diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml
index 3b4a3c4327..171d91da8a 100644
--- a/mods/cnc/tilesets/desert.yaml
+++ b/mods/cnc/tilesets/desert.yaml
@@ -1,76 +1,71 @@
 General:
 	Name: Desert
 	Id: DESERT
-	Extensions: .des, .shp, .tem
 	Palette: desert.pal
+	Extensions: .des, .shp, .tem
 	WaterPaletteRotationBase: 32
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 
 Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 134, 95, 69
-		TargetTypes: Ground
-	TerrainType@Water:
-		Type: Water
-		IsWater: true
-		AcceptsSmudgeType:
-		Color: 93, 165, 206
-		TargetTypes: Water
-	TerrainType@Road:
-		Type: Road
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 168, 123, 83
-		TargetTypes: Ground
-	TerrainType@Rock:
-		Type: Rock
-		AcceptsSmudgeType:
-		Color: 116, 90, 63
-		TargetTypes: Ground
-	TerrainType@Tree:
-		Type: Tree
-		AcceptsSmudgeType:
-		Color: 28, 32, 36
-		TargetTypes: Ground
-	TerrainType@River:
-		Type: River
-		AcceptsSmudgeType:
-		Color: 111, 132, 139
-		TargetTypes: Ground
-	TerrainType@Rough:
-		Type: Rough
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Wall:
-		Type: Wall
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 208, 192, 160
-		TargetTypes: Ground
 	TerrainType@Beach:
 		Type: Beach
-		AcceptsSmudgeType:
-		Color: 176, 156, 120
-		TargetTypes: Ground
-	TerrainType@Tiberium:
-		Type: Tiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 161, 226, 28
 		TargetTypes: Ground
+		Color: 255,176,156,120
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 252, 252
 		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,252,252
+	TerrainType@Clear:
+		Type: Clear
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,134,95,69
+	TerrainType@River:
+		Type: River
+		TargetTypes: Ground
+		Color: 255,111,132,139
+	TerrainType@Road:
+		Type: Road
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,168,123,83
+	TerrainType@Rock:
+		Type: Rock
+		TargetTypes: Ground
+		Color: 255,116,90,63
+	TerrainType@Rough:
+		Type: Rough
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,68,68,60
+	TerrainType@Tiberium:
+		Type: Tiberium
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,161,226,28
+	TerrainType@Tree:
+		Type: Tree
+		TargetTypes: Ground
+		Color: 255,28,32,36
+	TerrainType@Wall:
+		Type: Wall
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,208,192,160
+	TerrainType@Water:
+		Type: Water
+		TargetTypes: Water
+		IsWater: True
+		Color: 255,93,165,206
 
 Templates:
 	Template@255:
 		Id: 255
-		Image: clear1
+		Image: clear1.des
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -90,10 +85,10 @@ Templates:
 			15: Clear
 	Template@65535:
 		Id: 65535
-		Image: clear1
+		Image: clear1.des
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -112,11 +107,10 @@ Templates:
 			14: Clear
 			15: Clear
 	Template@0:
-		Id: 0
-		Image: clear1
+		Image: clear1.des
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -136,34 +130,36 @@ Templates:
 			15: Clear
 	Template@1:
 		Id: 1
-		Image: w1
+		Image: w1.des
 		Size: 1,1
 		Category: Terrain
 		Tiles:
 			0: Water
 	Template@13:
 		Id: 13
-		Image: s01
+		Image: s01.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 			3: Rock
 	Template@14:
 		Id: 14
-		Image: s02
+		Image: s02.des
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
 			5: Rock
 	Template@15:
 		Id: 15
-		Image: s03
+		Image: s03.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -173,7 +169,7 @@ Templates:
 			3: Rock
 	Template@16:
 		Id: 16
-		Image: s04
+		Image: s04.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -183,7 +179,7 @@ Templates:
 			3: Rock
 	Template@17:
 		Id: 17
-		Image: s05
+		Image: s05.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -193,17 +189,18 @@ Templates:
 			3: Rock
 	Template@18:
 		Id: 18
-		Image: s06
+		Image: s06.des
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
 	Template@19:
 		Id: 19
-		Image: s07
+		Image: s07.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -213,27 +210,29 @@ Templates:
 			3: Rock
 	Template@20:
 		Id: 20
-		Image: s08
+		Image: s08.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@21:
 		Id: 21
-		Image: s09
+		Image: s09.des
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@22:
 		Id: 22
-		Image: s10
+		Image: s10.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -243,7 +242,7 @@ Templates:
 			3: Rock
 	Template@23:
 		Id: 23
-		Image: s11
+		Image: s11.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -253,7 +252,7 @@ Templates:
 			3: Rock
 	Template@24:
 		Id: 24
-		Image: s12
+		Image: s12.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -263,74 +262,89 @@ Templates:
 			3: Rock
 	Template@25:
 		Id: 25
-		Image: s13
+		Image: s13.des
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
+			2: Clear
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@26:
 		Id: 26
-		Image: s14
+		Image: s14.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
+			2: Clear
 	Template@27:
 		Id: 27
-		Image: s15
+		Image: s15.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@28:
 		Id: 28
-		Image: s16
+		Image: s16.des
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			2: Rock
 			3: Rock
 			5: Rock
 	Template@29:
 		Id: 29
-		Image: s17
+		Image: s17.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@30:
 		Id: 30
-		Image: s18
+		Image: s18.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@31:
 		Id: 31
-		Image: s19
+		Image: s19.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@32:
 		Id: 32
-		Image: s20
+		Image: s20.des
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@33:
 		Id: 33
-		Image: s21
+		Image: s21.des
 		Size: 1,2
 		Category: Cliffs
 		Tiles:
@@ -338,7 +352,7 @@ Templates:
 			1: Rock
 	Template@34:
 		Id: 34
-		Image: s22
+		Image: s22.des
 		Size: 2,1
 		Category: Cliffs
 		Tiles:
@@ -346,17 +360,19 @@ Templates:
 			1: Rock
 	Template@35:
 		Id: 35
-		Image: s23
+		Image: s23.des
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@36:
 		Id: 36
-		Image: s24
+		Image: s24.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -366,7 +382,7 @@ Templates:
 			3: Rock
 	Template@37:
 		Id: 37
-		Image: s25
+		Image: s25.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -376,7 +392,7 @@ Templates:
 			3: Rock
 	Template@38:
 		Id: 38
-		Image: s26
+		Image: s26.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -386,17 +402,19 @@ Templates:
 			3: Rock
 	Template@39:
 		Id: 39
-		Image: s27
+		Image: s27.des
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@40:
 		Id: 40
-		Image: s28
+		Image: s28.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -405,7 +423,7 @@ Templates:
 			3: Rock
 	Template@41:
 		Id: 41
-		Image: s29
+		Image: s29.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -415,24 +433,27 @@ Templates:
 			3: Rock
 	Template@42:
 		Id: 42
-		Image: s30
+		Image: s30.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@43:
 		Id: 43
-		Image: s31
+		Image: s31.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@44:
 		Id: 44
-		Image: s32
+		Image: s32.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -441,7 +462,7 @@ Templates:
 			2: Rock
 	Template@45:
 		Id: 45
-		Image: s33
+		Image: s33.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -451,7 +472,7 @@ Templates:
 			3: Rock
 	Template@46:
 		Id: 46
-		Image: s34
+		Image: s34.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -461,7 +482,7 @@ Templates:
 			3: Rock
 	Template@47:
 		Id: 47
-		Image: s35
+		Image: s35.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -471,7 +492,7 @@ Templates:
 			3: Rock
 	Template@48:
 		Id: 48
-		Image: s36
+		Image: s36.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -481,7 +502,7 @@ Templates:
 			3: Rock
 	Template@49:
 		Id: 49
-		Image: s37
+		Image: s37.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -491,7 +512,7 @@ Templates:
 			3: Rock
 	Template@50:
 		Id: 50
-		Image: s38
+		Image: s38.des
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -501,7 +522,7 @@ Templates:
 			3: Rock
 	Template@53:
 		Id: 53
-		Image: sh20
+		Image: sh20.des
 		Size: 4,1
 		Category: Beach
 		Tiles:
@@ -511,20 +532,22 @@ Templates:
 			3: River
 	Template@54:
 		Id: 54
-		Image: sh21
+		Image: sh21.des
 		Size: 3,1
 		Category: Beach
 		Tiles:
 			0: Rock
+			1: Clear
 			2: River
 	Template@55:
 		Id: 55
-		Image: sh22
+		Image: sh22.des
 		Size: 6,2
 		Category: Beach
 		Tiles:
 			1: Rock
 			2: Rock
+			3: Clear
 			6: River
 			7: Water
 			8: Water
@@ -533,77 +556,83 @@ Templates:
 			11: River
 	Template@56:
 		Id: 56
-		Image: sh23
+		Image: sh23.des
 		Size: 2,2
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
 			3: River
 	Template@57:
 		Id: 57
-		Image: br1
+		Image: br1.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Tree
 	Template@58:
 		Id: 58
-		Image: br2
+		Image: br2.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Tree
 	Template@59:
 		Id: 59
-		Image: br3
+		Image: br3.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Tree
 	Template@60:
 		Id: 60
-		Image: br4
+		Image: br4.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Tree
 	Template@61:
 		Id: 61
-		Image: br5
+		Image: br5.des
 		Size: 1,1
 		Tiles:
 			0: Wall
 	Template@62:
 		Id: 62
-		Image: br6
+		Image: br6.des
 		Size: 2,2
 		Category: Debris
 		Tiles:
 			0: Tree
 			1: Tree
 			2: Tree
+			3: Clear
 	Template@63:
 		Id: 63
-		Image: br7
+		Image: br7.des
 		Size: 2,2
 		Category: Debris
 		Tiles:
 			0: Tree
 			1: Tree
+			2: Clear
 			3: Tree
 	Template@64:
 		Id: 64
-		Image: br8
+		Image: br8.des
 		Size: 3,2
 		Category: Debris
 		Tiles:
 			0: Tree
 			1: Tree
+			2: Clear
+			3: Clear
 			4: Tree
 			5: Tree
 	Template@65:
 		Id: 65
-		Image: br9
+		Image: br9.des
 		Size: 3,2
 		Category: Debris
 		Tiles:
@@ -615,60 +644,86 @@ Templates:
 			5: Tree
 	Template@66:
 		Id: 66
-		Image: br10
+		Image: br10.des
 		Size: 2,1
 		Tiles:
 			0: Wall
 			1: Wall
 	Template@67:
 		Id: 67
-		Image: p01
+		Image: p01.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@68:
 		Id: 68
-		Image: p02
+		Image: p02.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@69:
 		Id: 69
-		Image: p03
+		Image: p03.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@70:
 		Id: 70
-		Image: p04
+		Image: p04.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@71:
 		Id: 71
-		Image: p05
+		Image: p05.des
 		Size: 2,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 	Template@72:
 		Id: 72
-		Image: p06
+		Image: p06.des
 		Size: 6,4
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			7: Clear
+			8: Clear
+			9: Clear
+			14: Clear
+			15: Clear
+			16: Clear
+			17: Clear
+			20: Clear
+			21: Clear
+			22: Clear
+			23: Clear
 	Template@73:
 		Id: 73
-		Image: p07
+		Image: p07.des
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
 	Template@76:
 		Id: 76
-		Image: sh17
+		Image: sh17.des
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -678,7 +733,7 @@ Templates:
 			3: Water
 	Template@77:
 		Id: 77
-		Image: sh18
+		Image: sh18.des
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -688,24 +743,25 @@ Templates:
 			3: Water
 	Template@78:
 		Id: 78
-		Image: sh19
+		Image: sh19.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
 			1: Rock
+			2: Clear
 			3: River
 			4: Rock
 			5: River
 	Template@82:
 		Id: 82
-		Image: b1
+		Image: b1.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@83:
 		Id: 83
-		Image: b2
+		Image: b2.des
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -713,67 +769,78 @@ Templates:
 			1: Rock
 	Template@85:
 		Id: 85
-		Image: b4
+		Image: b4.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@86:
 		Id: 86
-		Image: b5
+		Image: b5.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@87:
 		Id: 87
-		Image: b6
+		Image: b6.des
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@93:
 		Id: 93
-		Image: d01
+		Image: d01.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 	Template@94:
 		Id: 94
-		Image: d02
+		Image: d02.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 	Template@95:
 		Id: 95
-		Image: d03
+		Image: d03.des
 		Size: 1,2
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
 	Template@96:
 		Id: 96
-		Image: d04
+		Image: d04.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@97:
 		Id: 97
-		Image: d05
+		Image: d05.des
 		Size: 3,4
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			6: Road
 			7: Road
+			9: Clear
 			10: Road
 	Template@98:
 		Id: 98
-		Image: d06
+		Image: d06.des
 		Size: 2,3
 		Category: Road
 		Tiles:
@@ -781,38 +848,51 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 	Template@99:
 		Id: 99
-		Image: d07
+		Image: d07.des
 		Size: 3,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			4: Road
+			5: Clear
 	Template@100:
 		Id: 100
-		Image: d08
+		Image: d08.des
 		Size: 3,2
 		Category: Road
 		Tiles:
 			1: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@101:
 		Id: 101
-		Image: d09
+		Image: d09.des
 		Size: 4,3
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
+			10: Clear
+			11: Clear
 	Template@102:
 		Id: 102
-		Image: d10
+		Image: d10.des
 		Size: 4,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Rock
 			4: Road
 			5: Road
@@ -820,39 +900,47 @@ Templates:
 			7: Road
 	Template@103:
 		Id: 103
-		Image: d11
+		Image: d11.des
 		Size: 2,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
+			4: Clear
 	Template@104:
 		Id: 104
-		Image: d12
+		Image: d12.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@105:
 		Id: 105
-		Image: d13
+		Image: d13.des
 		Size: 4,3
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			2: Clear
+			4: Clear
 			5: Road
 			6: Road
+			7: Clear
 			10: Wall
 			11: Road
 	Template@106:
 		Id: 106
-		Image: d14
+		Image: d14.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Wall
 			5: Road
 			6: Road
@@ -860,7 +948,7 @@ Templates:
 			8: Road
 	Template@107:
 		Id: 107
-		Image: d15
+		Image: d15.des
 		Size: 3,3
 		Category: Road
 		Tiles:
@@ -869,243 +957,313 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@108:
 		Id: 108
-		Image: d16
+		Image: d16.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
+			7: Clear
 			8: Wall
 	Template@109:
 		Id: 109
-		Image: d17
+		Image: d17.des
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@110:
 		Id: 110
-		Image: d18
+		Image: d18.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Wall
 	Template@111:
 		Id: 111
-		Image: d19
+		Image: d19.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: Road
+			8: Clear
 	Template@112:
 		Id: 112
-		Image: d20
+		Image: d20.des
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Road
 	Template@113:
 		Id: 113
-		Image: d21
+		Image: d21.des
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Rock
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@114:
 		Id: 114
-		Image: d22
+		Image: d22.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
+			8: Clear
 	Template@115:
 		Id: 115
-		Image: d23
+		Image: d23.des
 		Size: 3,3
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@116:
 		Id: 116
-		Image: d24
+		Image: d24.des
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@117:
 		Id: 117
-		Image: d25
+		Image: d25.des
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@118:
 		Id: 118
-		Image: d26
+		Image: d26.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@119:
 		Id: 119
-		Image: d27
+		Image: d27.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@120:
 		Id: 120
-		Image: d28
+		Image: d28.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@121:
 		Id: 121
-		Image: d29
+		Image: d29.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@122:
 		Id: 122
-		Image: d30
+		Image: d30.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			2: Road
 	Template@123:
 		Id: 123
-		Image: d31
+		Image: d31.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Road
 	Template@124:
 		Id: 124
-		Image: d32
+		Image: d32.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@125:
 		Id: 125
-		Image: d33
+		Image: d33.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
 	Template@126:
 		Id: 126
-		Image: d34
+		Image: d34.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
 	Template@127:
 		Id: 127
-		Image: d35
+		Image: d35.des
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@128:
 		Id: 128
-		Image: d36
+		Image: d36.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@129:
 		Id: 129
-		Image: d37
+		Image: d37.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@130:
 		Id: 130
