diff --git a/package.json b/package.json
index 32759c6..49a4218 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
       "file-types": [
         "html"
       ],
-      "highlights": "src/highlights.json",
       "injection-regex": "html"
     }
   ]
diff --git a/properties/highlights.css b/properties/highlights.css
deleted file mode 100644
index 202bf1b..0000000
--- a/properties/highlights.css
+++ /dev/null
@@ -1,26 +0,0 @@
-@import "./injections.css";
-
-tag_name {
-  highlight: 'tag';
-}
-
-/* TODO - highlight as an error? */
-erroneous_end_tag_name {
-  highlight: 'tag';
-}
-
-doctype {
-  highlight: 'constant';
-}
-
-attribute_name {
-  highlight: 'attribute';
-}
-
-attribute_value {
-  highlight: 'string';
-}
-
-comment {
-  highlight: 'comment';
-}
diff --git a/properties/injections.css b/properties/injections.css
deleted file mode 100644
index 36d8657..0000000
--- a/properties/injections.css
+++ /dev/null
@@ -1,9 +0,0 @@
-script_element {
-  injection-language: 'javascript';
-  injection-content: child(this(), 1);
-}
-
-style_element {
-  injection-language: 'css';
-  injection-content: child(this(), 1);
-}
diff --git a/queries/highlights.scm b/queries/highlights.scm
new file mode 100644
index 0000000..c7e4d0d
--- /dev/null
+++ b/queries/highlights.scm
@@ -0,0 +1,10 @@
+(tag_name) @tag
+(erroneous_end_tag_name) @tag.error
+(doctype) @constant
+(attribute_name) @attribute
+(attribute_value) @string
+(comment) @comment
+
+"<" @punctuation.bracket
+">" @punctuation.bracket
+"</" @punctuation.bracket
diff --git a/queries/injections.scm b/queries/injections.scm
new file mode 100644
index 0000000..5c4fcb8
--- /dev/null
+++ b/queries/injections.scm
@@ -0,0 +1,7 @@
+((script_element
+  (raw_text) @injection.content) @injection.site
+(set! injection.language "javascript"))
+
+((style_element
+  (raw_text) @injection.content) @injection.site
+(set! injection.language "css"))
diff --git a/src/highlights.json b/src/highlights.json
deleted file mode 100644
index 5cb0621..0000000
--- a/src/highlights.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "states": [
-    {
-      "id": 0,
-      "property_set_id": 0,
-      "transitions": [
-        {
-          "type": "comment",
-          "named": true,
-          "state_id": 1
-        },
-        {
-          "type": "attribute_value",
-          "named": true,
-          "state_id": 2
-        },
-        {
-          "type": "attribute_name",
-          "named": true,
-          "state_id": 3
-        },
-        {
-          "type": "doctype",
-          "named": true,
-          "state_id": 4
-        },
-        {
-          "type": "erroneous_end_tag_name",
-          "named": true,
-          "state_id": 5
-        },
-        {
-          "type": "tag_name",
-          "named": true,
-          "state_id": 5
-        },
-        {
-          "type": "style_element",
-          "named": true,
-          "state_id": 6
-        },
-        {
-          "type": "script_element",
-          "named": true,
-          "state_id": 7
-        }
-      ],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 1,
-      "property_set_id": 1,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 2,
-      "property_set_id": 2,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 3,
-      "property_set_id": 3,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 4,
-      "property_set_id": 4,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 5,
-      "property_set_id": 5,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 6,
-      "property_set_id": 6,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 7,
-      "property_set_id": 7,
-      "transitions": [],
-      "default_next_state_id": 0
-    }
-  ],
-  "property_sets": [
-    {},
-    {
-      "highlight": "comment"
-    },
-    {
-      "highlight": "string"
-    },
-    {
-      "highlight": "attribute"
-    },
-    {
-      "highlight": "constant"
-    },
-    {
-      "highlight": "tag"
-    },
-    {
-      "injection-content": {
-        "args": [
-          {
-            "args": [],
-            "name": "this"
-          },
-          1
-        ],
-        "name": "child"
-      },
-      "injection-language": "css"
-    },
-    {
-      "injection-content": {
-        "args": [
-          {
-            "args": [],
-            "name": "this"
-          },
-          1
-        ],
-        "name": "child"
-      },
-      "injection-language": "javascript"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/injections.json b/src/injections.json
deleted file mode 100644
index aba398b..0000000
--- a/src/injections.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "states": [
-    {
-      "id": 0,
-      "property_set_id": 0,
-      "transitions": [
-        {
-          "type": "style_element",
-          "named": true,
-          "state_id": 1
-        },
-        {
-          "type": "script_element",
-          "named": true,
-          "state_id": 2
-        }
-      ],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 1,
-      "property_set_id": 1,
-      "transitions": [],
-      "default_next_state_id": 0
-    },
-    {
-      "id": 2,
-      "property_set_id": 2,
-      "transitions": [],
-      "default_next_state_id": 0
-    }
-  ],
-  "property_sets": [
-    {},
-    {
-      "injection-content": {
-        "args": [
-          {
-            "args": [],
-            "name": "this"
-          },
-          1
-        ],
-        "name": "child"
-      },
-      "injection-language": "css"
-    },
-    {
-      "injection-content": {
-        "args": [
-          {
-            "args": [],
-            "name": "this"
-          },
-          1
-        ],
-        "name": "child"
-      },
-      "injection-language": "javascript"
-    }
-  ]
-}
\ No newline at end of file