diff --git a/wgsl.xml b/wgsl.xml
index 7a8a08d..eb89ec3 100644
--- a/wgsl.xml
+++ b/wgsl.xml
@@ -144,15 +144,14 @@
 				<IncludeRules context="##Alerts" />
 			</context>
 			<context attribute="Attribute" lineEndContext="#stay" name="Attribute">
-				<StringDetect attribute="Attribute" context="#pop!AttrBuiltin1" String="builtin" />
-				<keyword attribute="Attribute" context="#pop" String="attribute" />
-				<DetectIdentifier attribute="Attribute" context="#pop" />
+				<DetectIdentifier attribute="Attribute" context="#pop!AttributeArgsMaybe" />
 			</context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="AttrBuiltin1">
-				<DetectChar attribute="Attribute" context="#pop!AttrBuiltin2" char="(" />
+			<context attribute="Attribute" lineEndContext="#stay" name="AttributeArgsMaybe">
+				<DetectChar attribute="Attribute" context="#pop!AttributeArgs" char="(" />
+				<RegExpr attribute="Normal Text" context="#pop" lookAhead="true" String="[^\s(]" />
 			</context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="AttrBuiltin2">
-				<keyword attribute="Attribute" context="#stay" String="builtin_value_name" />
+			<context attribute="Attribute" lineEndContext="#stay" name="AttributeArgs">
+				<DetectChar attribute="Attribute" context="AttributeArgs" char="(" />
 				<DetectChar attribute="Attribute" context="#pop" char=")" />
 			</context>
 		</contexts>