diff --git a/queries/highlights.scm b/queries/highlights.scm
index c53c441..5855b96 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -29,19 +29,34 @@
 
 ; declarations
 
+(var_decl name: (identifier) type: (type) @variable)
 (function_declaration name:
 	[
 		(identifier)
 		(overloadable_operator)
 	] @function
 )
-(class_declaration name: (identifier) @function)
+(class_declaration name: (identifier) @class)
 
 ; operators
 
-; [
-; 	"+"
-; ] @operator
+[
+	"**"
+	"*"
+	"/"
+	"%"
+	"+"
+	"-"
+	"=="
+	"!="
+	"<"
+	">"
+	"<="
+	">="
+	"&&"
+	"||"
+	"^^"
+] @operator
 
 ; keywords