diff --git a/wgsl.xml b/wgsl.xml
index a049c34..879588d 100644
--- a/wgsl.xml
+++ b/wgsl.xml
@@ -63,6 +63,163 @@
 			<item>array</item>
 		</list>
 
+		<list name="Bit Reinterpretation Built-in Functions">
+			<item>bitcast</item>
+		</list>
+		<list name="Logical Built-in Functions">
+			<item>all</item>
+			<item>any</item>
+			<item>select</item>
+		</list>
+		<list name="Array Built-in Functions">
+			<item>arrayLength</item>
+		</list>
+		<list name="Numeric Built-in Functions">
+			<item>abs</item>
+			<item>acos</item>
+			<item>acosh</item>
+			<item>asin</item>
+			<item>asinh</item>
+			<item>atan</item>
+			<item>atanh</item>
+			<item>atan2</item>
+			<item>ceil</item>
+			<item>clamp</item>
+			<item>cos</item>
+			<item>cosh</item>
+			<item>countLeadingZeros</item>
+			<item>countOneBits</item>
+			<item>countTrailingZeros</item>
+			<item>cross</item>
+			<item>degrees</item>
+			<item>determinant</item>
+			<item>distance</item>
+			<item>dot</item>
+			<item>dot4U8Packed</item>
+			<item>dot4I8Packed</item>
+			<item>exp</item>
+			<item>exp2</item>
+			<item>extractBits</item> (signed)
+			<item>extractBits</item> (unsigned)
+			<item>faceForward</item>
+			<item>firstLeadingBit</item> (signed)
+			<item>firstLeadingBit</item> (unsigned)
+			<item>firstTrailingBit</item>
+			<item>floor</item>
+			<item>fma</item>
+			<item>fract</item>
+			<item>frexp</item>
+			<item>insertBits</item>
+			<item>inverseSqrt</item>
+			<item>ldexp</item>
+			<item>length</item>
+			<item>log</item>
+			<item>log2</item>
+			<item>max</item>
+			<item>min</item>
+			<item>mix</item>
+			<item>modf</item>
+			<item>normalize</item>
+			<item>pow</item>
+			<item>quantizeToF16</item>
+			<item>radians</item>
+			<item>reflect</item>
+			<item>refract</item>
+			<item>reverseBits</item>
+			<item>round</item>
+			<item>saturate</item>
+			<item>sign</item>
+			<item>sin</item>
+			<item>sinh</item>
+			<item>smoothstep</item>
+			<item>sqrt</item>
+			<item>step</item>
+			<item>tan</item>
+			<item>tanh</item>
+			<item>transpose</item>
+			<item>trunc</item>
+		</list>
+		<list name="Derivative Built-in Functions">
+			<item>dpdx</item>
+			<item>dpdxCoarse</item>
+			<item>dpdxFine</item>
+			<item>dpdy</item>
+			<item>dpdyCoarse</item>
+			<item>dpdyFine</item>
+			<item>fwidth</item>
+			<item>fwidthCoarse</item>
+			<item>fwidthFine</item>
+		</list>
+		<list name="Texture Built-in Functions">
+			<item>textureDimensions</item>
+			<item>textureGather</item>
+			<item>textureGatherCompare</item>
+			<item>textureLoad</item>
+			<item>textureNumLayers</item>
+			<item>textureNumLevels</item>
+			<item>textureNumSamples</item>
+			<item>textureSample</item>
+			<item>textureSampleBias</item>
+			<item>textureSampleCompare</item>
+			<item>textureSampleCompareLevel</item>
+			<item>textureSampleGrad</item>
+			<item>textureSampleLevel</item>
+			<item>textureSampleBaseClampToEdge</item>
+			<item>textureStore</item>
+		</list>
+		<list name="Atomic Built-in Functions">
+			<item>atomicLoad</item>
+			<item>atomicStore</item>
+			<item>atomicAdd</item>
+			<item>atomicSub</item>
+			<item>atomicMax</item>
+			<item>atomicMin</item>
+			<item>atomicAnd</item>
+			<item>atomicOr</item>
+			<item>atomicXor</item>
+			<item>atomicExchange</item>
+			<item>atomicCompareExchangeWeak</item>
+		</list>
+		<list name="Data Packing Built-in Functions">
+			<item>pack4x8snorm</item>
+			<item>pack4x8unorm</item>
+			<item>pack4xI8</item>
+			<item>pack4xU8</item>
+			<item>pack4xI8Clamp</item>
+			<item>pack4xU8Clamp</item>
+			<item>pack2x16snorm</item>
+			<item>pack2x16unorm</item>
+			<item>pack2x16float</item>
+		</list>
+		<list name="Data Unpacking Built-in Functions">
+			<item>unpack4x8snorm</item>
+			<item>unpack4x8unorm</item>
+			<item>unpack4xI8</item>
+			<item>unpack4xU8</item>
+			<item>unpack2x16snorm</item>
+			<item>unpack2x16unorm</item>
+			<item>unpack2x16float</item>
+		</list>
+		<list name="Synchronization Built-in Functions">
+			<item>storageBarrier</item>
+			<item>textureBarrier</item>
+			<item>workgroupBarrier</item>
+			<item>workgroupUniformLoad</item>
+		</list>
+
+		<list name="Built-in Functions">
+			<include>Bit Reinterpretation Built-in Functions</include>
+			<include>Logical Built-in Functions</include>
+			<include>Array Built-in Functions</include>
+			<include>Numeric Built-in Functions</include>
+			<include>Derivative Built-in Functions</include>
+			<include>Texture Built-in Functions</include>
+			<include>Atomic Built-in Functions</include>
+			<include>Data Packing Built-in Functions</include>
+			<include>Data Unpacking Built-in Functions</include>
+			<include>Synchronization Built-in Functions</include>
+		</list>
+
 		<list name="simple_attribute">
 			<item>@compute</item>
 			<item>@const</item>
@@ -135,7 +292,8 @@
 			<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="Builtin Type" context="#stay" String="type" />
+				<keyword attribute="Builtin Function" context="#stay" String="Built-in Functions" />
 			</context>
 
 			<context name="_Numbers">
@@ -204,7 +362,8 @@
 			<itemData spellChecking="false" name="Normal Text" defStyleNum="dsNormal" />
 			<itemData spellChecking="false" name="Keyword" defStyleNum="dsKeyword" />
 			<itemData spellChecking="false" name="Control Flow" defStyleNum="dsControlFlow" />
-			<itemData spellChecking="false" name="BuiltIn" defStyleNum="dsDataType" />
+			<itemData spellChecking="false" name="Builtin Type" defStyleNum="dsDataType" />
+			<itemData spellChecking="false" name="Builtin Function" defStyleNum="dsBuiltIn" />
 			<itemData spellChecking="false" name="Error" defStyleNum="dsError" />
 			<itemData spellChecking="false" name="Unknown Attribute" defStyleNum="dsError" />
 			<itemData spellChecking="false" name="Known Attribute" defStyleNum="dsAttribute" />