diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
index 9560278e29..7f40854a1a 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
@@ -152,6 +152,8 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2991", "2992", Path.Combine(PathToSHPs, "starporto"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2993", "2995", Path.Combine(PathToSHPs, "lighto"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2996", "2997", Path.Combine(PathToSHPs, "palaceo"), "--building"},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "3370", "3380", Path.Combine(PathToSHPs, "unload"), "--vehicle"},
+				//explosions
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "sandwormmouth")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "sandwormdust")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3586", "3600", Path.Combine(PathToSHPs, "wormsigns1")},
@@ -354,6 +356,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--shp", Path.Combine(PathToSHPs, "starporto.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "lighto.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "palaceo.png"), "96"},
+				new string[] {"--shp", Path.Combine(PathToSHPs, "unload.png"), "48"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "sandwormmouth.png"), "68"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "sandwormdust.png"), "68"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns1.png"), "16"},
diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index 0ddf63efe7..f0abe4cb87 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -1,21 +1,19 @@
 # make structures appear earlier when errecting from ground
-# harvester harvest and unload frames missing (too few DATA.R8 frames in general)
+# too few DATA.R8 frames?
 # carryalls should automatically transport harvesters (needs complex logic)
 # windtrap animations missing
 # outpost animations missing
 # construction yard crane animations missing
 # welding animation (factories) missing
 # chimney animation (refinery) missing
+# harvester unload and harvest animation missing
 # add more spice tiles and make them fit
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
 # RenderBuildingTurreted does not support separate turret sequence
 # ornithocopter should flap (might need new RenderOrni code for proper animation)
 # R8 converter needs infantry frame resorter
-# add fremen (stealthed)
-# add saboteur (stealthed with C4)
 # add grenade thrower
-# add sadukar (heavy infantry)
 # add sandworm (behave like a moving anti-vehicle mine)
 # add thumper which deploys and really attracts sandworms
 # add neutral buildings: emperor palace, fremen siech, smugglers factory
@@ -38,4 +36,4 @@
 # mouse cursor has no transparency and is a little pixelish
 # infantry-only areas (Rough) do not show the dark-green mouse cursor
 # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI)
-# create a minimal Freeware auto-download version from patch 1.06 files
\ No newline at end of file
+# replace RA sounds by Dune 2000 ones
\ No newline at end of file
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index f1344e1659..c7c40c1548 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -20,7 +20,7 @@ CARRYALL:
 	Helicopter:
 		InitialFacing: 0
 		ROT: 5
-		Speed: 15
+		Speed: 20
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: hightecha
diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml
index 69eaf5c93e..4b670ac1ef 100644
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -141,7 +141,7 @@ SONICTANK:
 FREMEN:
 	Inherits: ^Infantry
 	Valued:
-		Cost: 1000
+		Cost: 800
 	Tooltip:
 		Name: Fremen
 		Description: Elite sniper infantry unit.\n  Strong vs Infantry\n  Weak vs Vehicles\n  Special Ability: Invisible
diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml
index 6c42afb88f..ac276902ce 100644
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -153,7 +153,7 @@ SARDAUKAR:
 		Prerequisites: palaceh
 		Owner: harkonnen
 	Valued:
-		Cost: 200
+		Cost: 800
 	Tooltip:
 		Name: Sardaukar
 		Description: Heavy infantry.
diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml
index c18830844b..a305f4bc63 100644
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -176,7 +176,7 @@ SABOTEUR:
 		Prerequisites: palaceo
 		Owner: ordos
 	Valued:
-		Cost: 1000
+		Cost: 800
 	Tooltip:
 		Name: Saboteur
 		Description: Sneaky infantry, armed with explosives.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 22c7e95257..6c57bc451c 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -175,6 +175,8 @@ World:
 		Name: Ordos
 		Race: ordos
 #	BibLayer:
+#		BibTypes: bib2x2,bib3x2,bib3x3
+#		BibWidths: 2,3,3
 	ResourceLayer:
 	ResourceType@spice:
 		ResourceType: 1
