diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 719e1896..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Checklist
-
-- [ ] All tests pass in CI
-- [ ] There are enough tests for the new fix/feature
-- [ ] Grammar rules have not been renamed unless absolutely necessary (x rules renamed)
-- [ ] The conflicts section hasn't grown too much (x new conflicts)
-- [ ] The parser size hasn't grown too much (master: STATE_COUNT, PR: STATE_COUNT)
-      (check the value of STATE_COUNT in src/parser.c)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69f7c503..a61f3e15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,36 +2,57 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
+    paths:
+      - "scripts.js"
+      - "common/*"
+      - "*/grammar.js"
+      - "*/src/**"
+      - "bindings/**"
+      - "binding.gyp"
   pull_request:
-    branches:
-      - master
+    paths:
+      - "scripts.js"
+      - "common/*"
+      - "*/grammar.js"
+      - "*/src/**"
+      - "bindings/**"
+      - "binding.gyp"
+
+concurrency:
+  group: ${{github.workflow}}-${{github.ref}}
+  cancel-in-progress: true
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    name: Test parsers
+    runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest, windows-latest, macos-14]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - uses: actions/setup-python@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up tree-sitter
+        uses: tree-sitter/setup-action/cli@v1
+      - name: Set up examples
+        run: |-
+          git clone https://github.com/laravel/laravel examples/laravel --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/laravel/framework examples/framework --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/phacility/phabricator examples/phabricator --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/sebastianbergmann/phpunit examples/phpunit --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/WordPress/WordPress examples/WordPress --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/wikimedia/mediawiki examples/mediawiki --single-branch --depth=1 --filter=blob:none
+      - name: Run tests
+        uses: tree-sitter/parser-test-action@v2
         with:
-          python-version: '3.12'
-      - run: npm install
-      - run: npm test
-      - run: npm run test-examples
-  test_windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+          test-rust: ${{runner.os == 'Linux'}}
+      - name: Parse examples
+        id: test
+        uses: tree-sitter/parse-action@v4
         with:
