diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index 739c1bf11e..be12066be8 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -600,7 +600,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/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml
index a810174b3c..f828df52dc 100644
--- a/mods/ra/rules/fakes.yaml
+++ b/mods/ra/rules/fakes.yaml
@@ -47,7 +47,7 @@ SYRF:
 	Targetable:
 		TargetTypes: Ground, Water, Structure, SpyInfiltrate
 	Building:
-		Footprint: xxx xxx xxx
+		Footprint: XXX xxx XXX
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
@@ -62,13 +62,11 @@ SYRF:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0, 768,0,0, 768,-1024,0, 768,1024,0
+		TargetableOffsets: 768,0,0, 768,-1024,0, 768,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -1152
 			BottomRight: 1536, 598
 	HitShape@BOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: -768,0,0
 		Type: Rectangle
 			TopLeft: -512, 598
@@ -91,7 +89,7 @@ SPEF:
 		GenericVisibility: Enemy
 		GenericStancePrefix: False
 	Building:
-		Footprint: xxx xxx xxx
+		Footprint: XXX xxx XXX
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
@@ -106,13 +104,10 @@ SPEF:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -598
 			BottomRight: 1536, 598
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 811,0,0, -811,0,0
 		Type: Rectangle
 			TopLeft: -555, -1110
@@ -197,7 +192,7 @@ FIXF:
 		GenericVisibility: Enemy
 		GenericStancePrefix: False
 	Building:
-		Footprint: _x_ xxx _x_
+		Footprint: _X_ xxx _X_
 		Dimensions: 3,3
 	Health:
 		HP: 800
@@ -210,13 +205,10 @@ FIXF:
 	Valued:
 		Cost: 120
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -683
 			BottomRight: 1536, 853
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 840,0,0, -1060,0,0
 		Type: Rectangle
 			TopLeft: -640, -768
@@ -227,8 +219,7 @@ FAPW:
 	Inherits@infiltrate: ^InfiltratableFake
 	Inherits@shape: ^3x2Shape
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 840,0,0, 840,-1024,0, 840,1024,0, -840,0,0, -355,-1024,0, -840,1024,0
+		TargetableOffsets: -355,-1024,0
 	Buildable:
 		BuildPaletteOrder: 950
 		Queue: Defense
@@ -241,7 +232,7 @@ FAPW:
 		GenericVisibility: Enemy
 		GenericStancePrefix: False
 	Building:
-		Footprint: xxx xxx ===
+		Footprint: xxx Xxx ===
 		Dimensions: 3,3
 		LocalCenterOffset: 0,-512,0
 	Health:
@@ -366,7 +357,7 @@ FACF:
 		GenericVisibility: Enemy
 		GenericStancePrefix: False
 	Building:
-		Footprint: xxx xxx xxx ===
+		Footprint: xxX xxx XxX ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	WithBuildingBib:
@@ -379,8 +370,7 @@ FACF:
 	Armor:
 		Type: Wood
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0, 1483,0,0, 1483,-1024,0, 1273,939,0, -1483,0,0, -980,-640,0, -980,640,0
+		TargetableOffsets: 1273,939,0, -980,-640,0, -980,640,0
 		Type: Rectangle
 			TopLeft: -1536, -1536
 			BottomRight: 1536, 1536
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 4018df34c7..d0be221786 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -118,7 +118,7 @@ SPEN:
 	Targetable:
 		TargetTypes: Ground, Water, Structure, C4, DetonateAttack, SpyInfiltrate
 	Building:
-		Footprint: xxx xxx xxx
+		Footprint: XXX xxx XXX
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
@@ -192,13 +192,10 @@ SPEN:
 		ZOffset: 256
 		RequiresCondition: primary
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -598
 			BottomRight: 1536, 598
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 811,0,0, -811,0,0
 		Type: Rectangle
 			TopLeft: -555, -1110
@@ -220,7 +217,7 @@ SYRD:
 	Targetable:
 		TargetTypes: Ground, Water, Structure, C4, DetonateAttack, SpyInfiltrate
 	Building:
