 			# .TH: Title (GNU manual macro)
 			name: "markup.heading.title.gnu.man.macro.roff"
 			patterns: [{include: "#params"}]
-			begin: "^([.'][ \t]*TH)(?=[ \t]|$)"
+			begin: "^([.'])[ \t]*(TH)(?=[ \t]|$)"
 			end: "$"
 			beginCaptures:
-				1: {name: "entity.name.function.roff"}
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.name.function.roff"}
 		},{
 			
 			# .SH: Section heading
 			name: "markup.heading.section.man.macro.roff"
 			patterns: [{include: "#params"}]
-			begin: "^([.'][ \t]*SH)(?=[ \t]|$)"
+			begin: "^([.'])[ \t]*(SH)(?=[ \t]|$)"
 			end: "$"
 			beginCaptures:
-				1: {name: "entity.name.function.roff"}
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.name.function.roff"}
 		},{
 			
 			# .Ss: Subsection
 			name: "markup.heading.subsection.man.macro.roff"
 			patterns: [{include: "#params"}]
-			begin: "^([.'][ \t]*Ss)(?=[ \t]|$)"
+			begin: "^([.'])[ \t]*(Ss)(?=[ \t]|$)"
 			end: "$"
 			beginCaptures:
-				1: {name: "entity.name.function.roff"}
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.name.function.roff"}
 		},{
 			
 			# .B: Bold
 			name: "markup.bold.roff"
-			begin: "^[.'][ \t]*B(?:$|[ \t]+|(?=\\\\))"
+			begin: "^([.'])[ \t]*(B)(?:$|[ \t]+|(?=\\\\))"
 			end:   "([^\n ]+ ?\n)"
 			patterns: [{ include: "$self" }]
-			
+			beginCaptures:
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.name.function.roff"}
 		},{
 			
 			# .I: Italic
 			name: "markup.italic.roff"
-			begin: "^[.'][ \t]*I(?:$|[ \t]+|(?=\\\\))"
+			begin: "^([.'])[ \t]*(I)(?:$|[ \t]+|(?=\\\\))"
 			end:   "([^\n ]+ ?\n)"
 			patterns: [{ include: "$self" }]
-			
+			beginCaptures:
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.name.function.roff"}
 		},{
 			
 			# .BI: Bold and italic
 			name: "markup.bold-italic.roff"
-			begin: "^([.'][ \t]*BI)(?=[ \t\\\\]|$)"
+			begin: "^([.'])[ \t]*(BI)(?=[ \t\\\\]|$)"
 			end:   "(?<!\\\\)(?=\n)"
 			beginCaptures:
-				1: {name: "entity.function.name.roff"}
+				1: {name: "punctuation.definition.macro.roff"}
+				2: {name: "entity.function.name.roff"}
 			patterns: [{
 				begin: '(?x)(?<=
 					^[.\']        BI|

	
	# Control line parameters
	params:
		patterns: [
			{include: "#escapes"}
			{include: "#string"}

			
			# .IR: Italic and Roman
			name: "markup.italic-roman.roff"
			begin: "^([.'])[ \t]*(IR)(?=[ \t\\\\]|$)"
			end:   "(?<!\\\\)(?=\n)"
			beginCaptures:
				1: {name: "punctuation.definition.macro.roff"}
				2: {name: "entity.function.name.roff"}
			patterns: [{
				begin: '(?x)(?<=
					^[.\']        IR|
