 	# EOF terminators for GNU APL
 	{
 		contentName: "text.embedded.apl"
-		begin: "^\\s*(\\)OFF|\\]NEXTFILE)\\b(.*)$"
+		begin: "^\\s*((\\))OFF|(\\])NEXTFILE)\\b(.*)$"
 		beginCaptures:
 			1: {name: "entity.name.command.eof.apl"}
-			2: {patterns: [{include: "#comment"}]}
+			2: {name: "punctuation.definition.command.apl"}
+			3: {name: "punctuation.definition.command.apl"}
+			4: {patterns: [{include: "#comment"}]}
 	}
 	
 	

	# User commands
	{
		name: "meta.user.command.apl"
		begin: "^\\s*(\\]\\S+)"
		end:   "$"
		beginCaptures:
			1: {name: "entity.name.command.apl"}
		patterns: [
			{ include: "#command-arguments" }
			{ include: "#command-switches"  }

	# System commands
	{
		name: "meta.system.command.apl"
		begin: "^\\s*((\\))\\S+)"
		end:   "$"
		beginCaptures:
			1: {name: "entity.name.command.apl"}
			2: {name: "punctuation.definition.command.apl"}
		patterns: [
			{ include: "#command-arguments" }
			{ include: "#command-switches"  }
