diff --git a/languages.toml b/languages.toml
index 4f5272476..0465a2522 100644
--- a/languages.toml
+++ b/languages.toml
@@ -420,7 +420,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-janet-simple", rev = "51
 
 [[grammar]]
 name = "c3"
-source = { git = "https://github.com/c3lang/tree-sitter-c3.git" , rev = "790a0326833cd647e00d8dec01268aa1ec2e3bdb" }
+source = { git = "https://github.com/c3lang/tree-sitter-c3" , rev = "790a0326833cd647e00d8dec01268aa1ec2e3bdb" }
 
 [[language]]
 name = "c3"
diff --git a/runtime/queries/c3/indents.scm b/runtime/queries/c3/indents.scm
new file mode 100644
index 000000000..901abf38d
--- /dev/null
+++ b/runtime/queries/c3/indents.scm
@@ -0,0 +1,13 @@
+[
+  (func_definition)
+  (if_stmt)
+  (enum_declaration)
+  (for_stmt)
+  (while_stmt)
+  (case_stmt)
+  (macro_declaration)
+] @indent
+
+[
+  "}"
+] @outdent
diff --git a/runtime/queries/c3/textobjects.scm b/runtime/queries/c3/textobjects.scm
new file mode 100644
index 000000000..8c0a3d514
--- /dev/null
+++ b/runtime/queries/c3/textobjects.scm
@@ -0,0 +1,17 @@
+(func_definition
+  body: (_) @function.inside) @function.around
+
+(struct_declaration
+  body: (_) @class.inside) @class.around
+
+(enum_declaration
+  body: (_) @class.inside) @class.around
+
+(fn_parameter_list 
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(line_comment) @comment.inside
+(line_comment)+ @comment.around
+
+(doc_comment) @comment.inside
+(doc_comment)+ @comment.outside