-		Image: d38
+		Image: d38.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@131:
 		Id: 131
-		Image: d39
+		Image: d39.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@132:
 		Id: 132
-		Image: d40
+		Image: d40.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			3: Clear
 	Template@133:
 		Id: 133
-		Image: d41
+		Image: d41.des
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Wall
 			2: Road
+			3: Clear
 	Template@134:
 		Id: 134
-		Image: d42
+		Image: d42.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
+			3: Clear
 	Template@135:
 		Id: 135
-		Image: d43
+		Image: d43.des
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@149:
 		Id: 149
-		Image: rv14
+		Image: rv14.des
 		Size: 4,3
 		Category: River
 		Tiles:
@@ -1123,22 +1281,25 @@ Templates:
 			11: Rock
 	Template@150:
 		Id: 150
-		Image: rv15
+		Image: rv15.des
 		Size: 4,3
 		Category: River
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: River
 			5: River
 			6: Rock
 			7: River
+			8: Clear
 			9: Rock
 			10: Rock
+			11: Clear
 	Template@151:
 		Id: 151
-		Image: rv16
+		Image: rv16.des
 		Size: 6,4
 		Category: River
 		Tiles:
@@ -1163,7 +1324,7 @@ Templates:
 			21: Tree
 	Template@152:
 		Id: 152
-		Image: rv17
+		Image: rv17.des
 		Size: 6,5
 		Category: River
 		Tiles:
@@ -1182,6 +1343,7 @@ Templates:
 			15: River
 			16: River
 			17: Rock
+			18: Clear
 			19: Rock
 			20: Rock
 			21: Rock
@@ -1191,7 +1353,7 @@ Templates:
 			29: River
 	Template@153:
 		Id: 153
-		Image: rv18
+		Image: rv18.des
 		Size: 4,4
 		Category: River
 		Tiles:
@@ -1210,12 +1372,13 @@ Templates:
 			14: Rock
 	Template@154:
 		Id: 154
-		Image: rv19
+		Image: rv19.des
 		Size: 4,4
 		Category: River
 		Tiles:
 			1: Rock
 			2: River
+			3: Clear
 			5: Rock
 			6: River
 			7: Tree
@@ -1223,20 +1386,25 @@ Templates:
 			9: Rock
 			10: River
 			11: Rock
+			12: Clear
 			13: Rock
 			14: River
 			15: Tree
 	Template@155:
 		Id: 155
-		Image: rv20
+		Image: rv20.des
 		Size: 6,8
 		Category: River
 		Tiles:
+			2: Clear
 			3: Rock
 			4: River
+			5: Clear
+			7: Clear
 			8: Rock
 			9: River
 			10: Rock
+			12: Clear
 			13: Rock
 			14: Rock
 			15: River
@@ -1245,6 +1413,7 @@ Templates:
 			19: Rock
 			20: River
 			21: Rock
+			22: Clear
 			24: Rock
 			25: Rock
 			26: River
@@ -1254,20 +1423,25 @@ Templates:
 			31: Rock
 			32: River
 			33: Rock
+			36: Clear
 			37: River
 			38: River
 			39: Rock
+			42: Clear
 			43: River
 			44: Rock
 			45: Rock
 	Template@156:
 		Id: 156
-		Image: rv21
+		Image: rv21.des
 		Size: 5,8
 		Category: River
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
+			5: Clear
 			6: River
 			7: River
 			8: Rock
@@ -1288,13 +1462,16 @@ Templates:
 			32: Rock
 			33: River
 			34: River
+			38: Clear
 			39: River
 	Template@157:
 		Id: 157
-		Image: rv22
+		Image: rv22.des
 		Size: 3,3
 		Category: River
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Rock
 			4: Rock
 			5: River
@@ -1303,7 +1480,7 @@ Templates:
 			8: Rock
 	Template@158:
 		Id: 158
-		Image: rv23
+		Image: rv23.des
 		Size: 3,3
 		Category: River
 		Tiles:
@@ -1318,7 +1495,7 @@ Templates:
 			8: Rock
 	Template@159:
 		Id: 159
-		Image: rv24
+		Image: rv24.des
 		Size: 3,3
 		Category: River
 		Tiles:
@@ -1329,9 +1506,10 @@ Templates:
 			4: River
 			5: River
 			7: Tree
+			8: Clear
 	Template@160:
 		Id: 160
-		Image: rv25
+		Image: rv25.des
 		Size: 3,3
 		Category: River
 		Tiles:
@@ -1343,46 +1521,55 @@ Templates:
 			5: Rock
 			6: Rock
 			7: Rock
+			8: Clear
 	Template@161:
 		Id: 161
-		Image: ford1
+		Image: ford1.des
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: River
 			8: River
 	Template@162:
 		Id: 162
-		Image: ford2
+		Image: ford2.des
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Road
 			2: River
 			3: River
 			4: Road
 			5: River
+			6: Clear
 			7: Road
+			8: Clear
 	Template@163:
 		Id: 163
-		Image: falls1
+		Image: falls1.des
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			2: River
 			3: River
 			4: River
 			5: River
+			6: Clear
 			7: Rock
 			8: Rock
 	Template@164:
 		Id: 164
-		Image: falls2
+		Image: falls2.des
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1394,15 +1581,18 @@ Templates:
 			5: River
 	Template@169:
 		Id: 169
-		Image: bridge3
+		Image: bridge3.des
 		Size: 6,5
 		Category: Bridge
 		Tiles:
+			3: Clear
 			4: Road
+			6: Clear
 			7: Rock
 			8: Wall
 			9: Road
 			10: Wall
+			11: Clear
 			12: River
 			13: River
 			14: Road
@@ -1411,21 +1601,26 @@ Templates:
 			17: Rock
 			18: Rock
 			19: Road
+			20: Clear
 			21: Rock
 			22: River
 			23: River
 			24: Road
+			25: Clear
 	Template@170:
 		Id: 170
-		Image: bridge3d
+		Image: bridge3d.des
 		Size: 6,5
 		Category: Bridge
 		Tiles:
+			3: Clear
 			4: Road
+			6: Clear
 			7: Rock
 			8: Rock
 			9: Wall
 			10: Wall
+			11: Clear
 			12: River
 			13: River
 			14: River
@@ -1434,19 +1629,24 @@ Templates:
 			17: Rock
 			18: Rock
 			19: Road
+			20: Clear
 			21: River
 			22: River
 			23: River
 			24: Road
+			25: Clear
 	Template@171:
 		Id: 171
-		Image: bridge4
+		Image: bridge4.des
 		Size: 6,4
 		Category: Bridge
 		Tiles:
 			1: Road
+			2: Clear
 			3: Tree
 			4: Rock
+			5: Clear
+			6: Clear
 			7: Wall
 			8: Road
 			9: Wall
@@ -1461,16 +1661,20 @@ Templates:
 			18: River
 			19: River
 			20: Rock
+			21: Clear
 			22: Road
 	Template@172:
 		Id: 172
-		Image: bridge4d
+		Image: bridge4d.des
 		Size: 6,4
 		Category: Bridge
 		Tiles:
 			1: Road
+			2: Clear
 			3: Tree
 			4: Rock
+			5: Clear
+			6: Clear
 			7: Wall
 			8: Wall
 			9: River
@@ -1485,10 +1689,11 @@ Templates:
 			18: River
 			19: River
 			20: Rock
+			21: Clear
 			22: Road
 	Template@173:
 		Id: 173
-		Image: sh24
+		Image: sh24.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1497,22 +1702,25 @@ Templates:
 			2: Rock
 			3: River
 			4: River
+			5: Clear
 			6: River
 			7: Water
 			8: River
 	Template@174:
 		Id: 174
-		Image: sh25
+		Image: sh25.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
 			0: River
 			1: River
 			2: River
+			3: Clear
+			4: Clear
 			5: Rock
 	Template@175:
 		Id: 175
-		Image: sh26
+		Image: sh26.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -1520,9 +1728,10 @@ Templates:
 			1: Rock
 			2: River
 			4: Rock
+			5: Clear
 	Template@176:
 		Id: 176
-		Image: sh27
+		Image: sh27.des
 		Size: 4,1
 		Category: Beach
 		Tiles:
@@ -1532,7 +1741,7 @@ Templates:
 			3: Rock
 	Template@177:
 		Id: 177
-		Image: sh28
+		Image: sh28.des
 		Size: 3,1
 		Category: Beach
 		Tiles:
@@ -1541,7 +1750,7 @@ Templates:
 			2: River
 	Template@178:
 		Id: 178
-		Image: sh29
+		Image: sh29.des
 		Size: 6,2
 		Category: Beach
 		Tiles:
@@ -1551,9 +1760,12 @@ Templates:
 			3: River
 			4: River
 			5: River
+			7: Clear
+			8: Clear
+			9: Clear
 	Template@179:
 		Id: 179
-		Image: sh30
+		Image: sh30.des
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -1562,7 +1774,7 @@ Templates:
 			2: Rock
 	Template@180:
 		Id: 180
-		Image: sh31
+		Image: sh31.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1572,38 +1784,44 @@ Templates:
 			3: Rock
 			4: River
 			5: Rock
+			6: Clear
 			7: River
 			8: Rock
 	Template@188:
 		Id: 188
-		Image: sh36
+		Image: sh36.des
 		Size: 1,1
 		Category: Beach
 		Tiles:
+			0: Clear
 	Template@189:
 		Id: 189
-		Image: sh37
+		Image: sh37.des
 		Size: 1,1
 		Category: Beach
 		Tiles:
+			0: Clear
 	Template@190:
 		Id: 190
-		Image: sh38
+		Image: sh38.des
 		Size: 1,1
 		Category: Beach
 		Tiles:
+			0: Clear
 	Template@191:
 		Id: 191
-		Image: sh39
+		Image: sh39.des
 		Size: 1,1
 		Category: Beach
 		Tiles:
+			0: Clear
 	Template@192:
 		Id: 192
-		Image: sh40
+		Image: sh40.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Clear
@@ -1614,7 +1832,7 @@ Templates:
 			8: Water
 	Template@193:
 		Id: 193
-		Image: sh41
+		Image: sh41.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1626,9 +1844,10 @@ Templates:
 			5: Clear
 			6: River
 			7: Rock
+			8: Clear
 	Template@194:
 		Id: 194
-		Image: sh42
+		Image: sh42.des
 		Size: 1,2
 		Category: Beach
 		Tiles:
@@ -1636,7 +1855,7 @@ Templates:
 			1: River
 	Template@195:
 		Id: 195
-		Image: sh43
+		Image: sh43.des
 		Size: 1,3
 		Category: Beach
 		Tiles:
@@ -1645,7 +1864,7 @@ Templates:
 			2: River
 	Template@196:
 		Id: 196
-		Image: sh44
+		Image: sh44.des
 		Size: 1,3
 		Category: Beach
 		Tiles:
@@ -1654,7 +1873,7 @@ Templates:
 			2: River
 	Template@197:
 		Id: 197
-		Image: sh45
+		Image: sh45.des
 		Size: 1,2
 		Category: Beach
 		Tiles:
@@ -1662,12 +1881,14 @@ Templates:
 			1: River
 	Template@198:
 		Id: 198
-		Image: sh46
+		Image: sh46.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: Clear
 			2: River
+			3: Clear
 			4: River
 			5: Water
 			6: River
@@ -1675,7 +1896,7 @@ Templates:
 			8: Water
 	Template@199:
 		Id: 199
-		Image: sh47
+		Image: sh47.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1688,7 +1909,7 @@ Templates:
 			8: River
 	Template@200:
 		Id: 200
-		Image: sh48
+		Image: sh48.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1699,7 +1920,7 @@ Templates:
 			8: River
 	Template@201:
 		Id: 201
-		Image: sh49
+		Image: sh49.des
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -1713,7 +1934,7 @@ Templates:
 			8: Rock
 	Template@202:
 		Id: 202
-		Image: sh50
+		Image: sh50.des
 		Size: 4,3
 		Category: Beach
 		Tiles:
@@ -1724,14 +1945,16 @@ Templates:
 			5: Rock
 			6: Rock
 			8: River
+			9: Clear
 	Template@203:
 		Id: 203
-		Image: sh51
+		Image: sh51.des
 		Size: 4,3
 		Category: Beach
 		Tiles:
 			0: River
 			1: Water
+			4: Clear
 			5: River
 			6: Water
 			8: Rock
@@ -1740,7 +1963,7 @@ Templates:
 			11: River
 	Template@204:
 		Id: 204
-		Image: sh52
+		Image: sh52.des
 		Size: 4,3
 		Category: Beach
 		Tiles:
@@ -1754,11 +1977,15 @@ Templates:
 			11: River
 	Template@205:
 		Id: 205
-		Image: sh53
+		Image: sh53.des
 		Size: 4,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
 			5: River
 			6: Water
 			7: Water
@@ -1768,10 +1995,11 @@ Templates:
 			11: River
 	Template@206:
 		Id: 206
-		Image: sh54
+		Image: sh54.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: Tree
 			2: River
 			3: River
@@ -1779,18 +2007,19 @@ Templates:
 			5: River
 	Template@207:
 		Id: 207
-		Image: sh55
+		Image: sh55.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
 			0: River
 			1: Rock
+			2: Clear
 			3: Water
 			4: River
 			5: River
 	Template@208:
 		Id: 208
-		Image: sh56
+		Image: sh56.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -1801,7 +2030,7 @@ Templates:
 			5: Rock
 	Template@209:
 		Id: 209
-		Image: sh57
+		Image: sh57.des
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -1811,20 +2040,22 @@ Templates:
 			5: River
 	Template@210:
 		Id: 210
-		Image: sh58
+		Image: sh58.des
 		Size: 2,3
 		Category: Beach
 		Tiles:
 			0: River
 			2: River
 			3: Water
+			4: Clear
 			5: River
 	Template@211:
 		Id: 211
-		Image: sh59
+		Image: sh59.des
 		Size: 2,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: River
@@ -1832,27 +2063,30 @@ Templates:
 			5: River
 	Template@212:
 		Id: 212
-		Image: sh60
+		Image: sh60.des
 		Size: 2,3
 		Category: Beach
 		Tiles:
 			0: Water
 			1: River
 			2: River
+			3: Clear
 			4: River
+			5: Clear
 	Template@213:
 		Id: 213
-		Image: sh61
+		Image: sh61.des
 		Size: 2,3
 		Category: Beach
 		Tiles:
 			0: River
+			1: Clear
 			2: Water
 			3: River
 			5: River
 	Template@214:
 		Id: 214
-		Image: sh62
+		Image: sh62.des
 		Size: 6,1
 		Category: Beach
 		Tiles:
@@ -1864,7 +2098,7 @@ Templates:
 			5: River
 	Template@215:
 		Id: 215
-		Image: sh63
+		Image: sh63.des
 		Size: 4,1
 		Category: Beach
 		Tiles:
diff --git a/mods/cnc/tilesets/jungle.yaml b/mods/cnc/tilesets/jungle.yaml
index 19d82bc13c..f9a20cce59 100644
--- a/mods/cnc/tilesets/jungle.yaml
+++ b/mods/cnc/tilesets/jungle.yaml
@@ -1,76 +1,71 @@
 General:
 	Name: Jungle
 	Id: JUNGLE
-	Extensions: .jun, .tem, .shp
 	Palette: jungle.pal
+	Extensions: .jun, .tem, .shp
 	WaterPaletteRotationBase: 32
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 
 Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 40, 92, 48
-		TargetTypes: Ground
-	TerrainType@Water:
-		Type: Water
-		IsWater: true
-		AcceptsSmudgeType:
-		Color: 92, 116, 164
-		TargetTypes: Water
-	TerrainType@Road:
-		Type: Road
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 64, 49
-		TargetTypes: Ground
-	TerrainType@Rock:
-		Type: Rock
-		AcceptsSmudgeType:
-		Color: 191, 199, 196
-		TargetTypes: Ground
-	TerrainType@Tree:
-		Type: Tree
-		AcceptsSmudgeType:
-		Color: 28, 32, 36
-		TargetTypes: Ground
-	TerrainType@River:
-		Type: River
-		AcceptsSmudgeType:
-		Color: 92, 140, 180
-		TargetTypes: Ground
-	TerrainType@Rough:
-		Type: Rough
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Wall:
-		Type: Wall
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 208, 192, 160
-		TargetTypes: Ground
 	TerrainType@Beach:
 		Type: Beach
