diff --git a/community/tree-sitter-bash/APKBUILD b/community/tree-sitter-bash/APKBUILD
index 932fdc05b5a7d0b9757c035775eee94353221c7b..95f124a676f2d3731b2439b06e78927c7f7d6092 100644
--- a/community/tree-sitter-bash/APKBUILD
+++ b/community/tree-sitter-bash/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-bash
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Bash grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-bash"
 arch="all"
diff --git a/community/tree-sitter-c/APKBUILD b/community/tree-sitter-c/APKBUILD
index d69967e6d215d0fdaee0ab2d33af4c1c814b9b4e..da5ac24d73139919b523bfc0e94105d5160dce73 100644
--- a/community/tree-sitter-c/APKBUILD
+++ b/community/tree-sitter-c/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-c
 pkgver=0.20.1
-pkgrel=2
+pkgrel=3
 pkgdesc="C grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-c"
 arch="all"
diff --git a/community/tree-sitter-cpp/APKBUILD b/community/tree-sitter-cpp/APKBUILD
index d5c05011983cfbc31d0006bcaf21879999347702..2cbe7c1d9fc9aa7925beddbd3d3d626bfa6c1324 100644
--- a/community/tree-sitter-cpp/APKBUILD
+++ b/community/tree-sitter-cpp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-cpp
 pkgver=0.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-cpp"
 arch="all"
diff --git a/community/tree-sitter-css/APKBUILD b/community/tree-sitter-css/APKBUILD
index 3bf55d2785093703ebc5c2d25ac68b566d188be7..8fbcd44182c2a2a7f672336ad3fa2c98d4bac6f6 100644
--- a/community/tree-sitter-css/APKBUILD
+++ b/community/tree-sitter-css/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-css
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="CSS grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-css"
 arch="all"
diff --git a/community/tree-sitter-elm/APKBUILD b/community/tree-sitter-elm/APKBUILD
index a6248177da6952317fcee204d4d058d3758ed903..38371b6e235c45f94a7b485186c81fd6558ab0c6 100644
--- a/community/tree-sitter-elm/APKBUILD
+++ b/community/tree-sitter-elm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-elm
 pkgver=5.5.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Elm grammar for tree-sitter"
 url="https://github.com/elm-tooling/tree-sitter-elm"
 arch="all"
diff --git a/community/tree-sitter-embedded-template/APKBUILD b/community/tree-sitter-embedded-template/APKBUILD
index 8200c18ea96c102b47a2b242837b8ddff9ac16fa..14c39c568fce2bcfdd0e6da3e37a08c267e63eb2 100644
--- a/community/tree-sitter-embedded-template/APKBUILD
+++ b/community/tree-sitter-embedded-template/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-embedded-template
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Tree-sitter grammar for embedded template languages like ERB, EJS"
 url="https://github.com/tree-sitter/tree-sitter-embedded-template"
 arch="all"
diff --git a/community/tree-sitter-html/APKBUILD b/community/tree-sitter-html/APKBUILD
index a582cbb0779c08fcdbb9f747cf8bbd33c65ffa11..afa32a6278771af0a330638334b6cbe96d0164be 100644
--- a/community/tree-sitter-html/APKBUILD
+++ b/community/tree-sitter-html/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-html
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="HTML grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-html"
 arch="all"
diff --git a/community/tree-sitter-java/APKBUILD b/community/tree-sitter-java/APKBUILD
index 4afef6303911fed3f3fc1a4483db845e375e9a05..5381d25984ebaad7215fabeb7e98174534540b7f 100644
--- a/community/tree-sitter-java/APKBUILD
+++ b/community/tree-sitter-java/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-java
 pkgver=0.19.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Java grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-java"
 arch="all"
diff --git a/community/tree-sitter-javascript/APKBUILD b/community/tree-sitter-javascript/APKBUILD
index d9a0e3068f647d58fbc4a10002f48792bb4a2b22..1a0801ecf573dcffffdf65f77286444461622928 100644
--- a/community/tree-sitter-javascript/APKBUILD
+++ b/community/tree-sitter-javascript/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-javascript
 pkgver=0.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="JavaScript grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-javascript"
 arch="all"
diff --git a/community/tree-sitter-jsdoc/APKBUILD b/community/tree-sitter-jsdoc/APKBUILD
index c5b7cadce7e7e3b2853a4e7a1a1d09b50126a4ee..ff482656773feec9fe55d5ec072ea0daafa6b4b9 100644
--- a/community/tree-sitter-jsdoc/APKBUILD
+++ b/community/tree-sitter-jsdoc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-jsdoc
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="JSDoc grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-jsdoc"
 arch="all"
diff --git a/community/tree-sitter-json/APKBUILD b/community/tree-sitter-json/APKBUILD
index 03e658c03d3807bae1296652c704ac8bc01ca1ed..79d16397e7b144fb10af4e6c31124dd2b6ac31ef 100644
--- a/community/tree-sitter-json/APKBUILD
+++ b/community/tree-sitter-json/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-json
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="JSON grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-json"
 arch="all"
