diff --git a/queries/highlights.scm b/queries/highlights.scm
index 89418a9..14d0ba5 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,11 +1,5 @@
-(dotted_identifier_list) @string
-
 ; Methods
 ; --------------------
-(super) @function
-
-(function_expression_body
-  (identifier) @function)
 
 ; NOTE: This query is a bit of a work around for the fact that the dart grammar doesn't
 ; specifically identify a node as a function call
@@ -65,6 +59,7 @@
  ">="
  "<="
  "||"
+ "~/"
  (increment_operator)
  (is_operator)
  (prefix_operator)
@@ -82,13 +77,13 @@
 
 ; Types
 ; --------------------
+((type_identifier) @type.builtin
+  (#match? @type.builtin "^(int|double|String|bool|List|Set|Map|Runes|Symbol)$"))
+(type_identifier) @type
 (class_definition
   name: (identifier) @type)
 (constructor_signature
   name: (identifier) @type)
-;; TODO: does not work
-;(type_identifier
-  ;(identifier) @type)
 (scoped_identifier
   scope: (identifier) @type)
 (function_signature
@@ -104,8 +99,6 @@
   name: (identifier) @type)
  (#match? @type "^[a-zA-Z]"))
 
-(type_identifier) @type
-
 ; Enums
 ; -------------------
 (enum_declaration
@@ -126,17 +119,14 @@
 (this) @variable.builtin
 
 ; properties
-(expression_statement
-  (selector
-  	(unconditional_assignable_selector
-    	(identifier) @function))
+((selector
+  (unconditional_assignable_selector (identifier) @function))
   (selector (argument_part (arguments)))
 )
-(expression_statement
-  (cascade_section
-  	(cascade_selector (identifier) @function)
-    (argument_part (arguments))
-  )
+
+(cascade_section
+  (cascade_selector (identifier) @function)
+  (argument_part (arguments))
 )
 
 (unconditional_assignable_selector
@@ -158,10 +148,10 @@
 ; Parameters
 ; --------------------
 (formal_parameter
-    name: (identifier) @parameter)
+    name: (identifier) @identifier.parameter)
 
 (named_argument
-  (label (identifier) @parameter))
+  (label (identifier) @identifier.parameter))
 
 ; Literals
 ; --------------------
@@ -174,11 +164,11 @@
     ; (hex_floating_point_literal)
 ] @number
 
-(symbol_literal) @symbol
 (string_literal) @string
+(symbol_literal (identifier) @constant) @constant
 (true) @boolean
 (false) @boolean
-(null_literal) @constant.builtin
+(null_literal) @constant.null
 
 (documentation_comment) @comment
 (comment) @comment
@@ -187,7 +177,7 @@
 ; --------------------
 [
     (assert_builtin)
-    (break_statement)
+    (break_builtin)
     (const_builtin)
     (part_of_builtin)
     (rethrow_builtin)
@@ -214,7 +204,6 @@
     "extension"
     "external"
     "factory"
-    "false"
     "final"
     "finally"
     "for"
@@ -231,7 +220,6 @@
     "library"
     "mixin"
     "new"
-    "null"
     "on"
     "operator"
     "part"
@@ -245,7 +233,6 @@
     "switch"
     "sync*"
     "throw"
-    "true"
     "try"
     "typedef"
     "var"
@@ -256,7 +243,4 @@
 ] @keyword
 
 ; Variable
-(identifier) @variable
-
-; Error
-(ERROR) @error
\ No newline at end of file
+(identifier) @variable
\ No newline at end of file
diff --git a/test/corpus/errors.txt b/test/corpus/errors.txt
index 5d4248b..af82f21 100644
--- a/test/corpus/errors.txt
+++ b/test/corpus/errors.txt
@@ -7,12 +7,11 @@ final a = StateProvider<T12345678>   // Complete expression is: final a = StateP
 
 ---
 
-
 (ERROR
   (final_builtin)
   (identifier)
   (type_identifier)
   (type_arguments
     (type_identifier))
-  (comment)
-  (comment))
\ No newline at end of file
+(comment)
+(comment))
\ No newline at end of file
diff --git a/test/highlight/types.dart b/test/highlight/types.dart
index a67839e..8a3846e 100644
--- a/test/highlight/types.dart
+++ b/test/highlight/types.dart
@@ -11,7 +11,7 @@ class Person {
 
   Person(String name) {
     // <- type
-    //    ^ type
+    //    ^ type.builtin
     this.name = name;
     this.pants = new Pants<Pocket>();
     //                ^ type
@@ -22,7 +22,7 @@ class Person {
   //            ^ variable.builtin
 
   String getName() {
-    // <- type
+    // <- type.builtin
     //    ^ function
     return this.name;