diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 811ba37b8..5570ee5af 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -170,4 +170,6 @@
 (preproc_params
   (identifier)) @parameter
 
+(attribute_declaration) @attribute
+
 (ERROR) @error
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index b4cbf7553..c88bce7e9 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -124,11 +124,14 @@
  "using"
  "virtual"
  "co_await"
- "co_yield"
- "co_return"
  (auto)
 ] @keyword
 
+[
+ "co_yield"
+ "co_return"
+] @keyword.return
+
 [
  "new"
  "delete"
@@ -150,9 +153,3 @@
 ] @keyword.operator
 
 "::" @operator
-
-; Annotations (not fully supported by parser)
-
-((ERROR) @attribute
-         (#vim-match? @attribute  "\[?\[.*\]\]?.*$"))
-(attribute) @attribute