diff --git a/queries/highlights.scm b/queries/highlights.scm
index 44c4ef5..de56d2b 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -42,6 +42,11 @@
   "var"
   "while"
 
+  "class"
+  "extends"
+  "method"
+  "new"
+
   "_cast"
   "_chunks"
   "_exp"
diff --git a/test/highlight/object-oriented.tig b/test/highlight/object-oriented.tig
new file mode 100644
index 0000000..94bfc91
--- /dev/null
+++ b/test/highlight/object-oriented.tig
@@ -0,0 +1,24 @@
+let
+  class A extends Object {}
+  /* <- keyword */
+  /*      ^ keyword */
+  /*              ^ type */
+
+  type B = class extends A {
+  /*       ^ keyword */
+  /*             ^ keyword */
+  /*                     ^ type */
+
+    var a := 12
+
+    method meth() : int = self.a
+    /* <- keyword */
+    /*                    ^ variable */
+  }
+
+  var object := new B
+  /*            ^ keyword */
+in
+  object.a := 27;
+  /*     ^ property */
+end