From 524bf7c9c4f26048cf3e9a548fb0414fa4e5f867 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 10 Mar 2017 16:01:42 -0800
Subject: [PATCH] Pick up new c/c++ grammar fixes #22339 (#22358)

---
 extensions/cpp/syntaxes/c++.json              |   14 +-
 extensions/cpp/syntaxes/c.json                | 1630 +++++++++++++----
 .../cpp/test/colorize-results/test_c.json     | 1071 +++++++++--
 .../cpp/test/colorize-results/test_cc.json    |  595 ++++--
 .../cpp/test/colorize-results/test_cpp.json   |  307 +++-
 .../test/colorize-results/test_m.json         |  668 +++----
 6 files changed, 3116 insertions(+), 1169 deletions(-)

diff --git a/extensions/cpp/syntaxes/c++.json b/extensions/cpp/syntaxes/c++.json
index 8e715c6b3f6..5c42cca159e 100644
--- a/extensions/cpp/syntaxes/c++.json
+++ b/extensions/cpp/syntaxes/c++.json
@@ -144,13 +144,13 @@
 			"begin": "\\{",
 			"beginCaptures": {
 				"0": {
-					"name": "punctuation.section.block.begin.c"
+					"name": "punctuation.section.block.begin.bracket.curly.c"
 				}
 			},
 			"end": "\\}",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.section.block.end.c"
+					"name": "punctuation.section.block.end.bracket.curly.c"
 				}
 			},
 			"name": "meta.block.cpp",
@@ -318,13 +318,13 @@
 							"begin": "\\{",
 							"beginCaptures": {
 								"0": {
-									"name": "punctuation.section.block.begin.cpp"
+									"name": "punctuation.section.block.begin.bracket.curly.cpp"
 								}
 							},
 							"end": "(\\})(\\s*\\n)?",
 							"endCaptures": {
 								"1": {
-									"name": "punctuation.section.block.end.cpp"
+									"name": "punctuation.section.block.end.bracket.curly.cpp"
 								},
 								"2": {
 									"name": "invalid.illegal.you-forgot-semicolon.cpp"
@@ -361,13 +361,13 @@
 							"begin": "\\{",
 							"beginCaptures": {
 								"0": {
-									"name": "punctuation.section.block.begin.c"
+									"name": "punctuation.section.block.begin.bracket.curly.c"
 								}
 							},
 							"end": "\\}|(?=\\s*#\\s*endif\\b)",
 							"endCaptures": {
 								"0": {
-									"name": "punctuation.section.block.end.c"
+									"name": "punctuation.section.block.end.bracket.curly.c"
 								}
 							},
 							"patterns": [
@@ -451,5 +451,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/atom/language-c/commit/80db38512efabb3030d600a8d8f8b6d91abbc96b"
+	"version": "https://github.com/atom/language-c/commit/314f4ee53ede0adc91f56ef91b13d43e66771cd7"
 }
\ No newline at end of file
diff --git a/extensions/cpp/syntaxes/c.json b/extensions/cpp/syntaxes/c.json
index 28ecbab7b57..a52e0c210f4 100644
--- a/extensions/cpp/syntaxes/c.json
+++ b/extensions/cpp/syntaxes/c.json
@@ -14,7 +14,7 @@
 			"include": "#preprocessor-rule-disabled"
 		},
 		{
-			"include": "#preprocessor-rule-other"
+			"include": "#preprocessor-rule-conditional"
 		},
 		{
 			"include": "#comments"
@@ -24,8 +24,7 @@
 			"name": "keyword.control.c"
 		},
 		{
-			"match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b",
-			"name": "storage.type.c"
+			"include": "#storage_types"
 		},
 		{
 			"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
@@ -57,7 +56,7 @@
 			"include": "#strings"
 		},
 		{
-			"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+     # define\n((?<id>[a-zA-Z_$][\\w$]*))  # macro name\n(?:\n  (\\()\n    (\n      \\s* \\g<id> \\s*         # first argument\n      ((,) \\s* \\g<id> \\s*)*  # additional arguments\n      (?:\\.\\.\\.)?            # varargs ellipsis?\n    )\n  (\\))\n)?",
+			"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+    # define\n((?<id>[a-zA-Z_$][\\w$]*))      # macro name\n(?:\n  (\\()\n    (\n      \\s* \\g<id> \\s*         # first argument\n      ((,) \\s* \\g<id> \\s*)*  # additional arguments\n      (?:\\.\\.\\.)?            # varargs ellipsis?\n    )\n  (\\))\n)?",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.define.c"
@@ -85,7 +84,7 @@
 			"name": "meta.preprocessor.macro.c",
 			"patterns": [
 				{
-					"include": "$base"
+					"include": "#preprocessor-rule-define-line-contents"
 				}
 			]
 		},
@@ -99,16 +98,22 @@
 					"name": "punctuation.definition.directive.c"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
+			"end": "(?<!\\\\)(?=\\n)|(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))",
 			"name": "meta.preprocessor.diagnostic.c",
 			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#strings"
+				},
 				{
 					"include": "#line_continuation_character"
 				}
 			]
 		},
 		{
-			"begin": "^\\s*((#)\\s*(include|import))\\b\\s*",
+			"begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.$3.c"
@@ -183,31 +188,57 @@
 			]
 		},
 		{
-			"begin": "^\\s*(?:((#)\\s*(?:elif|else|if|ifdef|ifndef))|((#)\\s*(pragma|undef)))\\b",
+			"begin": "^\\s*(?:((#)\\s*undef))\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.directive.conditional.c"
+					"name": "keyword.control.directive.undef.c"
 				},
 				"2": {
 					"name": "punctuation.definition.directive.c"
+				}
+			},
+			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+			"name": "meta.preprocessor.c",
+			"patterns": [
+				{
+					"match": "[a-zA-Z_$][\\w$]*",
+					"name": "entity.name.function.preprocessor.c"
 				},
-				"3": {
-					"name": "keyword.control.directive.$5.c"
+				{
+					"include": "#line_continuation_character"
+				}
+			]
+		},
+		{
+			"begin": "^\\s*(?:((#)\\s*pragma))\\b",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.directive.pragma.c"
 				},
-				"4": {
+				"2": {
 					"name": "punctuation.definition.directive.c"
 				}
 			},
 			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"name": "meta.preprocessor.c",
+			"name": "meta.preprocessor.pragma.c",
 			"patterns": [
+				{
+					"include": "#strings"
+				},
+				{
+					"match": "[a-zA-Z_$][\\w\\-$]*",
+					"name": "entity.other.attribute-name.pragma.preprocessor.c"
+				},
+				{
+					"include": "#numbers"
+				},
 				{
 					"include": "#line_continuation_character"
 				}
 			]
 		},
 		{
-			"match": "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
+			"match": "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
 			"name": "support.type.sys-types.c"
 		},
 		{
@@ -234,38 +265,39 @@
 			"include": "#block"
 		},
 		{
-			"begin": "(?x)\n(?:\n  ^ |\n  (?:\n    (?=\\s)(?<!else|new|return)(?<=\\w)  # word + space before name\n    |\n    (?=\\s*[A-Za-z_])(?<!&&)(?<=[*&>])   # type modifier before name\n  )\n)\n(\\s*)(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(?=\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.function.leading.c"
-				},
-				"3": {
-					"name": "entity.name.function.c"
-				},
-				"4": {
-					"name": "punctuation.definition.parameters.c"
-				}
-			},
-			"end": "(?<=\\})|(?=#)|(;)",
+			"include": "#parens"
+		},
+		{
+			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+			"end": "(?<=\\))(?!\\w)",
 			"name": "meta.function.c",
 			"patterns": [
 				{
-					"include": "#comments"
-				},
-				{
-					"include": "#parens"
-				},
-				{
-					"match": "\\b(const)\\b",
-					"name": "storage.modifier.c"
-				},
-				{
-					"include": "#block"
+					"include": "#function-innards"
 				}
 			]
 		},
 		{
 			"include": "#line_continuation_character"
+		},
+		{
+			"match": "(\\[)|(\\])",
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.begin.bracket.square.c"
+				},
+				"2": {
+					"name": "punctuation.definition.end.bracket.square.c"
+				}
+			}
+		},
+		{
+			"match": ";",
+			"name": "punctuation.terminator.statement.c"
+		},
+		{
+			"match": ",",
+			"name": "punctuation.separator.delimiter.c"
 		}
 	],
 	"repository": {
@@ -281,21 +313,21 @@
 					"name": "variable.other.member.c"
 				}
 			},
-			"match": "((\\.)|(->))([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\()"
+			"match": "((\\.)|(->))\\s*(([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\())?"
 		},
 		"block": {
 			"patterns": [
 				{
-					"begin": "\\{",
+					"begin": "{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.block.begin.c"
+							"name": "punctuation.section.block.begin.bracket.curly.c"
 						}
 					},
-					"end": "\\}|(?=\\s*#\\s*endif\\b)",
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.block.end.c"
+							"name": "punctuation.section.block.end.bracket.curly.c"
 						}
 					},
 					"name": "meta.block.c",
@@ -316,7 +348,7 @@
 					"include": "#preprocessor-rule-disabled-block"
 				},
 				{
-					"include": "#preprocessor-rule-other-block"
+					"include": "#preprocessor-rule-conditional-block"
 				},
 				{
 					"include": "#access"
@@ -340,7 +372,26 @@
 					"name": "meta.initialization.c"
 				},
 				{
-					"include": "#block"
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.block.begin.bracket.curly.c"
+						}
+					},
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.block.end.bracket.curly.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#block_innards"
+						}
+					]
+				},
+				{
+					"include": "#parens-block"
 				},
 				{
 					"include": "$base"
@@ -348,19 +399,14 @@
 			]
 		},
 		"c_function_call": {
-			"captures": {
-				"1": {
-					"name": "punctuation.whitespace.function-call.leading.c"
-				},
-				"2": {
-					"name": "support.function.any-method.c"
-				},
-				"4": {
-					"name": "punctuation.definition.parameters.c"
+			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(?=\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+			"end": "(?<=\\))(?!\\w)",
+			"name": "meta.function-call.c",
+			"patterns": [
+				{
+					"include": "#function-call-innards"
 				}
-			},
-			"match": "(?x)\n(?:\n  (?=\\s)\n  (?:(?<=else|new|return) | (?<!\\w)) (\\s+)\n)?\n\n# Actual name\n(\n  \\b\n  (?!\n    (while|for|do|if|else|switch|catch|enumerate|return|sizeof|r?iterate)\n    \\s* \\(\n  )\n  (?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | ::)++\n)\n\\s*(\\() # Opening bracket",
-			"name": "meta.function-call.c"
+			]
 		},
 		"comments": {
 			"patterns": [
@@ -417,7 +463,7 @@
 									"name": "punctuation.definition.comment.cpp"
 								}
 							},
-							"end": "\\n",
+							"end": "(?=\\n)",
 							"name": "comment.line.double-slash.cpp",
 							"patterns": [
 								{
@@ -467,7 +513,7 @@
 		"numbers": {
 			"patterns": [
 				{
-					"match": "\\b((0(x|X)[0-9a-fA-F]*)|(0(b|B)[01]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
+					"match": "\\b((0(x|X)[0-9a-fA-F']*)|(0(b|B)[01']*)|(([0-9']+\\.?[0-9']*)|(\\.[0-9']+))((e|E)(\\+|-)?[0-9']+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
 					"name": "constant.numeric.c"
 				}
 			]
@@ -476,26 +522,44 @@
 			"begin": "\\(",
 			"beginCaptures": {
 				"0": {
-					"name": "punctuation.section.parens.begin.c"
+					"name": "punctuation.section.parens.begin.bracket.round.c"
 				}
 			},
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.section.parens.end.c"
+					"name": "punctuation.section.parens.end.bracket.round.c"
 				}
 			},
-			"name": "meta.parens.c",
 			"patterns": [
 				{
 					"include": "$base"
 				}
 			]
 		},
+		"parens-block": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.parens.begin.bracket.round.c"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.parens.end.bracket.round.c"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#block_innards"
+				}
+			]
+		},
 		"pragma-mark": {
 			"captures": {
 				"1": {
-					"name": "meta.preprocessor.c"
+					"name": "meta.preprocessor.pragma.c"
 				},
 				"2": {
 					"name": "keyword.control.directive.pragma.pragma-mark.c"
@@ -504,132 +568,643 @@
 					"name": "punctuation.definition.directive.c"
 				},
 				"4": {
-					"name": "meta.toc-list.pragma-mark.c"
+					"name": "entity.name.tag.pragma-mark.c"
 				}
 			},
 			"match": "^\\s*(((#)\\s*pragma\\s+mark)\\s+(.*))",
 			"name": "meta.section"
 		},
