 			
 			# Macro definition: Terminator included
 			name: "meta.function.definition.request.with-terminator.$2.roff"
-			begin: "^([.'])[ \t]*(de|am)\\s*(\\S+)\\s*(\"[^\"]+\"?|\\S+?(?=\\s|\\\\\"))?(.*)$"
-			end:   "^(\\.)[ \t]*((\\4)(?=$|\\s|\\\\(?:$|\")))"
+			begin: "^([.'])[ \t]*((de)|(am))\\s*(\\S+)\\s*(\"[^\"]+\"?|\\S+?(?=\\s|\\\\\"))?(.*)$"
+			end:   "^(\\.)[ \t]*((\\6)(?=$|\\s|\\\\(?:$|\")))"
 			beginCaptures:
 				1: {name: "punctuation.definition.request.roff"}
-				2: {name: "storage.type.function.roff"}
-				3: {name: "entity.name.function.roff"}
-				4: {name: "entity.terminator.roff", patterns: [{include: "#string"}]}
-				5: {patterns: [{include: "#params"}]}
+				3: {name: "storage.type.function.roff"}
+				4: {name: "entity.name.function.roff"}
+				5: {name: "variable.parameter.roff"}
+				6: {name: "entity.terminator.roff", patterns: [{include: "#string"}]}
+				7: {patterns: [{include: "#params"}]}
 			endCaptures:
 				1: {name: "punctuation.definition.request.roff"}
 				2: {name: "entity.terminator.roff"}

			
			# Macro definition: No terminator specified
			name: "meta.function.definition.request.$2.roff"
			begin: "^([.'])[ \t]*(de|am)\\s*(\\S+?)?\\s*(\\\\\".*)?$"
			end:   "^\\.[ \t]*\\."
			beginCaptures:
				1: {name: "punctuation.definition.request.roff"}
				2: {name: "storage.type.function.roff"}
				3: {name: "entity.name.function.roff"}
				4: {patterns: [{include: "#escapes"}]}
				5: {patterns: [{include: "#params"}]}
			endCaptures:
				0: {name: "punctuation.definition.request.roff"}
			patterns: [{include: "$self"}]

			# Generic requests without formatting
			name: "meta.function.request.$2.roff"
			begin: "(?x) ^([.'])[ \t]*
				(ab|ad|af|bd|bp|br|c2|cc|ce|cf|ch|cs|cu|da|di|dt|ec|em|eo
				|ev|ex|fc|fi|fl|fp|ft|hc|hw|hy|ig|in|it|lc|lg|lf|ll|ls|lt
				|mc|mk|na|ne|nf|nh|nm|nn|ns|nx|os|pc|pi|pl|pm|pn|po|ps|rd
				|rm|rn|rr|rs|rt|so|sp|ss|sv|sy|ta|tc|ti|tl|tm|tr|uf|vs|wh)"
			end: "(?<!\\\\)(?=\n)"
			beginCaptures:
				1: {name: "punctuation.definition.request.roff"}
