diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index 53e27efa1..a7bb3bcc0 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -32,7 +32,6 @@ local filetypes = {
   markdown = { 'pandoc' },
   muttrc = { 'neomuttrc' },
   ocaml_interface = { 'ocamlinterface' },
-  orca = { 'inp' },
   perl = { 'pl' },
   poe_filter = { 'poefilter' },
   powershell = { 'ps1' },
diff --git a/runtime/queries/orca/highlights.scm b/runtime/queries/orca/highlights.scm
index 5a172e8a6..927f47bc6 100644
--- a/runtime/queries/orca/highlights.scm
+++ b/runtime/queries/orca/highlights.scm
@@ -27,10 +27,10 @@
 ] @operator
 
 (geom_block
-  "*" @keyword)
+  "*" @punctuation.special)
 
 (geom_line
-  "*" @keyword
+  "*" @punctuation.special
   (file) @string.special.path)
 
 [
@@ -47,12 +47,6 @@
 (variable_def
   (variable_name) @variable) ; r in variable definitions
 
-(variable_range
-  (float) @number.float)
-
-(variable_array
-  (float) @number.float)
-
 ; General word values (LAST - lower priority)
 (value_atom
   (word) @number) ; Words used as values get same color as other values
@@ -63,10 +57,6 @@
   connect2: (integer) @operator
   connect3: (integer) @operator)
 
-(int_line
-  (coord_value
-    (float) @number.float))
-
 (int_line
   (coord_value
     (variable_ref) @operator))
@@ -75,10 +65,6 @@
 (zmat_line2
   zmat_atom1: (integer) @operator)
 
-(zmat_line2
-  (coord_value
-    (float) @number.float))
-
 (zmat_line2
   (coord_value
     (variable_ref) @operator))
@@ -87,10 +73,6 @@
   zmat_atom1: (integer) @operator
   zmat_atom2: (integer) @operator)
 
-(zmat_line3
-  (coord_value
-    (float) @number.float))
-
 (zmat_line3
   (coord_value
     (variable_ref) @operator))
@@ -98,9 +80,7 @@
 (zmat_line4
   zmat_atom1: (integer) @operator
   zmat_atom2: (integer) @operator
-  zmat_atom3: (integer) @operator
-  (coord_value
-    (float) @number.float))
+  zmat_atom3: (integer) @operator)
 
 (zmat_line4
   (coord_value