diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt
index e1486281b..5db82c838 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-6,-6,6,6,0,0
 VertexFriction=60,60,60,60,60,60
 Value=12
 Mass=20
-Components=Chunk_Wood=2;Chunk_Metal=1;
+Components=Planks=2;
 Rotate=1
 Float=1
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt
index 9c8340b7e..e45d20a26 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=-6,-6,6,6,0,0
 VertexFriction=60,60,60,60,60,60
 Value=16
 Mass=50
-Components=Metal=2;
-Rotate=1
+Components=Chunk_Metal=2;
+Rotate=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt
index f10f78014..ce505f34c 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-6,-5,-5,4
 VertexFriction=50,100,100,40
 Value=10
 Mass=20
-Components=Chunk_Wood=1;Chunk_Metal=1;
+Components=Planks=1;Chunk_Metal=1;
 Rotate=1
  
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt
index fa812c3cb..95901f33b 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=4,-3,-3
 VertexFriction=100,100,100
 Value=8
 Mass=10
-Components=Chunk_Wood=2;Rope=1;
+Components=Planks=1;Rope=1;
 Rotate=1
-NoStabilize=1
+NoStabilize=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt
index d77311100..f19c810c5 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=0,0,0
 VertexFriction=50,50,100
 Value=10
 Mass=10
-Components=Chunk_Wood=1;Chunk_Metal=1;
+Components=Planks=1;Chunk_Metal=1;
 Rotate=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt
index 63d41d446..2d5c7599c 100644
--- a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-13,-15,-14,24,24,24
 VertexFriction=50,50,50,100,100,100
 Value=200
 Mass=4500
-Components=Planks=3;Chunk_Metal=2;Loam=2
+Components=Planks=2;Chunk_Metal=1;Chunk_Rock=3
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt
index bc111c53c..1758b7e7c 100644
--- a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-17,-25,-14,25,25,25
 VertexFriction=50,50,50,100,100,100
 Value=200
 Mass=4500
-Components=Chunk_Wood=3;Chunk_Metal=3
+Components=Chunk_Wood=2;Chunk_Metal=1;Chunk_Rock=1
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt
index 76a0a294c..0341c1292 100644
--- a/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Chest.ocd/DefCore.txt
@@ -10,7 +10,7 @@ VertexX=-8,-8,8,8
 VertexY=-2,11,-2,11
 VertexCNAT=5,9,6,10
 VertexFriction=50,50,100,100
-Components=Chunk_Wood=3;
+Components=Chunk_Wood=2;
 Construction=1
 Value=15
 Mass=10
diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt
index f14a749e4..d5bbec523 100644
--- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-27,-27,32,32,32
 VertexFriction=50,50,100,100,100
 Value=50
 Mass=1500
-Components=Planks=3;Chunk_Metal=1
+Components=Chunk_Wood=2;Chunk_Metal=1
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt
index 8e9a0a38b..12b16dec2 100644
--- a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-34,-29,-29,34,34
 VertexFriction=50,50,50,100,100
 Value=200
 Mass=100
-Components=Chunk_Wood=3;Chunk_Metal=1
+Components=Chunk_Wood=1;Chunk_Metal=1
 Picture=30,0,80,94
 Exclusive=1
 Construction=1
diff --git a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt
index c0a7472e2..e983fe1bd 100644
--- a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-17,-25,-14,25,25,25
 VertexFriction=50,50,50,100,100,100
 Value=200
 Mass=4500
-Components=Chunk_Rock=1;Chunk_Wood=2;
+Components=Chunk_Rock=2;Chunk_Wood=1;
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt
index f2def34bd..c2bd0f827 100644
--- a/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/InventorsLab.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=41,-41, 41,41,41,11,2
 VertexFriction=100,10,100,100,100,10,10
 Value=200
 Mass=4500
-Components=Planks=3;Chunk_Metal=3
+Components=Planks=2;Chunk_Metal=3;Chunk_Rock=2
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt
index 3513f11e6..fdfc61d39 100644
--- a/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Kitchen.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-17,-25,-14,25,25,25
 VertexFriction=50,50,50,100,100,100
 Value=200
 Mass=4500
-Components=Planks=3;Chunk_Rock=1;Chunk_Metal=1
+Components=Planks=2;Chunk_Rock=2
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt
index 69137c2d6..afd478034 100644
--- a/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Loom.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-4,-3,14,14
 VertexFriction=50,50,100,100
 Value=100
 Mass=1000
