diff --git a/runtime/queries/cpp/context.scm b/runtime/queries/cpp/context.scm
index 1f6855b47..91c737763 100644
--- a/runtime/queries/cpp/context.scm
+++ b/runtime/queries/cpp/context.scm
@@ -1,4 +1,4 @@
 ; Credits to nvim-treesitter-context
 
 ; inherits c
-(class_specifier) @context
\ No newline at end of file
+(class_specifier) @context
diff --git a/runtime/queries/elixir/context.scm b/runtime/queries/elixir/context.scm
index 0a96b5016..0a6b0bc2e 100644
--- a/runtime/queries/elixir/context.scm
+++ b/runtime/queries/elixir/context.scm
@@ -15,4 +15,3 @@
 (stab_clause) @context
 
 (call) @context
-  
\ No newline at end of file
diff --git a/runtime/queries/go/context.scm b/runtime/queries/go/context.scm
index 335da0bb3..e7ffd164e 100644
--- a/runtime/queries/go/context.scm
+++ b/runtime/queries/go/context.scm
@@ -1,3 +1,5 @@
+; Credits to nvim-treesitter/nvim-treesitter-context
+
 (function_declaration
 	result: (_) @context.end
 ) @context
diff --git a/runtime/queries/json/context.scm b/runtime/queries/json/context.scm
new file mode 100644
index 000000000..2b0f30f23
--- /dev/null
+++ b/runtime/queries/json/context.scm
@@ -0,0 +1,5 @@
+; Credits to nvim-treesitter/nvim-treesitter-context
+[
+  (object)
+  (pair)
+] @context
diff --git a/runtime/queries/markdown/context.scm b/runtime/queries/markdown/context.scm
new file mode 100644
index 000000000..e1cc92fe4
--- /dev/null
+++ b/runtime/queries/markdown/context.scm
@@ -0,0 +1,2 @@
+; Credits to nvim-treesitter/nvim-treesitter-context
+(section) @context
diff --git a/runtime/queries/toml/context.scm b/runtime/queries/toml/context.scm
new file mode 100644
index 000000000..feceb3925
--- /dev/null
+++ b/runtime/queries/toml/context.scm
@@ -0,0 +1,8 @@
+; Credits to nvim-treesitter/nvim-treesitter-context
+[
+  (table)
+  (table_array_element)
+  (inline_table)
+  (array)
+  (pair)
+] @context
diff --git a/runtime/queries/yaml/context.scm b/runtime/queries/yaml/context.scm
new file mode 100644
index 000000000..df6fdf3ff
--- /dev/null
+++ b/runtime/queries/yaml/context.scm
@@ -0,0 +1,6 @@
+; Credits to nvim-treesitter/nvim-treesitter-context
+[
+  (block_mapping)
+  (block_mapping_pair)
+  (block_sequence_item)
+] @context
diff --git a/runtime/queries/zig/context.scm b/runtime/queries/zig/context.scm
index 63aeaba87..13b5df4b5 100644
--- a/runtime/queries/zig/context.scm
+++ b/runtime/queries/zig/context.scm
@@ -1,4 +1,3 @@
-
 (TopLevelDecl
   (FnProto)
   (Block) @context.end