diff --git a/build.zig b/build.zig
index de865d1..aca3e86 100644
--- a/build.zig
+++ b/build.zig
@@ -102,7 +102,6 @@ pub fn build(b: *std.Build) void {
     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/commonlisp/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-astro/queries/injections.scm");
@@ -134,7 +133,6 @@ pub fn build(b: *std.Build) void {
     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");
 
     const syntax_mod = b.addModule("syntax", .{
         .root_source_file = b.path("src/syntax.zig"),
diff --git a/build.zig.zon b/build.zig.zon
index ba748bd..a53abd7 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -6,8 +6,8 @@
 
     .dependencies = .{
         .tree_sitter = .{
-            .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-442fdce63897329a7cf2f533508c6879e0e1c094/source.tar.gz",
-            .hash = "N-V-__8AAEzbrirOSwR2m8orFR06xmMmuA_m7wSxLi29ntV3",
+            .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-f9fb7a84a1d7e1aeaa88b95ce2306c2e24e7b1b9/source.tar.gz",
+            .hash = "N-V-__8AAAbAVCqbNHeQBE-3LU1IcULUOEWAZaLueuct59Z9",
         },
         .cbor = .{
             .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz",
diff --git a/src/file_types.zig b/src/file_types.zig
index 8bf077b..eeb9d07 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -71,16 +71,6 @@ pub const cpp = .{
     .injections = "tree-sitter-cpp/queries/injections.scm",
 };
 
-pub const csproj = .{
-    .description = "C# Project",
-    .color = 0x68217a,
-    .icon = "󰌛",
-    .extensions = .{"csproj"},
-    .comment = "<!--",
-    .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
-    .parser = xml.parser,
-};
-
 pub const css = .{
     .description = "CSS",
     .color = 0x3d8fc6,
@@ -128,7 +118,7 @@ pub const fish = .{
     .highlights = "tree-sitter-fish/queries/highlights.scm",
 };
 
-pub const fsharp = .{
+pub const @"fsharp" = .{
     .description = "F#",
     .color = 0x378bba,
     .icon = "",
@@ -250,16 +240,6 @@ pub const kdl = .{
     .comment = "//",
 };
 
-pub const commonlisp = .{
-    .description = "Lisp",
-    .color = 0xFFFFFF,
-    .icon = "",
-    .extensions = .{ "lisp", "ls", "el" },
-    .comment = ";",
-    .highlights = "nvim-treesitter/queries/commonlisp/highlights.scm",
-    .injections = "nvim-treesitter/queries/commonlisp/injections.scm",
-};
-
 pub const lua = .{
     .description = "Lua",
     .color = 0x02027d,
@@ -367,6 +347,7 @@ pub const odin = .{
     .description = "Odin",
     .extensions = .{"odin"},
     .comment = "//",
+    .parser = @import("file_type.zig").Parser("odin"),
     .injections = "tree-sitter-odin/queries/injections.scm",
 };
 
@@ -403,15 +384,6 @@ pub const powershell = .{
     .comment = "#",
 };
 
-pub const props = .{
-    .description = "MSBuild Properties",
-    .icon = "",
-    .extensions = .{"Directory.Build.props"},
-    .comment = "<!--",
-    .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
-    .parser = xml.parser,
-};
-
 pub const proto = .{
     .description = "protobuf (proto)",
     .extensions = .{"proto"},
@@ -469,7 +441,7 @@ pub const rust = .{
 
 pub const scheme = .{
     .description = "Scheme",
-    .extensions = .{ "scm", "ss" },
+    .extensions = .{ "scm", "ss", "el" },
     .comment = ";",
 };
 
@@ -551,7 +523,6 @@ pub const xml = .{
     .comment = "<!--",
     .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
     .first_line_matches = FirstLineMatch{ .prefix = "<?xml " },
-    .parser = @import("file_type.zig").Parser("xml"),
 };
 
 pub const yaml = .{