 			{include: "#escaped-newline"}
 			{include: "#operators"}
 			{include: "#punctuation"}
-			{include: "#shapes"}
+			{include: "#primitives"}
 			{include: "#attributes"}
 			{include: "#globals"}
 			{include: "#function-call"}

		name: "variable.other.property.$1.pic"
		match: """(?x)\\b
			(cw|dashed|diameter|diam|dotted|down|height|ht|invisible
			|invis|left|move|radius|rad|right|same|up|width|wid)\\b"""


	# Instance backreferences: "1st, last, 2nd last, 8th", etc

			{match: "[-/+*%^]",   name: "keyword.operator.arithmetic.pic"}
		]


	# Shape primitives
	primitives:
		name: "keyword.function.pic"
		match: "\\b(box|line|arrow|circle|ellipse|arc|move|spline)\\b"
		captures: 0: name: "entity.function.name.pic"


	# Punctuation
	punctuation:
		patterns: [