-		AcceptsSmudgeType:
-		Color: 176, 156, 120
-		TargetTypes: Ground
-	TerrainType@Tiberium:
-		Type: Tiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 161, 226, 28
 		TargetTypes: Ground
+		Color: 255,176,156,120
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 252, 252
 		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,252,252
+	TerrainType@Clear:
+		Type: Clear
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,40,92,48
+	TerrainType@River:
+		Type: River
+		TargetTypes: Ground
+		Color: 255,92,140,180
+	TerrainType@Road:
+		Type: Road
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,64,49
+	TerrainType@Rock:
+		Type: Rock
+		TargetTypes: Ground
+		Color: 255,191,199,196
+	TerrainType@Rough:
+		Type: Rough
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,68,68,60
+	TerrainType@Tiberium:
+		Type: Tiberium
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,161,226,28
+	TerrainType@Tree:
+		Type: Tree
+		TargetTypes: Ground
+		Color: 255,28,32,36
+	TerrainType@Wall:
+		Type: Wall
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,208,192,160
+	TerrainType@Water:
+		Type: Water
+		TargetTypes: Water
+		IsWater: True
+		Color: 255,92,116,164
 
 Templates:
 	Template@255:
 		Id: 255
-		Image: clear1
+		Image: clear1.jun
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -90,10 +85,10 @@ Templates:
 			15: Clear
 	Template@65535:
 		Id: 65535
-		Image: clear1
+		Image: clear1.jun
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -112,11 +107,10 @@ Templates:
 			14: Clear
 			15: Clear
 	Template@0:
-		Id: 0
-		Image: clear1
+		Image: clear1.jun
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -136,14 +130,14 @@ Templates:
 			15: Clear
 	Template@1:
 		Id: 1
-		Image: w1
+		Image: w1.jun
 		Size: 1,1
 		Category: Terrain
 		Tiles:
 			0: Water
 	Template@2:
 		Id: 2
-		Image: w2
+		Image: w2.jun
 		Size: 2,2
 		Category: Terrain
 		Tiles:
@@ -153,20 +147,28 @@ Templates:
 			3: Water
 	Template@3:
 		Id: 3
-		Image: sh1
+		Image: sh1.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@4:
 		Id: 4
-		Image: sh2
+		Image: sh2.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
 			5: River
@@ -175,14 +177,14 @@ Templates:
 			8: Water
 	Template@5:
 		Id: 5
-		Image: sh3
+		Image: sh3.jun
 		Size: 1,1
 		Category: Beach
 		Tiles:
 			0: River
 	Template@6:
 		Id: 6
-		Image: sh4
+		Image: sh4.jun
 		Size: 2,1
 		Category: Beach
 		Tiles:
@@ -190,23 +192,29 @@ Templates:
 			1: River
 	Template@7:
 		Id: 7
-		Image: sh5
+		Image: sh5.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@8:
 		Id: 8
-		Image: sh11
+		Image: sh11.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: Rock
+			3: Clear
 			4: River
 			5: River
 			6: Water
@@ -214,7 +222,7 @@ Templates:
 			8: Water
 	Template@9:
 		Id: 9
-		Image: sh12
+		Image: sh12.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -222,11 +230,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Rock
+			4: Clear
+			5: Clear
 			6: Tree
 			7: Tree
+			8: Clear
 	Template@10:
 		Id: 10
-		Image: sh13
+		Image: sh13.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -234,12 +245,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Water
+			4: Clear
 			5: Rock
+			6: Clear
 			7: Rock
 			8: Road
 	Template@11:
 		Id: 11
-		Image: sh14
+		Image: sh14.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -249,10 +262,12 @@ Templates:
 			3: River
 			4: River
 			5: River
+			6: Clear
+			7: Clear
 			8: Tree
 	Template@12:
 		Id: 12
-		Image: sh15
+		Image: sh15.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -261,30 +276,34 @@ Templates:
 			3: River
 			4: Rock
 			5: Rock
+			6: Clear
 			7: Tree
+			8: Clear
 	Template@13:
 		Id: 13
-		Image: s01
+		Image: s01.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 			3: Rock
 	Template@14:
 		Id: 14
-		Image: s02
+		Image: s02.jun
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
 			5: Rock
 	Template@15:
 		Id: 15
-		Image: s03
+		Image: s03.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -294,7 +313,7 @@ Templates:
 			3: Rock
 	Template@16:
 		Id: 16
-		Image: s04
+		Image: s04.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -304,7 +323,7 @@ Templates:
 			3: Rock
 	Template@17:
 		Id: 17
-		Image: s05
+		Image: s05.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -314,17 +333,18 @@ Templates:
 			3: Rock
 	Template@18:
 		Id: 18
-		Image: s06
+		Image: s06.jun
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
 	Template@19:
 		Id: 19
-		Image: s07
+		Image: s07.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -334,27 +354,29 @@ Templates:
 			3: Rock
 	Template@20:
 		Id: 20
-		Image: s08
+		Image: s08.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@21:
 		Id: 21
-		Image: s09
+		Image: s09.jun
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@22:
 		Id: 22
-		Image: s10
+		Image: s10.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -364,7 +386,7 @@ Templates:
 			3: Rock
 	Template@23:
 		Id: 23
-		Image: s11
+		Image: s11.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -374,7 +396,7 @@ Templates:
 			3: Rock
 	Template@24:
 		Id: 24
-		Image: s12
+		Image: s12.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -384,74 +406,89 @@ Templates:
 			3: Rock
 	Template@25:
 		Id: 25
-		Image: s13
+		Image: s13.jun
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
+			2: Clear
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@26:
 		Id: 26
-		Image: s14
+		Image: s14.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
+			2: Clear
 	Template@27:
 		Id: 27
-		Image: s15
+		Image: s15.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@28:
 		Id: 28
-		Image: s16
+		Image: s16.jun
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			2: Rock
 			3: Rock
 			5: Rock
 	Template@29:
 		Id: 29
-		Image: s17
+		Image: s17.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@30:
 		Id: 30
-		Image: s18
+		Image: s18.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@31:
 		Id: 31
-		Image: s19
+		Image: s19.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@32:
 		Id: 32
-		Image: s20
+		Image: s20.jun
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@33:
 		Id: 33
-		Image: s21
+		Image: s21.jun
 		Size: 1,2
 		Category: Cliffs
 		Tiles:
@@ -459,7 +496,7 @@ Templates:
 			1: Rock
 	Template@34:
 		Id: 34
-		Image: s22
+		Image: s22.jun
 		Size: 2,1
 		Category: Cliffs
 		Tiles:
@@ -467,17 +504,19 @@ Templates:
 			1: Rock
 	Template@35:
 		Id: 35
-		Image: s23
+		Image: s23.jun
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@36:
 		Id: 36
-		Image: s24
+		Image: s24.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -487,7 +526,7 @@ Templates:
 			3: Rock
 	Template@37:
 		Id: 37
-		Image: s25
+		Image: s25.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -497,7 +536,7 @@ Templates:
 			3: Rock
 	Template@38:
 		Id: 38
-		Image: s26
+		Image: s26.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -507,17 +546,19 @@ Templates:
 			3: Rock
 	Template@39:
 		Id: 39
-		Image: s27
+		Image: s27.jun
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@40:
 		Id: 40
-		Image: s28
+		Image: s28.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -526,7 +567,7 @@ Templates:
 			3: Rock
 	Template@41:
 		Id: 41
-		Image: s29
+		Image: s29.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -536,24 +577,27 @@ Templates:
 			3: Rock
 	Template@42:
 		Id: 42
-		Image: s30
+		Image: s30.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@43:
 		Id: 43
-		Image: s31
+		Image: s31.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@44:
 		Id: 44
-		Image: s32
+		Image: s32.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -562,7 +606,7 @@ Templates:
 			2: Rock
 	Template@45:
 		Id: 45
-		Image: s33
+		Image: s33.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -572,7 +616,7 @@ Templates:
 			3: Rock
 	Template@46:
 		Id: 46
-		Image: s34
+		Image: s34.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -582,7 +626,7 @@ Templates:
 			3: Rock
 	Template@47:
 		Id: 47
-		Image: s35
+		Image: s35.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -592,7 +636,7 @@ Templates:
 			3: Rock
 	Template@48:
 		Id: 48
-		Image: s36
+		Image: s36.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -602,7 +646,7 @@ Templates:
 			3: Rock
 	Template@49:
 		Id: 49
-		Image: s37
+		Image: s37.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -612,7 +656,7 @@ Templates:
 			3: Rock
 	Template@50:
 		Id: 50
-		Image: s38
+		Image: s38.jun
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -622,62 +666,94 @@ Templates:
 			3: Rock
 	Template@51:
 		Id: 51
-		Image: sh32
+		Image: sh32.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@52:
 		Id: 52
-		Image: sh33
+		Image: sh33.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@67:
 		Id: 67
-		Image: p01
+		Image: p01.jun
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@68:
 		Id: 68
-		Image: p02
+		Image: p02.jun
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@69:
 		Id: 69
-		Image: p03
+		Image: p03.jun
 		Size: 1,1
+		PickAny: True
 		Category: Debris
 		Tiles:
 			0: Wall
+			1: Clear
+			2: Clear
 	Template@70:
 		Id: 70
-		Image: p04
+		Image: p04.jun
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@73:
 		Id: 73
-		Image: p07
+		Image: p07.jun
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
 	Template@74:
 		Id: 74
-		Image: p08
+		Image: p08.jun
 		Size: 3,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 	Template@75:
 		Id: 75
-		Image: sh16
+		Image: sh16.jun
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -689,7 +765,7 @@ Templates:
 			5: River
 	Template@76:
 		Id: 76
-		Image: sh17
+		Image: sh17.jun
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -699,7 +775,7 @@ Templates:
 			3: Water
 	Template@77:
 		Id: 77
-		Image: sh18
+		Image: sh18.jun
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -709,7 +785,7 @@ Templates:
 			3: Water
 	Template@79:
 		Id: 79
-		Image: p13
+		Image: p13.jun
 		Size: 3,2
 		Category: Debris
 		Tiles:
@@ -717,10 +793,11 @@ Templates:
 			1: Wall
 			2: Wall
 			3: Wall
+			4: Clear
 			5: Wall
 	Template@80:
 		Id: 80
-		Image: p14
+		Image: p14.jun
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -728,14 +805,14 @@ Templates:
 			1: Wall
 	Template@82:
 		Id: 82
-		Image: b1
+		Image: b1.jun
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@83:
 		Id: 83
-		Image: b2
+		Image: b2.jun
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -743,98 +820,131 @@ Templates:
 			1: Rock
 	Template@84:
 		Id: 84
-		Image: b3
+		Image: b3.jun
 		Size: 3,1
 		Category: Debris
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 	Template@88:
 		Id: 88
-		Image: sh6
+		Image: sh6.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@89:
 		Id: 89
-		Image: sh7
+		Image: sh7.jun
 		Size: 2,2
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Water
 	Template@90:
 		Id: 90
-		Image: sh8
+		Image: sh8.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
 			5: River
+			6: Clear
+			7: Clear
 			8: Water
 	Template@91:
 		Id: 91
-		Image: sh9
+		Image: sh9.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: River
+			8: Clear
 	Template@92:
 		Id: 92
-		Image: sh10
+		Image: sh10.jun
 		Size: 2,2
 		Category: Beach
 		Tiles:
 			0: River
+			1: Clear
 			2: Water
 			3: River
 	Template@93:
 		Id: 93
-		Image: d01
+		Image: d01.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 	Template@94:
 		Id: 94
-		Image: d02
+		Image: d02.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 	Template@95:
 		Id: 95
-		Image: d03
+		Image: d03.jun
 		Size: 1,2
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
 	Template@96:
 		Id: 96
-		Image: d04
+		Image: d04.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@97:
 		Id: 97
-		Image: d05
+		Image: d05.jun
 		Size: 3,4
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			6: Road
 			7: Road
+			9: Clear
 			10: Road
 	Template@98:
 		Id: 98
-		Image: d06
+		Image: d06.jun
 		Size: 2,3
 		Category: Road
 		Tiles:
@@ -842,38 +952,51 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 	Template@99:
 		Id: 99
-		Image: d07
+		Image: d07.jun
 		Size: 3,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			4: Road
+			5: Clear
 	Template@100:
 		Id: 100
-		Image: d08
+		Image: d08.jun
 		Size: 3,2
 		Category: Road
 		Tiles:
 			1: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@101:
 		Id: 101
-		Image: d09
+		Image: d09.jun
 		Size: 4,3
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
+			10: Clear
+			11: Clear
 	Template@102:
 		Id: 102
-		Image: d10
+		Image: d10.jun
 		Size: 4,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Rock
 			4: Road
 			5: Road
@@ -881,39 +1004,47 @@ Templates:
 			7: Road
 	Template@103:
 		Id: 103
-		Image: d11
+		Image: d11.jun
 		Size: 2,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
+			4: Clear
 	Template@104:
 		Id: 104
-		Image: d12
+		Image: d12.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@105:
 		Id: 105
-		Image: d13
+		Image: d13.jun
 		Size: 4,3
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			2: Clear
+			4: Clear
 			5: Road
 			6: Road
+			7: Clear
 			10: Wall
 			11: Road
 	Template@106:
 		Id: 106
-		Image: d14
+		Image: d14.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Wall
 			5: Road
 			6: Road
@@ -921,7 +1052,7 @@ Templates:
 			8: Road
 	Template@107:
 		Id: 107
-		Image: d15
+		Image: d15.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
@@ -930,246 +1061,317 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@108:
 		Id: 108
-		Image: d16
+		Image: d16.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
+			7: Clear
 			8: Wall
 	Template@109:
 		Id: 109
-		Image: d17
+		Image: d17.jun
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@110:
 		Id: 110
-		Image: d18
+		Image: d18.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Wall
 	Template@111:
 		Id: 111
-		Image: d19
+		Image: d19.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: Road
+			8: Clear
 	Template@112:
 		Id: 112
-		Image: d20
+		Image: d20.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Road
 	Template@113:
 		Id: 113
-		Image: d21
+		Image: d21.jun
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Rock
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@114:
 		Id: 114
-		Image: d22
+		Image: d22.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
+			8: Clear
 	Template@115:
 		Id: 115
-		Image: d23
+		Image: d23.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@116:
 		Id: 116
-		Image: d24
+		Image: d24.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@117:
 		Id: 117
-		Image: d25
+		Image: d25.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@118:
 		Id: 118
-		Image: d26
+		Image: d26.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@119:
 		Id: 119
-		Image: d27
+		Image: d27.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@120:
 		Id: 120
-		Image: d28
+		Image: d28.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@121:
 		Id: 121
-		Image: d29
+		Image: d29.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@122:
 		Id: 122
-		Image: d30
+		Image: d30.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			2: Road
 	Template@123:
 		Id: 123
-		Image: d31
+		Image: d31.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Road
 	Template@124:
 		Id: 124
-		Image: d32
+		Image: d32.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@125:
 		Id: 125
-		Image: d33
+		Image: d33.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
 	Template@126:
 		Id: 126
-		Image: d34
+		Image: d34.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
 	Template@127:
 		Id: 127
-		Image: d35
+		Image: d35.jun
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@128:
 		Id: 128
-		Image: d36
+		Image: d36.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@129:
 		Id: 129
-		Image: d37
+		Image: d37.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@130:
 		Id: 130
-		Image: d38
+		Image: d38.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@131:
 		Id: 131
-		Image: d39
+		Image: d39.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@132:
 		Id: 132
-		Image: d40
+		Image: d40.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			3: Clear
 	Template@133:
 		Id: 133
-		Image: d41
+		Image: d41.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Wall
 			2: Road
+			3: Clear
 	Template@134:
 		Id: 134
-		Image: d42
+		Image: d42.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
+			3: Clear
 	Template@135:
 		Id: 135
-		Image: d43
+		Image: d43.jun
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@136:
 		Id: 136
-		Image: rv01
+		Image: rv01.jun
 		Size: 5,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			5: Rock
 			6: River
