diff --git a/Package.swift b/Package.swift
index 9ef1aaf..42b8543 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         .library(name: "TreeSitterWit", targets: ["TreeSitterWit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/tree-sitter/swift-tree-sitter", from: "0.8.0"),
+        .package(name: "SwiftTreeSitter", url: "https://github.com/tree-sitter/swift-tree-sitter", from: "0.9.0"),
     ],
     targets: [
         .target(
diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs
index d228d13..ffcd74b 100644
--- a/bindings/rust/lib.rs
+++ b/bindings/rust/lib.rs
@@ -15,7 +15,7 @@
 //! assert!(!tree.root_node().has_error());
 //! ```
 //!
-//! [`Parser`]: https://docs.rs/tree-sitter/0.25.6/tree_sitter/struct.Parser.html
+//! [`Parser`]: https://docs.rs/tree-sitter/0.25.8/tree_sitter/struct.Parser.html
 //! [tree-sitter]: https://tree-sitter.github.io/
 
 use tree_sitter_language::LanguageFn;
diff --git a/justfile b/justfile
index 70ac51c..76e3f68 100644
--- a/justfile
+++ b/justfile
@@ -30,37 +30,19 @@ build:
 test *args: generate
     tree-sitter test {{ args }}
 
-[private]
-remove-local:
-    rm -rf ~/.local/share/nvim/lazy/nvim-treesitter/queries/wit
-
-# Install the queries locally
-install-local: remove-local
-    cp -r ./queries ~/.local/share/nvim/lazy/nvim-treesitter/queries/wit
-
 fmt:
-    eslint --fix grammar.js
+    npx eslint --fix grammar.js
     ts_query_ls format ./queries
     # topiary fmt ./examples/*.wit
     just --fmt --unstable
     nixfmt flake.nix shell.nix
 
-alias fmt-queries := format-queries
-
-# Format the queries
-format-queries:
-    nvim -l scripts/format-queries.lua
-
 # Lint all the things
 lint:
     npx eslint grammar.js
     typos
     just --fmt --unstable --check
 
-# Format the grammar
-format-grammar:
-    npx eslint --fix grammar.js
-
 # updates node package.json to latest available
 update:
     pnpm outdated --format json | jq  'keys[]' | xargs pnpm update
diff --git a/pyproject.toml b/pyproject.toml
index b4e09ce..ee70bea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
+requires = ["setuptools>=62.4.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
diff --git a/queries/highlights.scm b/queries/highlights.scm
index aeb7ae9..4a8c1e9 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -29,7 +29,6 @@
     "deprecated"
   ] @attribute.builtin)
 
-
 (unstable_gate
   feature: (id) @string)
 
@@ -175,7 +174,6 @@
 
 "_" @variable.parameter.builtin
 
-
 [
   ";"
   ":"
diff --git a/src/node-types.json b/src/node-types.json
index c5ea2de..449964d 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -65,6 +65,7 @@
   {
     "type": "block_comment",
     "named": true,
+    "extra": true,
     "fields": {
       "doc": {
         "multiple": false,
@@ -471,6 +472,7 @@
   {
     "type": "line_comment",
     "named": true,
+    "extra": true,
     "fields": {
       "doc": {
         "multiple": false,
diff --git a/src/parser.c b/src/parser.c
index 7d0685b..7467f05 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Automatically @generated by tree-sitter v0.25.6 */
+/* Automatically @generated by tree-sitter v0.25.8 */
 
 #include "tree_sitter/parser.h"