-		"preprocessor-rule-disabled": {
-			"begin": "^\\s*(((#)if)\\s+(0)\\b).*",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
+		"operators": {
+			"patterns": [
+				{
+					"match": "(?<![\\w$])(sizeof)(?![\\w$])",
+					"name": "keyword.operator.sizeof.c"
 				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
+				{
+					"match": "--",
+					"name": "keyword.operator.decrement.c"
 				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
+				{
+					"match": "\\+\\+",
+					"name": "keyword.operator.increment.c"
 				},
-				"4": {
-					"name": "constant.numeric.preprocessor.c"
-				}
-			},
-			"end": "^\\s*(((#)\\s*endif)\\b)",
-			"endCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
+				{
+					"match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
+					"name": "keyword.operator.assignment.compound.c"
 				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
+				{
+					"match": "&=|\\^=|<<=|>>=|\\|=",
+					"name": "keyword.operator.assignment.compound.bitwise.c"
+				},
+				{
+					"match": "<<|>>",
+					"name": "keyword.operator.bitwise.shift.c"
+				},
+				{
+					"match": "!=|<=|>=|==|<|>",
+					"name": "keyword.operator.comparison.c"
+				},
+				{
+					"match": "&&|!|\\|\\|",
+					"name": "keyword.operator.logical.c"
+				},
+				{
+					"match": "&|\\||\\^|~",
+					"name": "keyword.operator.c"
+				},
+				{
+					"match": "=",
+					"name": "keyword.operator.assignment.c"
+				},
+				{
+					"match": "%|\\*|/|-|\\+",
+					"name": "keyword.operator.c"
 				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				}
-			},
-			"patterns": [
 				{
-					"begin": "^\\s*(((#)\\s*else)\\b)",
+					"begin": "\\?",
 					"beginCaptures": {
-						"1": {
-							"name": "meta.preprocessor.c"
-						},
-						"2": {
-							"name": "keyword.control.directive.conditional.c"
-						},
-						"3": {
-							"name": "punctuation.definition.directive.c"
+						"0": {
+							"name": "keyword.operator.ternary.c"
 						}
 					},
-					"end": "(?=^\\s*#\\s*endif\\b)",
-					"patterns": [
-						{
-							"include": "$base"
+					"end": ":",
+					"endCaptures": {
+						"0": {
+							"name": "keyword.operator.ternary.c"
 						}
-					]
-				},
-				{
-					"begin": "\\G",
-					"end": "(?=^\\s*#\\s*(else|endif)\\b)",
-					"contentName": "comment.block.preprocessor.if-branch",
+					},
 					"patterns": [
 						{
-							"include": "#disabled"
+							"include": "#access"
 						},
 						{
-							"include": "#pragma-mark"
+							"include": "#libc"
+						},
+						{
+							"include": "#c_function_call"
+						},
+						{
+							"include": "$self"
 						}
 					]
 				}
 			]
 		},
-		"preprocessor-rule-disabled-block": {
-			"begin": "^\\s*(((#)if)\\s+(0)\\b).*",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				},
-				"4": {
-					"name": "constant.numeric.preprocessor.c"
-				}
-			},
-			"end": "^\\s*(((#)\\s*endif)\\b)",
-			"endCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				}
-			},
+		"strings": {
 			"patterns": [
 				{
-					"begin": "^\\s*(((#)\\s*else\\b))",
+					"begin": "\"",
 					"beginCaptures": {
-						"1": {
-							"name": "meta.preprocessor.c"
-						},
-						"2": {
-							"name": "keyword.control.directive.conditional.c"
-						},
-						"3": {
-							"name": "punctuation.definition.directive.c"
+						"0": {
+							"name": "punctuation.definition.string.begin.c"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.c"
 						}
 					},
-					"end": "(?=^\\s*#\\s*endif\\b)",
+					"name": "string.quoted.double.c",
 					"patterns": [
 						{
-							"include": "#block_innards"
+							"include": "#string_escaped_char"
+						},
+						{
+							"include": "#string_placeholder"
+						},
+						{
+							"include": "#line_continuation_character"
 						}
 					]
 				},
 				{
-					"begin": "\\G",
-					"end": "(?=^\\s*#\\s*(else|endif)\\b)",
-					"contentName": "comment.block.preprocessor.if-branch.in-block",
-					"patterns": [
-						{
-							"include": "#disabled"
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.c"
+						}
+					},
+					"end": "'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.c"
+						}
+					},
+					"name": "string.quoted.single.c",
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
+						},
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				}
+			]
+		},
+		"string_escaped_char": {
+			"patterns": [
+				{
+					"match": "(?x)\\\\ (\n\\\\             |\n[abefnprtv'\"?]   |\n[0-3]\\d{,2}     |\n[4-7]\\d?        |\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
+					"name": "constant.character.escape.c"
+				},
+				{
+					"match": "\\\\.",
+					"name": "invalid.illegal.unknown-escape.c"
+				}
+			]
+		},
+		"string_placeholder": {
+			"patterns": [
+				{
+					"match": "(?x) %\n(\\d+\\$)?                           # field (argument #)\n[#0\\- +']*                          # flags\n[,;:_]?                              # separator character (AltiVec)\n((-?\\d+)|\\*(-?\\d+\\$)?)?          # minimum field width\n(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?    # precision\n(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n[diouxXDOUeEfFgGaACcSspn%]           # conversion type",
+					"name": "constant.other.placeholder.c"
+				},
+				{
+					"match": "(%)(?!\"\\s*(PRI|SCN))",
+					"captures": {
+						"1": {
+							"name": "invalid.illegal.placeholder.c"
+						}
+					}
+				}
+			]
+		},
+		"storage_types": {
+			"patterns": [
+				{
+					"match": "\\b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\b",
+					"name": "storage.type.c"
+				}
+			]
+		},
+		"vararg_ellipses": {
+			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
+			"name": "punctuation.vararg-ellipses.c"
+		},
+		"preprocessor-rule-conditional": {
+			"patterns": [
+				{
+					"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "#preprocessor-rule-enabled-elif"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-else"
+						},
+						{
+							"include": "#preprocessor-rule-disabled-elif"
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"match": "^\\s*#\\s*(else|elif|endif)\\b",
+					"captures": {
+						"0": {
+							"name": "invalid.illegal.stray-$1.c"
+						}
+					}
+				}
+			]
+		},
+		"preprocessor-rule-conditional-block": {
+			"patterns": [
+				{
+					"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "#preprocessor-rule-enabled-elif-block"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-else-block"
+						},
+						{
+							"include": "#preprocessor-rule-disabled-elif"
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "#block_innards"
+						}
+					]
+				},
+				{
+					"match": "^\\s*#\\s*(else|elif|endif)\\b",
+					"captures": {
+						"0": {
+							"name": "invalid.illegal.stray-$1.c"
+						}
+					}
+				}
+			]
+		},
+		"preprocessor-rule-conditional-line": {
+			"patterns": [
+				{
+					"match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+					"name": "keyword.control.directive.conditional.c"
+				},
+				{
+					"match": "\\bdefined\\b",
+					"name": "invalid.illegal.macro-name.c"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#strings"
+				},
+				{
+					"include": "#numbers"
+				},
+				{
+					"begin": "\\?",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.ternary.c"
+						}
+					},
+					"end": ":",
+					"endCaptures": {
+						"0": {
+							"name": "keyword.operator.ternary.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-conditional-line"
+						}
+					]
+				},
+				{
+					"include": "#operators"
+				},
+				{
+					"match": "\\b(NULL|true|false|TRUE|FALSE)\\b",
+					"name": "constant.language.c"
+				},
+				{
+					"match": "[a-zA-Z_$][\\w$]*",
+					"name": "entity.name.function.preprocessor.c"
+				},
+				{
+					"include": "#line_continuation_character"
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.c"
+						}
+					},
+					"end": "\\)|(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-conditional-line"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor-rule-disabled": {
+			"patterns": [
+				{
+					"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-elif"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-else"
+						},
+						{
+							"include": "#preprocessor-rule-disabled-elif"
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+									"name": "meta.preprocessor.c",
+									"patterns": [
+										{
+											"include": "#preprocessor-rule-conditional-line"
+										}
+									]
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"begin": "\\n",
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.if-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"preprocessor-rule-disabled-block": {
+			"patterns": [
+				{
+					"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
+						},
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-elif-block"
+						},
+						{
+							"include": "#preprocessor-rule-enabled-else-block"
+						},
+						{
+							"include": "#preprocessor-rule-disabled-elif"
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+							"patterns": [
+								{
+									"begin": "\\G",
+									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+									"name": "meta.preprocessor.c",
+									"patterns": [
+										{
+											"include": "#preprocessor-rule-conditional-line"
+										}
+									]
+								},
+								{
+									"include": "#block_innards"
+								}
+							]
+						},
+						{
+							"begin": "\\n",
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.if-branch.in-block.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"preprocessor-rule-disabled-elif": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.c"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.c"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.c"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+			"patterns": [
+				{
+					"begin": "\\G",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.c",
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-conditional-line"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.elif-branch.c",
+					"patterns": [
+						{
+							"include": "#disabled"
 						},
 						{
 							"include": "#pragma-mark"
@@ -639,348 +1214,741 @@
 			]
 		},
 		"preprocessor-rule-enabled": {
-			"begin": "^\\s*(((#)if)\\s+(0*1)\\b)",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				},
-				"4": {
-					"name": "constant.numeric.preprocessor.c"
-				}
-			},
-			"end": "^\\s*(((#)\\s*endif)\\b)",
-			"endCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				}
-			},
 			"patterns": [
 				{
-					"begin": "^\\s*(((#)\\s*else)\\b).*",
+					"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.preprocessor.c"
 						},
-						"2": {
+						"1": {
 							"name": "keyword.control.directive.conditional.c"
 						},
+						"2": {
+							"name": "punctuation.definition.directive.c"
+						},
 						"3": {
+							"name": "constant.numeric.preprocessor.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
+						"2": {
 							"name": "punctuation.definition.directive.c"
 						}
 					},
-					"contentName": "comment.block.preprocessor.else-branch",
-					"end": "(?=^\\s*#\\s*endif\\b)",
 					"patterns": [
 						{
-							"include": "#disabled"
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
 						},
 						{
-							"include": "#pragma-mark"
-						}
-					]
-				},
-				{
-					"begin": "\\G",
-					"end": "(?=^\\s*#\\s*(else|endif)\\b)",
-					"patterns": [
+							"include": "#comments"
+						},
 						{
-							"include": "$base"
+							"begin": "^\\s*((#)\\s*else\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.else-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.if-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "\\n",
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
 						}
 					]
 				}
 			]
 		},
 		"preprocessor-rule-enabled-block": {
-			"begin": "^\\s*(((#)if)\\s+(0*1)\\b)",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				},
-				"4": {
-					"name": "constant.numeric.preprocessor.c"
-				}
-			},
-			"end": "^\\s*(((#)\\s*endif)\\b)",
-			"endCaptures": {
-				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				}
-			},
 			"patterns": [
 				{
-					"begin": "^\\s*(((#)\\s*else)\\b).*",
+					"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.preprocessor.c"
 						},
+						"1": {
+							"name": "keyword.control.directive.conditional.c"
+						},
 						"2": {
+							"name": "punctuation.definition.directive.c"
+						}
+					},
+					"end": "^\\s*((#)\\s*endif\\b)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.preprocessor.c"
+						},
+						"1": {
 							"name": "keyword.control.directive.conditional.c"
 						},
-						"3": {
+						"2": {
 							"name": "punctuation.definition.directive.c"
 						}
 					},
-					"contentName": "comment.block.preprocessor.else-branch.in-block",
-					"end": "(?=^\\s*#\\s*endif\\b)",
 					"patterns": [
 						{
-							"include": "#disabled"
+							"begin": "\\G",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+							"name": "meta.preprocessor.c",
+							"patterns": [
+								{
+									"include": "#preprocessor-rule-conditional-line"
+								}
+							]
 						},
 						{
-							"include": "#pragma-mark"
+							"include": "#comments"
+						},
+						{
+							"begin": "^\\s*((#)\\s*else\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.else-branch.in-block.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*elif\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.if-branch.in-block.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "\\n",
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"patterns": [
+								{
+									"include": "#block_innards"
+								}
+							]
 						}
 					]
+				}
+			]
+		},
+		"preprocessor-rule-enabled-elif": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.c"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.c"
 				},
+				"2": {
+					"name": "punctuation.definition.directive.c"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
 				{
 					"begin": "\\G",
-					"end": "(?=^\\s*#\\s*(else|endif)\\b)",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.c",
 					"patterns": [
 						{
-							"include": "#block_innards"
+							"include": "#preprocessor-rule-conditional-line"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+					"patterns": [
+						{
+							"begin": "^\\s*((#)\\s*(else)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*(elif)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"preprocessor-rule-other": {
-			"begin": "^\\s*(((#)\\s*if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+		"preprocessor-rule-enabled-elif-block": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.preprocessor.c"
 				},
-				"2": {
+				"1": {
 					"name": "keyword.control.directive.conditional.c"
 				},
-				"3": {
+				"2": {
 					"name": "punctuation.definition.directive.c"
 				}
 			},
-			"end": "^\\s*(((#)\\s*(endif))\\b)",
-			"endCaptures": {
-				"1": {
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
+				{
+					"begin": "\\G",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.c",
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-conditional-line"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+					"patterns": [
+						{
+							"begin": "^\\s*((#)\\s*(else)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.in-block.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*(elif)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.c"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.c"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.c"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.c",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma-mark"
+								}
+							]
+						},
+						{
+							"include": "#block_innards"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor-rule-enabled-else": {
+			"begin": "^\\s*((#)\\s*else\\b)",
+			"beginCaptures": {
+				"0": {
 					"name": "meta.preprocessor.c"
 				},
-				"2": {
+				"1": {
 					"name": "keyword.control.directive.conditional.c"
 				},
-				"3": {
+				"2": {
 					"name": "punctuation.definition.directive.c"
 				}
 			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
 					"include": "$base"
 				}
 			]
 		},
-		"preprocessor-rule-other-block": {
-			"begin": "^\\s*(((#)\\s*if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+		"preprocessor-rule-enabled-else-block": {
+			"begin": "^\\s*((#)\\s*else\\b)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.preprocessor.c"
 				},
-				"2": {
-					"name": "keyword.control.directive.conditional.c"
-				},
-				"3": {
-					"name": "punctuation.definition.directive.c"
-				}
-			},
-			"end": "^\\s*(((#)\\s*endif)\\b)",
-			"endCaptures": {
 				"1": {
-					"name": "meta.preprocessor.c"
-				},
-				"2": {
 					"name": "keyword.control.directive.conditional.c"
 				},
-				"3": {
+				"2": {
 					"name": "punctuation.definition.directive.c"
 				}
 			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
 					"include": "#block_innards"
 				}
 			]
 		},
-		"operators": {
+		"preprocessor-rule-define-line-contents": {
 			"patterns": [
 				{
-					"match": "(?<![\\w$])(sizeof)(?![\\w$])",
-					"name": "keyword.operator.sizeof.c"
-				},
-				{
-					"match": "--",
-					"name": "keyword.operator.decrement.c"
-				},
-				{
-					"match": "\\+\\+",
-					"name": "keyword.operator.increment.c"
-				},
-				{
-					"match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
-					"name": "keyword.operator.assignment.compound.c"
-				},
-				{
-					"match": "&=|\\^=|<<=|>>=|\\|=",
-					"name": "keyword.operator.assignment.compound.bitwise.c"
-				},
-				{
-					"match": "<<|>>",
-					"name": "keyword.operator.bitwise.shift.c"
-				},
-				{
-					"match": "!=|<=|>=|==|<|>",
-					"name": "keyword.operator.comparison.c"
+					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "&&|!|\\|\\|",
-					"name": "keyword.operator.logical.c"
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.block.begin.bracket.curly.c"
+						}
+					},
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.block.end.bracket.curly.c"
+						}
+					},
+					"name": "meta.block.c",
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-define-line-blocks"
+						}
+					]
 				},
 				{
-					"match": "&|\\||\\^|~",
-					"name": "keyword.operator.c"
+					"match": "\\(",
+					"name": "punctuation.section.parens.begin.bracket.round.c"
 				},
 				{
-					"match": "=",
-					"name": "keyword.operator.assignment.c"
+					"match": "\\)",
+					"name": "punctuation.section.parens.end.bracket.round.c"
 				},
 				{
-					"match": "%|\\*|/|-|\\+",
-					"name": "keyword.operator.c"
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+					"end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
+					"name": "meta.function.c",
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-define-line-functions"
+						}
+					]
 				},
 				{
-					"begin": "\\?",
+					"begin": "\"",
 					"beginCaptures": {
 						"0": {
-							"name": "keyword.operator.ternary.c"
+							"name": "punctuation.definition.string.begin.c"
 						}
 					},
-					"end": ":",
+					"end": "\"|(?<!\\\\)(?=\\s*\\n)",
 					"endCaptures": {
 						"0": {
-							"name": "keyword.operator.ternary.c"
+							"name": "punctuation.definition.string.end.c"
 						}
 					},
+					"name": "string.quoted.double.c",
 					"patterns": [
 						{
-							"include": "#access"
+							"include": "#string_escaped_char"
 						},
 						{
-							"include": "#libc"
+							"include": "#string_placeholder"
 						},
 						{
-							"include": "#c_function_call"
+							"include": "#line_continuation_character"
+						}
+					]
+				},
+				{
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.c"
+						}
+					},
+					"end": "'|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.c"
+						}
+					},
+					"name": "string.quoted.single.c",
+					"patterns": [
+						{
+							"include": "#string_escaped_char"
 						},
 						{
-							"include": "$self"
+							"include": "#line_continuation_character"
 						}
 					]
+				},
+				{
+					"include": "#access"
+				},
+				{
+					"include": "#libc"
+				},
+				{
+					"include": "$base"
 				}
 			]
 		},
-		"strings": {
+		"preprocessor-rule-define-line-blocks": {
 			"patterns": [
 				{
-					"begin": "\"",
+					"begin": "{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.c"
+							"name": "punctuation.section.block.begin.bracket.curly.c"
 						}
 					},
-					"end": "\"",
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.c"
+							"name": "punctuation.section.block.end.bracket.curly.c"
 						}
 					},
-					"name": "string.quoted.double.c",
 					"patterns": [
 						{
-							"include": "#string_escaped_char"
+							"include": "#preprocessor-rule-define-line-blocks"
 						},
 						{
-							"include": "#string_placeholder"
+							"include": "#preprocessor-rule-define-line-contents"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor-rule-define-line-contents"
+				}
+			]
+		},
+		"preprocessor-rule-define-line-functions": {
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#storage_types"
+				},
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"include": "#access"
+				},
+				{
+					"include": "#operators"
+				},
+				{
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.c"
 						},
+						"2": {
+							"name": "punctuation.section.arguments.begin.bracket.round.c"
+						}
+					},
+					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.arguments.end.bracket.round.c"
+						}
+					},
+					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "#preprocessor-rule-define-line-functions"
 						}
 					]
 				},
 				{
-					"begin": "'",
+					"begin": "\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.c"
+							"name": "punctuation.section.parens.begin.bracket.round.c"
 						}
 					},
-					"end": "'",
+					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
 					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.c"
+						"1": {
+							"name": "punctuation.section.parens.end.bracket.round.c"
 						}
 					},
-					"name": "string.quoted.single.c",
 					"patterns": [
 						{
-							"include": "#string_escaped_char"
-						},
-						{
-							"include": "#line_continuation_character"
+							"include": "#preprocessor-rule-define-line-functions"
 						}
 					]
+				},
+				{
+					"include": "#preprocessor-rule-define-line-contents"
 				}
 			]
 		},
-		"string_escaped_char": {
+		"function-innards": {
 			"patterns": [
 				{
-					"match": "(?x)\\\\ (\n\\\\             |\n[abefnprtv'\"?]   |\n[0-3]\\d{,2}     |\n[4-7]\\d?        |\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
-					"name": "constant.character.escape.c"
+					"include": "#comments"
 				},
 				{
-					"match": "\\\\.",
-					"name": "invalid.illegal.unknown-escape.c"
+					"include": "#storage_types"
+				},
+				{
+					"include": "#operators"
+				},
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.c"
+						},
+						"2": {
+							"name": "punctuation.section.parameters.begin.bracket.round.c"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parameters.end.bracket.round.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function-innards"
+						}
+					]
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.c"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function-innards"
+						}
+					]
+				},
+				{
+					"include": "$base"
 				}
 			]
 		},
-		"string_placeholder": {
+		"function-call-innards": {
 			"patterns": [
 				{
-					"match": "(?x) %\n(\\d+\\$)?                           # field (argument #)\n[#0\\- +']*                          # flags\n[,;:_]?                              # separator character (AltiVec)\n((-?\\d+)|\\*(-?\\d+\\$)?)?          # minimum field width\n(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?    # precision\n(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n[diouxXDOUeEfFgGaACcSspn%]           # conversion type",
-					"name": "constant.other.placeholder.c"
+					"include": "#comments"
+				},
+				{
+					"include": "#storage_types"
+				},
+				{
+					"include": "#access"
+				},
+				{
+					"include": "#operators"
+				},
+				{
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.c"
+						},
+						"2": {
+							"name": "punctuation.section.arguments.begin.bracket.round.c"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function-call-innards"
+						}
+					]
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.c"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.c"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function-call-innards"
+						}
+					]
 				},
 				{
-					"match": "%",
-					"name": "invalid.illegal.placeholder.c"
+					"include": "#block_innards"
 				}
 			]
 		}
 	},
