diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt
new file mode 100644
index 000000000..8ec7a0d70
--- /dev/null
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/DefCore.txt
@@ -0,0 +1,17 @@
+[DefCore]
+id=Planks
+Version=4,10,0,0
+Category=C4D_Object
+Width=12
+Height=12
+Offset=-6,-6
+Vertices=3
+VertexX=0,4,-4
+VertexY=3,-3,-3
+VertexFriction=40,40,40
+Value=6
+Mass=16
+Components=Chunk_Wood=1
+Rotate=1
+Float=1
+StretchGrowth=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png
new file mode 100644
index 000000000..6602dd926
Binary files /dev/null and b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Graphics.8.png differ
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c
new file mode 100644
index 000000000..c7c5ae9f2
--- /dev/null
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/Script.c
@@ -0,0 +1,24 @@
+/*--- Planks ---*/
+
+#include Library_CarryHeavy
+
+public func GetCarryMode(clonk) { return CARRY_BothHands; }
+public func GetCarryPhase() { return 800; }
+
+protected func Hit()
+{
+	Sound("WoodHit?");
+}
+
+public func IsFuel() { return true; }
+public func GetFuelAmount() { return 150; }
+public func IsChunk() { return true; }
+public func IsSawmillProduct() { return true; }
+
+local Name = "$Name$";
+local Description = "$Description$";
+local Rebuy = true;
+local BlastIncinerate = 5;
+local ContactIncinerate = 1;
+local Touchable = 2;
+local Plane = 470;
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt
new file mode 100644
index 000000000..ad07a8e9d
--- /dev/null
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblDE.txt
@@ -0,0 +1,2 @@
+Name=Holz
+Description=Geeignet als Bau- oder Brennmaterial.
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt
new file mode 100644
index 000000000..3768fd152
--- /dev/null
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Planks.ocd/StringTblUS.txt
@@ -0,0 +1,2 @@
+Name=Log
+Description=Needed for construction or as fuel.
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt
index 9548f01a2..665026f5f 100644
--- a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=3,-3,-3
 VertexFriction=40,40,40
 Value=6
 Mass=16
-Components=Wood=3
+Components=Chunk_Wood=1
 Rotate=1
 Float=1
 StretchGrowth=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c
index 6a2454bde..18707eb2e 100644
--- a/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c
+++ b/planet/Objects.ocd/Items.ocd/Chunks.ocd/Wood.ocd/Script.c
@@ -20,7 +20,7 @@ protected func Hit()
 public func IsFuel() { return true; }
 public func GetFuelAmount() { return 150; }
 public func IsChunk() { return true; }
-public func IsSawmillProduct() { return true; }
+public func IsSawmillIngredient() { return true; }
 
 local Name = "$Name$";
 local Description = "$Description$";
diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c
index 90d4883c0..9a092a767 100644
--- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c
+++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c
@@ -13,7 +13,7 @@ func Incineration()
 
 public func IsFuel() { return true; }
 public func GetFuelAmount() { return 50; }
-public func IsSawmillProduct() { return true; }
+//public func IsSawmillProduct() { return true; }
 
 local Collectible = 1;
 local Name = "$Name$";
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt
index 616a87a0e..ffbcc41f6 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=0,3,-3
 VertexFriction=50,50,50
 Value=15
 Mass=12
-Components=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
  
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 201aa92e8..eb7b3175b 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=Wood=2;Metal=1;
+Components=Chunk_Wood=2;Metal=1;
 Rotate=1
 Float=1
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt
index ec65b2b6e..897203d65 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=3,-6,10,10
 VertexFriction=80,60,60
 Value=12
 Mass=20
-Components=PowderKeg=1;Firestone=1;Wood=1;
+Components=PowderKeg=1;Firestone=1;Planks=1;
 Rotate=1
 ColorByOwner=1
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt
index dca86bff1..34c331f5c 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/DefCore.txt
@@ -10,7 +10,7 @@ VertexX=-4,-4,5,5
 VertexY=-2,5,-2,5
 VertexCNAT=5,9,6,10
 VertexFriction=25,25,25,25
-Components=Wood=3;
+Components=Chunk_Wood=3;
 Construction=1
 Value=6
 Mass=12
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt
index b8fb29923..cc44c257f 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/DefCore.txt
@@ -12,5 +12,5 @@ VertexFriction=50,50,50,50
 Picture=0,0,64,64
 Value=16
 Mass=30
-Components=Wood=1;Coal=2;Firestone=2
+Components=Planks=1;Coal=2;Firestone=2
 Rotate=1
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt
index b7cef8452..df5518d15 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=0,0
 VertexFriction=80,80
 Value=12
 Mass=10