diff --git a/community/tree-sitter-julia/APKBUILD b/community/tree-sitter-julia/APKBUILD
index c34973d67e3174cf8c1f90f6d96ae1304e2e0332..ecf0f90ca105597f75a77fd8d4705d1900ff8820 100644
--- a/community/tree-sitter-julia/APKBUILD
+++ b/community/tree-sitter-julia/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-julia
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Julia grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-julia"
 arch="all"
diff --git a/community/tree-sitter-python/APKBUILD b/community/tree-sitter-python/APKBUILD
index 69f10f7cf0fa60d7d5a5f301c303c073094d22f2..9639303cb905fc96589b0d82ea1d53d87eefed9c 100644
--- a/community/tree-sitter-python/APKBUILD
+++ b/community/tree-sitter-python/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-python
 pkgver=0.19.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Python grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-python"
 arch="all"
diff --git a/community/tree-sitter-regex/APKBUILD b/community/tree-sitter-regex/APKBUILD
index 654fc6d8574cffb65b2b6ad4b186913c75f1616d..3ce793700a6946372d6c17cdbaf130ff59dab69b 100644
--- a/community/tree-sitter-regex/APKBUILD
+++ b/community/tree-sitter-regex/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-regex
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Tree-sitter grammar for regular expressions"
 url="https://github.com/tree-sitter/tree-sitter-regex"
 arch="all"
diff --git a/community/tree-sitter-ruby/APKBUILD b/community/tree-sitter-ruby/APKBUILD
index e9fc39376ffab20274afcfb2b7b4fc6b6c0ee153..2d6197926605f5bd297bcd1be75266e738f562b0 100644
--- a/community/tree-sitter-ruby/APKBUILD
+++ b/community/tree-sitter-ruby/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-ruby
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Ruby grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-ruby"
 arch="all"
diff --git a/community/tree-sitter-rust/APKBUILD b/community/tree-sitter-rust/APKBUILD
index 537743d49ed1f16f9b8c55607f1713a5c377363b..2bebe09f8590b9ed92955f9306d3e96a92f22200 100644
--- a/community/tree-sitter-rust/APKBUILD
+++ b/community/tree-sitter-rust/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-rust
 pkgver=0.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Rust grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-rust"
 arch="all"
diff --git a/community/tree-sitter-scala/APKBUILD b/community/tree-sitter-scala/APKBUILD
index 513fdbfc6a82c9d95a270a15eb255261aad87469..780368dbedf3d21c863a7057839881bf3d7c08a4 100644
--- a/community/tree-sitter-scala/APKBUILD
+++ b/community/tree-sitter-scala/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-scala
 pkgver=0.19.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Scala grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-scala"
 arch="all"
diff --git a/community/tree-sitter-toml/APKBUILD b/community/tree-sitter-toml/APKBUILD
index e08024c2a09105fdd48d968ca2d2484a72418301..efe6bae328e9f62d6a93c45e87000e373516409e 100644
--- a/community/tree-sitter-toml/APKBUILD
+++ b/community/tree-sitter-toml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-toml
 pkgver=0.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="TOML grammar for tree-sitter"
 url="https://github.com/ikatyang/tree-sitter-toml"
 arch="all"
diff --git a/community/tree-sitter-tsq/APKBUILD b/community/tree-sitter-tsq/APKBUILD
index 619684f888cd76159d6263ad16ef7bba6f979659..edf2194eb22593744a6f0721fc5c94f831bb6a35 100644
--- a/community/tree-sitter-tsq/APKBUILD
+++ b/community/tree-sitter-tsq/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-tsq
 pkgver=0.19.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Tree-sitter grammar for the tree-sitter query language"
 url="https://github.com/tree-sitter/tree-sitter-tsq"
 arch="all"
diff --git a/community/tree-sitter-typescript/APKBUILD b/community/tree-sitter-typescript/APKBUILD
index 14ef663d1c7614d72bdb6ef07a84d14e14861da8..a705d9f70d9d89d882dcacbcb9e5c693ff02f165 100644
--- a/community/tree-sitter-typescript/APKBUILD
+++ b/community/tree-sitter-typescript/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=tree-sitter-typescript
 pkgver=0.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="TypeScript grammar for tree-sitter"
 url="https://github.com/tree-sitter/tree-sitter-typescript"
 arch="all"
@@ -18,14 +18,20 @@ _langs='tsx typescript'
 
 build() {
 	local lang; for lang in $_langs; do
-		abuild-tree-sitter build -C "$lang/src"
+		abuild-tree-sitter build -s "$lang/src"
 	done
 }
 
 package() {
+	local querydir="$pkgdir/usr/share/tree-sitter/queries"
+
 	local lang; for lang in $_langs; do
-		DESTDIR="$pkgdir" abuild-tree-sitter install -C "$lang/src"
+		DESTDIR="$pkgdir" abuild-tree-sitter install -s "$lang/src"
 	done
+
+	rm "$querydir"/tsx/*
+	echo '; inherits: typescript' > "$querydir"/tsx/highlights.scm
+	echo '; inherits: typescript' > "$querydir"/tsx/injections.scm
 }
 
 sha512sums="