diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index f4f0088a74..ad602f8b80 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -272,7 +272,6 @@ refinery:
 			TopLeft: -512, -1024
 			BottomRight: 1536, 0
 	HitShape@BOTTOM:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -1536, 0
 			BottomRight: 512, 1024
@@ -459,21 +458,18 @@ heavy_factory:
 	Tooltip:
 		Name: Heavy Factory
 	Building:
-		Footprint: _x_ xxx =xx ===
+		Footprint: _x_ xxx =xX ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	WithBuildingBib:
 	Health:
 		HP: 3500
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, -1680,0,0, 0,1024,0, 0,-1024,0, -1155,-704,0, -1365,832,0
+		TargetableOffsets: -1155,-704,0, -1365,832,0
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 1536
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 1680,0,0
 		Type: Rectangle
 			TopLeft: -512, -1536
 			BottomRight: 512, -512
@@ -617,7 +613,6 @@ starport:
 			TopLeft: -1536, -1536
 			BottomRight: 1536, 512
 	HitShape@BOTTOM:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -512, 512
 			BottomRight: 512, 1536
@@ -838,7 +833,6 @@ repair_pad:
 			TopLeft: -1536, -512
 			BottomRight: 1536, 512
 	HitShape@TOPANDBOTTOM:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -512, -1536
 			BottomRight: 512, 1536
@@ -892,20 +886,18 @@ high_tech_factory:
 		SpawnOffset: 0,0,728
 		ExitCell: 0,0
 	Building:
-		Footprint: _x_ xxx xxx ===
+		Footprint: _X_ xxx XXX ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	WithBuildingBib:
 	Health:
 		HP: 3500
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, -1312,0,0, 0,-1024,0, -1312,-1024,0, 0,1024,0, -1312,1024,0
+		TargetableOffsets: -1312,0,0, -1312,-1024,0, -1312,1024,0
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 1536
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 1280,0,0
 		Type: Rectangle
 			TopLeft: -512, -1536
@@ -971,20 +963,18 @@ research_centre:
 	Tooltip:
 		Name: IX Research Center
 	Building:
-		Footprint: _x_ xxx xxx ===
+		Footprint: _X_ xxx XXX ===
 		Dimensions: 3,4
 		LocalCenterOffset: 0,-512,0
 	WithBuildingBib:
 	Health:
 		HP: 2500
 	HitShape:
-		UseOccupiedCellsOffsets: false
-		TargetableOffsets: 0,0,0, -1574,-158,0, 0,-1024,0, -1050,-1024,0, 0,1024,0, -1155,960,0
+		TargetableOffsets: -1574,-158,0, -1050,-1024,0, -1155,960,0
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 1536
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
 		TargetableOffsets: 1312,0,0
 		Type: Rectangle
 			TopLeft: -512, -1536
@@ -1037,12 +1027,10 @@ palace:
 			TopLeft: -1536, -512
 			BottomRight: 1536, 512
 	HitShape@TOP:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -1536, -1536
 			BottomRight: 512, -512
 	HitShape@BOTTOM:
-		UseOccupiedCellsOffsets: false
 		Type: Rectangle
 			TopLeft: -512, 512
 			BottomRight: 1536, 1536