-Components=Wood=2;Metal=1;Rope=1;
+Components=Planks=2;Metal=1;Rope=1;
 Rotate=1
 Float=2
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt
index 0f87b9b52..4246d1f41 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Hammer.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=1,5,-2,-2
 VertexFriction=80,80,80,80
 Value=3
 Mass=15
-Components=Wood=1;Rock=1;
+Components=Chunk_Wood=1;Rock=1;
 Rotate=1
  
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 771b94744..31a2ca9e7 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=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
  
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt
index c871cccfe..d46382fc2 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=4,-3,-3
 VertexFriction=100,100,100
 Value=8
 Mass=10
-Components=Wood=2;Rope=2;
+Components=Chunk_Wood=2;Rope=2;
 Rotate=1
 NoStabilize=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 1fdd10f9d..fa812c3cb 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=Wood=2;Rope=1;
+Components=Chunk_Wood=2;Rope=1;
 Rotate=1
 NoStabilize=1
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt
index 485c0620d..558fe1e12 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=-7,9,0
 VertexFriction=50,50,50
 Value=10
 Mass=20
-Components=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
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 8a55b9630..2272558c9 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=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt
index 8b360e064..b9bf52835 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-10,-10,10,10
 VertexFriction=100,100,100,100,100
 Value=8
 Mass=10
-Components=Wood=3;
+Components=Chunk_Wood=3;
 Rotate=1
 Float=2
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt
index 425344d79..8f294f804 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-7,7
 VertexFriction=50,50
 Value=10
 Mass=20
-Components=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
  
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt
index 6a85912da..58ee5e3ac 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=0,0,2,0
 VertexFriction=50,50,70
 Value=25
 Mass=15
-Components=Metal=3;Wood=1;
+Components=Metal=3;Planks=1;
 Rotate=1
\ No newline at end of file
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt
index 19a78a65c..e960fb510 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-12,13
 VertexFriction=100,50
 Value=12
 Mass=9
-Components=Wood=2;Metal=1;
+Components=Chunk_Wood=2;Metal=1;
 Rotate=1
  
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt
index 023157a5b..c8ec346d9 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=0,0,2,0
 VertexFriction=50,50,70
 Value=18
 Mass=15
-Components=Metal=2;Wood=1;
+Components=Metal=2;Chunk_Wood=1;
 Rotate=1
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt
index 93f4830af..81ccca5ac 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/DefCore.txt
@@ -11,5 +11,5 @@ VertexY=-4,5,-2,-2
 VertexFriction=50,50
 Value=10
 Mass=20
-Components=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt
index ffec21760..cc1e1ff9c 100644
--- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/DefCore.txt
@@ -11,6 +11,6 @@ VertexY=-7,7
 VertexFriction=50,50
 Value=10
 Mass=20
-Components=Wood=1;Metal=1;
+Components=Chunk_Wood=1;Metal=1;
 Rotate=1
  
diff --git a/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Armory.ocd/DefCore.txt
index 0ab579d26..c6eb4c219 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=Wood=3;Metal=2;Loam=2
+Components=Planks=3;Metal=2;Loam=2
 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 e8c592352..86b8c2970 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=Wood=3;Metal=3
+Components=Chunk_Wood=3;Metal=3
 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 bc06f465e..76a0a294c 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=Wood=3;
+Components=Chunk_Wood=3;
 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 9397424e0..3d8f294a2 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=Wood=3;Metal=1
+Components=Planks=3;Metal=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 44c3f3e91..1fa3b9bf3 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=Wood=3;Metal=3
+Components=Planks=3;Metal=3
 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 191a5aaab..c980203c9 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=Wood=3;Chunk_Rock=1;Metal=1
+Components=Planks=3;Chunk_Rock=1;Metal=1
 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 763689d22..d3a793f59 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=Wood=3;Metal=1;Chunk_Rock=1
+Components=Planks=3;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 593c0e1fe..e84e66753 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=Wood=1;Metal=3;
+Components=Planks=1;Metal=3;
 Picture=3360,0,112,128,0,0
 Exclusive=1
 Construction=1
diff --git a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c
index d7334dd83..17ab53384 100644
--- a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c
+++ b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c
@@ -2,7 +2,7 @@
 	Sawmill
 	Authors: Ringwaul, Clonkonaut
 
-	Cuts trees or other objects into wood. Accepts only objects purely made from wood.
+	Cuts trees or other objects into planks. Accepts only objects purely made from planks.
 --*/
 
 #include Library_Structure
