diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 2cb14c109..228a03972 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -118,6 +118,7 @@
 (call target: ((identifier) @keyword (#any-of? @keyword
   "alias"
   "case"
+  "catch"
   "cond"
   "else"
   "for"
diff --git a/queries/elixir/indents.scm b/queries/elixir/indents.scm
index ef0db3907..2c1419294 100644
--- a/queries/elixir/indents.scm
+++ b/queries/elixir/indents.scm
@@ -1,28 +1,18 @@
 [
   (arguments)
-  (call)
   (do_block)
   (list)
   (map)
-  (stab_expression)
+  (tuple)
 ] @indent
 
-(stab_expression
- right: (_) @indent)
-
 [
-  "("
   ")"
-  "{"
-  "}"
-  "["
   "]"
+  "end"
+  "}"
   (after_block)
-  (catch_block)
   (else_block)
   (rescue_block)
-  "do"
-  "end"
+  (catch_block)
 ] @branch
-
-(comment) @ignore