diff --git a/README.md b/README.md
index 263da5605..64cbf72b9 100644
--- a/README.md
+++ b/README.md
@@ -306,7 +306,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
-- [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
+- [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 109486fbf..3670f5a53 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -399,7 +399,7 @@
     "revision": "ed9a12f6ae4e75d4622adef8fb1b1e4d0ac0a759"
   },
   "proto": {
-    "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
+    "revision": "4f5450ca84ffc1bff6c604f061276729cf184f40"
   },
   "prql": {
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fc2bad86c..6ac8be998 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1198,10 +1198,10 @@ list.promql = {
 
 list.proto = {
   install_info = {
-    url = "https://github.com/mitchellh/tree-sitter-proto",
+    url = "https://github.com/treywood/tree-sitter-proto",
     files = { "src/parser.c" },
   },
-  maintainers = { "@fsouza" },
+  maintainers = { "@treywood" },
 }
 
 list.prql = {
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index a24314834..e869b87e0 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -1,18 +1,30 @@
 [
-  "syntax"
-  "option"
-  "service"
-  "rpc"
-  "returns"
-  "message"
   "enum"
+  "extend"
+  "extensions"
+  "message"
   "oneof"
-  "optional"
-  "repeated"
+  "option"
   "reserved"
+  "service"
+  "syntax"
   "to"
 ] @keyword
 
+[
+ "rpc"
+] @keyword.function
+
+[
+ "returns"
+] @keyword.return
+
+[
+  "optional"
+  "repeated"
+  "required"
+] @type.qualifier
+
 [
   "package"
   "import"
@@ -34,6 +46,7 @@
 [
   (string)
   "\"proto3\""
+  "\"proto2\""
 ] @string
 
 (int_lit) @number