diff --git a/mods/d2k/tilesets/BASE.tsx b/mods/d2k/tilesets/BASE.tsx
index 978015be2c..65c0cfd19e 100644
--- a/mods/d2k/tilesets/BASE.tsx
+++ b/mods/d2k/tilesets/BASE.tsx
@@ -11,6 +11,7 @@
   <terrain x="0" y="8" t="3" />
   <terrain x="0" y="10" t="3" />
   <terrain x="0" y="11" t="3" />
+  <terrain x="0" y="12" t="3" />
   <terrain x="0" y="13" t="1" />
   <terrain x="0" y="14" t="1" />
   <terrain x="0" y="15" t="8" />
@@ -23,7 +24,7 @@
   <terrain x="0" y="22" t="1" />
   <terrain x="0" y="23" t="1" />
   <terrain x="0" y="24" t="3" />
-  <terrain x="0" y="27" t="2" />
+  <terrain x="0" y="27" t="3" />
   <terrain x="0" y="28" t="3" />
   <terrain x="0" y="29" t="2" />
   <terrain x="0" y="30" t="2" />
@@ -59,8 +60,8 @@
   <terrain x="1" y="23" t="2" />
   <terrain x="1" y="24" t="3" />
   <terrain x="1" y="25" t="3" />
-  <terrain x="1" y="26" t="2" />
-  <terrain x="1" y="27" t="2" />
+  <terrain x="1" y="26" t="3" />
+  <terrain x="1" y="27" t="3" />
   <terrain x="1" y="28" t="3" />
   <terrain x="1" y="29" t="2" />
   <terrain x="1" y="30" t="1" />
@@ -90,10 +91,11 @@
   <terrain x="2" y="18" t="4" />
   <terrain x="2" y="20" t="3" />
   <terrain x="2" y="21" t="3" />
+  <terrain x="2" y="22" t="3" />
   <terrain x="2" y="24" t="3" />
   <terrain x="2" y="25" t="3" />
-  <terrain x="2" y="26" t="2" />
-  <terrain x="2" y="27" t="2" />
+  <terrain x="2" y="26" t="3" />
+  <terrain x="2" y="27" t="3" />
   <terrain x="2" y="28" t="3" />
   <terrain x="2" y="29" t="2" />
   <terrain x="2" y="30" t="2" />
@@ -115,6 +117,7 @@
   <terrain x="3" y="8" t="3" />
   <terrain x="3" y="10" t="3" />
   <terrain x="3" y="11" t="3" />
+  <terrain x="3" y="12" t="3" />
   <terrain x="3" y="13" t="1" />
   <terrain x="3" y="14" t="1" />
   <terrain x="3" y="15" t="1" />
@@ -146,6 +149,7 @@
   <terrain x="4" y="8" t="4" />
   <terrain x="4" y="9" t="4" />
   <terrain x="4" y="10" t="3" />
+  <terrain x="4" y="11" t="3" />
   <terrain x="4" y="13" t="1" />
   <terrain x="4" y="15" t="1" />
   <terrain x="4" y="16" t="1" />
@@ -171,6 +175,7 @@
   <terrain x="5" y="1" t="6" />
   <terrain x="5" y="2" t="6" />
   <terrain x="5" y="3" t="6" />
+  <terrain x="5" y="4" t="3" />
   <terrain x="5" y="5" t="3" />
   <terrain x="5" y="6" t="3" />
   <terrain x="5" y="8" t="4" />
@@ -202,7 +207,9 @@
   <terrain x="6" y="1" t="6" />
   <terrain x="6" y="2" t="6" />
   <terrain x="6" y="3" t="6" />
+  <terrain x="6" y="4" t="3" />
   <terrain x="6" y="6" t="3" />
+  <terrain x="6" y="7" t="3" />
   <terrain x="6" y="8" t="4" />
   <terrain x="6" y="9" t="4" />
   <terrain x="6" y="10" t="3" />
@@ -235,10 +242,12 @@
   <terrain x="6" y="39" t="7" />
   <terrain x="7" y="2" t="6" />
   <terrain x="7" y="4" t="3" />
