diff --git a/grammars/tree-sitter-c.cson b/grammars/tree-sitter-c.cson
index 116597e..b5f590a 100644
--- a/grammars/tree-sitter-c.cson
+++ b/grammars/tree-sitter-c.cson
@@ -124,7 +124,20 @@ scopes:
   '"_Atomic"': 'storage.modifier'
   'function_specifier': 'storage.modifier'
 
+  '";"': 'punctuation.terminator.statement'
+  '"["': 'punctuation.definition.begin.bracket.square'
+  '"]"': 'punctuation.definition.end.bracket.square'
+  '","': 'punctuation.separator.delimiter'
+  'char_literal > "\'"': 'punctuation.definition.string'
+  # 'string_literal > "\"': 'punctuation.definition.string' # TODO: Figure out why this doesn't work
+  '"{"': 'punctuation.section.block.begin.bracket.curly'
+  '"}"': 'punctuation.section.block.end.bracket.curly'
+  '"("': 'punctuation.section.parens.begin.bracket.round'
+  '")"': 'punctuation.section.parens.end.bracket.round'
+
   '"sizeof"': 'keyword.operator.sizeof'
+  '"."': 'keyword.operator.member'
+  '"->"': 'keyword.operator.member'
   '"*"': 'keyword.operator'
   '"-"': 'keyword.operator'
   '"+"': 'keyword.operator'
@@ -136,6 +149,7 @@ scopes:
   '"!"': 'keyword.operator'
   '"!="': 'keyword.operator'
   '"<"': 'keyword.operator'
+  '">"': 'keyword.operator'
   '">="': 'keyword.operator'
   '"<="': 'keyword.operator'
   '"&&"': 'keyword.operator'
diff --git a/grammars/tree-sitter-cpp.cson b/grammars/tree-sitter-cpp.cson
index dffafd4..a3dff68 100644
--- a/grammars/tree-sitter-cpp.cson
+++ b/grammars/tree-sitter-cpp.cson
@@ -172,9 +172,33 @@ scopes:
   '"final"': 'storage.modifier'
   '"override"': 'storage.modifier'
 
+  '";"': 'punctuation.terminator.statement'
+  '"["': 'punctuation.definition.begin.bracket.square'
+  '"]"': 'punctuation.definition.end.bracket.square'
+  'access_specifier > ":"': 'punctuation.definition.visibility.colon'
+  'base_class_clause > ":"': 'punctuation.definition.inheritance.colon'
+  'base_class_clause > ","': 'punctuation.definition.separator.class.comma'
+  'field_declaration > ","': 'punctuation.separator.delimiter'
+  'parameter_list > ","': 'punctuation.separator.delimiter'
+  'field_initializer_list > ":"': 'punctuation.definition.initialization.colon'
+  'field_initializer_list > ","': 'punctuation.separator.delimiter'
+  '"::"': 'punctuation.separator.method.double-colon'
+  'template_parameter_list > "<"': 'punctuation.definition.template.bracket.angle'
+  'template_parameter_list > ">"': 'punctuation.definition.template.bracket.angle'
+  'template_argument_list > ">"': 'punctuation.definition.template.bracket.angle'
+  'template_argument_list > "<"': 'punctuation.definition.template.bracket.angle'
+  'char_literal > "\'"': 'punctuation.definition.string'
+  # 'string_literal > "\""': 'punctuation.definition.string' # TODO: Figure out why this doesn't work
+  '"{"': 'punctuation.section.block.begin.bracket.curly'
+  '"}"': 'punctuation.section.block.end.bracket.curly'
+  '"("': 'punctuation.section.parens.begin.bracket.round'
+  '")"': 'punctuation.section.parens.end.bracket.round'
+
   '"sizeof"': 'keyword.operator.sizeof'
   '"new"': 'keyword.operator'
   '"delete"': 'keyword.operator'
+  '"."': 'keyword.operator.member'
+  '"->"': 'keyword.operator.member'
   '"*"': 'keyword.operator'
   '"-"': 'keyword.operator'
   '"+"': 'keyword.operator'
@@ -185,7 +209,8 @@ scopes:
   '"=="': 'keyword.operator'
   '"!"': 'keyword.operator'
   '"!="': 'keyword.operator'
-  '"<"': 'keyword.operator'
+  'relational_expression > "<"': 'keyword.operator'
+  'relational_expression > ">"': 'keyword.operator'
   '">="': 'keyword.operator'
   '"<="': 'keyword.operator'
   '"&&"': 'keyword.operator'
@@ -208,4 +233,4 @@ scopes:
   '"^="': 'keyword.operator'
   '"|="': 'keyword.operator'
   '"?"': 'keyword.operator'
-  '":"': 'keyword.operator'
+  'conditional_expression > ":"': 'keyword.operator'