diff --git a/mods/cnc/rules/civilian-desert.yaml b/mods/cnc/rules/civilian-desert.yaml
index ba1f6c435e..96db0c02d5 100644
--- a/mods/cnc/rules/civilian-desert.yaml
+++ b/mods/cnc/rules/civilian-desert.yaml
@@ -35,7 +35,6 @@ V21:
 			TopLeft: -1024, -1024
 			BottomRight: 1024, 0
 	HitShape@WELL:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: -770,512,0
 		Type: Rectangle
 			TopLeft: 0, 0
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index cfb9e231e5..20b2ddfa75 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -97,8 +97,7 @@ NUKE:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^2x2Shape
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, -700,-512,0, -700,512,0, 840,-512,0, 630,299,0
+		TargetableOffsets: 630,299,0
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -111,7 +110,7 @@ NUKE:
 		Queue: Building.GDI, Building.Nod
 		Description: Generates power
 	Building:
-		Footprint: xx xx ==
+		Footprint: xX xx ==
 		Dimensions: 2,3
 		LocalCenterOffset: 0,-512,0
 	Health:
@@ -127,8 +126,7 @@ NUK2:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^2x2Shape
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, -840,-512,0, -840,512,0, 840,-512,0, 630,299,0
+		TargetableOffsets: 630,299,0
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -141,7 +139,7 @@ NUK2:
 		Queue: Building.GDI, Building.Nod
 		Description: Provides more power, cheaper than the\nstandard Power Plant
 	Building:
-		Footprint: xx xx ==
+		Footprint: xX xx ==
 		Dimensions: 2,3
 		LocalCenterOffset: 0,-512,0
 	Health:
@@ -156,12 +154,10 @@ NUK2:
 PROC:
 	Inherits: ^BaseBuilding
 	HitShape:
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 853
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -512, -1450
 			BottomRight: 896, -512
@@ -346,8 +342,7 @@ HAND:
 AFLD:
 	Inherits: ^BaseBuilding
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-512,256, 0,-1536,256, -840,-512,0, -840,-1536,0, 0,512,0, 0,1536,0, -840,512,0, -840,1536,0
+		TargetableOffsets: 0,0,0, 0,-512,256, 0,-1536,256
 		Type: Rectangle
 			TopLeft: -2048, -1024
 			BottomRight: 2048, 1024
@@ -363,7 +358,7 @@ AFLD:
 		Queue: Building.Nod
 		Description: Provides a dropzone\nfor vehicle reinforcements
 	Building:
-		Footprint: xxxx xxxx ====
+		Footprint: xxXX xxxx ====
 		Dimensions: 4,3
 		LocalCenterOffset: 0,-512,0
 	Health:
@@ -497,8 +492,7 @@ HQ:
 	Inherits: ^BaseBuilding
 	Inherits@IDISABLE: ^DisabledOverlay
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,512,0, 420,-598,256, -840,-512,0, -840,512,0
+		TargetableOffsets: 0,0,0, 0,512,0, 420,-598,256
 		Type: Rectangle
 			TopLeft: -1024, -384
 			BottomRight: 1024, 1024
@@ -514,7 +508,7 @@ HQ:
 		Queue: Building.GDI, Building.Nod
 		Description: Provides radar and Air Strike support power.\nUnlocks higher-tech units and buildings.\nRequires power to operate.
 	Building:
-		Footprint: x_ xx ==
+		Footprint: X_ xx ==
 		Dimensions: 2,3
 		LocalCenterOffset: 0,-512,0
 	Selectable:
@@ -566,13 +560,10 @@ HQ:
 FIX:
 	Inherits: ^BaseBuilding
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -683
 			BottomRight: 1536, 768
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 840,0,0, -1060,0,0
 		Type: Rectangle
 			TopLeft: -640, -980
@@ -587,7 +578,7 @@ FIX:
 		Queue: Building.GDI, Building.Nod
 		Description: Repairs vehicles
 	Building:
-		Footprint: _x_ xxx _x_
+		Footprint: _X_ xxx _X_
 		Dimensions: 3,3
 	Selectable:
 		Bounds: 64,34,0,3
@@ -613,8 +604,7 @@ EYE:
 	Inherits: ^BaseBuilding
 	Inherits@IDISABLE: ^DisabledOverlay
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,512,128, 420,-598,213, -840,-512,0, -840,512,0
+		TargetableOffsets: 0,0,0, 0,512,128, 420,-598,213
 		Type: Rectangle
 			TopLeft: -1024, -384
 			BottomRight: 1024, 1024
@@ -630,7 +620,7 @@ EYE:
 		Queue: Building.GDI
 		Description: Provides radar and Orbital Ion Cannon support power.\nUnlocks Mammoth Tank and Commando.\nRequires power to operate.
 	Building:
-		Footprint: x_ xx ==
+		Footprint: X_ xx ==
 		Dimensions: 2,3
 		LocalCenterOffset: 0,-512,0
 	Selectable: