diff --git a/packages/controller/package.json b/packages/controller/package.json
index ccda8907..9aeb29bf 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -13,6 +13,7 @@
 		"clusteriocontroller": "./dist/node/controller.js"
 	},
 	"keywords": [
+		"clusterio",
 		"factorio"
 	],
 	"engines": {
diff --git a/packages/create/package.json b/packages/create/package.json
index 814e26f0..8fc99cb5 100644
--- a/packages/create/package.json
+++ b/packages/create/package.json
@@ -9,8 +9,8 @@
 		"clusteriocreate": "./create.js"
 	},
 	"keywords": [
-		"factorio",
-		"clusterio"
+		"clusterio",
+		"factorio"
 	],
 	"engines": {
 		"node": ">=18"
diff --git a/packages/create/templates/common/package.json b/packages/create/templates/common/package.json
index 36e5ad01..ada0a72b 100644
--- a/packages/create/templates/common/package.json
+++ b/packages/create/templates/common/package.json
@@ -8,9 +8,6 @@
 //%if !typescript
 	"main": "index.js",
 //%endif
-	"keywords": [
-		"clusterio-plugin"
-	],
 	"scripts": {
 		"prepare": "__prepare__"
 	},
@@ -51,6 +48,7 @@
 	},
 	"keywords": [
 		"clusterio",
+		"clusterio-plugin",
 		"factorio"
 	]
 }
diff --git a/packages/ctl/package.json b/packages/ctl/package.json
index 28c79023..e26219d3 100644
--- a/packages/ctl/package.json
+++ b/packages/ctl/package.json
@@ -13,6 +13,7 @@
 		"clusterioctl": "./dist/node/ctl.js"
 	},
 	"keywords": [
+		"clusterio",
 		"factorio"
 	],
 	"engines": {
diff --git a/packages/host/package.json b/packages/host/package.json
index ea44fdc9..f5bc92d8 100644
--- a/packages/host/package.json
+++ b/packages/host/package.json
@@ -13,6 +13,7 @@
 		"clusteriohost": "./dist/node/host.js"
 	},
 	"keywords": [
+		"clusterio",
 		"factorio"
 	],
 	"engines": {
diff --git a/packages/lib/package.json b/packages/lib/package.json
index d5c58364..0f0ed1b5 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -11,6 +11,7 @@
 	"main": "dist/node/index.js",
 	"browser": "browser.ts",
 	"keywords": [
+		"clusterio",
 		"factorio"
 	],
 	"engines": {
diff --git a/packages/lib/src/load_plugin_list.ts b/packages/lib/src/load_plugin_list.ts
index d21f2718..8af16781 100644
--- a/packages/lib/src/load_plugin_list.ts
+++ b/packages/lib/src/load_plugin_list.ts
@@ -127,7 +127,7 @@ export async function loadPluginList(pluginListPath: string, findLocal = true):
 		await findLocalPlugins(pluginList, pluginListPath);
 	}
 
-	// Optionally discover NPM plugins
+	// Discover NPM plugins
 	await findNpmPlugins(pluginList, pluginListPath);
 
 	return pluginList;
diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json
index f61a632f..1921c733 100644
--- a/packages/web_ui/package.json
+++ b/packages/web_ui/package.json
@@ -10,7 +10,8 @@
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"keywords": [
-		"clusterio"
+		"clusterio",
+		"factorio"
 	],
 	"engines": {
 		"node": ">=12"
diff --git a/plugins/global_chat/package.json b/plugins/global_chat/package.json
index c20e1846..e4620e37 100644
--- a/plugins/global_chat/package.json
+++ b/plugins/global_chat/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/clusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
diff --git a/plugins/inventory_sync/package.json b/plugins/inventory_sync/package.json
index 03f31ade..013b6c6e 100644
--- a/plugins/inventory_sync/package.json
+++ b/plugins/inventory_sync/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/factorioClusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
diff --git a/plugins/player_auth/package.json b/plugins/player_auth/package.json
index a05ba974..8b40b929 100644
--- a/plugins/player_auth/package.json
+++ b/plugins/player_auth/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/clusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
diff --git a/plugins/research_sync/package.json b/plugins/research_sync/package.json
index 9b553b1d..5cf8a269 100644
--- a/plugins/research_sync/package.json
+++ b/plugins/research_sync/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/clusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json
index 9737a2a6..691c8c38 100644
--- a/plugins/statistics_exporter/package.json
+++ b/plugins/statistics_exporter/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/clusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json
index 2825680f..ee517d3d 100644
--- a/plugins/subspace_storage/package.json
+++ b/plugins/subspace_storage/package.json
@@ -8,7 +8,9 @@
 	"repository": "clusterio/clusterio",
 	"main": "dist/node/index.js",
 	"keywords": [
-		"clusterio-plugin"
+		"clusterio",
+		"clusterio-plugin",
+		"factorio"
 	],
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",