@@ -19,31 +19,14 @@ public func Construction(object creator)
 public func Initialize()
 {
 	this.SpinAnimation = PlayAnimation("work", 10, Anim_Const(0), Anim_Const(1000));
-	AddTimer("CollectionZone", 1);
 	return _inherited(...);
 }
 
 /*-- Interaction --*/
 
-// Sawmill can't be accessed as a container.
-public func IsContainer() { return false; }
-
-// Sawmill can't be interacted with.
-public func IsInteractable() { return false; }
-
-// Automatically search for trees in front of sawmill
-// Temporary solution?
-protected func FindTrees()
-{
-	var tree = FindObject(Find_AtPoint(), Find_Func("IsTree"), Find_Not(Find_Func("IsStanding")), Find_Func("GetComponent", Wood));
-	if (!tree) return;
-	
-	Saw(tree);
-}
-
 private func CheckWoodObject(object target)
 {
-	if (target->GetComponent(nil, 0) != Wood) return false;
+	if (target->GetComponent(nil, 0) != Planks) return false;
 	if (target->GetComponent(nil, 1)) return false;
 	return true;
 }
@@ -52,20 +35,11 @@ private func CheckWoodObject(object target)
 
 private func IgnoreKnowledge() { return true; }
 
-public func Saw(object target)
-{
-	target->Enter(this);
-	var output = target->GetComponent(Wood);
-	target->Split2Components();
-	AddToQueue(Wood, output);
-	return true;
-}
-
 private func IsProduct(id product_id)
 {
 	return product_id->~IsSawmillProduct();
 }
-private func ProductionTime(id toProduce) { return 100; }
+private func ProductionTime(id toProduce) { return 400; }
 private func PowerNeed() { return 50; }
 
 public func NeedRawMaterial(id rawmat_id)
@@ -108,23 +82,17 @@ public func OnProductionFinish(id product)
 	}
 }	
 
-// Timer, check for objects to collect in the designated collection zone
-func CollectionZone()
-{
-	if (GetCon() < 100) return;
-	
-	// Only take one tree at a time
-	if (!(FrameCounter() % 35)) 
-		if (GetLength(queue) == 0)
-			FindTrees();
-}
-
-protected func Collection()
+func Collection()
 {
 	Sound("Clonk");
 	return _inherited(...);
 }
 
+func Collection2()
+{
+	if (!GetQueue()[0]) AddToQueue(Planks, 1);
+}
+
 public func FxSawingTimer(object target, proplist effect, int time)
 {
 	var dir = GetCalcDir();
@@ -145,8 +113,8 @@ public func OnProductEjection(object product)
 
 protected func RejectCollect(id id_def, object collect)
 {
-	// Don't collect wood
-	if (id_def == Wood) 
+	// Don't collect planks
+	if (id_def == Planks) 
 		return true;
 	if (collect->~IsSawmillIngredient() || CheckWoodObject(collect)) 
 		return false;
diff --git a/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Shipyard.ocd/DefCore.txt
index 33d13c576..da54ace8f 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=Wood=12;Metal=6
+Components=Planks=12;Metal=6
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/DefCore.txt
index 941a71def..388c4a08e 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;Wood=2;
+Components=Chunk_Rock=1;Planks=2;
 Exclusive=1
 Construction=1
 ContainBlast=1
diff --git a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt
index 8d844eb61..e83689354 100644
--- a/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/WoodenCabin.ocd/DefCore.txt
@@ -11,7 +11,7 @@ VertexY=-7,-6,19,19,4,19,-4,19
 VertexFriction=50,50,100,100
 Value=200
 Mass=4000
-Components=Wood=5;Chunk_Rock=1
+Components=Chunk_Wood=5;Chunk_Rock=1
 Entrance=-12,0,13,20
 Exclusive=1
 Construction=1
diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/DefCore.txt
index 936e0c3b8..9005d09a8 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=Metal=6;Wood=4;
+Components=Metal=6;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 515b54038..bcee663f6 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=Metal=4;Wood=4;Rope=2;
+Components=Metal=4;Planks=4;Rope=2;
 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 a2c0d2a68..11565dd26 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=Metal=4;Wood=2;
+Components=Metal=4;Planks=2;
 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 ce1dabe84..4d3b1657d 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=Metal=1;Wood=6;
+Components=Metal=1;Chunk_Wood=6;
 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 4db4d0064..17a48ce8f 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=Metal=2;Wood=1;
+Components=Metal=2;Chunk_Wood=1;
 Collection=-12,-8,24,10
 GrabPutGet=C4D_GrabGet|C4D_GrabPut
 Rotate=30