+  <terrain x="7" y="6" t="3" />
   <terrain x="7" y="8" t="4" />
   <terrain x="7" y="9" t="4" />
   <terrain x="7" y="10" t="3" />
   <terrain x="7" y="11" t="3" />
+  <terrain x="7" y="12" t="3" />
   <terrain x="7" y="13" t="1" />
   <terrain x="7" y="14" t="1" />
   <terrain x="7" y="15" t="2" />
@@ -254,7 +263,7 @@
   <terrain x="7" y="26" t="3" />
   <terrain x="7" y="27" t="2" />
   <terrain x="7" y="28" t="3" />
-  <terrain x="7" y="29" t="1" />
+  <terrain x="7" y="29" t="3" />
   <terrain x="7" y="30" t="3" />
   <terrain x="7" y="31" t="3" />
   <terrain x="7" y="32" t="5" />
@@ -265,10 +274,13 @@
   <terrain x="7" y="38" t="7" />
   <terrain x="7" y="39" t="7" />
   <terrain x="8" y="4" t="3" />
+  <terrain x="8" y="6" t="3" />
+  <terrain x="8" y="7" t="3" />
   <terrain x="8" y="8" t="3" />
   <terrain x="8" y="9" t="3" />
   <terrain x="8" y="10" t="3" />
   <terrain x="8" y="11" t="3" />
+  <terrain x="8" y="12" t="3" />
   <terrain x="8" y="13" t="3" />
   <terrain x="8" y="15" t="2" />
   <terrain x="8" y="18" t="4" />
@@ -282,7 +294,7 @@
   <terrain x="8" y="26" t="3" />
   <terrain x="8" y="27" t="2" />
   <terrain x="8" y="28" t="3" />
-  <terrain x="8" y="29" t="1" />
+  <terrain x="8" y="29" t="3" />
   <terrain x="8" y="30" t="3" />
   <terrain x="8" y="31" t="3" />
   <terrain x="8" y="32" t="5" />
@@ -295,6 +307,7 @@
   <terrain x="8" y="39" t="7" />
   <terrain x="9" y="4" t="3" />
   <terrain x="9" y="6" t="3" />
+  <terrain x="9" y="7" t="3" />
   <terrain x="9" y="8" t="3" />
   <terrain x="9" y="9" t="3" />
   <terrain x="9" y="10" t="3" />
@@ -315,7 +328,7 @@
   <terrain x="9" y="25" t="3" />
   <terrain x="9" y="26" t="3" />
   <terrain x="9" y="27" t="2" />
-  <terrain x="9" y="28" t="1" />
+  <terrain x="9" y="28" t="3" />
   <terrain x="9" y="29" t="3" />
   <terrain x="9" y="30" t="3" />
   <terrain x="9" y="31" t="3" />
@@ -328,6 +341,7 @@
   <terrain x="9" y="38" t="7" />
   <terrain x="9" y="39" t="7" />
   <terrain x="10" y="1" t="6" />
+  <terrain x="10" y="4" t="3" />
   <terrain x="10" y="5" t="3" />
   <terrain x="10" y="6" t="3" />
   <terrain x="10" y="7" t="3" />
@@ -335,6 +349,7 @@
   <terrain x="10" y="9" t="3" />
   <terrain x="10" y="10" t="3" />
   <terrain x="10" y="11" t="3" />
+  <terrain x="10" y="12" t="3" />
   <terrain x="10" y="14" t="1" />
   <terrain x="10" y="15" t="1" />
   <terrain x="10" y="17" t="4" />
@@ -347,8 +362,8 @@
   <terrain x="10" y="25" t="3" />
   <terrain x="10" y="26" t="3" />
   <terrain x="10" y="27" t="2" />
-  <terrain x="10" y="28" t="2" />
-  <terrain x="10" y="29" t="2" />
+  <terrain x="10" y="28" t="3" />
+  <terrain x="10" y="29" t="3" />
   <terrain x="10" y="31" t="3" />
   <terrain x="10" y="32" t="5" />
   <terrain x="10" y="33" t="5" />