-		Footprint: xxx xxx xxx
+		Footprint: XXX xxx XXX
 		Dimensions: 3,3
 		Adjacent: 8
 		TerrainTypes: Water
@@ -300,13 +297,11 @@ SYRD:
 		ZOffset: 256
 		RequiresCondition: primary
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0, 768,0,0, 768,-1024,0, 768,1024,0
+		TargetableOffsets: 768,0,0, 768,-1024,0, 768,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -1152
 			BottomRight: 1536, 598
 	HitShape@BOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: -768,0,0
 		Type: Rectangle
 			TopLeft: -512, 598
@@ -982,7 +977,7 @@ WEAP:
 FACT:
 	Inherits: ^Building
 	Building:
-		Footprint: xxx xxx xxx ===
+		Footprint: xxX xxx XxX ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	Buildable:
@@ -1057,8 +1052,7 @@ FACT:
 		UseDeathTypeSuffix: false
 	ProvidesPrerequisite@buildingname:
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0, 1483,0,0, 1483,-1024,0, 1273,939,0, -1483,0,0, -980,-640,0, -980,640,0
+		TargetableOffsets: 1273,939,0, -980,-640,0, -980,640,0
 		Type: Rectangle
 			TopLeft: -1536, -1536
 			BottomRight: 1536, 1536
@@ -1075,7 +1069,7 @@ PROC:
 	Tooltip:
 		Name: Ore Refinery
 	Building:
-		Footprint: _x_ xxx x== ===
+		Footprint: _X_ xxx X== ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	Selectable:
@@ -1119,19 +1113,15 @@ PROC:
 		UseDeathTypeSuffix: false
 	ProvidesPrerequisite@buildingname:
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 598
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 1680,0,0
 		Type: Rectangle
 			TopLeft: -512, -1536
 			BottomRight: 512, -512
 	HitShape@BOTTOMLEFT:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: -1260,-1024,0
 		Type: Rectangle
 			TopLeft: -1536, 598
@@ -1434,8 +1424,7 @@ APWR:
 	Inherits@POWER_OUTAGE: ^DisabledByPowerOutage
 	Inherits@shape: ^3x2Shape
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 840,0,0, 840,-1024,0, 840,1024,0, -840,0,0, -355,-1024,0, -840,1024,0
+		TargetableOffsets: -355,-1024,0
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 110
@@ -1448,7 +1437,7 @@ APWR:
 	ProvidesPrerequisite:
 		Prerequisite: anypower
 	Building:
-		Footprint: xxx xxx ===
+		Footprint: xxx Xxx ===
 		Dimensions: 3,3
 		LocalCenterOffset: 0,-512,0
 	Selectable:
@@ -1475,8 +1464,7 @@ STEK:
 	Inherits: ^ScienceBuilding
 	Inherits@shape: ^3x2Shape
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 840,0,0, -840,0,0, 420,-768,0, 420,768,0, -770,-768,0, -770,768,0
+		TargetableOffsets: 420,-768,0, 420,768,0, -770,-768,0, -770,768,0
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 150
@@ -1489,7 +1477,7 @@ STEK:
 	ProvidesPrerequisite:
 		Prerequisite: techcenter
 	Building:
-		Footprint: xxx xxx ===
+		Footprint: XxX XxX ===
 		Dimensions: 3,3
 		LocalCenterOffset: 0,-512,0
 	Health:
@@ -1731,7 +1719,7 @@ FIX:
 	Tooltip:
 		Name: Service Depot
 	Building:
-		Footprint: _x_ xxx _x_
+		Footprint: _X_ xxx _X_
 		Dimensions: 3,3
 	Selectable:
 		Bounds: 68,34,0,3
@@ -1760,13 +1748,10 @@ FIX:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, 0,-1024,0, 0,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -683
 			BottomRight: 1536, 853
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 840,0,0, -1060,0,0
 		Type: Rectangle
 			TopLeft: -640, -768