diff --git a/build.zig b/build.zig
index 34ebe57..ae8f52c 100644
--- a/build.zig
+++ b/build.zig
@@ -71,7 +71,7 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-julia/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-kdl/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-lua/queries/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-mail/queries/mail/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-mail/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-make/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-markdown/tree-sitter-markdown/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-markdown/tree-sitter-markdown-inline/queries/highlights.scm");
@@ -93,8 +93,10 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-proto/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-python/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-purescript/queries/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-query/queries/query/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-regex/queries/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rpmspec/queries/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rpmspec/rpmbash/queries/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rpmspec/rpmspec/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ruby/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rust/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ssh-config/queries/highlights.scm");
@@ -114,12 +116,13 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-zig/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ziggy/tree-sitter-ziggy/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ziggy/tree-sitter-ziggy-schema/queries/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/verilog/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/comment/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/commonlisp/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/latex/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/hcl/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/rst/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/systemverilog/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/comment/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/commonlisp/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/latex/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/hcl/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/hurl/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/rst/highlights.scm");
 
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "queries/cmake/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-asm/queries/asm/injections.scm");
@@ -150,6 +153,8 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-po/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-purescript/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-purescript/vim_queries/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-query/queries/query/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rpmspec/rpmspec/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rust/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-superhtml/tree-sitter-superhtml/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-swift/queries/injections.scm");
@@ -157,11 +162,12 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-uxntal/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-vim/queries/vim/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-zig/queries/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/verilog/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/commonlisp/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/latex/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/hcl/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/rst/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/systemverilog/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/commonlisp/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/latex/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/hcl/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/hurl/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/runtime/queries/rst/injections.scm");
 
     const syntax_mod = b.addModule("syntax", .{
         .root_source_file = b.path("src/syntax.zig"),
diff --git a/src/file_types.zig b/src/file_types.zig
index 7e1b1dd..ad003e8 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -59,7 +59,7 @@ pub const comment = .{
     .icon = "#",
     .extensions = .{},
     .comment = "#",
-    .highlights = "nvim-treesitter/queries/comment/highlights.scm",
+    .highlights = "nvim-treesitter/runtime/queries/comment/highlights.scm",
 };
 
 pub const conf = .{
@@ -232,8 +232,8 @@ pub const hcl = .{
     .icon = "",
     .extensions = .{ "hcl", "tf", "tfvars" },
     .comment = "#",
-    .highlights = "nvim-treesitter/queries/hcl/highlights.scm",
-    .injections = "nvim-treesitter/queries/hcl/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/hcl/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/hcl/injections.scm",
 };
 
 pub const html = .{
@@ -261,7 +261,8 @@ pub const hurl = .{
     .icon = "",
     .extensions = .{"hurl"},
     .comment = "#",
-    .injections = "tree-sitter-hurl/queries/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/hurl/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/hurl/injections.scm",
 };
 
 pub const java = .{
@@ -317,8 +318,8 @@ pub const latex = .{
     .icon = "",
     .extensions = .{ "tex", "aux", "sty", "cls" },
     .comment = "%",
-    .highlights = "nvim-treesitter/queries/latex/highlights.scm",
-    .injections = "nvim-treesitter/queries/latex/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/latex/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/latex/injections.scm",
 };
 
 pub const commonlisp = .{
@@ -327,8 +328,8 @@ pub const commonlisp = .{
     .icon = "",
     .extensions = .{ "lisp", "ls", "el" },
     .comment = ";",
-    .highlights = "nvim-treesitter/queries/commonlisp/highlights.scm",
-    .injections = "nvim-treesitter/queries/commonlisp/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/commonlisp/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/commonlisp/injections.scm",
 };
 
 pub const lua = .{
@@ -346,7 +347,6 @@ pub const mail = .{
     .icon = "󰇮",
     .extensions = .{ "eml", "mbox" },
     .comment = ">",
-    .highlights = "tree-sitter-mail/queries/mail/highlights.scm",
     .first_line_matches = FirstLineMatch{ .prefix = "From" },
 };
 
@@ -553,20 +553,31 @@ pub const regex = .{
     .comment = "#",
 };
 
+pub const rpmbash = .{
+    .description = "RPM spec (bash)",
+    .color = 0xff0000,
+    .icon = "󱄛",
+    .extensions = .{},
+    .comment = "#",
+    .highlights = "tree-sitter-rpmspec/rpmbash/queries/highlights.scm",
+};
+
 pub const rpmspec = .{
     .description = "RPM spec",
     .color = 0xff0000,
     .icon = "󱄛",
     .extensions = .{"spec"},
     .comment = "#",
+    .highlights = "tree-sitter-rpmspec/rpmspec/queries/highlights.scm",
+    .injections = "tree-sitter-rpmspec/rpmspec/queries/injections.scm",
 };
 
 pub const rst = .{
     .description = "reStructuredText",
     .extensions = .{"rst"},
     .comment = "..",
-    .highlights = "nvim-treesitter/queries/rst/highlights.scm",
-    .injections = "nvim-treesitter/queries/rst/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/rst/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/rst/injections.scm",
 };
 
 pub const ruby = .{
@@ -586,9 +597,17 @@ pub const rust = .{
     .injections = "tree-sitter-rust/queries/injections.scm",
 };
 
+pub const query = .{
+    .description = "Query (tree-sitter)",
+    .extensions = .{"scm"},
+    .comment = ";",
+    .highlights = "tree-sitter-query/queries/query/highlights.scm",
+    .injections = "tree-sitter-query/queries/query/injections.scm",
+};
+
 pub const scheme = .{
     .description = "Scheme",
-    .extensions = .{ "scm", "ss" },
+    .extensions = .{ "scm", "ss", "scheme" },
     .comment = ";",
 };
 
@@ -613,12 +632,12 @@ pub const swift = .{
     .comment = "//",
 };
 
-pub const verilog = .{
+pub const systemverilog = .{
     .description = "SystemVerilog",
     .extensions = .{ "sv", "svh", "v", "vh" },
     .comment = "//",
-    .highlights = "nvim-treesitter/queries/verilog/highlights.scm",
-    .injections = "nvim-treesitter/queries/verilog/injections.scm",
+    .highlights = "nvim-treesitter/runtime/queries/systemverilog/highlights.scm",
+    .injections = "nvim-treesitter/runtime/queries/systemverilog/injections.scm",
 };
 
 pub const toml = .{