@@ -362,6 +377,7 @@
   <terrain x="11" y="1" t="6" />
   <terrain x="11" y="4" t="3" />
   <terrain x="11" y="5" t="3" />
+  <terrain x="11" y="7" t="3" />
   <terrain x="11" y="8" t="3" />
   <terrain x="11" y="9" t="3" />
   <terrain x="11" y="11" t="3" />
@@ -369,12 +385,13 @@
   <terrain x="11" y="16" t="1" />
   <terrain x="11" y="20" t="3" />
   <terrain x="11" y="21" t="3" />
-  <terrain x="11" y="23" t="1" />
+  <terrain x="11" y="22" t="3" />
+  <terrain x="11" y="23" t="3" />
   <terrain x="11" y="24" t="3" />
   <terrain x="11" y="25" t="3" />
   <terrain x="11" y="26" t="3" />
   <terrain x="11" y="28" t="3" />
-  <terrain x="11" y="29" t="2" />
+  <terrain x="11" y="29" t="3" />
   <terrain x="11" y="30" t="2" />
   <terrain x="11" y="31" t="2" />
   <terrain x="11" y="32" t="5" />
@@ -389,6 +406,7 @@
   <terrain x="12" y="1" t="4" />
   <terrain x="12" y="4" t="3" />
   <terrain x="12" y="5" t="3" />
+  <terrain x="12" y="7" t="3" />
   <terrain x="12" y="8" t="3" />
   <terrain x="12" y="9" t="3" />
   <terrain x="12" y="10" t="3" />
@@ -457,9 +475,10 @@
   <terrain x="14" y="5" t="3" />
   <terrain x="14" y="6" t="3" />
   <terrain x="14" y="7" t="3" />
-  <terrain x="14" y="8" t="3" />
-  <terrain x="14" y="9" t="3" />
+  <terrain x="14" y="8" t="4" />
+  <terrain x="14" y="9" t="4" />
   <terrain x="14" y="10" t="3" />
+  <terrain x="14" y="11" t="3" />
   <terrain x="14" y="12" t="3" />
   <terrain x="14" y="14" t="1" />
   <terrain x="14" y="15" t="1" />
@@ -467,9 +486,10 @@
   <terrain x="14" y="17" t="4" />
   <terrain x="14" y="18" t="4" />
   <terrain x="14" y="19" t="4" />
+  <terrain x="14" y="20" t="3" />
   <terrain x="14" y="21" t="3" />
   <terrain x="14" y="22" t="3" />
-  <terrain x="14" y="23" t="2" />
+  <terrain x="14" y="23" t="3" />
   <terrain x="14" y="24" t="2" />
   <terrain x="14" y="25" t="3" />
   <terrain x="14" y="26" t="3" />
@@ -494,8 +514,8 @@
   <terrain x="15" y="5" t="3" />
   <terrain x="15" y="6" t="3" />
   <terrain x="15" y="7" t="3" />
-  <terrain x="15" y="8" t="3" />
-  <terrain x="15" y="9" t="3" />
+  <terrain x="15" y="8" t="4" />
+  <terrain x="15" y="9" t="4" />
   <terrain x="15" y="10" t="3" />
   <terrain x="15" y="11" t="3" />
   <terrain x="15" y="12" t="3" />
@@ -505,7 +525,9 @@
   <terrain x="15" y="17" t="4" />
   <terrain x="15" y="18" t="4" />
   <terrain x="15" y="19" t="4" />
+  <terrain x="15" y="20" t="3" />
   <terrain x="15" y="21" t="3" />
+  <terrain x="15" y="22" t="3" />
   <terrain x="15" y="23" t="3" />
   <terrain x="15" y="24" t="2" />
   <terrain x="15" y="25" t="3" />
@@ -528,13 +550,15 @@
   <terrain x="16" y="5" t="3" />
   <terrain x="16" y="6" t="3" />
   <terrain x="16" y="7" t="3" />