@@ -1182,9 +1384,10 @@ Templates:
 			13: Rock
 			14: River
 			16: Wall
+			17: Clear
 	Template@137:
 		Id: 137
-		Image: rv02
+		Image: rv02.jun
 		Size: 5,3
 		Category: River
 		Tiles:
@@ -1200,26 +1403,35 @@ Templates:
 			9: River
 			10: River
 			11: Rock
+			12: Clear
 	Template@138:
 		Id: 138
-		Image: rv03
+		Image: rv03.jun
 		Size: 4,4
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			4: River
 			5: River
 			6: River
+			7: Clear
+			8: Clear
 			9: River
 			10: River
 			11: River
+			13: Clear
+			14: Clear
 			15: River
 	Template@139:
 		Id: 139
-		Image: rv04
+		Image: rv04.jun
 		Size: 4,4
 		Category: River
 		Tiles:
 			2: Wall
+			3: Clear
+			5: Clear
 			6: River
 			7: River
 			8: River
@@ -1231,12 +1443,14 @@ Templates:
 			14: Rock
 	Template@140:
 		Id: 140
-		Image: rv05
+		Image: rv05.jun
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
+			3: Clear
 			4: River
 			5: River
 			6: Rock
@@ -1244,7 +1458,7 @@ Templates:
 			8: River
 	Template@141:
 		Id: 141
-		Image: rv06
+		Image: rv06.jun
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1253,9 +1467,10 @@ Templates:
 			2: Rock
 			3: Rock
 			4: River
+			5: Clear
 	Template@142:
 		Id: 142
-		Image: rv07
+		Image: rv07.jun
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1267,7 +1482,7 @@ Templates:
 			5: River
 	Template@143:
 		Id: 143
-		Image: rv08
+		Image: rv08.jun
 		Size: 2,2
 		Category: River
 		Tiles:
@@ -1277,36 +1492,41 @@ Templates:
 			3: River
 	Template@144:
 		Id: 144
-		Image: rv09
+		Image: rv09.jun
 		Size: 2,2
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
 			3: River
 	Template@145:
 		Id: 145
-		Image: rv10
+		Image: rv10.jun
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
+			2: Clear
 			3: River
 	Template@146:
 		Id: 146
-		Image: rv11
+		Image: rv11.jun
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
 			2: River
+			3: Clear
 	Template@147:
 		Id: 147
-		Image: rv12
+		Image: rv12.jun
 		Size: 3,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Rock
@@ -1315,14 +1535,17 @@ Templates:
 			6: River
 			7: River
 			8: Rock
+			9: Clear
 			10: River
 			11: River
 	Template@148:
 		Id: 148
-		Image: rv13
+		Image: rv13.jun
 		Size: 4,4
 		Category: River
 		Tiles:
+			2: Clear
+			3: Clear
 			4: River
 			5: River
 			6: River
@@ -1331,49 +1554,58 @@ Templates:
 			9: Rock
 			10: River
 			11: Rock
+			12: Clear
 			13: Rock
 			14: River
 			15: Rock
 	Template@161:
 		Id: 161
-		Image: ford1
+		Image: ford1.jun
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: River
 			8: River
 	Template@162:
 		Id: 162
-		Image: ford2
+		Image: ford2.jun
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Road
 			2: River
 			3: River
 			4: Road
 			5: River
+			6: Clear
 			7: Road
+			8: Clear
 	Template@163:
 		Id: 163
-		Image: falls1
+		Image: falls1.jun
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			2: River
 			3: River
 			4: River
 			5: River
+			6: Clear
 			7: Rock
 			8: Rock
 	Template@164:
 		Id: 164
-		Image: falls2
+		Image: falls2.jun
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1385,10 +1617,11 @@ Templates:
 			5: River
 	Template@165:
 		Id: 165
-		Image: bridge1
+		Image: bridge1.jun
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1399,13 +1632,16 @@ Templates:
 			10: Wall
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@166:
 		Id: 166
-		Image: bridge1d
+		Image: bridge1d.jun
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1416,14 +1652,19 @@ Templates:
 			10: River
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@167:
 		Id: 167
-		Image: bridge2
+		Image: bridge2.jun
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Road
 			7: Wall
@@ -1433,16 +1674,24 @@ Templates:
 			11: Wall
 			12: Road
 			13: Wall
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@168:
 		Id: 168
-		Image: bridge2d
+		Image: bridge2d.jun
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Wall
 			7: River
@@ -1452,40 +1701,55 @@ Templates:
 			11: River
 			12: River
 			13: River
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@186:
 		Id: 186
-		Image: sh34
+		Image: sh34.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Water
+			3: Clear
+			4: Clear
 			5: Water
+			6: Clear
+			7: Clear
 			8: Water
 	Template@187:
 		Id: 187
-		Image: sh35
+		Image: sh35.jun
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
 			1: River
+			2: Clear
 			3: Water
 			4: River
+			5: Clear
 			6: Water
+			7: Clear
+			8: Clear
 	Template@188:
 		Id: 188
-		Image: a10cr
+		Image: a10cr.tem
 		Size: 4,2
 		Category: Debris
 		Tiles:
 			1: Tree
+			2: Tree
+			3: Tree
+			4: Tree
 			5: Tree
 			6: Tree
 			7: Tree
-			3: Tree
-			2: Tree
-			4: Tree
 
diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml
index b5cf00bdff..f3c26af9bc 100644
--- a/mods/cnc/tilesets/snow.yaml
+++ b/mods/cnc/tilesets/snow.yaml
@@ -1,76 +1,71 @@
 General:
 	Name: Snow
 	Id: SNOW
-	Extensions: .sno, .shp, .tem
 	Palette: snow.pal
+	Extensions: .sno, .shp, .tem
 	WaterPaletteRotationBase: 32
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 
 Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 196, 196, 196
-		TargetTypes: Ground
-	TerrainType@Water:
-		Type: Water
-		IsWater: true
-		AcceptsSmudgeType:
-		Color: 92, 116, 164
-		TargetTypes: Water
-	TerrainType@Road:
-		Type: Road
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 88, 116, 116
-		TargetTypes: Ground
-	TerrainType@Rock:
-		Type: Rock
-		AcceptsSmudgeType:
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Tree:
-		Type: Tree
-		AcceptsSmudgeType:
-		Color: 28, 32, 36
-		TargetTypes: Ground
-	TerrainType@River:
-		Type: River
-		AcceptsSmudgeType:
-		Color: 92, 140, 180
-		TargetTypes: Ground
-	TerrainType@Rough:
-		Type: Rough
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Wall:
-		Type: Wall
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 208, 192, 160
-		TargetTypes: Ground
 	TerrainType@Beach:
 		Type: Beach
-		AcceptsSmudgeType:
-		Color: 176, 156, 120
-		TargetTypes: Ground
-	TerrainType@Tiberium:
-		Type: Tiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 161, 226, 28
 		TargetTypes: Ground
+		Color: 255,176,156,120
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 252, 252
 		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,252,252
+	TerrainType@Clear:
+		Type: Clear
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,196,196,196
+	TerrainType@River:
+		Type: River
+		TargetTypes: Ground
+		Color: 255,92,140,180
+	TerrainType@Road:
+		Type: Road
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,88,116,116
+	TerrainType@Rock:
+		Type: Rock
+		TargetTypes: Ground
+		Color: 255,68,68,60
+	TerrainType@Rough:
+		Type: Rough
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,68,68,60
+	TerrainType@Tiberium:
+		Type: Tiberium
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,161,226,28
+	TerrainType@Tree:
+		Type: Tree
+		TargetTypes: Ground
+		Color: 255,28,32,36
+	TerrainType@Wall:
+		Type: Wall
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,208,192,160
+	TerrainType@Water:
+		Type: Water
+		TargetTypes: Water
+		IsWater: True
+		Color: 255,92,116,164
 
 Templates:
 	Template@255:
 		Id: 255
-		Image: clear1
+		Image: clear1.sno
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -88,12 +83,16 @@ Templates:
 			13: Clear
 			14: Clear
 			15: Clear
+			16: Clear
+			17: Clear
+			18: Clear
+			19: Clear
 	Template@65535:
 		Id: 65535
-		Image: clear1
+		Image: clear1.sno
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -111,12 +110,15 @@ Templates:
 			13: Clear
 			14: Clear
 			15: Clear
+			16: Clear
+			17: Clear
+			18: Clear
+			19: Clear
 	Template@0:
-		Id: 0
-		Image: clear1
+		Image: clear1.sno
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -134,16 +136,20 @@ Templates:
 			13: Clear
 			14: Clear
 			15: Clear
+			16: Clear
+			17: Clear
+			18: Clear
+			19: Clear
 	Template@1:
 		Id: 1
-		Image: w1
+		Image: w1.sno
 		Size: 1,1
 		Category: Terrain
 		Tiles:
 			0: Water
 	Template@2:
 		Id: 2
-		Image: w2
+		Image: w2.sno
 		Size: 2,2
 		Category: Terrain
 		Tiles:
@@ -153,20 +159,28 @@ Templates:
 			3: Water
 	Template@3:
 		Id: 3
-		Image: sh1
+		Image: sh1.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@4:
 		Id: 4
-		Image: sh2
+		Image: sh2.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
 			5: River
@@ -175,14 +189,14 @@ Templates:
 			8: Water
 	Template@5:
 		Id: 5
-		Image: sh3
+		Image: sh3.sno
 		Size: 1,1
 		Category: Beach
 		Tiles:
 			0: River
 	Template@6:
 		Id: 6
-		Image: sh4
+		Image: sh4.sno
 		Size: 2,1
 		Category: Beach
 		Tiles:
@@ -190,23 +204,29 @@ Templates:
 			1: River
 	Template@7:
 		Id: 7
-		Image: sh5
+		Image: sh5.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@8:
 		Id: 8
-		Image: sh11
+		Image: sh11.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: Rock
+			3: Clear
 			4: River
 			5: River
 			6: Water
@@ -214,7 +234,7 @@ Templates:
 			8: Water
 	Template@9:
 		Id: 9
-		Image: sh12
+		Image: sh12.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -222,11 +242,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Rock
+			4: Clear
+			5: Clear
 			6: Tree
 			7: Tree
+			8: Clear
 	Template@10:
 		Id: 10
-		Image: sh13
+		Image: sh13.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -234,12 +257,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Water
+			4: Clear
 			5: Rock
+			6: Clear
 			7: Rock
 			8: Road
 	Template@11:
 		Id: 11
-		Image: sh14
+		Image: sh14.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -249,10 +274,12 @@ Templates:
 			3: River
 			4: River
 			5: River
+			6: Clear
+			7: Clear
 			8: Tree
 	Template@12:
 		Id: 12
-		Image: sh15
+		Image: sh15.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -261,30 +288,34 @@ Templates:
 			3: River
 			4: Rock
 			5: Rock
+			6: Clear
 			7: Tree
+			8: Clear
 	Template@13:
 		Id: 13
-		Image: s01
+		Image: s01.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 			3: Rock
 	Template@14:
 		Id: 14
-		Image: s02
+		Image: s02.sno
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
 			5: Rock
 	Template@15:
 		Id: 15
-		Image: s03
+		Image: s03.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -294,7 +325,7 @@ Templates:
 			3: Rock
 	Template@16:
 		Id: 16
-		Image: s04
+		Image: s04.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -304,7 +335,7 @@ Templates:
 			3: Rock
 	Template@17:
 		Id: 17
-		Image: s05
+		Image: s05.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -314,17 +345,18 @@ Templates:
 			3: Rock
 	Template@18:
 		Id: 18
-		Image: s06
+		Image: s06.sno
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
 	Template@19:
 		Id: 19
-		Image: s07
+		Image: s07.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -334,27 +366,29 @@ Templates:
 			3: Rock
 	Template@20:
 		Id: 20
-		Image: s08
+		Image: s08.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@21:
 		Id: 21
-		Image: s09
+		Image: s09.sno
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@22:
 		Id: 22
-		Image: s10
+		Image: s10.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -364,7 +398,7 @@ Templates:
 			3: Rock
 	Template@23:
 		Id: 23
-		Image: s11
+		Image: s11.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -374,7 +408,7 @@ Templates:
 			3: Rock
 	Template@24:
 		Id: 24
-		Image: s12
+		Image: s12.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -384,74 +418,89 @@ Templates:
 			3: Rock
 	Template@25:
 		Id: 25
-		Image: s13
+		Image: s13.sno
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
+			2: Clear
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@26:
 		Id: 26
-		Image: s14
+		Image: s14.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
+			2: Clear
 	Template@27:
 		Id: 27
-		Image: s15
+		Image: s15.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@28:
 		Id: 28
-		Image: s16
+		Image: s16.sno
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			2: Rock
 			3: Rock
 			5: Rock
 	Template@29:
 		Id: 29
-		Image: s17
+		Image: s17.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@30:
 		Id: 30
-		Image: s18
+		Image: s18.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@31:
 		Id: 31
-		Image: s19
+		Image: s19.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@32:
 		Id: 32
-		Image: s20
+		Image: s20.sno
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@33:
 		Id: 33
-		Image: s21
+		Image: s21.sno
 		Size: 1,2
 		Category: Cliffs
 		Tiles:
@@ -459,7 +508,7 @@ Templates:
 			1: Rock
 	Template@34:
 		Id: 34
-		Image: s22
+		Image: s22.sno
 		Size: 2,1
 		Category: Cliffs
 		Tiles:
@@ -467,17 +516,19 @@ Templates:
 			1: Rock
 	Template@35:
 		Id: 35
-		Image: s23
+		Image: s23.sno
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@36:
 		Id: 36
-		Image: s24
+		Image: s24.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -487,7 +538,7 @@ Templates:
 			3: Rock
 	Template@37:
 		Id: 37
-		Image: s25
+		Image: s25.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -497,7 +548,7 @@ Templates:
 			3: Rock
 	Template@38:
 		Id: 38
-		Image: s26
+		Image: s26.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -507,17 +558,19 @@ Templates:
 			3: Rock
 	Template@39:
 		Id: 39
-		Image: s27
+		Image: s27.sno
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@40:
 		Id: 40
-		Image: s28
+		Image: s28.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -526,7 +579,7 @@ Templates:
 			3: Rock
 	Template@41:
 		Id: 41
-		Image: s29
+		Image: s29.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -536,24 +589,27 @@ Templates:
 			3: Rock
 	Template@42:
 		Id: 42
-		Image: s30
+		Image: s30.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@43:
 		Id: 43
-		Image: s31
+		Image: s31.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@44:
 		Id: 44
-		Image: s32
+		Image: s32.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -562,7 +618,7 @@ Templates:
 			2: Rock
 	Template@45:
 		Id: 45
-		Image: s33
+		Image: s33.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -572,7 +628,7 @@ Templates:
 			3: Rock
 	Template@46:
 		Id: 46
-		Image: s34
+		Image: s34.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -582,7 +638,7 @@ Templates:
 			3: Rock
 	Template@47:
 		Id: 47
-		Image: s35
+		Image: s35.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -592,7 +648,7 @@ Templates:
 			3: Rock
 	Template@48:
 		Id: 48
-		Image: s36
+		Image: s36.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -602,7 +658,7 @@ Templates:
 			3: Rock
 	Template@49:
 		Id: 49
-		Image: s37
+		Image: s37.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -612,7 +668,7 @@ Templates:
 			3: Rock
 	Template@50:
 		Id: 50
-		Image: s38
+		Image: s38.sno
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -622,62 +678,94 @@ Templates:
 			3: Rock
 	Template@51:
 		Id: 51
-		Image: sh32
+		Image: sh32.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@52:
 		Id: 52
-		Image: sh33
+		Image: sh33.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@67:
 		Id: 67
-		Image: p01
+		Image: p01.sno
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@68:
 		Id: 68
-		Image: p02
+		Image: p02.sno
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@69:
 		Id: 69
-		Image: p03
+		Image: p03.sno
 		Size: 1,1
+		PickAny: True
 		Category: Debris
 		Tiles:
 			0: Wall
+			1: Clear
+			2: Clear
 	Template@70:
 		Id: 70
-		Image: p04
+		Image: p04.sno
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@73:
 		Id: 73
-		Image: p07
+		Image: p07.sno
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
 	Template@74:
 		Id: 74
-		Image: p08
+		Image: p08.sno
 		Size: 3,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 	Template@75:
 		Id: 75
-		Image: sh16
+		Image: sh16.sno
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -689,7 +777,7 @@ Templates:
 			5: River
 	Template@76:
 		Id: 76
-		Image: sh17
+		Image: sh17.sno
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -699,7 +787,7 @@ Templates:
 			3: Water
 	Template@77:
 		Id: 77
-		Image: sh18
+		Image: sh18.sno
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -709,7 +797,7 @@ Templates:
 			3: Water
 	Template@79:
 		Id: 79
-		Image: p13
+		Image: p13.sno
 		Size: 3,2
 		Category: Debris
 		Tiles:
@@ -717,10 +805,11 @@ Templates:
 			1: Wall
 			2: Wall
 			3: Wall
+			4: Clear
 			5: Wall
 	Template@80:
 		Id: 80
-		Image: p14
+		Image: p14.sno
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -728,14 +817,14 @@ Templates:
 			1: Wall
 	Template@82:
 		Id: 82
-		Image: b1
+		Image: b1.sno
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@83:
 		Id: 83
-		Image: b2
+		Image: b2.sno
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -743,7 +832,7 @@ Templates:
 			1: Rock
 	Template@84:
 		Id: 84
-		Image: b3
+		Image: b3.sno
 		Size: 3,1
 		Category: Debris
 		Tiles:
@@ -752,90 +841,122 @@ Templates:
 			2: Rock
 	Template@88:
 		Id: 88
-		Image: sh6
+		Image: sh6.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@89:
 		Id: 89
-		Image: sh7
+		Image: sh7.sno
 		Size: 2,2
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Water
 	Template@90:
 		Id: 90
-		Image: sh8
+		Image: sh8.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
 			5: River
+			6: Clear
+			7: Clear
 			8: Water
 	Template@91:
 		Id: 91
-		Image: sh9
+		Image: sh9.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: River
+			8: Clear
 	Template@92:
 		Id: 92
-		Image: sh10
+		Image: sh10.sno
 		Size: 2,2
 		Category: Beach
 		Tiles:
 			0: River
+			1: Clear
 			2: Water
 			3: River
 	Template@93:
 		Id: 93
-		Image: d01
+		Image: d01.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 	Template@94:
 		Id: 94
-		Image: d02
+		Image: d02.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 	Template@95:
 		Id: 95
-		Image: d03
+		Image: d03.sno
 		Size: 1,2
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
 	Template@96:
 		Id: 96
-		Image: d04
+		Image: d04.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@97:
 		Id: 97
-		Image: d05
+		Image: d05.sno
 		Size: 3,4
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			6: Road
 			7: Road
+			9: Clear
 			10: Road
 	Template@98:
 		Id: 98
-		Image: d06
+		Image: d06.sno
 		Size: 2,3
 		Category: Road
 		Tiles:
@@ -843,38 +964,51 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 	Template@99:
 		Id: 99
-		Image: d07
+		Image: d07.sno
 		Size: 3,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			4: Road
+			5: Clear
 	Template@100:
 		Id: 100
-		Image: d08
+		Image: d08.sno
 		Size: 3,2
 		Category: Road
 		Tiles:
 			1: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@101:
 		Id: 101
-		Image: d09
+		Image: d09.sno
 		Size: 4,3
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
+			10: Clear
+			11: Clear
 	Template@102:
 		Id: 102
-		Image: d10
+		Image: d10.sno
 		Size: 4,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Rock
 			4: Road
 			5: Road
@@ -882,39 +1016,47 @@ Templates:
 			7: Road
 	Template@103:
 		Id: 103
-		Image: d11
+		Image: d11.sno
 		Size: 2,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
+			4: Clear
 	Template@104:
 		Id: 104
-		Image: d12
+		Image: d12.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@105:
 		Id: 105
-		Image: d13
+		Image: d13.sno
 		Size: 4,3
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			2: Clear
+			4: Clear
 			5: Road
 			6: Road
+			7: Clear
 			10: Wall
 			11: Road
 	Template@106:
 		Id: 106
-		Image: d14
+		Image: d14.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Wall
 			5: Road
 			6: Road
@@ -922,7 +1064,7 @@ Templates:
 			8: Road
 	Template@107:
 		Id: 107
-		Image: d15
+		Image: d15.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
@@ -931,246 +1073,317 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@108:
 		Id: 108
-		Image: d16
+		Image: d16.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
+			7: Clear
 			8: Wall
 	Template@109:
 		Id: 109
-		Image: d17
+		Image: d17.sno
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@110:
 		Id: 110
-		Image: d18
+		Image: d18.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Wall
 	Template@111:
 		Id: 111
-		Image: d19
+		Image: d19.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: Road
+			8: Clear
 	Template@112:
 		Id: 112
-		Image: d20
+		Image: d20.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Road
 	Template@113:
 		Id: 113
-		Image: d21
+		Image: d21.sno
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Rock
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@114:
 		Id: 114
-		Image: d22
+		Image: d22.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
+			8: Clear
 	Template@115:
 		Id: 115
-		Image: d23
+		Image: d23.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@116:
 		Id: 116
-		Image: d24
+		Image: d24.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@117:
 		Id: 117
-		Image: d25
+		Image: d25.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@118:
 		Id: 118
-		Image: d26
+		Image: d26.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@119:
 		Id: 119
-		Image: d27
+		Image: d27.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@120:
 		Id: 120
-		Image: d28
+		Image: d28.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@121:
 		Id: 121
-		Image: d29
+		Image: d29.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@122:
 		Id: 122
-		Image: d30
+		Image: d30.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			2: Road
 	Template@123:
 		Id: 123
-		Image: d31
+		Image: d31.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Road
 	Template@124:
 		Id: 124
-		Image: d32
+		Image: d32.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@125:
 		Id: 125
-		Image: d33
+		Image: d33.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
 	Template@126:
 		Id: 126
-		Image: d34
+		Image: d34.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
 	Template@127:
 		Id: 127
-		Image: d35
+		Image: d35.sno
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@128:
 		Id: 128
-		Image: d36
+		Image: d36.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@129:
 		Id: 129
-		Image: d37
+		Image: d37.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@130:
 		Id: 130
-		Image: d38
+		Image: d38.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@131:
 		Id: 131
-		Image: d39
+		Image: d39.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@132:
 		Id: 132
-		Image: d40
+		Image: d40.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			3: Clear
 	Template@133:
 		Id: 133
-		Image: d41
+		Image: d41.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Wall
 			2: Road
+			3: Clear
 	Template@134:
 		Id: 134
-		Image: d42
+		Image: d42.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
+			3: Clear
 	Template@135:
 		Id: 135
-		Image: d43
+		Image: d43.sno
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@136:
 		Id: 136
-		Image: rv01
+		Image: rv01.sno
 		Size: 5,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			5: Rock
 			6: River
@@ -1183,9 +1396,10 @@ Templates:
 			13: Rock
 			14: River
 			16: Wall
+			17: Clear
 	Template@137:
 		Id: 137
-		Image: rv02
+		Image: rv02.sno
 		Size: 5,3
 		Category: River
 		Tiles:
@@ -1201,26 +1415,35 @@ Templates:
 			9: River
 			10: River
 			11: Rock
+			12: Clear
 	Template@138:
 		Id: 138
-		Image: rv03
+		Image: rv03.sno
 		Size: 4,4
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			4: River
 			5: River
 			6: River
+			7: Clear
+			8: Clear
 			9: River
 			10: River
 			11: River
+			13: Clear
+			14: Clear
 			15: River
 	Template@139:
 		Id: 139
-		Image: rv04
+		Image: rv04.sno
 		Size: 4,4
 		Category: River
 		Tiles:
 			2: Wall
+			3: Clear
+			5: Clear
 			6: River
 			7: River
 			8: River
@@ -1232,12 +1455,14 @@ Templates:
 			14: Rock
 	Template@140:
 		Id: 140
-		Image: rv05
+		Image: rv05.sno
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
+			3: Clear
 			4: River
 			5: River
 			6: Rock
@@ -1245,7 +1470,7 @@ Templates:
 			8: River
 	Template@141:
 		Id: 141
-		Image: rv06
+		Image: rv06.sno
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1254,9 +1479,10 @@ Templates:
 			2: Rock
 			3: Rock
 			4: River
+			5: Clear
 	Template@142:
 		Id: 142
-		Image: rv07
+		Image: rv07.sno
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1268,7 +1494,7 @@ Templates:
 			5: River
 	Template@143:
 		Id: 143
-		Image: rv08
+		Image: rv08.sno
 		Size: 2,2
 		Category: River
 		Tiles:
@@ -1278,36 +1504,41 @@ Templates:
 			3: River
 	Template@144:
 		Id: 144
-		Image: rv09
+		Image: rv09.sno
 		Size: 2,2
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
 			3: River
 	Template@145:
 		Id: 145
-		Image: rv10
+		Image: rv10.sno
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
+			2: Clear
 			3: River
 	Template@146:
 		Id: 146
-		Image: rv11
+		Image: rv11.sno
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
 			2: River
+			3: Clear
 	Template@147:
 		Id: 147
-		Image: rv12
+		Image: rv12.sno
 		Size: 3,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Rock
@@ -1316,14 +1547,17 @@ Templates:
 			6: River
 			7: River
 			8: Rock
+			9: Clear
 			10: River
 			11: River
 	Template@148:
 		Id: 148
-		Image: rv13
+		Image: rv13.sno
 		Size: 4,4
 		Category: River
 		Tiles:
+			2: Clear
+			3: Clear
 			4: River
 			5: River
 			6: River
@@ -1332,49 +1566,58 @@ Templates:
 			9: Rock
 			10: River
 			11: Rock
+			12: Clear
 			13: Rock
 			14: River
 			15: Rock
 	Template@161:
 		Id: 161
-		Image: ford1
+		Image: ford1.sno
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: River
 			8: River
 	Template@162:
 		Id: 162
-		Image: ford2
+		Image: ford2.sno
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Road
 			2: River
 			3: River
 			4: Road
 			5: River
+			6: Clear
 			7: Road
+			8: Clear
 	Template@163:
 		Id: 163
-		Image: falls1
+		Image: falls1.sno
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			2: River
 			3: River
 			4: River
 			5: River
+			6: Clear
 			7: Rock
 			8: Rock
 	Template@164:
 		Id: 164
-		Image: falls2
+		Image: falls2.sno
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1386,10 +1629,11 @@ Templates:
 			5: River
 	Template@165:
 		Id: 165
-		Image: bridge1
+		Image: bridge1.sno
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1400,13 +1644,16 @@ Templates:
 			10: Wall
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@166:
 		Id: 166
-		Image: bridge1d
+		Image: bridge1d.sno
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1417,14 +1664,19 @@ Templates:
 			10: River
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@167:
 		Id: 167
-		Image: bridge2
+		Image: bridge2.sno
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Road
 			7: Wall
@@ -1434,16 +1686,24 @@ Templates:
 			11: Wall
 			12: Road
 			13: Wall
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@168:
 		Id: 168
-		Image: bridge2d
+		Image: bridge2d.sno
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Wall
 			7: River
@@ -1453,27 +1713,42 @@ Templates:
 			11: River
 			12: River
 			13: River
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@186:
 		Id: 186
-		Image: sh34
+		Image: sh34.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Water
+			3: Clear
+			4: Clear
 			5: Water
+			6: Clear
+			7: Clear
 			8: Water
 	Template@187:
 		Id: 187
-		Image: sh35
+		Image: sh35.sno
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
 			1: River
+			2: Clear
 			3: Water
 			4: River
+			5: Clear
 			6: Water
+			7: Clear
+			8: Clear
 
diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml
index 35ce5ec31d..a8f6362ab3 100644
--- a/mods/cnc/tilesets/temperat.yaml
+++ b/mods/cnc/tilesets/temperat.yaml
@@ -1,76 +1,71 @@
 General:
 	Name: Temperate
 	Id: TEMPERAT
-	Extensions: .tem, .shp
 	Palette: temperat.pal
+	Extensions: .tem, .shp
 	WaterPaletteRotationBase: 32
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 
 Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 40, 68, 40
-		TargetTypes: Ground
-	TerrainType@Water:
-		Type: Water
-		IsWater: true
-		AcceptsSmudgeType:
-		Color: 92, 116, 164
-		TargetTypes: Water
-	TerrainType@Road:
-		Type: Road
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 88, 116, 116
-		TargetTypes: Ground
-	TerrainType@Rock:
-		Type: Rock
-		AcceptsSmudgeType:
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Tree:
-		Type: Tree
-		AcceptsSmudgeType:
-		Color: 28, 32, 36
-		TargetTypes: Ground
-	TerrainType@River:
-		Type: River
-		AcceptsSmudgeType:
-		Color: 92, 140, 180
-		TargetTypes: Ground
-	TerrainType@Rough:
-		Type: Rough
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Wall:
-		Type: Wall
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 208, 192, 160
-		TargetTypes: Ground
 	TerrainType@Beach:
 		Type: Beach
-		AcceptsSmudgeType:
-		Color: 176, 156, 120
-		TargetTypes: Ground
-	TerrainType@Tiberium:
-		Type: Tiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 161, 226, 28
 		TargetTypes: Ground
+		Color: 255,176,156,120
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 252, 252
 		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,252,252
+	TerrainType@Clear:
+		Type: Clear
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,40,68,40
+	TerrainType@River:
+		Type: River
+		TargetTypes: Ground
+		Color: 255,92,140,180
+	TerrainType@Road:
+		Type: Road
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,88,116,116
+	TerrainType@Rock:
+		Type: Rock
+		TargetTypes: Ground
+		Color: 255,68,68,60
+	TerrainType@Rough:
+		Type: Rough
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,68,68,60
+	TerrainType@Tiberium:
+		Type: Tiberium
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,161,226,28
+	TerrainType@Tree:
+		Type: Tree
+		TargetTypes: Ground
+		Color: 255,28,32,36
+	TerrainType@Wall:
+		Type: Wall
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,208,192,160
+	TerrainType@Water:
+		Type: Water
+		TargetTypes: Water
+		IsWater: True
+		Color: 255,92,116,164
 
 Templates:
 	Template@255:
 		Id: 255
-		Image: clear1
+		Image: clear1.tem
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -90,10 +85,10 @@ Templates:
 			15: Clear
 	Template@65535:
 		Id: 65535
-		Image: clear1
+		Image: clear1.tem
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -112,11 +107,10 @@ Templates:
 			14: Clear
 			15: Clear
 	Template@0:
-		Id: 0
-		Image: clear1
+		Image: clear1.tem
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -136,14 +130,14 @@ Templates:
 			15: Clear
 	Template@1:
 		Id: 1
-		Image: w1
+		Image: w1.tem
 		Size: 1,1
 		Category: Terrain
 		Tiles:
 			0: Water
 	Template@2:
 		Id: 2
-		Image: w2
+		Image: w2.tem
 		Size: 2,2
 		Category: Terrain
 		Tiles:
@@ -153,20 +147,28 @@ Templates:
 			3: Water
 	Template@3:
 		Id: 3
-		Image: sh1
+		Image: sh1.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@4:
 		Id: 4
-		Image: sh2
+		Image: sh2.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
 			5: River
@@ -175,14 +177,14 @@ Templates:
 			8: Water
 	Template@5:
 		Id: 5
-		Image: sh3
+		Image: sh3.tem
 		Size: 1,1
 		Category: Beach
 		Tiles:
 			0: River
 	Template@6:
 		Id: 6
-		Image: sh4
+		Image: sh4.tem
 		Size: 2,1
 		Category: Beach
 		Tiles:
@@ -190,23 +192,29 @@ Templates:
 			1: River
 	Template@7:
 		Id: 7
-		Image: sh5
+		Image: sh5.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@8:
 		Id: 8
-		Image: sh11
+		Image: sh11.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: Rock
+			3: Clear
 			4: River
 			5: River
 			6: Water
@@ -214,7 +222,7 @@ Templates:
 			8: Water
 	Template@9:
 		Id: 9
-		Image: sh12
+		Image: sh12.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -222,11 +230,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Rock
+			4: Clear
+			5: Clear
 			6: Tree
 			7: Tree
+			8: Clear
 	Template@10:
 		Id: 10
-		Image: sh13
+		Image: sh13.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -234,12 +245,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Water
+			4: Clear
 			5: Rock
+			6: Clear
 			7: Rock
 			8: Road
 	Template@11:
 		Id: 11
-		Image: sh14
+		Image: sh14.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -249,10 +262,12 @@ Templates:
 			3: River
 			4: River
 			5: River
+			6: Clear
+			7: Clear
 			8: Tree
 	Template@12:
 		Id: 12
-		Image: sh15
+		Image: sh15.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -261,30 +276,34 @@ Templates:
 			3: River
 			4: Rock
 			5: Rock
+			6: Clear
 			7: Tree
+			8: Clear
 	Template@13:
 		Id: 13
-		Image: s01
+		Image: s01.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 			3: Rock
 	Template@14:
 		Id: 14
-		Image: s02
+		Image: s02.tem
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
 			5: Rock
 	Template@15:
 		Id: 15
-		Image: s03
+		Image: s03.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -294,7 +313,7 @@ Templates:
 			3: Rock
 	Template@16:
 		Id: 16
-		Image: s04
+		Image: s04.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -304,7 +323,7 @@ Templates:
 			3: Rock
 	Template@17:
 		Id: 17
-		Image: s05
+		Image: s05.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -314,17 +333,18 @@ Templates:
 			3: Rock
 	Template@18:
 		Id: 18
-		Image: s06
+		Image: s06.tem
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
 	Template@19:
 		Id: 19
-		Image: s07
+		Image: s07.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -334,27 +354,29 @@ Templates:
 			3: Rock
 	Template@20:
 		Id: 20
-		Image: s08
+		Image: s08.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@21:
 		Id: 21
-		Image: s09
+		Image: s09.tem
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@22:
 		Id: 22
-		Image: s10
+		Image: s10.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -364,7 +386,7 @@ Templates:
 			3: Rock
 	Template@23:
 		Id: 23
-		Image: s11
+		Image: s11.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -374,7 +396,7 @@ Templates:
 			3: Rock
 	Template@24:
 		Id: 24
-		Image: s12
+		Image: s12.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -384,74 +406,89 @@ Templates:
 			3: Rock
 	Template@25:
 		Id: 25
-		Image: s13
+		Image: s13.tem
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
+			2: Clear
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@26:
 		Id: 26
-		Image: s14
+		Image: s14.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
+			2: Clear
 	Template@27:
 		Id: 27
-		Image: s15
+		Image: s15.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@28:
 		Id: 28
-		Image: s16
+		Image: s16.tem
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			2: Rock
 			3: Rock
 			5: Rock
 	Template@29:
 		Id: 29
-		Image: s17
+		Image: s17.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@30:
 		Id: 30
-		Image: s18
+		Image: s18.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@31:
 		Id: 31
-		Image: s19
+		Image: s19.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@32:
 		Id: 32
-		Image: s20
+		Image: s20.tem
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@33:
 		Id: 33
-		Image: s21
+		Image: s21.tem
 		Size: 1,2
 		Category: Cliffs
 		Tiles:
@@ -459,7 +496,7 @@ Templates:
 			1: Rock
 	Template@34:
 		Id: 34
-		Image: s22
+		Image: s22.tem
 		Size: 2,1
 		Category: Cliffs
 		Tiles:
@@ -467,17 +504,19 @@ Templates:
 			1: Rock
 	Template@35:
 		Id: 35
-		Image: s23
+		Image: s23.tem
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@36:
 		Id: 36
-		Image: s24
+		Image: s24.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -487,7 +526,7 @@ Templates:
 			3: Rock
 	Template@37:
 		Id: 37
-		Image: s25
+		Image: s25.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -497,7 +536,7 @@ Templates:
 			3: Rock
 	Template@38:
 		Id: 38
-		Image: s26
+		Image: s26.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -507,17 +546,19 @@ Templates:
 			3: Rock
 	Template@39:
 		Id: 39
-		Image: s27
+		Image: s27.tem
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@40:
 		Id: 40
-		Image: s28
+		Image: s28.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -526,7 +567,7 @@ Templates:
 			3: Rock
 	Template@41:
 		Id: 41
-		Image: s29
+		Image: s29.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -536,24 +577,27 @@ Templates:
 			3: Rock
 	Template@42:
 		Id: 42
-		Image: s30
+		Image: s30.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@43:
 		Id: 43
-		Image: s31
+		Image: s31.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@44:
 		Id: 44
-		Image: s32
+		Image: s32.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -562,7 +606,7 @@ Templates:
 			2: Rock
 	Template@45:
 		Id: 45
-		Image: s33
+		Image: s33.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -572,7 +616,7 @@ Templates:
 			3: Rock
 	Template@46:
 		Id: 46
-		Image: s34
+		Image: s34.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -582,7 +626,7 @@ Templates:
 			3: Rock
 	Template@47:
 		Id: 47
-		Image: s35
+		Image: s35.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -592,7 +636,7 @@ Templates:
 			3: Rock
 	Template@48:
 		Id: 48
-		Image: s36
+		Image: s36.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -602,7 +646,7 @@ Templates:
 			3: Rock
 	Template@49:
 		Id: 49
-		Image: s37
+		Image: s37.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -612,7 +656,7 @@ Templates:
 			3: Rock
 	Template@50:
 		Id: 50
-		Image: s38
+		Image: s38.tem
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -622,62 +666,297 @@ Templates:
 			3: Rock
 	Template@51:
 		Id: 51
-		Image: sh32
+		Image: sh32.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@52:
 		Id: 52
-		Image: sh33
+		Image: sh33.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@67:
 		Id: 67
-		Image: p01
+		Image: p01.tem
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@68:
 		Id: 68
-		Image: p02
+		Image: p02.tem
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Wall
 	Template@69:
 		Id: 69
-		Image: p03
+		Image: p03.tem
 		Size: 1,1
+		PickAny: True
 		Category: Debris
 		Tiles:
 			0: Wall
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
+			9: Clear
+			10: Clear
+			11: Clear
+			12: Clear
+			13: Clear
+			14: Clear
+			15: Clear
+			16: Clear
+			17: Clear
+			18: Clear
+			19: Clear
+			20: Clear
+			21: Clear
+			22: Clear
+			23: Clear
+			24: Clear
+			25: Clear
+			26: Clear
+			27: Clear
+			28: Clear
+			29: Clear
+			30: Clear
+			31: Clear
+			32: Clear
+			33: Clear
+			34: Clear
+			35: Clear
+			36: Clear
+			37: Clear
+			38: Clear
+			39: Clear
+			40: Clear
+			41: Clear
+			42: Clear
+			43: Clear
+			44: Clear
+			45: Clear
+			46: Clear
+			47: Clear
+			48: Clear
+			49: Clear
+			50: Clear
+			51: Clear
+			52: Clear
+			53: Clear
+			54: Clear
+			55: Clear
+			56: Clear
+			57: Clear
+			58: Clear
+			59: Clear
+			60: Clear
+			61: Clear
+			62: Clear
+			63: Clear
+			64: Clear
+			65: Clear
+			66: Clear
+			67: Clear
+			68: Clear
+			69: Clear
+			70: Clear
+			71: Clear
+			72: Clear
+			73: Clear
+			74: Clear
+			75: Clear
+			76: Clear
+			77: Clear
+			78: Clear
+			79: Clear
+			80: Clear
+			81: Clear
+			82: Clear
+			83: Clear
+			84: Clear
+			85: Clear
+			86: Clear
+			87: Clear
+			88: Clear
+			89: Clear
+			90: Clear
+			91: Clear
+			92: Clear
+			93: Clear
+			94: Clear
+			95: Clear
+			96: Clear
+			97: Clear
+			98: Clear
+			99: Clear
+			100: Clear
+			101: Clear
+			102: Clear
 	Template@70:
 		Id: 70
-		Image: p04
+		Image: p04.tem
 		Size: 1,1
+		PickAny: True
 		Category: Debris
 		Tiles:
 			0: Wall
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
+			9: Clear
+			10: Clear
+			11: Clear
+			12: Clear
+			13: Clear
+			14: Clear
+			15: Clear
+			16: Clear
+			17: Clear
+			18: Clear
+			19: Clear
+			20: Clear
+			21: Clear
+			22: Clear
+			23: Clear
+			24: Clear
+			25: Clear
+			26: Clear
+			27: Clear
+			28: Clear
+			29: Clear
+			30: Clear
+			31: Clear
+			32: Clear
+			33: Clear
+			34: Clear
+			35: Clear
+			36: Clear
+			37: Clear
+			38: Clear
+			39: Clear
+			40: Clear
+			41: Clear
+			42: Clear
+			43: Clear
+			44: Clear
+			45: Clear
+			46: Clear
+			47: Clear
+			48: Clear
+			49: Clear
+			50: Clear
+			51: Clear
+			52: Clear
+			53: Clear
+			54: Clear
+			55: Clear
+			56: Clear
+			57: Clear
+			58: Clear
+			59: Clear
+			60: Clear
+			61: Clear
+			62: Clear
+			63: Clear
+			64: Clear
+			65: Clear
+			66: Clear
+			67: Clear
+			68: Clear
+			69: Clear
+			70: Clear
+			71: Clear
+			72: Clear
+			73: Clear
+			74: Clear
+			75: Clear
+			76: Clear
+			77: Clear
+			78: Clear
+			79: Clear
+			80: Clear
+			81: Clear
+			82: Clear
+			83: Clear
+			84: Clear
+			85: Clear
+			86: Clear
+			87: Clear
+			88: Clear
+			89: Clear
+			90: Clear
+			91: Clear
+			92: Clear
+			93: Clear
+			94: Clear
+			95: Clear
+			96: Clear
+			97: Clear
+			98: Clear
+			99: Clear
+			100: Clear
+			101: Clear
+			102: Clear
 	Template@73:
 		Id: 73
-		Image: p07
+		Image: p07.tem
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
 	Template@74:
 		Id: 74
-		Image: p08
+		Image: p08.tem
 		Size: 3,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 	Template@75:
 		Id: 75
-		Image: sh16
+		Image: sh16.tem
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -689,7 +968,7 @@ Templates:
 			5: River
 	Template@76:
 		Id: 76
-		Image: sh17
+		Image: sh17.tem
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -699,7 +978,7 @@ Templates:
 			3: Water
 	Template@77:
 		Id: 77
-		Image: sh18
+		Image: sh18.tem
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -709,7 +988,7 @@ Templates:
 			3: Water
 	Template@79:
 		Id: 79
-		Image: p13
+		Image: p13.tem
 		Size: 3,2
 		Category: Debris
 		Tiles:
@@ -717,10 +996,11 @@ Templates:
 			1: Wall
 			2: Wall
 			3: Wall
+			4: Clear
 			5: Wall
 	Template@80:
 		Id: 80
-		Image: p14
+		Image: p14.tem
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -728,14 +1008,14 @@ Templates:
 			1: Wall
 	Template@82:
 		Id: 82
-		Image: b1
+		Image: b1.tem
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@83:
 		Id: 83
-		Image: b2
+		Image: b2.tem
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -743,98 +1023,131 @@ Templates:
 			1: Rock
 	Template@84:
 		Id: 84
-		Image: b3
+		Image: b3.tem
 		Size: 3,1
 		Category: Debris
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 	Template@88:
 		Id: 88
-		Image: sh6
+		Image: sh6.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@89:
 		Id: 89
-		Image: sh7
+		Image: sh7.tem
 		Size: 2,2
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Water
 	Template@90:
 		Id: 90
-		Image: sh8
+		Image: sh8.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
 			5: River
+			6: Clear
+			7: Clear
 			8: Water
 	Template@91:
 		Id: 91
-		Image: sh9
+		Image: sh9.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: River
+			8: Clear
 	Template@92:
 		Id: 92
-		Image: sh10
+		Image: sh10.tem
 		Size: 2,2
 		Category: Beach
 		Tiles:
 			0: River
+			1: Clear
 			2: Water
 			3: River
 	Template@93:
 		Id: 93
-		Image: d01
+		Image: d01.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 	Template@94:
 		Id: 94
-		Image: d02
+		Image: d02.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 	Template@95:
 		Id: 95
-		Image: d03
+		Image: d03.tem
 		Size: 1,2
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
 	Template@96:
 		Id: 96
-		Image: d04
+		Image: d04.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@97:
 		Id: 97
-		Image: d05
+		Image: d05.tem
 		Size: 3,4
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			6: Road
 			7: Road
+			9: Clear
 			10: Road
 	Template@98:
 		Id: 98
-		Image: d06
+		Image: d06.tem
 		Size: 2,3
 		Category: Road
 		Tiles:
@@ -842,38 +1155,51 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 	Template@99:
 		Id: 99
-		Image: d07
+		Image: d07.tem
 		Size: 3,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			4: Road
+			5: Clear
 	Template@100:
 		Id: 100
-		Image: d08
+		Image: d08.tem
 		Size: 3,2
 		Category: Road
 		Tiles:
 			1: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@101:
 		Id: 101
-		Image: d09
+		Image: d09.tem
 		Size: 4,3
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
+			10: Clear
+			11: Clear
 	Template@102:
 		Id: 102
-		Image: d10
+		Image: d10.tem
 		Size: 4,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Rock
 			4: Road
 			5: Road
@@ -881,39 +1207,47 @@ Templates:
 			7: Road
 	Template@103:
 		Id: 103
-		Image: d11
+		Image: d11.tem
 		Size: 2,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
+			4: Clear
 	Template@104:
 		Id: 104
-		Image: d12
+		Image: d12.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@105:
 		Id: 105
-		Image: d13
+		Image: d13.tem
 		Size: 4,3
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			2: Clear
+			4: Clear
 			5: Road
 			6: Road
+			7: Clear
 			10: Wall
 			11: Road
 	Template@106:
 		Id: 106
-		Image: d14
+		Image: d14.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Wall
 			5: Road
 			6: Road
@@ -921,7 +1255,7 @@ Templates:
 			8: Road
 	Template@107:
 		Id: 107
-		Image: d15
+		Image: d15.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
@@ -930,246 +1264,317 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@108:
 		Id: 108
-		Image: d16
+		Image: d16.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
+			7: Clear
 			8: Wall
 	Template@109:
 		Id: 109
-		Image: d17
+		Image: d17.tem
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@110:
 		Id: 110
-		Image: d18
+		Image: d18.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Wall
 	Template@111:
 		Id: 111
-		Image: d19
+		Image: d19.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: Road
+			8: Clear
 	Template@112:
 		Id: 112
-		Image: d20
+		Image: d20.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Road
 	Template@113:
 		Id: 113
-		Image: d21
+		Image: d21.tem
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Rock
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@114:
 		Id: 114
-		Image: d22
+		Image: d22.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
+			8: Clear
 	Template@115:
 		Id: 115
-		Image: d23
+		Image: d23.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@116:
 		Id: 116
-		Image: d24
+		Image: d24.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@117:
 		Id: 117
-		Image: d25
+		Image: d25.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@118:
 		Id: 118
-		Image: d26
+		Image: d26.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@119:
 		Id: 119
-		Image: d27
+		Image: d27.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@120:
 		Id: 120
-		Image: d28
+		Image: d28.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@121:
 		Id: 121
-		Image: d29
+		Image: d29.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@122:
 		Id: 122
-		Image: d30
+		Image: d30.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			2: Road
 	Template@123:
 		Id: 123
-		Image: d31
+		Image: d31.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Road
 	Template@124:
 		Id: 124
-		Image: d32
+		Image: d32.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@125:
 		Id: 125
-		Image: d33
+		Image: d33.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
 	Template@126:
 		Id: 126
-		Image: d34
+		Image: d34.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
 	Template@127:
 		Id: 127
-		Image: d35
+		Image: d35.tem
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@128:
 		Id: 128
-		Image: d36
+		Image: d36.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@129:
 		Id: 129
-		Image: d37
+		Image: d37.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@130:
 		Id: 130
-		Image: d38
+		Image: d38.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@131:
 		Id: 131
-		Image: d39
+		Image: d39.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@132:
 		Id: 132
-		Image: d40
+		Image: d40.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			3: Clear
 	Template@133:
 		Id: 133
-		Image: d41
+		Image: d41.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Wall
 			2: Road
+			3: Clear
 	Template@134:
 		Id: 134
-		Image: d42
+		Image: d42.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
+			3: Clear
 	Template@135:
 		Id: 135
-		Image: d43
+		Image: d43.tem
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@136:
 		Id: 136
-		Image: rv01
+		Image: rv01.tem
 		Size: 5,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			5: Rock
 			6: River
@@ -1182,9 +1587,10 @@ Templates:
 			13: Rock
 			14: River
 			16: Wall
+			17: Clear
 	Template@137:
 		Id: 137
-		Image: rv02
+		Image: rv02.tem
 		Size: 5,3
 		Category: River
 		Tiles:
@@ -1200,26 +1606,35 @@ Templates:
 			9: River
 			10: River
 			11: Rock
+			12: Clear
 	Template@138:
 		Id: 138
-		Image: rv03
+		Image: rv03.tem
 		Size: 4,4
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			4: River
 			5: River
 			6: River
+			7: Clear
+			8: Clear
 			9: River
 			10: River
 			11: River
+			13: Clear
+			14: Clear
 			15: River
 	Template@139:
 		Id: 139
-		Image: rv04
+		Image: rv04.tem
 		Size: 4,4
 		Category: River
 		Tiles:
 			2: Wall
+			3: Clear
+			5: Clear
 			6: River
 			7: River
 			8: River
@@ -1231,12 +1646,14 @@ Templates:
 			14: Rock
 	Template@140:
 		Id: 140
-		Image: rv05
+		Image: rv05.tem
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
+			3: Clear
 			4: River
 			5: River
 			6: Rock
@@ -1244,7 +1661,7 @@ Templates:
 			8: River
 	Template@141:
 		Id: 141
-		Image: rv06
+		Image: rv06.tem
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1253,9 +1670,10 @@ Templates:
 			2: Rock
 			3: Rock
 			4: River
+			5: Clear
 	Template@142:
 		Id: 142
-		Image: rv07
+		Image: rv07.tem
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1267,7 +1685,7 @@ Templates:
 			5: River
 	Template@143:
 		Id: 143
-		Image: rv08
+		Image: rv08.tem
 		Size: 2,2
 		Category: River
 		Tiles:
@@ -1277,36 +1695,41 @@ Templates:
 			3: River
 	Template@144:
 		Id: 144
-		Image: rv09
+		Image: rv09.tem
 		Size: 2,2
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
 			3: River
 	Template@145:
 		Id: 145
-		Image: rv10
+		Image: rv10.tem
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
+			2: Clear
 			3: River
 	Template@146:
 		Id: 146
-		Image: rv11
+		Image: rv11.tem
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
 			2: River
+			3: Clear
 	Template@147:
 		Id: 147
-		Image: rv12
+		Image: rv12.tem
 		Size: 3,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Rock
@@ -1315,14 +1738,17 @@ Templates:
 			6: River
 			7: River
 			8: Rock
+			9: Clear
 			10: River
 			11: River
 	Template@148:
 		Id: 148
-		Image: rv13
+		Image: rv13.tem
 		Size: 4,4
 		Category: River
 		Tiles:
+			2: Clear
+			3: Clear
 			4: River
 			5: River
 			6: River
@@ -1331,49 +1757,58 @@ Templates:
 			9: Rock
 			10: River
 			11: Rock
+			12: Clear
 			13: Rock
 			14: River
 			15: Rock
 	Template@161:
 		Id: 161
-		Image: ford1
+		Image: ford1.tem
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: River
 			8: River
 	Template@162:
 		Id: 162
-		Image: ford2
+		Image: ford2.tem
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Road
 			2: River
 			3: River
 			4: Road
 			5: River
+			6: Clear
 			7: Road
+			8: Clear
 	Template@163:
 		Id: 163
-		Image: falls1
+		Image: falls1.tem
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			2: River
 			3: River
 			4: River
 			5: River
+			6: Clear
 			7: Rock
 			8: Rock
 	Template@164:
 		Id: 164
-		Image: falls2
+		Image: falls2.tem
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1385,10 +1820,11 @@ Templates:
 			5: River
 	Template@165:
 		Id: 165
-		Image: bridge1
+		Image: bridge1.tem
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1399,13 +1835,16 @@ Templates:
 			10: Wall
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@166:
 		Id: 166
-		Image: bridge1d
+		Image: bridge1d.tem
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1416,14 +1855,19 @@ Templates:
 			10: River
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@167:
 		Id: 167
-		Image: bridge2
+		Image: bridge2.tem
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Road
 			7: Wall
@@ -1433,16 +1877,24 @@ Templates:
 			11: Wall
 			12: Road
 			13: Wall
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@168:
 		Id: 168
-		Image: bridge2d
+		Image: bridge2d.tem
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Wall
 			7: River
@@ -1452,40 +1904,55 @@ Templates:
 			11: River
 			12: River
 			13: River
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@186:
 		Id: 186
-		Image: sh34
+		Image: sh34.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Water
+			3: Clear
+			4: Clear
 			5: Water
+			6: Clear
+			7: Clear
 			8: Water
 	Template@187:
 		Id: 187
-		Image: sh35
+		Image: sh35.tem
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
 			1: River
+			2: Clear
 			3: Water
 			4: River
+			5: Clear
 			6: Water
+			7: Clear
+			8: Clear
 	Template@188:
 		Id: 188
-		Image: a10cr
+		Image: a10cr.tem
 		Size: 4,2
 		Category: Debris
 		Tiles:
 			1: Tree
+			2: Tree
+			3: Tree
+			4: Tree
 			5: Tree
 			6: Tree
 			7: Tree
-			3: Tree
-			2: Tree
-			4: Tree
 
diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml
index df5cbe3095..afb0de37aa 100644
--- a/mods/cnc/tilesets/winter.yaml
+++ b/mods/cnc/tilesets/winter.yaml
@@ -1,76 +1,71 @@
 General:
 	Name: Winter
 	Id: WINTER
-	Extensions: .win, .shp, .tem
 	Palette: winter.pal
+	Extensions: .win, .shp, .tem
 	WaterPaletteRotationBase: 32
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 
 Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 40, 68, 40
-		TargetTypes: Ground
-	TerrainType@Water:
-		Type: Water
-		IsWater: true
-		AcceptsSmudgeType:
-		Color: 92, 116, 164
-		TargetTypes: Water
-	TerrainType@Road:
-		Type: Road
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 88, 116, 116
-		TargetTypes: Ground
-	TerrainType@Rock:
-		Type: Rock
-		AcceptsSmudgeType:
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Tree:
-		Type: Tree
-		AcceptsSmudgeType:
-		Color: 28, 32, 36
-		TargetTypes: Ground
-	TerrainType@River:
-		Type: River
-		AcceptsSmudgeType:
-		Color: 92, 140, 180
-		TargetTypes: Ground
-	TerrainType@Rough:
-		Type: Rough
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 68, 68, 60
-		TargetTypes: Ground
-	TerrainType@Wall:
-		Type: Wall
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 208, 192, 160
-		TargetTypes: Ground
 	TerrainType@Beach:
 		Type: Beach
-		AcceptsSmudgeType:
-		Color: 176, 156, 120
-		TargetTypes: Ground
-	TerrainType@Tiberium:
-		Type: Tiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 161, 226, 28
 		TargetTypes: Ground
+		Color: 255,176,156,120
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
-		AcceptsSmudgeType: Crater, Scorch
-		Color: 84, 252, 252
 		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,84,252,252
+	TerrainType@Clear:
+		Type: Clear
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,40,68,40
+	TerrainType@River:
+		Type: River
+		TargetTypes: Ground
+		Color: 255,92,140,180
+	TerrainType@Road:
+		Type: Road
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,88,116,116
+	TerrainType@Rock:
+		Type: Rock
+		TargetTypes: Ground
+		Color: 255,68,68,60
+	TerrainType@Rough:
+		Type: Rough
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,68,68,60
+	TerrainType@Tiberium:
+		Type: Tiberium
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,161,226,28
+	TerrainType@Tree:
+		Type: Tree
+		TargetTypes: Ground
+		Color: 255,28,32,36
+	TerrainType@Wall:
+		Type: Wall
+		TargetTypes: Ground
+		AcceptsSmudgeType: Crater, Scorch
+		Color: 255,208,192,160
+	TerrainType@Water:
+		Type: Water
+		TargetTypes: Water
+		IsWater: True
+		Color: 255,92,116,164
 
 Templates:
 	Template@255:
 		Id: 255
-		Image: clear1
+		Image: clear1.win
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -90,10 +85,10 @@ Templates:
 			15: Clear
 	Template@65535:
 		Id: 65535
-		Image: clear1
+		Image: clear1.win
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -112,11 +107,10 @@ Templates:
 			14: Clear
 			15: Clear
 	Template@0:
-		Id: 0
-		Image: clear1
+		Image: clear1.win
 		Size: 1,1
-		Category: Terrain
 		PickAny: True
+		Category: Terrain
 		Tiles:
 			0: Clear
 			1: Clear
@@ -136,14 +130,14 @@ Templates:
 			15: Clear
 	Template@1:
 		Id: 1
-		Image: w1
+		Image: w1.win
 		Size: 1,1
 		Category: Terrain
 		Tiles:
 			0: Water
 	Template@2:
 		Id: 2
-		Image: w2
+		Image: w2.win
 		Size: 2,2
 		Category: Terrain
 		Tiles:
@@ -153,20 +147,28 @@ Templates:
 			3: Water
 	Template@3:
 		Id: 3
-		Image: sh1
+		Image: sh1.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@4:
 		Id: 4
-		Image: sh2
+		Image: sh2.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
 			5: River
@@ -175,14 +177,14 @@ Templates:
 			8: Water
 	Template@5:
 		Id: 5
-		Image: sh3
+		Image: sh3.win
 		Size: 1,1
 		Category: Beach
 		Tiles:
 			0: River
 	Template@6:
 		Id: 6
-		Image: sh4
+		Image: sh4.win
 		Size: 2,1
 		Category: Beach
 		Tiles:
@@ -190,23 +192,29 @@ Templates:
 			1: River
 	Template@7:
 		Id: 7
-		Image: sh5
+		Image: sh5.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
 			4: River
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@8:
 		Id: 8
-		Image: sh11
+		Image: sh11.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: Rock
+			3: Clear
 			4: River
 			5: River
 			6: Water
@@ -214,7 +222,7 @@ Templates:
 			8: Water
 	Template@9:
 		Id: 9
-		Image: sh12
+		Image: sh12.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -222,11 +230,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Rock
+			4: Clear
+			5: Clear
 			6: Tree
 			7: Tree
+			8: Clear
 	Template@10:
 		Id: 10
-		Image: sh13
+		Image: sh13.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -234,12 +245,14 @@ Templates:
 			1: Water
 			2: Water
 			3: Water
+			4: Clear
 			5: Rock
+			6: Clear
 			7: Rock
 			8: Road
 	Template@11:
 		Id: 11
-		Image: sh14
+		Image: sh14.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -249,10 +262,12 @@ Templates:
 			3: River
 			4: River
 			5: River
+			6: Clear
+			7: Clear
 			8: Tree
 	Template@12:
 		Id: 12
-		Image: sh15
+		Image: sh15.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
@@ -261,30 +276,34 @@ Templates:
 			3: River
 			4: Rock
 			5: Rock
+			6: Clear
 			7: Tree
+			8: Clear
 	Template@13:
 		Id: 13
-		Image: s01
+		Image: s01.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 			3: Rock
 	Template@14:
 		Id: 14
-		Image: s02
+		Image: s02.win
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
 			5: Rock
 	Template@15:
 		Id: 15
-		Image: s03
+		Image: s03.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -294,7 +313,7 @@ Templates:
 			3: Rock
 	Template@16:
 		Id: 16
-		Image: s04
+		Image: s04.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -304,7 +323,7 @@ Templates:
 			3: Rock
 	Template@17:
 		Id: 17
-		Image: s05
+		Image: s05.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -314,17 +333,18 @@ Templates:
 			3: Rock
 	Template@18:
 		Id: 18
-		Image: s06
+		Image: s06.win
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
 	Template@19:
 		Id: 19
-		Image: s07
+		Image: s07.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -334,27 +354,29 @@ Templates:
 			3: Rock
 	Template@20:
 		Id: 20
-		Image: s08
+		Image: s08.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@21:
 		Id: 21
-		Image: s09
+		Image: s09.win
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
 			2: Rock
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@22:
 		Id: 22
-		Image: s10
+		Image: s10.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -364,7 +386,7 @@ Templates:
 			3: Rock
 	Template@23:
 		Id: 23
-		Image: s11
+		Image: s11.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -374,7 +396,7 @@ Templates:
 			3: Rock
 	Template@24:
 		Id: 24
-		Image: s12
+		Image: s12.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -384,74 +406,89 @@ Templates:
 			3: Rock
 	Template@25:
 		Id: 25
-		Image: s13
+		Image: s13.win
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
+			2: Clear
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@26:
 		Id: 26
-		Image: s14
+		Image: s14.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
+			2: Clear
 	Template@27:
 		Id: 27
-		Image: s15
+		Image: s15.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@28:
 		Id: 28
-		Image: s16
+		Image: s16.win
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			2: Rock
 			3: Rock
 			5: Rock
 	Template@29:
 		Id: 29
-		Image: s17
+		Image: s17.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@30:
 		Id: 30
-		Image: s18
+		Image: s18.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@31:
 		Id: 31
-		Image: s19
+		Image: s19.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@32:
 		Id: 32
-		Image: s20
+		Image: s20.win
 		Size: 2,3
 		Category: Cliffs
 		Tiles:
+			1: Clear
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@33:
 		Id: 33
-		Image: s21
+		Image: s21.win
 		Size: 1,2
 		Category: Cliffs
 		Tiles:
@@ -459,7 +496,7 @@ Templates:
 			1: Rock
 	Template@34:
 		Id: 34
-		Image: s22
+		Image: s22.win
 		Size: 2,1
 		Category: Cliffs
 		Tiles:
@@ -467,17 +504,19 @@ Templates:
 			1: Rock
 	Template@35:
 		Id: 35
-		Image: s23
+		Image: s23.win
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
 			1: Rock
 			2: Rock
 			3: Rock
 			4: Rock
+			5: Clear
 	Template@36:
 		Id: 36
-		Image: s24
+		Image: s24.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -487,7 +526,7 @@ Templates:
 			3: Rock
 	Template@37:
 		Id: 37
-		Image: s25
+		Image: s25.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -497,7 +536,7 @@ Templates:
 			3: Rock
 	Template@38:
 		Id: 38
-		Image: s26
+		Image: s26.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -507,17 +546,19 @@ Templates:
 			3: Rock
 	Template@39:
 		Id: 39
-		Image: s27
+		Image: s27.win
 		Size: 3,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
+			3: Clear
 			4: Rock
 			5: Rock
 	Template@40:
 		Id: 40
-		Image: s28
+		Image: s28.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -526,7 +567,7 @@ Templates:
 			3: Rock
 	Template@41:
 		Id: 41
-		Image: s29
+		Image: s29.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -536,24 +577,27 @@ Templates:
 			3: Rock
 	Template@42:
 		Id: 42
-		Image: s30
+		Image: s30.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
 			0: Rock
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@43:
 		Id: 43
-		Image: s31
+		Image: s31.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Rock
 			3: Rock
 	Template@44:
 		Id: 44
-		Image: s32
+		Image: s32.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -562,7 +606,7 @@ Templates:
 			2: Rock
 	Template@45:
 		Id: 45
-		Image: s33
+		Image: s33.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -572,7 +616,7 @@ Templates:
 			3: Rock
 	Template@46:
 		Id: 46
-		Image: s34
+		Image: s34.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -582,7 +626,7 @@ Templates:
 			3: Rock
 	Template@47:
 		Id: 47
-		Image: s35
+		Image: s35.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -592,7 +636,7 @@ Templates:
 			3: Rock
 	Template@48:
 		Id: 48
-		Image: s36
+		Image: s36.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -602,7 +646,7 @@ Templates:
 			3: Rock
 	Template@49:
 		Id: 49
-		Image: s37
+		Image: s37.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -612,7 +656,7 @@ Templates:
 			3: Rock
 	Template@50:
 		Id: 50
-		Image: s38
+		Image: s38.win
 		Size: 2,2
 		Category: Cliffs
 		Tiles:
@@ -622,34 +666,63 @@ Templates:
 			3: Rock
 	Template@51:
 		Id: 51
-		Image: sh32
+		Image: sh32.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@52:
 		Id: 52
-		Image: sh33
+		Image: sh33.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
 	Template@73:
 		Id: 73
-		Image: p07
+		Image: p07.win
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
 	Template@74:
 		Id: 74
-		Image: p08
+		Image: p08.win
 		Size: 3,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 	Template@75:
 		Id: 75
-		Image: sh16
+		Image: sh16.win
 		Size: 3,2
 		Category: Beach
 		Tiles:
@@ -661,7 +734,7 @@ Templates:
 			5: River
 	Template@76:
 		Id: 76
-		Image: sh17
+		Image: sh17.win
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -671,7 +744,7 @@ Templates:
 			3: Water
 	Template@77:
 		Id: 77
-		Image: sh18
+		Image: sh18.win
 		Size: 2,2
 		Category: Beach
 		Tiles:
@@ -681,7 +754,7 @@ Templates:
 			3: Water
 	Template@79:
 		Id: 79
-		Image: p13
+		Image: p13.win
 		Size: 3,2
 		Category: Debris
 		Tiles:
@@ -689,10 +762,11 @@ Templates:
 			1: Wall
 			2: Wall
 			3: Wall
+			4: Clear
 			5: Wall
 	Template@80:
 		Id: 80
-		Image: p14
+		Image: p14.win
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -700,20 +774,26 @@ Templates:
 			1: Wall
 	Template@81:
 		Id: 81
-		Image: p15
+		Image: p15.win
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 	Template@82:
 		Id: 82
-		Image: b1
+		Image: b1.win
 		Size: 1,1
 		Category: Debris
 		Tiles:
 			0: Rock
 	Template@83:
 		Id: 83
-		Image: b2
+		Image: b2.win
 		Size: 2,1
 		Category: Debris
 		Tiles:
@@ -721,98 +801,131 @@ Templates:
 			1: Rock
 	Template@84:
 		Id: 84
-		Image: b3
+		Image: b3.win
 		Size: 3,1
 		Category: Debris
 		Tiles:
 			0: Rock
 			1: Rock
+			2: Clear
 	Template@88:
 		Id: 88
-		Image: sh6
+		Image: sh6.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
 			6: Water
 			7: Water
 			8: Water
 	Template@89:
 		Id: 89
-		Image: sh7
+		Image: sh7.win
 		Size: 2,2
 		Category: Beach
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Water
 	Template@90:
 		Id: 90
-		Image: sh8
+		Image: sh8.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			4: Clear
 			5: River
+			6: Clear
+			7: Clear
 			8: Water
 	Template@91:
 		Id: 91
-		Image: sh9
+		Image: sh9.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
 			3: River
+			4: Clear
+			5: Clear
 			6: Water
 			7: River
+			8: Clear
 	Template@92:
 		Id: 92
-		Image: sh10
+		Image: sh10.win
 		Size: 2,2
 		Category: Beach
 		Tiles:
 			0: River
+			1: Clear
 			2: Water
 			3: River
 	Template@93:
 		Id: 93
-		Image: d01
+		Image: d01.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 	Template@94:
 		Id: 94
-		Image: d02
+		Image: d02.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 	Template@95:
 		Id: 95
-		Image: d03
+		Image: d03.win
 		Size: 1,2
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
 	Template@96:
 		Id: 96
-		Image: d04
+		Image: d04.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@97:
 		Id: 97
-		Image: d05
+		Image: d05.win
 		Size: 3,4
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			6: Road
 			7: Road
+			9: Clear
 			10: Road
 	Template@98:
 		Id: 98
-		Image: d06
+		Image: d06.win
 		Size: 2,3
 		Category: Road
 		Tiles:
@@ -820,38 +933,51 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 	Template@99:
 		Id: 99
-		Image: d07
+		Image: d07.win
 		Size: 3,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			4: Road
+			5: Clear
 	Template@100:
 		Id: 100
-		Image: d08
+		Image: d08.win
 		Size: 3,2
 		Category: Road
 		Tiles:
 			1: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@101:
 		Id: 101
-		Image: d09
+		Image: d09.win
 		Size: 4,3
 		Category: Road
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
+			10: Clear
+			11: Clear
 	Template@102:
 		Id: 102
-		Image: d10
+		Image: d10.win
 		Size: 4,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Rock
 			4: Road
 			5: Road
@@ -859,39 +985,47 @@ Templates:
 			7: Road
 	Template@103:
 		Id: 103
-		Image: d11
+		Image: d11.win
 		Size: 2,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
+			4: Clear
 	Template@104:
 		Id: 104
-		Image: d12
+		Image: d12.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@105:
 		Id: 105
-		Image: d13
+		Image: d13.win
 		Size: 4,3
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			2: Clear
+			4: Clear
 			5: Road
 			6: Road
+			7: Clear
 			10: Wall
 			11: Road
 	Template@106:
 		Id: 106
-		Image: d14
+		Image: d14.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Wall
 			5: Road
 			6: Road
@@ -899,7 +1033,7 @@ Templates:
 			8: Road
 	Template@107:
 		Id: 107
-		Image: d15
+		Image: d15.win
 		Size: 3,3
 		Category: Road
 		Tiles:
@@ -908,246 +1042,317 @@ Templates:
 			2: Road
 			3: Road
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@108:
 		Id: 108
-		Image: d16
+		Image: d16.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
+			7: Clear
 			8: Wall
 	Template@109:
 		Id: 109
-		Image: d17
+		Image: d17.win
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@110:
 		Id: 110
-		Image: d18
+		Image: d18.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Wall
 	Template@111:
 		Id: 111
-		Image: d19
+		Image: d19.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: Road
+			8: Clear
 	Template@112:
 		Id: 112
-		Image: d20
+		Image: d20.win
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
 			8: Road
 	Template@113:
 		Id: 113
-		Image: d21
+		Image: d21.win
 		Size: 3,2
 		Category: Road
 		Tiles:
 			0: Rock
 			1: Road
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 	Template@114:
 		Id: 114
-		Image: d22
+		Image: d22.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			3: Road
 			4: Road
+			5: Clear
+			6: Clear
 			7: Road
+			8: Clear
 	Template@115:
 		Id: 115
-		Image: d23
+		Image: d23.win
 		Size: 3,3
 		Category: Road
 		Tiles:
 			1: Road
+			2: Clear
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@116:
 		Id: 116
-		Image: d24
+		Image: d24.win
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@117:
 		Id: 117
-		Image: d25
+		Image: d25.win
 		Size: 3,3
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			3: Clear
 			4: Road
+			5: Clear
+			7: Clear
 			8: Road
 	Template@118:
 		Id: 118
-		Image: d26
+		Image: d26.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@119:
 		Id: 119
-		Image: d27
+		Image: d27.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 	Template@120:
 		Id: 120
-		Image: d28
+		Image: d28.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@121:
 		Id: 121
-		Image: d29
+		Image: d29.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
 	Template@122:
 		Id: 122
-		Image: d30
+		Image: d30.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
+			1: Clear
 			2: Road
 	Template@123:
 		Id: 123
-		Image: d31
+		Image: d31.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
+			2: Clear
 			3: Road
 	Template@124:
 		Id: 124
-		Image: d32
+		Image: d32.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 	Template@125:
 		Id: 125
-		Image: d33
+		Image: d33.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
 			3: Road
 	Template@126:
 		Id: 126
-		Image: d34
+		Image: d34.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
 			5: Road
 			6: Road
 			7: Road
 	Template@127:
 		Id: 127
-		Image: d35
+		Image: d35.win
 		Size: 3,3
 		Category: Road
 		Tiles:
+			1: Clear
 			2: Road
+			3: Clear
 			4: Road
+			5: Clear
 			6: Road
+			7: Clear
 	Template@128:
 		Id: 128
-		Image: d36
+		Image: d36.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@129:
 		Id: 129
-		Image: d37
+		Image: d37.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
+			3: Clear
 	Template@130:
 		Id: 130
-		Image: d38
+		Image: d38.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@131:
 		Id: 131
-		Image: d39
+		Image: d39.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			1: Road
+			3: Clear
 	Template@132:
 		Id: 132
-		Image: d40
+		Image: d40.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Road
 			1: Road
+			3: Clear
 	Template@133:
 		Id: 133
-		Image: d41
+		Image: d41.win
 		Size: 2,2
 		Category: Road
 		Tiles:
 			0: Wall
 			2: Road
+			3: Clear
 	Template@134:
 		Id: 134
-		Image: d42
+		Image: d42.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
+			3: Clear
 	Template@135:
 		Id: 135
-		Image: d43
+		Image: d43.win
 		Size: 2,2
 		Category: Road
 		Tiles:
+			0: Clear
 			2: Road
 			3: Road
 	Template@136:
 		Id: 136
-		Image: rv01
+		Image: rv01.win
 		Size: 5,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			5: Rock
 			6: River
@@ -1160,9 +1365,10 @@ Templates:
 			13: Rock
 			14: River
 			16: Wall
+			17: Clear
 	Template@137:
 		Id: 137
-		Image: rv02
+		Image: rv02.win
 		Size: 5,3
 		Category: River
 		Tiles:
@@ -1178,26 +1384,35 @@ Templates:
 			9: River
 			10: River
 			11: Rock
+			12: Clear
 	Template@138:
 		Id: 138
-		Image: rv03
+		Image: rv03.win
 		Size: 4,4
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			4: River
 			5: River
 			6: River
+			7: Clear
+			8: Clear
 			9: River
 			10: River
 			11: River
+			13: Clear
+			14: Clear
 			15: River
 	Template@139:
 		Id: 139
-		Image: rv04
+		Image: rv04.win
 		Size: 4,4
 		Category: River
 		Tiles:
 			2: Wall
+			3: Clear
+			5: Clear
 			6: River
 			7: River
 			8: River
@@ -1209,12 +1424,14 @@ Templates:
 			14: Rock
 	Template@140:
 		Id: 140
-		Image: rv05
+		Image: rv05.win
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
+			3: Clear
 			4: River
 			5: River
 			6: Rock
@@ -1222,7 +1439,7 @@ Templates:
 			8: River
 	Template@141:
 		Id: 141
-		Image: rv06
+		Image: rv06.win
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1231,9 +1448,10 @@ Templates:
 			2: Rock
 			3: Rock
 			4: River
+			5: Clear
 	Template@142:
 		Id: 142
-		Image: rv07
+		Image: rv07.win
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1245,7 +1463,7 @@ Templates:
 			5: River
 	Template@143:
 		Id: 143
-		Image: rv08
+		Image: rv08.win
 		Size: 2,2
 		Category: River
 		Tiles:
@@ -1255,36 +1473,41 @@ Templates:
 			3: River
 	Template@144:
 		Id: 144
-		Image: rv09
+		Image: rv09.win
 		Size: 2,2
 		Category: River
 		Tiles:
+			0: Clear
+			1: Clear
 			2: River
 			3: River
 	Template@145:
 		Id: 145
-		Image: rv10
+		Image: rv10.win
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
+			2: Clear
 			3: River
 	Template@146:
 		Id: 146
-		Image: rv11
+		Image: rv11.win
 		Size: 2,2
 		Category: River
 		Tiles:
 			0: River
 			1: River
 			2: River
+			3: Clear
 	Template@147:
 		Id: 147
-		Image: rv12
+		Image: rv12.win
 		Size: 3,4
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
 			2: River
 			3: Rock
@@ -1293,14 +1516,17 @@ Templates:
 			6: River
 			7: River
 			8: Rock
+			9: Clear
 			10: River
 			11: River
 	Template@148:
 		Id: 148
-		Image: rv13
+		Image: rv13.win
 		Size: 4,4
 		Category: River
 		Tiles:
+			2: Clear
+			3: Clear
 			4: River
 			5: River
 			6: River
@@ -1309,49 +1535,58 @@ Templates:
 			9: Rock
 			10: River
 			11: Rock
+			12: Clear
 			13: Rock
 			14: River
 			15: Rock
 	Template@161:
 		Id: 161
-		Image: ford1
+		Image: ford1.win
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: River
+			2: Clear
 			3: Road
 			4: Road
 			5: Road
+			6: Clear
 			7: River
 			8: River
 	Template@162:
 		Id: 162
-		Image: ford2
+		Image: ford2.win
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Road
 			2: River
 			3: River
 			4: Road
 			5: River
+			6: Clear
 			7: Road
+			8: Clear
 	Template@163:
 		Id: 163
-		Image: falls1
+		Image: falls1.win
 		Size: 3,3
 		Category: River
 		Tiles:
+			0: Clear
 			1: Rock
 			2: River
 			3: River
 			4: River
 			5: River
+			6: Clear
 			7: Rock
 			8: Rock
 	Template@164:
 		Id: 164
-		Image: falls2
+		Image: falls2.win
 		Size: 3,2
 		Category: River
 		Tiles:
@@ -1363,10 +1598,11 @@ Templates:
 			5: River
 	Template@165:
 		Id: 165
-		Image: bridge1
+		Image: bridge1.win
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1377,13 +1613,16 @@ Templates:
 			10: Wall
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@166:
 		Id: 166
-		Image: bridge1d
+		Image: bridge1d.win
 		Size: 4,4
 		Category: Bridge
 		Tiles:
+			2: Clear
 			3: Road
 			4: River
 			5: Wall
@@ -1394,14 +1633,19 @@ Templates:
 			10: River
 			11: River
 			12: Road
+			13: Clear
+			14: Clear
 			15: River
 	Template@167:
 		Id: 167
-		Image: bridge2
+		Image: bridge2.win
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Road
 			7: Wall
@@ -1411,16 +1655,24 @@ Templates:
 			11: Wall
 			12: Road
 			13: Wall
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@168:
 		Id: 168
-		Image: bridge2d
+		Image: bridge2d.win
 		Size: 5,5
 		Category: Bridge
 		Tiles:
 			0: Road
+			1: Clear
+			2: Clear
+			4: Clear
 			5: Wall
 			6: Wall
 			7: River
@@ -1430,57 +1682,106 @@ Templates:
 			11: River
 			12: River
 			13: River
+			14: Clear
 			15: River
+			16: Clear
+			17: Clear
 			18: Road
+			19: Clear
+			23: Clear
 			24: Road
 	Template@181:
 		Id: 181
-		Image: p16
+		Image: p16.win
 		Size: 2,2
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
 	Template@182:
 		Id: 182
-		Image: p17
+		Image: p17.win
 		Size: 4,2
 		Category: Debris
 		Tiles:
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
 	Template@183:
 		Id: 183
-		Image: p18
+		Image: p18.win
 		Size: 4,3
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			10: Clear
+			11: Clear
 	Template@184:
 		Id: 184
-		Image: p19
+		Image: p19.win
 		Size: 6,2
 		Category: Debris
 		Tiles:
+			2: Clear
+			3: Clear
+			4: Clear
+			5: Clear
+			6: Clear
+			7: Clear
+			8: Clear
+			9: Clear
 	Template@185:
 		Id: 185
-		Image: p20
+		Image: p20.win
 		Size: 4,3
 		Category: Debris
 		Tiles:
+			0: Clear
+			1: Clear
+			2: Clear
+			3: Clear
+			6: Clear
+			7: Clear
+			10: Clear
+			11: Clear
 	Template@186:
 		Id: 186
-		Image: sh34
+		Image: sh34.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
+			0: Clear
+			1: Clear
 			2: Water
+			3: Clear
+			4: Clear
 			5: Water
+			6: Clear
+			7: Clear
 			8: Water
 	Template@187:
 		Id: 187
-		Image: sh35
+		Image: sh35.win
 		Size: 3,3
 		Category: Beach
 		Tiles:
 			0: Water
 			1: River
+			2: Clear
 			3: Water
 			4: River
+			5: Clear
 			6: Water
+			7: Clear
+			8: Clear