diff --git a/Makefile b/Makefile
index 8932961d..3ecb8621 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ test: release
 		then echo "Error: package.version != git.tag" && exit 1 ; fi
 
 devenv:
-	npm install syntaxdev@0.0.11
+	npm install syntaxdev@0.0.12
 
 release:
 	./node_modules/.bin/syntaxdev build-plist --in grammars/src/MagicPython.syntax.yaml --out grammars/MagicPython.tmLanguage
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
index 92b93020..fe97f739 100644
--- a/grammars/MagicPython.tmLanguage
+++ b/grammars/MagicPython.tmLanguage
@@ -1733,7 +1733,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>variable.parameter.class.python entity.other.inherited-class.python</string>
+            <string>entity.other.inherited-class.python variable.parameter.class.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3060,7 +3060,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.backreference.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3070,7 +3070,7 @@ indirectly through syntactic constructs
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.backreference.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp</string>
           </dict>
         </dict>
       </dict>
@@ -3332,7 +3332,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.begin.regexp</string>
+                <string>punctuation.character.set.begin.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -3350,7 +3350,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.end.regexp</string>
+                <string>punctuation.character.set.end.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -3389,7 +3389,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3402,7 +3402,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3479,7 +3479,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3519,7 +3519,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3559,7 +3559,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3599,7 +3599,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3639,7 +3639,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3666,7 +3666,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -3674,7 +3674,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3701,7 +3701,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -3709,7 +3709,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3809,7 +3809,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.begin.regexp</string>
+                <string>punctuation.character.set.begin.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -3827,7 +3827,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.end.regexp</string>
+                <string>punctuation.character.set.end.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -3866,7 +3866,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3879,7 +3879,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -3960,7 +3960,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4004,7 +4004,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4048,7 +4048,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4092,7 +4092,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4136,7 +4136,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4167,7 +4167,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -4175,7 +4175,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4206,7 +4206,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -4214,7 +4214,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4314,7 +4314,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.begin.regexp</string>
+                <string>punctuation.character.set.begin.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -4332,7 +4332,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.end.regexp</string>
+                <string>punctuation.character.set.end.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -4371,7 +4371,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4384,7 +4384,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4461,7 +4461,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4501,7 +4501,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4541,7 +4541,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4581,7 +4581,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4621,7 +4621,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4648,7 +4648,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -4656,7 +4656,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4683,7 +4683,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -4691,7 +4691,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4791,7 +4791,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.begin.regexp</string>
+                <string>punctuation.character.set.begin.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -4809,7 +4809,7 @@ indirectly through syntactic constructs
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.end.regexp</string>
+                <string>punctuation.character.set.end.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -4848,7 +4848,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4861,7 +4861,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4942,7 +4942,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -4986,7 +4986,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5030,7 +5030,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5074,7 +5074,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5118,7 +5118,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5149,7 +5149,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -5157,7 +5157,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5188,7 +5188,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -5196,7 +5196,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5497,7 +5497,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5510,7 +5510,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5550,7 +5550,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5590,7 +5590,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5630,7 +5630,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5670,7 +5670,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5710,7 +5710,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5737,7 +5737,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -5745,7 +5745,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5772,7 +5772,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -5780,7 +5780,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5873,7 +5873,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5886,7 +5886,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5930,7 +5930,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -5974,7 +5974,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6018,7 +6018,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6062,7 +6062,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6106,7 +6106,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6137,7 +6137,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6145,7 +6145,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6176,7 +6176,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6184,7 +6184,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6277,7 +6277,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6290,7 +6290,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6330,7 +6330,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6370,7 +6370,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6410,7 +6410,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6450,7 +6450,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6490,7 +6490,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6517,7 +6517,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6525,7 +6525,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6552,7 +6552,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6560,7 +6560,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6653,7 +6653,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6666,7 +6666,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6710,7 +6710,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6754,7 +6754,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6798,7 +6798,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6842,7 +6842,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6886,7 +6886,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6917,7 +6917,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6925,7 +6925,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6956,7 +6956,7 @@ indirectly through syntactic constructs
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -6964,7 +6964,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -6987,7 +6987,7 @@ indirectly through syntactic constructs
       <key>fregexp-single-one-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.single.python string.interpolated.python</string>
+        <string>string.interpolated.python string.regexp.quoted.single.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(\')</string>
         <key>end</key>
@@ -7039,7 +7039,7 @@ indirectly through syntactic constructs
       <key>fregexp-single-three-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.multi.python string.interpolated.python</string>
+        <string>string.interpolated.python string.regexp.quoted.multi.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(\'\'\')</string>
         <key>end</key>
@@ -7091,7 +7091,7 @@ indirectly through syntactic constructs
       <key>fregexp-double-one-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.single.python string.interpolated.python</string>
+        <string>string.interpolated.python string.regexp.quoted.single.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(")</string>
         <key>end</key>
@@ -7143,7 +7143,7 @@ indirectly through syntactic constructs
       <key>fregexp-double-three-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.multi.python string.interpolated.python</string>
+        <string>string.interpolated.python string.regexp.quoted.multi.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(""")</string>
         <key>end</key>
@@ -7805,7 +7805,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.single.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.single.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7815,7 +7815,7 @@ indirectly through syntactic constructs
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.interpolated.python string.quoted.single.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -7823,7 +7823,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7869,12 +7869,12 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.single.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.single.python storage.type.string.python</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.quoted.single.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -7882,7 +7882,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7923,12 +7923,12 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.raw.single.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.raw.single.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.single.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.quoted.raw.single.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -7936,7 +7936,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.single.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.single.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7967,7 +7967,7 @@ indirectly through syntactic constructs
       <key>fstring-single-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.single.python string.interpolated.python</string>
+        <string>string.interpolated.python string.quoted.single.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -7990,7 +7990,7 @@ indirectly through syntactic constructs
       <key>fstring-raw-single-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.raw.single.python string.interpolated.python</string>
+        <string>string.interpolated.python string.quoted.raw.single.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -8177,7 +8177,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.multi.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.multi.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8187,7 +8187,7 @@ indirectly through syntactic constructs
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.interpolated.python string.quoted.multi.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -8195,7 +8195,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8241,12 +8241,12 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.multi.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.multi.python storage.type.string.python</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.quoted.multi.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -8254,7 +8254,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8295,12 +8295,12 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>storage.type.string.python string.quoted.raw.multi.python string.interpolated.python</string>
+            <string>string.interpolated.python string.quoted.raw.multi.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.multi.python punctuation.definition.string.begin.python</string>
+            <string>punctuation.definition.string.begin.python string.quoted.raw.multi.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -8308,7 +8308,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
+            <string>punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.multi.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8339,7 +8339,7 @@ indirectly through syntactic constructs
       <key>fstring-multi-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.multi.python string.interpolated.python</string>
+        <string>string.interpolated.python string.quoted.multi.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -8362,7 +8362,7 @@ indirectly through syntactic constructs
       <key>fstring-raw-multi-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.raw.multi.python string.interpolated.python</string>
+        <string>string.interpolated.python string.quoted.raw.multi.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
diff --git a/grammars/MagicRegExp.tmLanguage b/grammars/MagicRegExp.tmLanguage
index 37c42d1b..3bc9d48e 100644
--- a/grammars/MagicRegExp.tmLanguage
+++ b/grammars/MagicRegExp.tmLanguage
@@ -148,7 +148,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.backreference.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -158,7 +158,7 @@
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.backreference.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp</string>
           </dict>
         </dict>
       </dict>
@@ -348,7 +348,7 @@
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.begin.regexp</string>
+                <string>punctuation.character.set.begin.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -366,7 +366,7 @@
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>constant.other.set.regexp punctuation.character.set.end.regexp</string>
+                <string>punctuation.character.set.end.regexp constant.other.set.regexp</string>
               </dict>
               <key>2</key>
               <dict>
@@ -405,7 +405,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -418,7 +418,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -495,7 +495,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp</string>
+            <string>keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -535,7 +535,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp</string>
+            <string>keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -575,7 +575,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp</string>
+            <string>keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -615,7 +615,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp</string>
+            <string>keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -655,7 +655,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp</string>
+            <string>keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -682,7 +682,7 @@
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -690,7 +690,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>
@@ -717,7 +717,7 @@
           <key>0</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp</string>
           </dict>
         </dict>
         <key>endCaptures</key>
@@ -725,7 +725,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.parenthesis.end.regexp support.other.parenthesis.regexp</string>
+            <string>support.other.parenthesis.regexp punctuation.parenthesis.end.regexp</string>
           </dict>
           <key>2</key>
           <dict>