-  <terrain x="16" y="8" t="3" />
-  <terrain x="16" y="9" t="3" />
+  <terrain x="16" y="8" t="4" />
+  <terrain x="16" y="9" t="4" />
   <terrain x="16" y="10" t="3" />
+  <terrain x="16" y="11" t="3" />
   <terrain x="16" y="12" t="1" />
   <terrain x="16" y="13" t="1" />
   <terrain x="16" y="14" t="1" />
   <terrain x="16" y="16" t="1" />
+  <terrain x="16" y="18" t="3" />
   <terrain x="16" y="19" t="3" />
   <terrain x="16" y="20" t="3" />
   <terrain x="16" y="21" t="3" />
@@ -561,24 +585,26 @@
   <terrain x="17" y="3" t="6" />
   <terrain x="17" y="6" t="3" />
   <terrain x="17" y="7" t="3" />
-  <terrain x="17" y="8" t="3" />
+  <terrain x="17" y="8" t="4" />
+  <terrain x="17" y="9" t="4" />
   <terrain x="17" y="10" t="3" />
   <terrain x="17" y="11" t="3" />
   <terrain x="17" y="12" t="1" />
   <terrain x="17" y="13" t="1" />
   <terrain x="17" y="15" t="1" />
   <terrain x="17" y="16" t="1" />
-  <terrain x="17" y="19" t="2" />
+  <terrain x="17" y="18" t="3" />
+  <terrain x="17" y="19" t="3" />
   <terrain x="17" y="20" t="3" />
   <terrain x="17" y="21" t="3" />
   <terrain x="17" y="22" t="3" />
-  <terrain x="17" y="23" t="2" />
+  <terrain x="17" y="23" t="3" />
   <terrain x="17" y="24" t="2" />
   <terrain x="17" y="25" t="3" />
   <terrain x="17" y="26" t="3" />
-  <terrain x="17" y="27" t="3" />
-  <terrain x="17" y="28" t="3" />
-  <terrain x="17" y="29" t="3" />
+  <terrain x="17" y="27" t="4" />
+  <terrain x="17" y="28" t="4" />
+  <terrain x="17" y="29" t="4" />
   <terrain x="17" y="30" t="2" />
   <terrain x="17" y="31" t="2" />
   <terrain x="17" y="32" t="5" />
@@ -605,16 +631,16 @@
   <terrain x="18" y="16" t="4" />
   <terrain x="18" y="17" t="4" />
   <terrain x="18" y="18" t="3" />
-  <terrain x="18" y="19" t="2" />
+  <terrain x="18" y="19" t="3" />
   <terrain x="18" y="20" t="3" />
   <terrain x="18" y="21" t="3" />
   <terrain x="18" y="22" t="3" />
   <terrain x="18" y="24" t="3" />
   <terrain x="18" y="25" t="1" />
   <terrain x="18" y="26" t="2" />
-  <terrain x="18" y="27" t="3" />
-  <terrain x="18" y="28" t="3" />
-  <terrain x="18" y="29" t="3" />
+  <terrain x="18" y="27" t="4" />
+  <terrain x="18" y="28" t="4" />
+  <terrain x="18" y="29" t="4" />
   <terrain x="18" y="30" t="2" />
   <terrain x="18" y="31" t="2" />
   <terrain x="18" y="32" t="5" />
@@ -624,6 +650,8 @@
   <terrain x="18" y="39" t="7" />
   <terrain x="19" y="1" t="6" />
   <terrain x="19" y="2" t="6" />
+  <terrain x="19" y="4" t="3" />
+  <terrain x="19" y="5" t="3" />
   <terrain x="19" y="6" t="3" />
   <terrain x="19" y="7" t="3" />
   <terrain x="19" y="8" t="1" />
@@ -634,15 +662,17 @@
   <terrain x="19" y="14" t="3" />
   <terrain x="19" y="16" t="4" />
   <terrain x="19" y="17" t="4" />
