diff --git a/queries/glimmer/folds.scm b/queries/glimmer/folds.scm
new file mode 100644
index 000000000..cfe9d35b0
--- /dev/null
+++ b/queries/glimmer/folds.scm
@@ -0,0 +1,4 @@
+[
+ (element_node (element_node_start))
+ (block_statement)
+] @fold
diff --git a/queries/glimmer/indents.scm b/queries/glimmer/indents.scm
new file mode 100644
index 000000000..8bccf33fa
--- /dev/null
+++ b/queries/glimmer/indents.scm
@@ -0,0 +1,22 @@
+[
+  (element_node (element_node_start))
+  (element_node_void)
+  (block_statement (block_statement_start))
+  (mustache_statement)
+] @indent.begin
+
+(element_node (element_node_end  [">"] @indent.end))
+(element_node_void "/>" @indent.end)
+[
+ ">"
+ "/>"
+ "</"
+ "{{/"
+ "}}"
+] @indent.branch
+
+(mustache_statement
+  (helper_invocation helper: (identifier) @_identifier (#eq? @_identifier "else"))
+  ) @indent.branch
+(mustache_statement ((identifier) @_identifier (#eq? @_identifier "else"))) @indent.branch
+(comment_statement) @indent.ignore
diff --git a/queries/glimmer/locals.scm b/queries/glimmer/locals.scm
new file mode 100644
index 000000000..c371162bc
--- /dev/null
+++ b/queries/glimmer/locals.scm
@@ -0,0 +1,7 @@
+[
+ (element_node)
+ (block_statement)
+] @scope
+
+(identifier) @reference
+(block_params (identifier) @definition.var)