-(type_annotation) @type
+(type_annotation) @punctuation
(member_type) @operator
(member) @property
(parameter_list) @function
-(parameter_list (identifier (optional_value) @variable.parameter.optional))
-(parameter_list (identifier) @variable.parameter)
-(identifier) @keyword
+(parameter_list (identifier (optional_value) @parameter.optional))
+(parameter_list (identifier) @parameter)
+(identifier) @type.definition
(throw_statement) @operator
(return_statement) @operator
+(comment) @comment