diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index ca327c596..3c9b7756f 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -79,6 +79,9 @@
 (using_directive
   (identifier) @type)
 
+(using_directive
+  (name_equals (identifier) @type.definition))
+
 (property_declaration
   name: (identifier) @property)
 
@@ -304,6 +307,7 @@
 
 [
  "using"
+ "as"
 ] @include
 
 (alias_qualified_name
@@ -316,7 +320,6 @@
  "nameof"
  "sizeof"
  "is"
- "as"
  "and"
  "or"
  "not"
@@ -331,23 +334,9 @@
  "params"
  "operator"
  "default"
- "abstract"
- "const"
- "extern"
  "implicit"
  "explicit"
- "internal"
  "override"
- "private"
- "protected"
- "public"
- "internal"
- "partial"
- "readonly"
- "sealed"
- "static"
- "virtual"
- "volatile"
  "async"
  "await"
  "class"
@@ -369,6 +358,25 @@
  "fixed"
 ] @keyword
 
+[
+ "const"
+ "extern"
+ "readonly"
+ "static"
+ "volatile"
+] @storageclass
+
+[
+ "abstract"
+ "private"
+ "protected"
+ "internal"
+ "public"
+ "partial"
+ "sealed"
+ "virtual"
+] @type.qualifier
+
 (parameter_modifier) @operator
 
 (query_expression