diff --git a/runtime/queries/elixir/highlights.scm b/runtime/queries/elixir/highlights.scm
index b9ec0210..6bf93a21 100644
--- a/runtime/queries/elixir/highlights.scm
+++ b/runtime/queries/elixir/highlights.scm
@@ -17,7 +17,8 @@
  (atom_content)
  (atom_end)] @tag
 
-(comment) @comment
+[(comment)
+ (unused_identifier)] @comment
 
 (escape_sequence) @escape
 
@@ -50,8 +51,7 @@
         left: (identifier) @variable.parameter
         operator: _ @function
         right: (identifier) @variable.parameter)]
-      (#match? @keyword "^(defp|def|defmacrop|defmacro|defguardp|defguard|defdelegate)$")
-      (#match? @variable.parameter "^[^_]"))
+      (#match? @keyword "^(defp|def|defmacrop|defmacro|defguardp|defguard|defdelegate)$"))
 
 (call (function_identifier) @keyword
       [(call
@@ -73,8 +73,7 @@
           (_ (_ (identifier) @variable.parameter))
           (_ (_ (_ (identifier) @variable.parameter)))
           (_ (_ (_ (_ (identifier) @variable.parameter))))
-          (_ (_ (_ (_ (_ (identifier) @variable.parameter)))))]))
- (#match? @variable.parameter "^[^_]"))
+          (_ (_ (_ (_ (_ (identifier) @variable.parameter)))))])))
 
 (unary_op
  operator: "@"
@@ -134,13 +133,6 @@
   ">>"
 ] @punctuation.bracket
 
-[(identifier) @function.special
- (#match? @function.special "^__.+__$")]
-
-[(remote_identifier) @function.special
- (#match? @function.special "^__.+__$")]
-
-[(identifier) @comment
- (#match? @comment "^_")]
+(special_identifier) @function.special
 
 (ERROR) @warning