-Components=Planks=3;Chunk_Metal=1;Chunk_Rock=1
+Components=Planks=2;Chunk_Metal=1;Chunk_Rock=1
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt
index fdedc75fc..f13448911 100644
--- a/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Pump.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-3,15,15
 VertexFriction=50,100,100
 Value=40
 Mass=400
-Components=Planks=1;Chunk_Metal=3;
+Components=Chunk_Rock=2;Chunk_Metal=1;
 Picture=3360,0,112,128,0,0
 Exclusive=1
 Construction=1
diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt
index ffd15d5f3..967141592 100644
--- a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=53,53,53,  3, 3,-17
 VertexFriction=100,100,100,50,50,50
 Value=200
 Mass=4500
-Components=Planks=12;Chunk_Metal=6
+Components=Planks=2;Chunk_Metal=3;Chunk_Rock=2
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt
index c3f1887be..a708946ca 100644
--- a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-4,-4,24,24,24
 VertexFriction=50,50,100,100
 Value=180
 Mass=4000
-Components=Chunk_Rock=2;Chunk_Metal=3
+Components=Chunk_Rock=4;Chunk_Metal=2
 Collection=-33,7,12,12
 Exclusive=1
 Construction=1
diff --git a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt
index 3abcd4bd2..215ef56b4 100644
--- a/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/ToolsWorkshop.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-4,-3,19,19
 VertexFriction=50,50,100,100
 Value=200
 Mass=4500
-Components=Chunk_Wood=6;Chunk_Metal=3
+Components=Chunk_Wood=2;Chunk_Metal=1;Chunk_Rock=1
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt
index 29173e3e4..bc173475b 100644
--- a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-27,-25,-25,34,34
 VertexFriction=50,50,50,100,100
 Value=45
 Mass=900
-Components=Chunk_Wood=3;Chunk_Metal=1
+Components=Chunk_Wood=2;Chunk_Metal=1
 Exclusive=1
 Construction=1
 Rotate=1
diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt
index 388c4a08e..c3c2a5f8e 100644
--- a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-10,-20,47,47,-20
 VertexFriction=50,50,100,100,50
 Value=150
 Mass=2500
-Components=Chunk_Rock=1;Planks=2;
+Components=Chunk_Rock=2;Planks=2;
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt
index d4ce6050d..e64ec6b0e 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt
@@ -13,7 +13,7 @@ VertexFriction=50,50,50,15,5,5,15,5,5
 Value=60
 Mass=300
 ColorByOwner=1
-Components=Chunk_Metal=6;Planks=4;
+Components=Chunk_Metal=4;Planks=4;
 Rotate=1
 Entrance=-12,-12,24,24
 Exclusive=1
diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt
index ad0efa35d..427915a56 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/DefCore.txt
@@ -12,7 +12,7 @@ VertexCNAT=0,4,5,6,1,2,1,2,9,10,8
 VertexFriction=0,20,20,20,20,20,20,20,80,80,80
 Value=50
 Mass=5000
-Components=Chunk_Metal=4;Planks=4;Rope=2;
+Components=Chunk_Metal=2;Planks=2;Cloth=1;
 Float=-27;
 SolidMask=0,0,36,4,11,49
 Picture=128,0,128,128,0,0
diff --git a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt
index bd3dfdc78..209c38445 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/DefCore.txt
@@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10
 VertexFriction=80,80,10,10
 Value=50
 Mass=125
-Components=Chunk_Metal=4;Planks=2;
+Components=Chunk_Metal=3;Planks=1;
 GrabPutGet=C4D_GrabGet|C4D_GrabPut
 Rotate=30
 UprightAttach=8
diff --git a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt
index 2ef2be563..45e57633d 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/DefCore.txt
@@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10
 VertexFriction=80,80,10,10
 Value=50
 Mass=125
-Components=Chunk_Metal=1;Chunk_Wood=6;
+Components=Chunk_Metal=1;Chunk_Wood=3;
 Entrance=-12,-12,24,24
 RotatedEntrance=1
 GrabPutGet=C4D_GrabGet|C4D_GrabPut
diff --git a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt
index 254228156..46c2aa6ee 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/DefCore.txt
@@ -13,7 +13,7 @@ VertexCNAT=5,6,9,10
 VertexFriction=80,80,10,10
 Value=20
 Mass=75
-Components=Chunk_Metal=2;Chunk_Wood=1;
+Components=Chunk_Metal=1;Chunk_Wood=1;
 Collection=-12,-8,24,10
 GrabPutGet=C4D_GrabGet|C4D_GrabPut
 Rotate=30