-	"version": "https://github.com/atom/language-c/commit/0d0f32388e73fc91a86f4c31ff59c36191869d63"
+	"version": "https://github.com/atom/language-c/commit/676056d40356884d161ea3170257121874092ace"
 }
\ No newline at end of file
diff --git a/extensions/cpp/test/colorize-results/test_c.json b/extensions/cpp/test/colorize-results/test_c.json
index 3549f3996c7..746ba3324f7 100644
--- a/extensions/cpp/test/colorize-results/test_c.json
+++ b/extensions/cpp/test/colorize-results/test_c.json
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.c meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.c meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.c meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.c meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": "float",
-		"t": "source.c meta.function.c meta.block.c storage.type.c",
+		"t": "source.c meta.block.c storage.type.c",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -330,8 +330,173 @@
 		}
 	},
 	{
-		"c": " a, b, c, determinant, r1,r2, real, imag;",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": " a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " b",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " c",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " determinant",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " r1",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "r2",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " real",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " imag",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -342,7 +507,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +518,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.c meta.function.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -364,7 +529,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +540,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -386,7 +551,7 @@
 	},
 	{
 		"c": "Enter coefficients a, b and c: ",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -397,7 +562,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -407,8 +572,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -419,7 +595,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +606,7 @@
 	},
 	{
 		"c": "scanf",
-		"t": "source.c meta.function.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -441,7 +617,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +628,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -463,7 +639,7 @@
 	},
 	{
 		"c": "%f%f%f",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -474,7 +650,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -485,7 +661,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +672,7 @@
 	},
 	{
 		"c": "&",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -506,8 +682,19 @@
 		}
 	},
 	{
-		"c": "a,",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,7 +705,7 @@
 	},
 	{
 		"c": "&",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -528,8 +715,19 @@
 		}
 	},
 	{
-		"c": "b,",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": "b",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,7 +738,7 @@
 	},
 	{
 		"c": "&",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -550,8 +748,30 @@
 		}
 	},
 	{
-		"c": "c);",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": "c",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -562,7 +782,7 @@
 	},
 	{
 		"c": "  determinant",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -573,7 +793,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -584,7 +804,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +815,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -606,7 +826,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,7 +837,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -628,7 +848,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.c meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -639,7 +859,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -650,7 +870,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -661,7 +881,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -671,8 +891,19 @@
 		}
 	},
 	{
-		"c": "c;",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": "c",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +914,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +925,7 @@
 	},
 	{
 		"c": "if",
-		"t": "source.c meta.function.c meta.block.c keyword.control.c",
+		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -704,8 +935,30 @@
 		}
 	},
 	{
-		"c": " (determinant",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": " ",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "determinant",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +969,7 @@
 	},
 	{
 		"c": ">",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.comparison.c",
+		"t": "source.c meta.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -727,7 +980,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.c meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -738,7 +991,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +1002,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -760,7 +1013,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.c meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +1024,7 @@
 	},
 	{
 		"c": "      r1",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -782,7 +1035,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -792,8 +1045,19 @@
 		}
 	},
 	{
-		"c": " (",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": " ",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -804,7 +1068,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -815,7 +1079,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +1090,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -837,7 +1101,7 @@
 	},
 	{
 		"c": "sqrt",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -847,8 +1111,30 @@
 		}
 	},
 	{
-		"c": "(determinant))",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "determinant",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "))",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -859,7 +1145,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -870,7 +1156,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -881,7 +1167,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -892,7 +1178,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -902,8 +1188,30 @@
 		}
 	},
 	{
-		"c": "a);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -914,7 +1222,7 @@
 	},
 	{
 		"c": "      r2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +1233,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -935,8 +1243,19 @@
 		}
 	},
 	{
-		"c": " (",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": " ",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +1266,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -958,7 +1277,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +1288,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -980,7 +1299,7 @@
 	},
 	{
 		"c": "sqrt",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -990,8 +1309,30 @@
 		}
 	},
 	{
-		"c": "(determinant))",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "determinant",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "))",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1002,7 +1343,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1013,7 +1354,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1024,7 +1365,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1035,7 +1376,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1045,8 +1386,30 @@
 		}
 	},
 	{
-		"c": "a);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1420,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1431,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1079,7 +1442,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1453,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1101,7 +1464,7 @@
 	},
 	{
 		"c": "Roots are: ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1112,7 +1475,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1123,7 +1486,7 @@
 	},
 	{
 		"c": " and ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1133,30 +1496,85 @@
 		}
 	},
 	{
-		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"c": "%.2f",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "r1 ",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " r2",
+		"t": "source.c meta.block.c",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": ",r1 , r2);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1167,7 +1585,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1596,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.c meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,7 +1607,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1200,7 +1618,7 @@
 	},
 	{
 		"c": "else",
-		"t": "source.c meta.function.c meta.block.c keyword.control.c",
+		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1211,7 +1629,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1640,7 @@
 	},
 	{
 		"c": "if",
-		"t": "source.c meta.function.c meta.block.c keyword.control.c",
+		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1232,8 +1650,30 @@
 		}
 	},
 	{
-		"c": " (determinant",
-		"t": "source.c meta.function.c meta.block.c",
+		"c": " ",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "determinant",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1244,7 +1684,7 @@
 	},
 	{
 		"c": "==",
-		"t": "source.c meta.function.c meta.block.c keyword.operator.comparison.c",
+		"t": "source.c meta.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1255,7 +1695,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.c meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1266,7 +1706,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1717,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1288,7 +1728,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.c meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1299,7 +1739,7 @@
 	},
 	{
 		"c": "    r1 ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1310,7 +1750,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1321,7 +1761,7 @@
 	},
 	{
 		"c": " r2 ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1772,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1343,7 +1783,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1354,7 +1794,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1365,7 +1805,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1376,7 +1816,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1387,7 +1827,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1398,7 +1838,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1409,7 +1849,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1419,8 +1859,30 @@
 		}
 	},
 	{
-		"c": "a);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1431,7 +1893,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,7 +1904,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1453,7 +1915,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1464,7 +1926,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1475,7 +1937,7 @@
 	},
 	{
 		"c": "Roots are: ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1486,7 +1948,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1497,7 +1959,7 @@
 	},
 	{
 		"c": " and ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1508,7 +1970,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1519,7 +1981,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1529,8 +1991,63 @@
 		}
 	},
 	{
-		"c": ", r1, r2);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " r1",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " r2",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1541,7 +2058,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1552,7 +2069,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.c meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1563,7 +2080,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1574,7 +2091,7 @@
 	},
 	{
 		"c": "else",
-		"t": "source.c meta.function.c meta.block.c keyword.control.c",
+		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1585,7 +2102,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1596,7 +2113,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.c meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1607,7 +2124,7 @@
 	},
 	{
 		"c": "    real",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1618,7 +2135,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1629,7 +2146,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1640,7 +2157,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1651,7 +2168,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1662,7 +2179,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1673,7 +2190,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1684,7 +2201,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1695,7 +2212,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1705,8 +2222,30 @@
 		}
 	},
 	{
-		"c": "a);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1717,7 +2256,7 @@
 	},
 	{
 		"c": "    imag ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1728,7 +2267,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.c meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1739,7 +2278,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1750,7 +2289,7 @@
 	},
 	{
 		"c": "sqrt",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1761,7 +2300,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1772,7 +2311,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1782,8 +2321,19 @@
 		}
 	},
 	{
-		"c": "determinant)",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "determinant",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1794,7 +2344,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1805,7 +2355,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1816,7 +2366,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.function.c meta.block.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1827,7 +2377,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.function.c meta.block.c meta.block.c keyword.operator.c",
+		"t": "source.c meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1837,8 +2387,30 @@
 		}
 	},
 	{
-		"c": "a);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": "a",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +2421,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.c meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1860,7 +2432,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.c meta.function.c meta.block.c meta.block.c support.function.C99.c",
+		"t": "source.c meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1871,7 +2443,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1882,7 +2454,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.begin.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1893,7 +2465,7 @@
 	},
 	{
 		"c": "Roots are: ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1904,7 +2476,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1915,7 +2487,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1926,7 +2498,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1937,7 +2509,7 @@
 	},
 	{
 		"c": "i and ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1948,7 +2520,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1959,7 +2531,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1970,7 +2542,7 @@
 	},
 	{
 		"c": "%.2f",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
+		"t": "source.c meta.block.c string.quoted.double.c constant.other.placeholder.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1981,7 +2553,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c",
+		"t": "source.c meta.block.c string.quoted.double.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1992,7 +2564,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.c meta.function.c meta.block.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
+		"t": "source.c meta.block.c string.quoted.double.c punctuation.definition.string.end.c",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2002,8 +2574,107 @@
 		}
 	},
 	{
-		"c": ", real, imag, real, imag);",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " real",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " imag",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " real",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.c meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " imag",
+		"t": "source.c meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.c meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2014,7 +2685,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2025,7 +2696,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.c meta.function.c meta.block.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.c meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2036,7 +2707,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2047,7 +2718,7 @@
 	},
 	{
 		"c": "return",
-		"t": "source.c meta.function.c meta.block.c keyword.control.c",
+		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2058,7 +2729,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2069,7 +2740,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.c meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.c meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2080,7 +2751,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.c meta.function.c meta.block.c",
+		"t": "source.c meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2091,7 +2762,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.c meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.c meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json
index 03b4e28572b..37929edca36 100644
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@@ -22,7 +22,7 @@
 		}
 	},
 	{
-		"c": " B4G_DEBUG_CHECK",
+		"c": " ",
 		"t": "source.cpp meta.preprocessor.c",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
@@ -32,9 +32,20 @@
 			"hc_black": "meta.preprocessor: #569CD6"
 		}
 	},
