diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index fb7ee2e5f..858781337 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -24,6 +24,9 @@
      (field_identifier) @method)) @_parent
  (#has-parent? @_parent template_method function_declarator call_expression))
 
+(field_declaration
+  (field_identifier) @field)
+
 (field_initializer
  (field_identifier) @property)
 
@@ -31,7 +34,10 @@
   declarator: (field_identifier) @method)
 
 (concept_definition
-  name: (identifier) @type)
+  name: (identifier) @type.definition)
+
+(alias_declaration
+  name: (type_identifier) @type.definition)
 
 (namespace_identifier) @namespace
 ((namespace_identifier) @type
@@ -127,28 +133,27 @@
 [
  "class"
  "decltype"
- "constexpr"
  "explicit"
- "final"
  "friend"
- "mutable"
  "namespace"
  "override"
- "private"
- "protected"
- "public"
  "template"
  "typename"
  "using"
- "virtual"
  "co_await"
  "concept"
  "requires"
- "consteval"
- "constinit"
  (auto)
 ] @keyword
 
+[
+ "public"
+ "private"
+ "protected"
+ "virtual"
+ "final"
+] @type.qualifier
+
 [
  "co_yield"
  "co_return"
@@ -175,4 +180,7 @@
 
 "::" @punctuation.delimiter
 
+(template_argument_list
+  ["<" ">"] @punctuation.bracket)
+
 (literal_suffix) @operator
diff --git a/tests/query/highlights/cpp/concepts.cpp b/tests/query/highlights/cpp/concepts.cpp
index 07e2313ea..27aed7a70 100644
--- a/tests/query/highlights/cpp/concepts.cpp
+++ b/tests/query/highlights/cpp/concepts.cpp
@@ -2,7 +2,7 @@
 template <class T, class U>
 concept Derived = std::is_base_of<U, T>::value;
 //  ^ keyword
-//       ^ type
+//       ^ type.definition
 
 template<typename T>
 concept Hashable = requires(T a) {