diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml
index 4cb3b82688..75bb274ae2 100644
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -380,13 +380,11 @@ BRIDGEHUT:
 
 C1:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianMaleVoice
 
 C2:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
@@ -395,7 +393,6 @@ C3:
 
 C4:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
@@ -404,7 +401,6 @@ C5:
 
 C6:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
@@ -413,7 +409,6 @@ C7:
 
 C8:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
@@ -422,7 +417,6 @@ C9:
 
 C10:
 	Inherits: ^CivInfantry
-	Selectable:
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index af0c6b595c..2988e028a3 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -180,6 +180,7 @@
 			Beach: 80
 	SelectionDecorations:
 	Selectable:
+		Bounds: 12,17,0,-6
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
 	TakeCover:
@@ -259,8 +260,6 @@
 	-TakeCover:
 	AppearsOnRadar:
 	SelectionDecorations:
-	Selectable:
-		Bounds: 12,17,0,-9
 	Valued:
 		Cost: 70
 	Tooltip:
diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml
index 15558fed49..88f5852d0a 100644
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -8,8 +8,6 @@ E1:
 	Buildable:
 		BuildPaletteOrder: 10
 		Queue: Infantry.GDI, Infantry.Nod
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 56
 	Health:
@@ -17,6 +15,7 @@ E1:
 	Armament:
 		Weapon: M16
 	AttackFrontal:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2,idle3,idle4
 		StandSequences: stand, stand2
@@ -32,8 +31,6 @@ E2:
 		BuildPaletteOrder: 40
 		Prerequisites: anyhq, ~techlevel.medium
 		Queue: Infantry.GDI
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 71
 	Health:
@@ -43,6 +40,7 @@ E2:
 		LocalOffset: 0,0,427
 		FireDelay: 15
 	AttackFrontal:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand, stand2
@@ -61,8 +59,6 @@ E3:
 	Buildable:
 		BuildPaletteOrder: 20
 		Queue: Infantry.GDI, Infantry.Nod
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 42
 	Health:
@@ -74,6 +70,7 @@ E3:
 		LocalOffset: 256,43,341
 		FireDelay: 5
 	AttackFrontal:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand, stand2
@@ -89,8 +86,6 @@ E4:
 		BuildPaletteOrder: 40
 		Prerequisites: anyhq, ~techlevel.medium
 		Queue: Infantry.Nod
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 56
 	Health:
@@ -104,6 +99,7 @@ E4:
 	AttackFrontal:
 	WithMuzzleFlash:
 		SplitFacings: true
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand, stand2
@@ -119,8 +115,6 @@ E5:
 		BuildPaletteOrder: 50
 		Prerequisites: tmpl, ~techlevel.high
 		Queue: Infantry.Nod
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 56
 		TerrainSpeeds:
@@ -140,6 +134,7 @@ E5:
 	WithMuzzleFlash:
 		SplitFacings: true
 	-PoisonedByTiberium:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand, stand2
@@ -154,8 +149,6 @@ E6:
 	Buildable:
 		BuildPaletteOrder: 30
 		Queue: Infantry.GDI, Infantry.Nod
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 56
 	Health:
@@ -167,6 +160,7 @@ E6:
 	Captures:
 		CaptureTypes: building, husk
 	-AutoTarget:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand, stand2
@@ -183,8 +177,6 @@ RMBO:
 		BuildPaletteOrder: 50
 		Prerequisites: eye, ~techlevel.high
 		Queue: Infantry.GDI
-	Selectable:
-		Bounds: 12,17,0,-6
 	Mobile:
 		Speed: 71
 	Health:
@@ -200,6 +192,7 @@ RMBO:
 	Armament:
 		Weapon: Sniper
 	AttackFrontal:
+	TakeCover:
 	WithInfantryBody:
 		IdleSequences: idle1,idle2,idle3
 		StandSequences: stand, stand2