+	{
+		"c": "B4G_DEBUG_CHECK",
+		"t": "source.cpp meta.preprocessor.c entity.name.function.preprocessor.c",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "meta.preprocessor: #569CD6",
+			"light_vs": "meta.preprocessor: #0000FF",
+			"hc_black": "meta.preprocessor: #569CD6"
+		}
+	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,7 +67,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -66,8 +77,19 @@
 		}
 	},
 	{
-		"c": "stderr,",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": "stderr",
+		"t": "source.cpp meta.function.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +100,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -89,7 +111,7 @@
 	},
 	{
 		"c": "num_candidate_ret=%d:",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -100,7 +122,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -110,8 +132,19 @@
 		}
 	},
 	{
-		"c": ", num_candidate",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " num_candidate",
+		"t": "source.cpp meta.function.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -122,7 +155,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -133,7 +166,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -166,7 +199,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp",
+		"t": "source.cpp punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -220,7 +253,18 @@
 		}
 	},
 	{
-		"c": ";i",
+		"c": ";",
+		"t": "source.cpp punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "i",
 		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -242,7 +286,7 @@
 		}
 	},
 	{
-		"c": "num_candidate;",
+		"c": "num_candidate",
 		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -252,6 +296,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": ";",
+		"t": "source.cpp punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "++",
 		"t": "source.cpp keyword.operator.increment.c",
@@ -264,7 +319,7 @@
 		}
 	},
 	{
-		"c": "i)",
+		"c": "i",
 		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -274,9 +329,20 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": ")",
