diff --git a/wgsl.xml b/wgsl.xml
index aa45223..1b9bc98 100644
--- a/wgsl.xml
+++ b/wgsl.xml
@@ -114,11 +114,19 @@
 
 		<contexts>
 			<context attribute="Normal Text" lineEndContext="#pop" name="Normal">
+				<IncludeRules context="_Keywords" />
+				<IncludeRules context="_Attributes" />
+				<IncludeRules context="_Numbers" />
+				<IncludeRules context="_Comments" />
+			</context>
+
+			<context name="_Keywords">
 				<keyword attribute="Keyword" context="#stay" String="keyword" />
 				<keyword attribute="Control Flow" context="#stay" String="control" />
 				<keyword attribute="BuiltIn" context="#stay" String="type" />
-				<keyword attribute="Known Attribute" context="AttributeArgsMaybe" String="attribute" />
-				<DetectChar attribute="Unknown Attribute" context="Attribute" char="@" />
+			</context>
+
+			<context name="_Numbers">
 				<RegExpr attribute="Hexadecimal Float" context="#stay" String="\b0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+([pP][+-]?[0-9]+[fh]?)?" />
 				<RegExpr attribute="Hexadecimal Float" context="#stay" String="\b0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*([pP][+-]?[0-9]+[fh]?)?" />
 				<RegExpr attribute="Hexadecimal Float" context="#stay" String="\b0[xX][0-9a-fA-F]+[pP][+-]?[0-9]+[fh]?" />
@@ -131,6 +139,9 @@
 				<RegExpr attribute="Decimal Float" context="#stay" String="\b[0-9]+[eE][+-]?[0-9]+[fh]?" />
 				<RegExpr attribute="Decimal Integer" context="#stay" String="\b0[iu]?" />
 				<RegExpr attribute="Decimal Integer" context="#stay" String="\b[1-9][0-9]*[iu]?" />
+			</context>
+
+			<context name="_Comments">
 				<Detect2Chars attribute="Comment" context="LineComment" char="/" char1="/" />
 				<Detect2Chars attribute="Comment" context="MultilineComment" char="/" char1="*" beginRegion="CommentFolding" />
 			</context>
@@ -142,6 +153,12 @@
 				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="CommentFolding" />
 				<IncludeRules context="##Alerts" />
 			</context>
+
+			<context name="_Attributes">
+				<keyword attribute="Known Attribute" context="AttributeArgsMaybe" String="attribute" />
+				<DetectChar attribute="Unknown Attribute" context="Attribute" char="@" />
+			</context>
+
 			<context attribute="Attribute Content" lineEndContext="#stay" name="Attribute">
 				<DetectIdentifier attribute="Unknown Attribute" context="#pop!AttributeArgsMaybe" />
 			</context>