diff --git a/ahk2 b/ahk2
index 297742ef..234ebd1c 160000
--- a/ahk2
+++ b/ahk2
@@ -1 +1 @@
-Subproject commit 297742ef9d2db65985007b19603c2a0d28b3c173
+Subproject commit 234ebd1c804cd83de7462a7b6fe46015ffcb984c
diff --git a/changelog.md b/changelog.md
index 8cec2c5f..ae535c76 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@
 
 -   Rename extension to `AHK++ (AutoHotkey Plus Plus)` to provide a clear short name while retaining previous brand
     -   In 6.2.0, only the settings were renamed. This release renames the extension display name on registries as well.
+-   Rewrite AutoHotkey v2 definition files using [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)'s syntaxes ([#521](https://github.com/mark-wiemer-org/ahkpp/issues/521))
 -   Add exclude setting ([#488](https://github.com/mark-wiemer-org/ahkpp/issues/488))
     -   Excluded files are not included in IntelliSense completion suggestions, even when they're added via `#include`
     -   Changed `v2.exclude` setting to `exclude`
diff --git a/license.md b/license.md
index e3d322d5..56d8e766 100644
--- a/license.md
+++ b/license.md
@@ -4,11 +4,13 @@ Portions copyright:
 -   2019-2022 [Weijan Chen](https://github.com/cweijan/autohotkey-plus),
 -   2020-2024 [thqby](https://github.com/thqby/vscode-autohotkey2-lsp),
 -   2022-2023 [Lexikos](https://github.com/Lexikos/vscode-auto-select).
+-   2023-2024 [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)
 
 ---
 
 -   Unless otherwise indicated, all content is licensed under [MIT](https://opensource.org/license/MIT).
 -   AutoHotkey H icon licensed under [GNU General Public License version 3](https://opensource.org/license/gpl-3-0).
 -   Files in the ahk2 submodule are licensed under [GNU Lesser General Public License version 3](https://opensource.org/license/lgpl-3-0).
+-   AutoHotkey v2 definition files provided by [GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite) and [used with permission](https://github.com/GroggyOtter/ahkv2_definition_rewrite/issues/8)
 -   Other files licensed outside of MIT are marked as such at the top of the file.
 -   Please [open a discussion](https://github.com/mark-wiemer-org/ahkpp/discussions/new?category=q-a) if you have any questions :)
diff --git a/readme.md b/readme.md
index 06f0c0b4..229fa86b 100644
--- a/readme.md
+++ b/readme.md
@@ -159,9 +159,11 @@ This extension relies heavily on open-source code. A huge thank you to all these
 
 -   [AutoHotkey Plus by cweijan](https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-autohotkey-plus): AHK++ is a fork of AutoHotkey Plus by cweijan (Weijan Chen)
 -   [Contributions to AHK++ by kyklish](https://github.com/mark-wiemer-org/ahkpp/commits/main?author=kyklish): Greatly improved formatting and snippets by both fixing bugs and adding features
--   [AutoHotkey v2 Language Support by thqby](https://marketplace.visualstudio.com/items?itemName=thqby.vscode-autohotkey2-lsp): The source of the v2 grammar and other great contributions
--   [Lexikos/vscode-auto-select](https://github.com/Lexikos/vscode-auto-select): The core code for automatically switching AHK versions
+-   [AutoHotkey v2 Language Support extension by thqby](https://marketplace.visualstudio.com/items?itemName=thqby.vscode-autohotkey2-lsp): The source of the v2 grammar and other great contributions
+-   [AutoHotkey v2 definition files by GroggyOtter](https://github.com/GroggyOtter/ahkv2_definition_rewrite)
+-   [AHK version selection by Lexikos](https://github.com/Lexikos/vscode-auto-select): The core code for automatically switching AHK versions
 -   [AutoHotkey by stef-levesque](https://marketplace.visualstudio.com/items?itemName=slevesque.vscode-autohotkey): AutoHotkey Plus is a fork of stef-levesque's original AutoHotkey extension, which provided the original grammar and snippets for AHK
+-   People like you: Thank you for opening issues, offering suggestions, and providing information to the AHK community :)
 
 ## Links