diff --git a/README.md b/README.md
index fc1e3fc..3aafedb 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@
 <br/><em>(Toggle Test File)</em></p>
 
 **⚠️ Note**: the default syntax highlighting for Go files is provided by a
-[TextMate rule](https://github.com/jeff-hykin/better-go-syntax) embedded in VS
+[TextMate rule](https://github.com/worlpaker/go-syntax) embedded in VS
 Code, not by this extension.
 
 For better syntax highlighting, we recommend enabling
diff --git a/docs/faq.md b/docs/faq.md
index 85bd464..f9aecce 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -5,10 +5,10 @@
 ## Syntax highlighting doesn't seem to work.
 
 The default syntax highlighting for Go files is provided by a
-[TextMate rule](https://github.com/jeff-hykin/better-go-syntax) embedded in VS Code,
+[TextMate rule](https://github.com/worlpaker/go-syntax) embedded in VS Code,
 not by this extension.
 
-For better syntax highlighting (including generics support), we recommend enabling
+For accurate syntax highlighting (including generics support), we recommend enabling
 [semantic highlighting](https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide)
 by turning on [Gopls' `ui.semanticTokens` setting](settings.md#uisemantictokens).
 
@@ -16,6 +16,11 @@
 "gopls": { "ui.semanticTokens": true }
 ```
 
+If you are experiencing issues with syntax highlighting, first check if you
+are using semantic highlighting. In case you did not enable semantic highlighting,
+report the issues to the [go-syntax](https://github.com/worlpaker/go-syntax)
+project directly.
+
 ## Code formatting by this extension doesn't seem to work.
 
 When you have multiple formatter extensions, be sure to set this