diff --git a/queries/folds.scm b/queries/folds.scm
new file mode 100644
index 0000000..b695824
--- /dev/null
+++ b/queries/folds.scm
@@ -0,0 +1,6 @@
+[
+  (object_block)
+  (assert_block)
+  (array_block)
+  (textblock)
+] @fold
diff --git a/queries/indents.scm b/queries/indents.scm
new file mode 100644
index 0000000..c89dce8
--- /dev/null
+++ b/queries/indents.scm
@@ -0,0 +1,11 @@
+[
+  (object_block)
+  (assert_block)
+  (array_block)
+  (textblock)
+] @indent.begin
+
+[
+  "}"
+  "]"
+] @indent.end
diff --git a/queries/tags.scm b/queries/tags.scm
new file mode 100644
index 0000000..0ed9f0a
--- /dev/null
+++ b/queries/tags.scm
@@ -0,0 +1,77 @@
+((meta
+  (keyword) @name) @definition.module)
+
+((http
+  (keyword) @name) @definition.module)
+
+((query
+  (keyword) @name) @definition.module)
+
+((headers
+  (keyword) @name) @definition.module)
+
+((authawsv4
+  (keyword) @name) @definition.module)
+
+((authbasic
+  (keyword) @name) @definition.module)
+
+((authbearer
+  (keyword) @name) @definition.module)
+
+((authdigest
+  (keyword) @name) @definition.module)
+
+((authoauth2
+  (keyword) @name) @definition.module)
+
+((bodyraw
+  (keyword) @name) @definition.module)
+
+((bodyjson
+  (keyword) @name) @definition.module)
+
+((bodytext
+  (keyword) @name) @definition.module)
+
+((bodyxml
+  (keyword) @name) @definition.module)
+
+((bodysparql
+  (keyword) @name) @definition.module)
+
+((bodygraphql
+  (keyword) @name) @definition.module)
+
+((bodygraphqlvars
+  (keyword) @name) @definition.module)
+
+((vars_plain
+  (keyword) @name) @definition.module)
+
+((varsreq
+  (keyword) @name) @definition.module)
+
+((varsres
+  (keyword) @name) @definition.module)
+
+((params_query
+  (keyword) @name) @definition.module)
+
+((params_path
+  (keyword) @name) @definition.module)
+
+((assert
+  (keyword) @name) @definition.module)
+
+((scriptreq
+  (keyword) @name) @definition.module)
+
+((scriptres
+  (keyword) @name) @definition.module)
+
+((tests
+  (keyword) @name) @definition.module)
+
+((docs
+  (keyword) @name) @definition.module)
diff --git a/tree-sitter.json b/tree-sitter.json
index 5f5f1d7..ee56507 100644
--- a/tree-sitter.json
+++ b/tree-sitter.json
@@ -12,7 +12,8 @@
       "injection-regex": "^bruno$",
       "class-name": "TreeSitterBruno",
       "highlights": "queries/highlights.scm",
-      "injections": "queries/injections.scm"
+      "injections": "queries/injections.scm",
+      "tags": "queries/tags.scm"
     }
   ],
   "metadata": {