+  <terrain x="19" y="18" t="3" />
   <terrain x="19" y="19" t="3" />
   <terrain x="19" y="20" t="3" />
+  <terrain x="19" y="21" t="3" />
   <terrain x="19" y="22" t="3" />
   <terrain x="19" y="23" t="2" />
   <terrain x="19" y="24" t="3" />
   <terrain x="19" y="26" t="2" />
-  <terrain x="19" y="27" t="3" />
-  <terrain x="19" y="28" t="3" />
-  <terrain x="19" y="29" t="3" />
+  <terrain x="19" y="27" t="4" />
+  <terrain x="19" y="28" t="4" />
+  <terrain x="19" y="29" t="4" />
   <terrain x="19" y="30" t="2" />
   <terrain x="19" y="31" t="2" />
   <terrain x="19" y="32" t="5" />
diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml
index a332ffff19..06e20cc11b 100644
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -161,8 +161,8 @@ Templates:
 		Tiles:
 			0: Cliff
 			2: Cliff
-			3: Sand
-			1: Sand
+			3: Cliff
+			1: Cliff
 	Template@11:
 		Id: 11
 		Image: BASE11
@@ -200,7 +200,7 @@ Templates:
 		PickAny: False
 		Tiles:
 			3: Cliff
-			2: Sand
+			2: Cliff
 			0: Sand
 			1: Cliff
 	Template@15:
@@ -211,7 +211,7 @@ Templates:
 		Tiles:
 			0: Cliff
 			1: Sand
-			3: Sand
+			3: Cliff
 			2: Cliff
 	Template@16:
 		Id: 16
@@ -219,9 +219,9 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			3: Sand
-			2: Sand
-			0: Sand
+			3: Cliff
+			2: Cliff
+			0: Cliff
 			1: Cliff
 	Template@17:
 		Id: 17
@@ -229,9 +229,9 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			1: Sand
+			1: Cliff
 			3: Sand
-			2: Sand
+			2: Cliff
 			0: Cliff
 	Template@18:
 		Id: 18
@@ -279,20 +279,20 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			1: Cliff
-			3: Sand
-			2: Cliff
-			0: Cliff
+			1: Rough
+			3: Rough
+			2: Rough
+			0: Rough
 	Template@23:
 		Id: 23
 		Image: BASE23
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			1: Cliff
-			3: Cliff
-			2: Cliff
-			0: Cliff
+			1: Rough
+			3: Rough
+			2: Rough
+			0: Rough
 	Template@24:
 		Id: 24
 		Image: BASE24
@@ -374,7 +374,7 @@ Templates:
 			3: Cliff
 			1: Cliff
 			4: Cliff
-			5: Sand
+			5: Cliff
 	Template@32:
 		Id: 32
 		Image: BASE32
@@ -394,7 +394,7 @@ Templates:
 			1: Sand
 			3: Cliff
 			5: Cliff
-			4: Sand
+			4: Cliff
 			2: Cliff
 			0: Cliff
 	Template@34:
@@ -404,7 +404,7 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Cliff
-			2: Sand
+			2: Cliff
 			4: Sand
 			5: Sand
 			3: Cliff
@@ -418,7 +418,7 @@ Templates:
 			0: Cliff
 			2: Cliff
 			4: Sand
-			5: Sand
+			5: Cliff
 			3: Cliff
 			1: Cliff
 	Template@36:
@@ -447,8 +447,8 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Cliff
+			1: Cliff
 			3: Sand
 			2: Cliff
 	Template@39:
@@ -468,7 +468,7 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Cliff
-			1: Sand
+			1: Cliff
 			3: Cliff
 			2: Sand
 	Template@41:
@@ -537,7 +537,7 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			2: Sand
+			2: Cliff
 			0: Cliff
 			1: Cliff
 			3: Cliff
@@ -548,7 +548,7 @@ Templates:
 		PickAny: False
 		Tiles:
 			3: Cliff
-			2: Sand
+			2: Cliff
 			0: Cliff
 			1: Cliff
 	Template@49:
