diff --git a/mods/d2k/maps/pasty-mesa.oramap b/mods/d2k/maps/pasty-mesa.oramap
new file mode 100644
index 0000000000..e4b60e015a
Binary files /dev/null and b/mods/d2k/maps/pasty-mesa.oramap differ
diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml
index e5a32cf0c1..24d85e4a7f 100644
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -4,7 +4,7 @@ General:
 	SheetSize: 1024
 	Palette: d2k.pal
 	Extensions: .R8, .r8, .shp, .tmp
-	EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
+	EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
 
 Terrain:
 	TerrainType@Clear: # TODO: workaround for the stupid WinForms editor
@@ -1262,12 +1262,13 @@ Templates:
 	Template@108:
 		Id: 108
 		Image: BLOXBASE
-		Frames: 677
-		Size: 1,1
-		Category: Unidentified
+		Frames: 677,697
+		Size: 1,2
+		Category: Rock-Cliff
 		PickAny: False
 		Tiles:
 			0: Cliff
+			1: Rock
 	Template@109:
 		Id: 109
 		Image: BLOXBASE
@@ -2317,13 +2318,13 @@ Templates:
 		Image: BLOXBASE
 		Frames: 254,255,274,275
 		Size: 2,2
-		Category: Unidentified
+		Category: Sand-Cliff
 		PickAny: False
 		Tiles:
 			0: Cliff
 			1: Cliff
-			3: Sand
-			2: Sand
+			3: Rough
+			2: Rough
 	Template@253:
 		Id: 253
 		Image: BLOXBASE
@@ -4845,11 +4846,11 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Cliff
-			3: Transition
-			4: Transition
+			3: Sand
+			4: Rough
 			1: Cliff
-			2: Transition
-			5: Transition
+			2: Rough
+			5: Cliff
 	Template@477:
 		Id: 477
 		Image: BLOXWAST
@@ -5034,13 +5035,13 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Rock
-			1: Transition
+			1: Rock
 			2: Rock
 			3: Cliff
-			4: Transition
+			4: Rough
 			5: Cliff
 			6: Cliff
-			7: Transition
+			7: Rough
 			8: Cliff
 	Template@514:
 		Id: 514
@@ -5050,10 +5051,10 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Sand
-			1: Transition
+			1: Rough
 			2: Cliff
 			3: Cliff
-			4: Transition
+			4: Rough
 			5: Cliff
 			6: Rock
 			7: Rock