-          node-version: 18
-      - run: npm install
-      - run: npm test
+          files: |
+            examples/**/*.php
+          invalid-files: |
+            examples/framework/tests/Foundation/fixtures/bad-syntax-strategy.php
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
new file mode 100644
index 00000000..d4045f9b
--- /dev/null
+++ b/.github/workflows/fuzz.yml
@@ -0,0 +1,30 @@
+name: Fuzz Parser
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - php/src/scanner.c
+      - php_only/src/scanner.c
+      - common/scanner.h
+  pull_request:
+    paths:
+      - php/src/scanner.c
+      - php_only/src/scanner.c
+      - common/scanner.h
+
+jobs:
+  fuzz:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [php, php_only]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Fuzz ${{matrix.language}} parser
+        uses: tree-sitter/fuzz-action@v4
+        with:
+          directory: ${{matrix.language}}
+          tree-sitter-version: v0.22.5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..ac31648d
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,23 @@
+name: Publish package
+
+on:
+  push:
+    tags: ["*"]
+
+concurrency:
+  group: ${{github.workflow}}-${{github.ref}}
+  cancel-in-progress: true
+
+jobs:
+  npm:
+    uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
+    secrets:
+      NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+  crates:
+    uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
+    secrets:
+      CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_REGISTRY_TOKEN}}
+  pypi:
+    uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main
+    secrets:
+      PYPI_API_TOKEN: ${{secrets.PYPI_API_TOKEN}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 870eb84b..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Release
-
-on:
-  workflow_run:
-    workflows: ["CI"]
-    branches:
-      - master
-    types:
-      - completed
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get previous commit SHA
-        id: get_previous_commit
-        run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0)
-          if [[ -z "$LATEST_TAG" ]]; then
-            echo "No tag found. Failing..."
-            exit 1
-          fi
-          echo "latest_tag=${LATEST_TAG#v}" >> "$GITHUB_ENV" # Remove 'v' prefix from the tag
-
-      - name: Check if version changed and is greater than the previous
-        id: version_check
-        run: |
-          # Compare the current version with the version from the previous commit
-          PREVIOUS_NPM_VERSION=${{ env.latest_tag }}
-          CURRENT_NPM_VERSION=$(jq -r '.version' package.json)
-          CURRENT_CARGO_VERSION=$(awk -F '"' '/^version/ {print $2}' Cargo.toml)
-          if [[ "$CURRENT_NPM_VERSION" != "$CURRENT_CARGO_VERSION" ]]; then # Cargo.toml and package.json versions must match
-            echo "Mismatch: NPM version ($CURRENT_NPM_VERSION) and Cargo.toml version ($CURRENT_CARGO_VERSION)"
-            echo "version_changed=false" >> "$GITHUB_ENV"
-          else
-            if [[ "$PREVIOUS_NPM_VERSION" ==  "$CURRENT_NPM_VERSION" ]]; then
-              echo "version_changed=" >> "$GITHUB_ENV"
-            else
-              IFS='.' read -ra PREVIOUS_VERSION_PARTS <<< "$PREVIOUS_NPM_VERSION"
-              IFS='.' read -ra CURRENT_VERSION_PARTS <<< "$CURRENT_NPM_VERSION"
-              VERSION_CHANGED=false
-              for i in "${!PREVIOUS_VERSION_PARTS[@]}"; do
-                if [[ ${CURRENT_VERSION_PARTS[i]} -gt ${PREVIOUS_VERSION_PARTS[i]} ]]; then
-                  VERSION_CHANGED=true
-                  break
-                elif [[ ${CURRENT_VERSION_PARTS[i]} -lt ${PREVIOUS_VERSION_PARTS[i]} ]]; then
-                  break
-                fi
-              done
-
-              echo "version_changed=$VERSION_CHANGED" >> "$GITHUB_ENV"
-              echo "current_version=${CURRENT_NPM_VERSION}" >> "$GITHUB_ENV"
-            fi
-          fi
-
-      - name: Display result
-        run: |
-          echo "Version bump detected: ${{ env.version_changed }}"
-
-      - name: Fail if version is lower
-        if: env.version_changed == 'false'
-        run: exit 1
-
-      - name: Setup Node
-        if: env.version_changed == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          registry-url: "https://registry.npmjs.org"
-      - name: Publish to NPM
-        if: env.version_changed == 'true'
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-        run: npm publish
-
-      - name: Setup Rust
-        if: env.version_changed == 'true'
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Publish to Crates.io
-        if: env.version_changed == 'true'
-        uses: katyo/publish-crates@v2
-        with:
-          registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-
-      - name: Tag versions
-        if: env.version_changed == 'true'
-        run: |
-          git checkout master
-          git config user.name github-actions[bot]
-          git config user.email github-actions[bot]@users.noreply.github.com
-          git tag -d "v${{ env.current_version }}" || true
-          git push origin --delete "v${{ env.current_version }}" || true
-          git tag -a "v${{ env.current_version }}" -m "Version ${{ env.current_version }}"
-          git push origin "v${{ env.current_version }}"
diff --git a/script/known-failures.txt b/script/known-failures.txt
deleted file mode 100644
index 8b137891..00000000
--- a/script/known-failures.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/script/parse-examples b/script/parse-examples
deleted file mode 100755
index 47ed4b34..00000000
--- a/script/parse-examples
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-cd "$(dirname "$0")/.."
-
-function clone_repo {
-	owner=$1
-	name=$2
-	sha=$3
-
-	path=examples/$name
-	if [ ! -d "$path" ]; then
-		echo "Cloning $owner/$name"
-		git clone --depth 1 "https://github.com/$owner/$name" "$path"
-	fi
-
-	pushd "$path" >/dev/null
-	actual_sha=$(git rev-parse HEAD)
-	if [ "$actual_sha" != "$sha" ]; then
-		echo "Updating $owner/$name to $sha"
-		git fetch --depth 1 origin "$sha"
-		git reset --hard "$sha"
-	fi
-	popd >/dev/null
-}
-
-clone_repo laravel laravel 9d0862b3340c8243ee072afc181e315ffa35e110
-clone_repo laravel framework 45d439e98a6b14afde8911f7d22a265948adbf72
-clone_repo phacility phabricator d0b01a41f2498fb2a6487c2d6704dc7acfd4675f
-clone_repo sebastianbergmann phpunit 5e523bdc7dd4d90fed9fb29d1df05347b3e7eaba
-clone_repo WordPress WordPress 45286c5bb3f6fe5005567903ec858d87077eae2c
-clone_repo wikimedia mediawiki b6b88cbf98fb0c7891324709a85eabc290ed28b4
-
-known_failures=$(cat script/known-failures.txt)
-
-# shellcheck disable=2046
-tree-sitter parse -q \
-	examples/**/*.php \
-	$(for file in $known_failures; do echo "!${file}"; done)
-
-example_count=$(find examples -name '*.php' | wc -l)
-failure_count=$(wc -w <<<"$known_failures")
-success_count=$((example_count - failure_count))
-success_percent=$(bc -l <<<"100*${success_count}/${example_count}")
-
-printf \
-	"Successfully parsed %d of %d example files (%.1f%%)\n" \
-	$success_count $example_count $success_percent