diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 6016a793c8..4bea6b65c7 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -50,8 +50,6 @@
 	UpgradeManager:
 	TemporaryOwnerManager:
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Tank:
 	AppearsOnRadar:
@@ -105,8 +103,6 @@
 	UpgradeManager:
 	TemporaryOwnerManager:
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Husk:
 	Health:
@@ -233,8 +229,6 @@
 		UpgradeMinEnabledLevel: 1
 	UpgradeManager:
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 	TerrainModifiesDamage:
 		TerrainModifier:
 			Rough: 80
@@ -271,8 +265,6 @@
 		UpgradeTypes: selfheal
 		UpgradeMinEnabledLevel: 1
 	UpgradeManager:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 	RenderUnit:
 
 ^Helicopter:
diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
index df78ba8f6e..52c573f56e 100644
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -34,7 +34,6 @@ BADR:
 	-EjectOnDeath:
 	-GpsDot:
 	RejectsOrders:
-	-AnnounceOnSeen:
 
 BADR.Bomber:
 	Inherits: ^Plane
@@ -351,5 +350,4 @@ U2:
 		Offset: -1c43,0,0
 		Interval: 2
 	RejectsOrders:
-	-AnnounceOnSeen:
 
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 75f390dcd6..e6f30eb3d7 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -72,8 +72,6 @@
 	TimedUpgradeBar:
 		Upgrade: invulnerability
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Tank:
 	AppearsOnRadar:
@@ -159,8 +157,6 @@
 		GroundCorpsePalette:
 		WaterCorpseSequence:
 		WaterCorpsePalette:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Infantry:
 	AppearsOnRadar:
@@ -252,8 +248,6 @@
 		UpgradeMinEnabledLevel: 1
 	UpgradeManager:
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Ship:
 	AppearsOnRadar:
@@ -308,8 +302,6 @@
 		Upgrade: invulnerability
 		UpgradeMinEnabledLevel: 1
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Plane:
 	AppearsOnRadar:
@@ -367,8 +359,6 @@
 		Upgrade: invulnerability
 	WithShadow:
 	MustBeDestroyed:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Helicopter:
 	Inherits: ^Plane
@@ -377,8 +367,6 @@
 	GpsDot:
 		String: Helicopter
 	Hovers:
-	AnnounceOnSeen:
-		Notification: EnemyUnitsApproaching
 
 ^Building:
 	AppearsOnRadar:
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index 953e2c318f..f784026b2e 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -176,6 +176,7 @@ CAMERA:
 	DetectCloaked:
 		Range: 10
 	RenderEditorOnly:
+		Image: camera
 
 camera.paradrop:
 	Immobile:
diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml
index 8ef6285292..34b56d4772 100644
--- a/mods/ra/rules/player.yaml
+++ b/mods/ra/rules/player.yaml
@@ -73,5 +73,4 @@ Player:
 		Name: Unrestricted
 		Prerequisites: techlevel.infonly, techlevel.low, techlevel.medium, techlevel.unrestricted
 	GlobalUpgradeManager:
-	EnemyWatcher: