diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7528eece5..449cddcbd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -167,7 +167,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.coroutine         ; keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
 @keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
-@keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
+@keyword.import            ; keywords for including or exporting modules (e.g. `import` / `from` in Python)
 @keyword.type              ; keywords describing namespaces and composite types (e.g. `struct`, `enum`)
 @keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index feb0e038e..7ad3478e4 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -93,13 +93,14 @@
 [
   "declare"
   "typeset"
-  "export"
   "readonly"
   "local"
   "unset"
   "unsetenv"
 ] @keyword
 
+"export" @keyword.import
+
 "function" @keyword.function
 
 (special_variable_name) @constant
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 12068af17..f60406272 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -314,20 +314,10 @@
 [
   "import"
   "from"
+  "as"
+  "export"
 ] @keyword.import
 
-(export_specifier
-  "as" @keyword.import)
-
-(import_specifier
-  "as" @keyword.import)
-
-(namespace_export
-  "as" @keyword.import)
-
-(namespace_import
-  "as" @keyword.import)
-
 [
   "for"
   "of"
@@ -340,7 +330,6 @@
   "break"
   "const"
   "debugger"
-  "export"
   "extends"
   "get"
   "let"
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 691d836ce..9f122e473 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -215,7 +215,6 @@
   "signal"
   "var"
   "onready"
-  "export"
   "setget"
   "remote"
   "master"
@@ -225,6 +224,8 @@
   "puppetsync"
 ] @keyword
 
+"export" @keyword.import
+
 [
   "enum"
   "class"
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index dc7947725..68a3e1881 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -20,7 +20,10 @@
   (#lua-match? @constant "^[A-Z_]+$"))
 
 ; Includes
-"use" @keyword.import
+[
+  "use"
+  "export"
+] @keyword.import
 
 (use_statement
   (scoped_type_identifier
@@ -41,7 +44,6 @@
 ; Keywords
 [
   "def"
-  "export"
   "let"
 ] @keyword
 
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 08ed56b83..23780731c 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -7,9 +7,10 @@
 [
   "local"
   "type"
-  "export"
 ] @keyword
 
+"export" @keyword.import
+
 (do_statement
   [
     "do"
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index f51616006..1a3cac749 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -37,8 +37,10 @@
     "|"
   ] @operator)
 
-(export_directive
-  "export" @keyword)
+[
+  "export"
+  "unexport"
+] @keyword.import
 
 (override_directive
   "override" @keyword)
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 2caeb7ba3..27f332028 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -102,7 +102,6 @@
   "property"
   "signal"
   "declare"
-  "export"
   "implements"
   "override"
 ] @keyword
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 562499733..8ab232c83 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -184,7 +184,7 @@
 ; Keywords:
 (animate_option_identifier) @keyword
 
-(export) @keyword
+(export) @keyword.import
 
 (if_statement
   "if" @keyword.conditional)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index bd13b1cb5..663c4a4a6 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -7,7 +7,6 @@
 
 [
   "declare"
-  "export"
   "implements"
   "type"
   "override"
@@ -32,9 +31,6 @@
 (as_expression
   "as" @keyword.operator)
 
-(export_statement
-  "as" @keyword.operator)
-
 (mapped_type_clause
   "as" @keyword.operator)
 
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index f0597ce34..521f97d20 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -139,7 +139,10 @@ field_constant: (IDENTIFIER) @constant
   "continue"
 ] @keyword.repeat
 
-"usingnamespace" @keyword.import
+[
+  "usingnamespace"
+  "export"
+] @keyword.import
 
 [
   "try"
@@ -168,7 +171,6 @@ field_constant: (IDENTIFIER) @constant
 
 [
   "comptime"
-  "export"
   "extern"
   "inline"
   "noinline"