@@ -584,9 +584,9 @@ Templates:
 			5: Sand
 			4: Cliff
 			3: Cliff
-			0: Sand
+			0: Cliff
 			1: Cliff
-			2: Sand
+			2: Cliff
 	Template@52:
 		Id: 52
 		Image: BASE52
@@ -993,15 +993,15 @@ Templates:
 		Size: 3,3
 		PickAny: False
 		Tiles:
-			0: Cliff
-			3: Cliff
-			6: Cliff
-			7: Cliff
-			8: Cliff
-			5: Cliff
-			2: Cliff
-			1: Cliff
-			4: Cliff
+			0: Rough
+			3: Rough
+			6: Rough
+			7: Rough
+			8: Rough
+			5: Rough
+			2: Rough
+			1: Rough
+			4: Rough
 	Template@102:
 		Id: 102
 		Image: BASE102
@@ -1613,7 +1613,7 @@ Templates:
 		Tiles:
 			0: Cliff
 			1: Cliff
-			3: Transition
+			3: Cliff
 			2: Cliff
 	Template@181:
 		Id: 181
@@ -1662,18 +1662,18 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Cliff
-			1: Transition
+			1: Cliff
 			3: Cliff
-			2: Transition
+			2: Cliff
 	Template@186:
 		Id: 186
 		Image: BASE186
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			0: Rock
-			2: Rock
-			3: Rock
+			0: Cliff
+			2: Cliff
+			3: Cliff
 			1: Cliff
 	Template@187:
 		Id: 187
@@ -1721,12 +1721,12 @@ Templates:
 		Size: 3,2
 		PickAny: False
 		Tiles:
-			5: Rock
-			2: Rock
-			1: Rock
+			5: Cliff
+			2: Cliff
+			1: Cliff
 			0: Sand
-			3: Rock
-			4: Rock
+			3: Cliff
+			4: Cliff
 	Template@192:
 		Id: 192
 		Image: BASE192
@@ -1757,7 +1757,7 @@ Templates:
 		Tiles:
 			0: Cliff
 			2: Cliff
-			4: Sand
+			4: Cliff
 			5: Cliff
 			3: Cliff
 			1: Cliff
@@ -1790,7 +1790,7 @@ Templates:
 			0: Cliff
 			2: Cliff
 			4: Cliff
-			5: Sand
+			5: Cliff
 			3: Cliff
 			1: Cliff
 	Template@198:
@@ -1818,11 +1818,11 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Cliff
-			1: Sand
+			1: Cliff
 			3: Cliff
 			5: Rock
 			4: Rock
-			2: Rock
+			2: Cliff
 	Template@201:
 		Id: 201
 		Image: BASE201
@@ -1880,7 +1880,7 @@ Templates:
 		PickAny: False
 		Tiles:
 			1: Cliff
-			3: Rock
+			3: Cliff
 			5: Rock
 			4: Rock
 			2: Cliff
@@ -1913,7 +1913,7 @@ Templates:
 		Tiles:
 			0: Cliff
 			2: Cliff
-			3: Sand
+			3: Cliff
 			1: Cliff
 	Template@210:
 		Id: 210
@@ -1922,9 +1922,9 @@ Templates:
 		PickAny: False
 		Tiles:
 			3: Cliff
-			1: Sand
+			1: Cliff
 			0: Cliff
-			2: Rock
+			2: Cliff
 	Template@211:
 		Id: 211
 		Image: BASE211
@@ -1941,9 +1941,9 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			3: Rock
-			1: Sand
-			0: Sand
+			3: Cliff
+			1: Cliff
+			0: Cliff
 			2: Cliff
 	Template@213:
 		Id: 213
@@ -1951,8 +1951,8 @@ Templates:
 		Size: 2,2
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Cliff
+			1: Cliff
 			3: Cliff
 			2: Cliff
 	Template@214:
@@ -2396,7 +2396,7 @@ Templates:
 			5: Cliff
 			2: Sand
 			1: Cliff
-			0: Transition
+			0: Cliff
 	Template@265:
 		Id: 265
 		Image: BASE265