diff --git a/src/file_type.zig b/src/file_type.zig
index 65f8c77..b27a0f9 100644
--- a/src/file_type.zig
+++ b/src/file_type.zig
@@ -125,6 +125,8 @@ fn load_file_types(comptime Namespace: type) []const FileType {
                     .highlights = if (build_options.use_tree_sitter)
                         if (@hasField(@TypeOf(args), "highlights"))
                             @embedFile(args.highlights)
+                        else if (@hasField(@TypeOf(args), "highlights_list"))
+                            @embedFile(args.highlights_list[0]) ++ "\n" ++ @embedFile(args.highlights_list[1])
                         else
                             @embedFile("tree-sitter-" ++ lang ++ "/queries/highlights.scm")
                     else
diff --git a/src/file_types.zig b/src/file_types.zig
index 1532ebb..a424ae4 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -43,6 +43,10 @@ pub const cpp = .{
     .icon = "",
     .extensions = .{ "cc", "cpp", "cxx", "hpp", "hxx", "h", "ipp", "ixx" },
     .comment = "//",
+    .highlights_list = .{
+        "tree-sitter-c/queries/highlights.scm",
+        "tree-sitter-cpp/queries/highlights.scm",
+    },
     .injections = "tree-sitter-cpp/queries/injections.scm",
     .formatter = .{"clang-format"},
     .language_server = .{"clangd"},