+		"t": "source.cpp punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -298,7 +364,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -308,8 +374,19 @@
 		}
 	},
 	{
-		"c": "stderr,",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": "stderr",
+		"t": "source.cpp meta.function.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +397,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -331,7 +408,7 @@
 	},
 	{
 		"c": "%d,",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -342,7 +419,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -352,8 +429,52 @@
 		}
 	},
 	{
-		"c": ",user_candidate[i]",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "user_candidate",
+		"t": "source.cpp meta.function.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.cpp meta.function.c punctuation.definition.begin.bracket.square.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "source.cpp meta.function.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.cpp meta.function.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -364,7 +485,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +496,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -386,7 +507,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +529,18 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "stderr",
+		"t": "source.cpp meta.function.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -418,8 +550,8 @@
 		}
 	},
 	{
-		"c": "stderr,",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +562,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -441,7 +573,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -452,7 +584,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.parens.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -463,7 +595,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +606,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -529,7 +661,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -551,7 +683,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -562,7 +694,7 @@
 	},
 	{
 		"c": "O obj",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"t": "source.cpp meta.function.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -573,7 +705,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -584,7 +716,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +727,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +738,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.whitespace.function-call.leading.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,10 +749,10 @@
 	},
 	{
 		"c": "LOG_INFO",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -628,7 +760,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -639,7 +771,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -650,7 +782,7 @@
 	},
 	{
 		"c": "not hilighted as string",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -661,7 +793,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -671,8 +803,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +826,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.whitespace.function-call.leading.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,10 +837,10 @@
 	},
 	{
 		"c": "LOG_INFO",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -705,7 +848,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +859,7 @@
 	},
 	{
 		"c": "obj ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +870,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.bitwise.shift.c",
+		"t": "source.cpp meta.block.c meta.function-call.c keyword.operator.bitwise.shift.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -738,7 +881,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +892,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -760,7 +903,7 @@
 	},
 	{
 		"c": ", even worse; ",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -771,7 +914,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -782,7 +925,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -793,7 +936,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.bitwise.shift.c",
+		"t": "source.cpp meta.block.c meta.function-call.c keyword.operator.bitwise.shift.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -804,7 +947,7 @@
 	},
 	{
 		"c": " obj",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +958,7 @@
 	},
 	{
 		"c": ".",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.separator.dot-access.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.separator.dot-access.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +969,7 @@
 	},
 	{
 		"c": "x",
-		"t": "source.cpp meta.function.c meta.block.c variable.other.member.c",
+		"t": "source.cpp meta.block.c meta.function-call.c variable.other.member.c",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -837,7 +980,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -848,7 +991,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.bitwise.shift.c",
+		"t": "source.cpp meta.block.c meta.function-call.c keyword.operator.bitwise.shift.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -859,7 +1002,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +1013,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -881,7 +1024,7 @@
 	},
 	{
 		"c": " check this out.",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -892,7 +1035,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -902,8 +1045,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -914,7 +1068,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.comment.leading.cpp",
+		"t": "source.cpp meta.block.c punctuation.whitespace.comment.leading.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +1079,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -936,7 +1090,7 @@
 	},
 	{
 		"c": " everything from this point on is interpeted as a string literal...",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -946,8 +1100,19 @@
 		}
 	},
 	{
-		"c": "    O x;",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": "    O x",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -958,7 +1123,7 @@
 	},
 	{
 		"c": "    std::unique_ptr",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +1134,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.comparison.c",
+		"t": "source.cpp meta.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -980,7 +1145,7 @@
 	},
 	{
 		"c": "O",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -991,7 +1156,7 @@
 	},
 	{
 		"c": ">",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.comparison.c",
+		"t": "source.cpp meta.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1002,7 +1167,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.whitespace.function-call.leading.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1013,10 +1178,10 @@
 	},
 	{
 		"c": "o",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1024,7 +1189,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1035,7 +1200,7 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cpp meta.function.c meta.block.c keyword.control.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c keyword.control.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1045,8 +1210,30 @@
 		}
 	},
 	{
-		"c": " O);",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": " O",
+		"t": "source.cpp meta.block.c meta.function-call.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1244,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.comment.leading.cpp",
+		"t": "source.cpp meta.block.c punctuation.whitespace.comment.leading.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1255,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1079,7 +1266,7 @@
 	},
 	{
 		"c": " sadness.",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1090,7 +1277,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.cpp meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1101,7 +1288,7 @@
 	},
 	{
 		"c": "sprintf",
-		"t": "source.cpp meta.function.c meta.block.c support.function.C99.c",
+		"t": "source.cpp meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1111,8 +1298,41 @@
 		}
 	},
 	{
-		"c": "(options, ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": "(",
+		"t": "source.cpp meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "options",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.cpp meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1343,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1134,7 +1354,7 @@
 	},
 	{
 		"c": "STYLE=Keramik;TITLE=%s;THEME=%s",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1145,7 +1365,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1155,8 +1375,52 @@
 		}
 	},
 	{
-		"c": ", ...);",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ",",
+		"t": "source.cpp meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.cpp meta.block.c punctuation.separator.dot-access.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.cpp meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1167,7 +1431,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,7 +1453,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1475,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1486,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1497,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1244,7 +1508,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1519,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.support.function.leading.c",
+		"t": "source.cpp meta.block.c punctuation.whitespace.support.function.leading.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1266,7 +1530,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.cpp meta.function.c meta.block.c support.function.C99.c",
+		"t": "source.cpp meta.block.c support.function.C99.c",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1277,7 +1541,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1288,7 +1552,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1299,7 +1563,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1310,7 +1574,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1320,8 +1584,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1607,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.comment.leading.cpp",
+		"t": "source.cpp meta.block.c punctuation.whitespace.comment.leading.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1618,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1354,7 +1629,7 @@
 	},
 	{
 		"c": " the rest of",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1365,7 +1640,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.whitespace.function-call.leading.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1376,18 +1651,18 @@
 	},
 	{
 		"c": "asm",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c storage.type.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6"
 		}
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1398,7 +1673,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1409,7 +1684,7 @@
 	},
 	{
 		"c": "movw $0x38, %ax; ltr %ax",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1420,7 +1695,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1430,8 +1705,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.parens.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,7 +1728,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.whitespace.function-call.leading.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1453,10 +1739,10 @@
 	},
 	{
 		"c": "fn",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1464,7 +1750,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1475,7 +1761,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1486,7 +1772,7 @@
 	},
 	{
 		"c": "{};",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1497,7 +1783,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c meta.function-call.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1507,8 +1793,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1519,7 +1816,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.whitespace.comment.leading.cpp",
+		"t": "source.cpp meta.block.c punctuation.whitespace.comment.leading.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,7 +1827,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1541,7 +1838,7 @@
 	},
 	{
 		"c": " the rest of",
-		"t": "source.cpp meta.function.c meta.block.c comment.line.double-slash.cpp",
+		"t": "source.cpp meta.block.c comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1552,7 +1849,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json
index eece5b000e7..2e0c66b817e 100644
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.class-struct-block.cpp punctuation.section.block.begin.cpp",
+		"t": "source.cpp meta.class-struct-block.cpp punctuation.section.block.begin.bracket.curly.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -231,7 +231,29 @@
 		}
 	},
 	{
-		"c": " width, height;",
+		"c": " width",
+		"t": "source.cpp meta.class-struct-block.cpp",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.cpp meta.class-struct-block.cpp punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " height",
 		"t": "source.cpp meta.class-struct-block.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -241,6 +263,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.class-struct-block.cpp punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "  ",
 		"t": "source.cpp meta.class-struct-block.cpp",
@@ -287,7 +320,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp meta.class-struct-block.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +353,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +364,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c storage.type.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c storage.type.c",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -342,7 +375,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +386,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c storage.type.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c storage.type.c",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -364,7 +397,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +408,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c",
+		"t": "source.cpp meta.class-struct-block.cpp punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +441,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp meta.class-struct-block.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +463,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -441,7 +474,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +485,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c",
+		"t": "source.cpp meta.class-struct-block.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +496,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +507,7 @@
 	},
 	{
 		"c": "return",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c keyword.control.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -485,7 +518,7 @@
 	},
 	{
 		"c": " width",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +529,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c keyword.operator.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -506,8 +539,19 @@
 		}
 	},
 	{
-		"c": "height;",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c",
+		"c": "height",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,7 +562,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.class-struct-block.cpp meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.cpp meta.class-struct-block.cpp meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -529,7 +573,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.class-struct-block.cpp punctuation.section.block.end.cpp",
+		"t": "source.cpp meta.class-struct-block.cpp punctuation.section.block.end.bracket.curly.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,7 +584,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp",
+		"t": "source.cpp punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -562,7 +606,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +639,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +650,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp meta.function.c meta.parens.c storage.type.c",
+		"t": "source.cpp meta.function.c storage.type.c",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -616,8 +660,30 @@
 		}
 	},
 	{
-		"c": " x, ",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"c": " x",
+		"t": "source.cpp meta.function.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.cpp meta.function.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cpp meta.function.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -628,7 +694,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp meta.function.c meta.parens.c storage.type.c",
+		"t": "source.cpp meta.function.c storage.type.c",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -639,7 +705,7 @@
 	},
 	{
 		"c": " y",
-		"t": "source.cpp meta.function.c meta.parens.c",
+		"t": "source.cpp meta.function.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -650,7 +716,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -661,7 +727,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -672,7 +738,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +749,7 @@
 	},
 	{
 		"c": "  width ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +760,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.cpp meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -704,8 +770,19 @@
 		}
 	},
 	{
-		"c": " x;",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": " x",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +793,7 @@
 	},
 	{
 		"c": "  height ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +804,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.assignment.c",
+		"t": "source.cpp meta.block.c keyword.operator.assignment.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -737,8 +814,19 @@
 		}
 	},
 	{
-		"c": " y;",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": " y",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +837,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +859,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c punctuation.whitespace.function.leading.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -804,7 +892,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.begin.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +903,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.function.c meta.parens.c punctuation.section.parens.end.c",
+		"t": "source.cpp meta.function.c punctuation.section.parameters.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +914,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -837,7 +925,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.begin.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -847,8 +935,8 @@
 		}
 	},
 	{
-		"c": "  Rectangle rect;",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": "  Rectangle rect",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -858,8 +946,30 @@
 		}
 	},
 	{
-		"c": "  rect.",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "  rect",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.cpp meta.block.c punctuation.separator.dot-access.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,10 +980,10 @@
 	},
 	{
 		"c": "set_values",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -881,7 +991,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c",
+		"t": "source.cpp meta.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -892,7 +1002,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -903,7 +1013,7 @@
 	},
 	{
 		"c": "3",
-		"t": "source.cpp meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.cpp meta.block.c meta.function-call.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -914,7 +1024,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.separator.delimiter.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +1035,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.cpp meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.cpp meta.block.c meta.function-call.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -935,8 +1045,19 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +1068,7 @@
 	},
 	{
 		"c": "  cout ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -958,7 +1079,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.bitwise.shift.c",
+		"t": "source.cpp meta.block.c keyword.operator.bitwise.shift.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -969,7 +1090,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -980,7 +1101,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -991,7 +1112,7 @@
 	},
 	{
 		"c": "area: ",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1002,7 +1123,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp meta.function.c meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1013,7 +1134,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1024,7 +1145,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp meta.function.c meta.block.c keyword.operator.bitwise.shift.c",
+		"t": "source.cpp meta.block.c keyword.operator.bitwise.shift.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1034,8 +1155,19 @@
 		}
 	},
 	{
-		"c": " rect.",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": " rect",
+		"t": "source.cpp meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.cpp meta.block.c punctuation.separator.dot-access.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1046,10 +1178,10 @@
 	},
 	{
 		"c": "area",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c support.function.any-method.c",
+		"t": "source.cpp meta.block.c meta.function-call.c entity.name.function.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1057,7 +1189,18 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.function.c meta.block.c meta.function-call.c punctuation.definition.parameters.c",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.cpp meta.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1067,8 +1210,8 @@
 		}
 	},
 	{
-		"c": ");",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"c": ";",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1222,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1233,7 @@
 	},
 	{
 		"c": "return",
-		"t": "source.cpp meta.function.c meta.block.c keyword.control.c",
+		"t": "source.cpp meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1101,7 +1244,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1112,7 +1255,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.cpp meta.function.c meta.block.c constant.numeric.c",
+		"t": "source.cpp meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1123,7 +1266,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp meta.function.c meta.block.c",
+		"t": "source.cpp meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1134,7 +1277,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp meta.function.c meta.block.c punctuation.section.block.end.c",
+		"t": "source.cpp meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/objective-c/test/colorize-results/test_m.json b/extensions/objective-c/test/colorize-results/test_m.json
index 3be7bbd0ceb..542815fa192 100644
--- a/extensions/objective-c/test/colorize-results/test_m.json
+++ b/extensions/objective-c/test/colorize-results/test_m.json
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -551,7 +551,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -660,7 +660,18 @@
 		}
 	},
 	{
-		"c": ", ",
+		"c": ",",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -682,7 +693,18 @@
 		}
 	},
 	{
-		"c": ", ",
+		"c": ",",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -705,7 +727,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +738,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +749,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc constant.numeric.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -738,7 +760,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +771,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +848,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -837,7 +859,7 @@
 	},
 	{
 		"c": "NSOpenPanel",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc support.class.cocoa",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c support.class.cocoa",
 		"r": {
 			"dark_plus": "support.class: #4EC9B0",
 			"light_plus": "support.class: #267F99",
@@ -847,8 +869,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"c": " openPanel",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -857,20 +879,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "openPanel",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -881,7 +892,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -903,18 +914,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "panel ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -924,30 +924,8 @@
 		}
 	},
 	{
-		"c": "setAllowedFileTypes",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"c": "panel setAllowedFileTypes:",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -957,8 +935,8 @@
 		}
 	},
 	{
-		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"c": "[[",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +947,7 @@
 	},
 	{
 		"c": "NSArray",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.bracketed.objc support.class.cocoa",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c support.class.cocoa",
 		"r": {
 			"dark_plus": "support.class: #4EC9B0",
 			"light_plus": "support.class: #267F99",
@@ -979,8 +957,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.bracketed.objc",
+		"c": " alloc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -989,20 +967,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "alloc",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1012,8 +979,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc",
+		"c": " initWithObjects:",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1022,31 +989,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "initWithObjects",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "@\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.begin.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1057,7 +1002,7 @@
 	},
 	{
 		"c": "ipa",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1068,7 +1013,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.end.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1078,8 +1023,19 @@
 		}
 	},
 	{
-		"c": ", ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc",
+		"c": ",",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1046,7 @@
 	},
 	{
 		"c": "@\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.begin.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1101,7 +1057,7 @@
 	},
 	{
 		"c": "xcarchive",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1112,7 +1068,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.end.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1122,8 +1078,19 @@
 		}
 	},
 	{
-		"c": ", ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc",
+		"c": ",",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1134,7 +1101,7 @@
 	},
 	{
 		"c": "@\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.begin.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1145,7 +1112,7 @@
 	},
 	{
 		"c": "app",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1156,7 +1123,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc string.quoted.double.objc punctuation.definition.string.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c string.quoted.double.objc punctuation.definition.string.end.objc",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1166,8 +1133,19 @@
 		}
 	},
 	{
-		"c": ", ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc",
+		"c": ",",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.delimiter.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1156,7 @@
 	},
 	{
 		"c": "nil",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc constant.language.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c constant.language.objc",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1188,19 +1166,8 @@
 		}
 	},
 	{
-		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc punctuation.section.scope.end.objc",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"c": "]]",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1178,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1200,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1243,8 +1210,8 @@
 		}
 	},
 	{
-		"c": "panel ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"c": "panel beginWithCompletionHandler:",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1253,31 +1220,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "beginWithCompletionHandler",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "^",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc keyword.operator.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1288,7 +1233,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1299,7 +1244,7 @@
 	},
 	{
 		"c": "NSInteger",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.type.cocoa.leopard",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c support.type.cocoa.leopard",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1309,8 +1254,19 @@
 		}
 	},
 	{
-		"c": " result)",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"c": " result",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1321,7 +1277,7 @@
 	},
 	{
 		"c": "     ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1288,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c punctuation.section.block.begin.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1299,7 @@
 	},
 	{
 		"c": "         ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1354,7 +1310,7 @@
 	},
 	{
 		"c": "if",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c keyword.control.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c keyword.control.c",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1364,8 +1320,30 @@
 		}
 	},
 	{
-		"c": " (result ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"c": " ",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.begin.bracket.round.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "result ",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1376,7 +1354,7 @@
 	},
 	{
 		"c": "==",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c keyword.operator.comparison.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1387,7 +1365,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1398,7 +1376,7 @@
 	},
 	{
 		"c": "NSFileHandlingPanelOKButton",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c support.constant.cocoa",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c support.constant.cocoa",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1409,7 +1387,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1398,7 @@
 	},
 	{
 		"c": "             ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1431,7 +1409,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,18 +1420,18 @@
 	},
 	{
 		"c": "self",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc variable.language.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
-			"dark_plus": "variable.language: #569CD6",
-			"light_plus": "variable.language: #0000FF",
-			"dark_vs": "variable.language: #569CD6",
-			"light_vs": "variable.language: #0000FF",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": ".inputTextField ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc",
+		"c": ".",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.dot-access.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1463,22 +1441,22 @@
 		}
 	},
 	{
-		"c": "setStringValue",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
+		"c": "inputTextField",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c variable.other.member.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
+		"c": " setStringValue:",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -1486,7 +1464,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1496,8 +1474,8 @@
 		}
 	},
 	{
-		"c": "panel.URL ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc",
+		"c": "panel",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1507,19 +1485,30 @@
 		}
 	},
 	{
-		"c": "path",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
+		"c": ".",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.dot-access.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.bracketed.objc punctuation.section.scope.end.objc",
+		"c": "URL",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c variable.other.member.c",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " path",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1529,8 +1518,8 @@
 		}
 	},
 	{
-		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"c": "]]",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1541,7 +1530,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1552,7 +1541,7 @@
 	},
 	{
 		"c": "     ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1563,7 +1552,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.block.c punctuation.section.block.end.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1574,7 +1563,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1585,7 +1574,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1640,7 +1629,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1717,7 +1706,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1794,7 +1783,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +1838,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1904,7 +1893,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1915,7 +1904,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2212,7 +2201,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.begin.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2310,19 +2299,8 @@
 		}
 	},
 	{
-		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"c": "[[",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2332,8 +2310,8 @@
 		}
 	},
 	{
-		"c": "UITapGestureRecognizer ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.bracketed.objc",
+		"c": "UITapGestureRecognizer alloc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2342,31 +2320,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "alloc",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.bracketed.objc punctuation.section.scope.end.objc",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2376,41 +2332,8 @@
 		}
 	},
 	{
-		"c": "initWithTarget",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "self",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc variable.language.objc",
-		"r": {
-			"dark_plus": "variable.language: #569CD6",
-			"light_plus": "variable.language: #0000FF",
-			"dark_vs": "variable.language: #569CD6",
-			"light_vs": "variable.language: #0000FF",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"c": " initWithTarget:self action:",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2419,31 +2342,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "action",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.name-of-parameter.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.name-of-parameter.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "@",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.selector.objc storage.type.objc punctuation.definition.storage.type.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.selector.objc storage.type.objc punctuation.definition.storage.type.objc",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2454,7 +2355,7 @@
 	},
 	{
 		"c": "selector",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.selector.objc storage.type.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.selector.objc storage.type.objc",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2465,7 +2366,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.selector.objc punctuation.definition.storage.type.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.selector.objc punctuation.definition.storage.type.objc",
 		"r": {
 			"dark_plus": "meta.selector: #D7BA7D",
 			"light_plus": "meta.selector: #800000",
@@ -2476,7 +2377,7 @@
 	},
 	{
 		"c": "handleTap:",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.selector.objc meta.selector.method-name.objc support.function.any-method.name-of-parameter.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.selector.objc meta.selector.method-name.objc support.function.any-method.name-of-parameter.objc",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -2487,7 +2388,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc meta.selector.objc punctuation.definition.storage.type.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.selector.objc punctuation.definition.storage.type.objc",
 		"r": {
 			"dark_plus": "meta.selector: #D7BA7D",
 			"light_plus": "meta.selector: #800000",
@@ -2498,7 +2399,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2509,7 +2410,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2597,7 +2498,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2608,7 +2509,7 @@
 	},
 	{
 		"c": "NSMutableArray",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc support.class.cocoa",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c support.class.cocoa",
 		"r": {
 			"dark_plus": "support.class: #4EC9B0",
 			"light_plus": "support.class: #267F99",
@@ -2618,8 +2519,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"c": " array",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2628,20 +2529,9 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "array",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2652,7 +2542,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2674,7 +2564,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2684,41 +2574,8 @@
 		}
 	},
 	{
-		"c": "gestureRecognizers ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "addObject",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "tapGesture",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"c": "gestureRecognizers addObject:tapGesture",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2729,7 +2586,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2740,7 +2597,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2762,7 +2619,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.begin.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.begin.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2772,8 +2629,8 @@
 		}
 	},
 	{
-		"c": "gestureRecognizers ",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc",
+		"c": "gestureRecognizers addObjectsFromArray:scnView",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2783,33 +2640,22 @@
 		}
 	},
 	{
-		"c": "addObjectsFromArray",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc support.function.any-method.objc punctuation.separator.arguments.objc",
+		"c": ".",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.separator.dot-access.c",
 		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
-		"c": "scnView.gestureRecognizers",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc meta.function-call.objc",
+		"c": "gestureRecognizers",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c variable.other.member.c",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -2817,7 +2663,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c meta.bracketed.objc punctuation.section.scope.end.objc",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.definition.end.bracket.square.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2828,7 +2674,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2893,7 +2739,7 @@
 		}
 	},
 	{
-		"c": " gestureRecognizers;",
+		"c": " gestureRecognizers",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2903,6 +2749,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": ";",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "\t",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
@@ -2926,7 +2783,7 @@
 		}
 	},
 	{
-		"c": " tapGesture;",
+		"c": " tapGesture",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2936,6 +2793,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": ";",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "\t",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
@@ -2982,7 +2850,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.terminator.statement.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2993,7 +2861,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.c",
+		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.c punctuation.section.block.end.bracket.curly.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
-- 
GitLab