diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index 1a0b8659c..d095cef63 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -80,17 +80,16 @@
   (angle_unit)
   (integer_distance_unit)
   (float_distance_unit)
-] @type
+] @string
 
 (percentage) @number
 
 (percentage
-  "%" @type)
+  "%" @string)
 
-[
-  (global_selector)
-  (id_selector)
-] @module
+(global_selector) @character.special
+
+(id_selector) @constant
 
 (id_selector_view
   [
@@ -136,4 +135,4 @@
   "env" @function.builtin
   (identifier) @variable)
 
-(property_name) @variable
+(property_name) @property
diff --git a/queries/rasi/injections.scm b/queries/rasi/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/rasi/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))