diff --git a/OpenRA.FileFormats/Map.cs b/OpenRA.FileFormats/Map.cs
index 45d223cee3..627861763a 100644
--- a/OpenRA.FileFormats/Map.cs
+++ b/OpenRA.FileFormats/Map.cs
@@ -92,7 +92,6 @@ namespace OpenRA.FileFormats
 				{
 					MapTiles[j, i].tile = (byte)ms.ReadByte();	
 					MapTiles[j, i].image = (byte)ms.ReadByte();
-					Log.Write("Set tile to {0} {1}",MapTiles[j, i].tile,MapTiles[j, i].image);
 				}
 		}
 
diff --git a/scm01ea.ini b/mods/cnc/scm01ea.ini
similarity index 100%
rename from scm01ea.ini
rename to mods/cnc/scm01ea.ini
diff --git a/mods/cnc/scm02ea.ini b/mods/cnc/scm02ea.ini
new file mode 100644
index 0000000000..912b9acde6
--- /dev/null
+++ b/mods/cnc/scm02ea.ini
@@ -0,0 +1,597 @@
+; Scenario 2 control for house Multi1.
+
+[Basic]
+BinaryPart=scm02ea.bin
+CarryOverCap=-1
+CarryOverMoney=50
+Intro=x
+BuildLevel=2
+Theme=No theme
+Percent=0
+Player=Multi3
+Action=LAND
+Lose=GAMEOVER
+Win=x
+Brief=GDI1
+Name=Sand Trap
+
+[MAP]
+Height=58
+Width=57
+Y=3
+X=3
+Theater=DESERT
+
+[Waypoints]
+31=-1
+30=-1
+29=3249
+28=901
+27=2337
+26=2337
+25=-1
+24=-1
+23=-1
+22=-1
+21=-1
+20=-1
+19=-1
+18=-1
+17=-1
+16=-1
+15=-1
+14=-1
+13=-1
+12=-1
+11=-1
+10=-1
+9=-1
+8=-1
+7=340
+6=376
+5=2292
+4=3334
+3=3737
+2=3760
+1=1057
+0=1030
+
+[Neutral]
+Allies=Neutral
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi1]
+Allies=Multi1,Multi2,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi2]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi3]
+Allies=Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi4]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[STRUCTURES]
+
+[OVERLAY]
+3862=TI1
+3860=TI1
+3859=TI1
+3858=TI1
+3857=TI1
+3856=TI1
+3855=TI1
+3854=TI1
+3850=TI1
+3849=TI1
+3848=TI1
+3847=TI1
+3846=TI1
+3845=TI1
+3844=TI1
+3843=TI1
+3819=TI10
+3818=TI11
+3799=TI11
+3798=TI6
+3797=TI7
+3796=TI5
+3795=TI6
+3794=TI12
+3793=TI3
+3791=TI5
+3785=TI6
+3784=TI2
+3783=TI3
+3782=TI11
+3781=TI11
+3780=TI3
+3756=TI6
+3755=TI7
+3754=TI5
+3735=TI3
+3734=TI6
+3733=TI2
+3732=TI10
+3731=TI12
+3730=TI7
+3729=TI5
+3728=TI6
+3726=TI2
+3722=TI4
+3721=TI8
+3720=TI9
+3719=TI1
+3718=TI12
+3694=TI9
+3693=TI5
+3692=TI2
+3691=TI4
+3690=TI8
+3670=TI12
+3669=TI6
+3668=TI8
+3667=TI10
+3666=TI3
+3665=TI8
+3664=TI8
+3658=TI9
+3631=TI9
+3630=TI12
+3629=TI6
+3628=TI1
+3627=TI10
+3626=TI12
+3604=TI9
+3602=TI4
+3567=TI8
+3566=TI4
+3564=TI1
+3563=TI8
+3562=TI2
+3541=TI5
+3540=TI10
+3502=TI5
+3501=TI7
+3499=TI6
+3437=TI4
+3436=TI5
+3435=TI5
+3434=TI6
+3372=TI2
+3371=TI3
+3370=TI1
+3258=TI5
+3194=TI5
+3193=TI9
+3130=TI9
+3129=TI7
+3128=TI12
+3066=TI8
+3065=TI2
+3013=TI3
+3001=TI3
+2999=TI8
+2954=TI12
+2953=TI7
+2950=TI12
+2949=TI8
+2948=TI8
+2939=TI9
+2938=TI2
+2936=TI5
+2935=TI9
+2925=TI10
+2890=TI8
+2889=TI4
+2888=TI4
+2887=TI5
+2886=TI6
+2885=TI5
+2884=TI10
+2874=TI5
+2873=TI6
+2872=TI8
+2826=TI7
+2824=TI7
+2822=TI11
+2821=TI12
+2820=TI2
+2811=TI7
+2809=TI4
+2771=TI4
+2768=TI4
+2759=TI12
+2758=TI11
+2757=TI5
+2756=TI5
+2746=TI7
+2745=TI10
+2709=TI10
+2708=TI1
+2707=TI12
+2705=TI5
+2703=TI1
+2702=TI1
+2695=TI5
+2694=TI1
+2693=TI9
+2692=TI5
+2681=TI9
+2648=TI12
+2647=TI10
+2646=TI4
+2645=TI9
+2644=TI6
+2642=TI10
+2641=TI11
+2640=TI1
+2639=TI7
+2638=TI2
+2631=TI12
+2630=TI11
+2617=TI9
+2583=TI9
+2582=TI12
+2581=TI10
+2580=TI11
+2578=TI7
+2577=TI2
+2576=TI11
+2575=TI3
+2553=TI7
+2518=TI4
+2517=TI12
+2516=TI10
+2515=TI12
+2514=TI5
+2513=TI2
+2512=TI6
+2511=TI4
+2453=TI3
+2452=TI11
+2451=TI5
+2449=TI1
+2448=TI2
+2388=TI5
+2386=TI10
+2385=TI4
+2351=TI12
+2350=TI8
+2349=TI5
+2288=TI8
+2286=TI9
+2285=TI3
+2284=TI5
+2283=TI11
+2282=TI5
+2252=TI11
+2251=TI3
+2223=TI2
+2222=TI4
+2221=TI1
+2220=TI3
+2219=TI6
+2218=TI11
+2187=TI5
+2186=TI11
+2185=TI5
+2158=TI11
+2157=TI10
+2156=TI6
+2155=TI11
+2154=TI8
+2153=TI7
+2152=TI3
+2145=TI11
+2123=TI6
+2121=TI9
+2093=TI1
+2092=TI3
+2091=TI4
+2090=TI9
+2089=TI6
+2088=TI6
+2061=TI3
+2059=TI10
+2058=TI12
+2054=TI10
+2053=TI12
+2027=TI8
+2026=TI4
+2025=TI11
+1996=TI8
+1995=TI2
+1994=TI3
+1990=TI7
+1989=TI3
+1963=TI4
+1931=TI11
+1930=TI10
+1929=TI10
+1928=TI10
+1927=TI2
+1926=TI4
+1925=TI1
+1924=TI6
+1866=TI7
+1865=TI4
+1864=TI9
+1863=TI1
+1862=TI4
+1861=TI10
+1860=TI3
+1801=TI4
+1800=TI8
+1799=TI1
+1798=TI2
+1797=TI3
+1796=TI2
+1795=TI8
+1737=TI1
+1735=TI4
+1734=TI12
+1733=TI3
+1732=TI4
+1731=TI9
+1690=TI12
+1689=TI8
+1670=TI8
+1669=TI4
+1668=TI4
+1624=TI10
+1559=TI6
+1558=TI12
+1498=TI7
+1497=TI11
+1496=TI11
+1495=TI12
+1494=TI6
+1493=TI10
+1492=TI5
+1491=TI1
+1465=TI11
+1433=TI11
+1432=TI6
+1431=TI11
+1430=TI3
+1429=TI9
+1428=TI9
+1427=TI9
+1401=TI12
+1369=TI9
+1368=TI2
+1367=TI6
+1366=TI9
+1365=TI2
+1364=TI1
+1363=TI12
+1337=TI8
+1336=TI2
+1326=TI3
+1324=TI1
+1322=TI12
+1321=TI12
+1320=TI6
+1303=TI1
+1302=TI11
+1301=TI2
+1300=TI1
+1273=TI5
+1263=TI9
+1260=TI11
+1259=TI9
+1258=TI7
+1256=TI10
+1240=TI2
+1239=TI9
+1238=TI5
+1237=TI3
+1236=TI8
+1199=TI5
+1198=TI4
+1195=TI5
+1194=TI4
+1193=TI1
+1176=TI11
+1175=TI8
+1173=TI2
+1172=TI6
+1133=TI12
+1132=TI8
+1131=TI7
+1130=TI6
+1129=TI4
+1128=TI9
+1127=TI1
+1126=TI11
+1109=TI5
+1108=TI6
+1107=TI3
+1068=TI12
+1067=TI11
+1066=TI5
+1065=TI9
+1064=TI10
+1063=TI10
+1062=TI6
+1044=TI6
+1043=TI11
+1004=TI9
+1003=TI2
+1002=TI3
+1001=TI9
+1000=TI11
+999=TI12
+998=TI3
+980=TI10
+978=TI7
+939=TI10
+938=TI12
+937=TI2
+936=TI3
+935=TI7
+934=TI10
+873=TI1
+872=TI4
+528=TI8
+527=TI5
+526=TI2
+523=TI6
+522=TI11
+521=TI2
+520=TI12
+463=TI5
+462=TI8
+461=TI8
+460=TI8
+459=TI7
+458=TI12
+457=TI2
+456=TI3
+455=TI3
+454=TI3
+398=TI10
+397=TI11
+396=TI8
+395=TI10
+394=TI11
+393=TI10
+392=TI9
+391=TI10
+390=TI4
+389=TI11
+371=TI6
+370=TI5
+369=TI4
+368=TI5
+367=TI10
+366=TI3
+363=TI7
+362=TI3
+361=TI2
+360=TI11
+333=TI10
+332=TI11
+330=TI1
+329=TI11
+327=TI7
+326=TI11
+325=TI4
+307=TI8
+306=TI8
+305=TI3
+304=TI4
+303=TI7
+302=TI6
+301=TI12
+300=TI8
+299=TI3
+298=TI9
+296=TI3
+295=TI12
+268=TI9
+267=TI2
+266=TI8
+265=TI10
+264=TI7
+263=TI9
+262=TI10
+261=TI4
+260=TI8
+242=TI11
+239=TI5
+238=TI6
+236=TI2
+235=TI4
+231=TI3
+
+[Base]
+Count=0
+
+[TERRAIN]
+3541=SPLIT3,None
+1235=SPLIT3,None
+264=SPLIT3,None
+1987=T18,None
+2198=T18,None
+2394=T18,None
+2372=T08,None
+2439=T08,None
+2373=T08,None
+925=ROCK1,None
+323=ROCK1,None
+364=ROCK6,None
+2741=T08,None
+1142=T08,None
+3573=T08,None
+2085=T08,None
+2151=T08,None
+2086=T08,None
+2030=T08,None
+771=ROCK1,None
+1958=ROCK1,None
+2267=T08,None
+2759=SPLIT3,None
+2515=SPLIT3,None
+3436=SPLIT3,None
+876=SPLIT3,None
+2153=SPLIT3,None
+233=SPLIT3,None
+
+[SMUDGE]
+
+[GoodGuy]
+Allies=GoodGuy,Neutral
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[BadGuy]
+Allies=BadGuy
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Special]
+Allies=Special
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi5]
+Allies=Multi5
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi6]
+Allies=Multi6
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
diff --git a/mods/cnc/scm70ea.ini b/mods/cnc/scm70ea.ini
new file mode 100644
index 0000000000..6e686d2c5d
--- /dev/null
+++ b/mods/cnc/scm70ea.ini
@@ -0,0 +1,531 @@
+; Scenario 70 control for house Multi1.
+
+[Basic]
+BinaryPart=scm70ea.bin
+CarryOverCap=-1
+Percent=0
+CarryOverMoney=100
+BuildLevel=70
+Theme=No theme
+Player=Multi3
+Action=LANDING
+Lose=GAMEOVER
+Win=CONSYARD
+Brief=x
+Intro=x
+Name=Winter Waterland
+
+[MAP]
+Height=62
+Width=62
+Y=1
+X=1
+Theater=WINTER
+
+[Waypoints]
+27=2080
+26=2080
+25=-1
+24=-1
+23=-1
+22=-1
+21=-1
+20=-1
+19=-1
+18=-1
+17=-1
+16=-1
+15=-1
+14=-1
+13=-1
+12=-1
+11=-1
+10=-1
+9=-1
+8=-1
+7=-1
+6=794
+5=1542
+4=312
+3=3831
+2=200
+1=1565
+0=3463
+
+[GoodGuy]
+Allies=GoodGuy,Neutral
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[BadGuy]
+Allies=BadGuy
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Neutral]
+Allies=Neutral
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Special]
+Allies=Special
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi1]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi2]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi3]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi4]
+Allies=Multi1,Multi2,Multi3,Multi4
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi5]
+Allies=Multi5
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[Multi6]
+Allies=Multi6
+MaxBuilding=150
+MaxUnit=150
+Edge=North
+Credits=0
+
+[TERRAIN]
+2101=T01,None
+1909=T02,None
+1848=T01,None
+519=TC04,None
+402=T16,None
+89=T16,None
+154=T17,None
+413=T15,None
+804=T15,None
+164=TC01,None
+759=T14,None
+573=T14,None
+488=TC02,None
+299=T17,None
+109=T17,None
+1003=T17,None
+993=T17,None
+687=T16,None
+752=T08,None
+486=T08,None
+1012=T08,None
+1150=T08,None
+597=T08,None
+1395=T08,None
+1326=T10,None
+1390=T07,None
+1444=T07,None
+1575=T07,None
+608=T07,None
+790=T07,None
+915=T07,None
+1748=T07,None
+1302=T07,None
+1241=T05,None
+1499=T06,None
+2013=T10,None
+1753=T10,None
+1635=T16,None
+1764=T16,None
+2023=T15,None
+1489=T13,None
+921=TC04,None
+2478=TC04,None
+2801=T01,None
+2988=T01,None
+1519=T01,None
+1212=T01,None
+1277=T01,None
+1717=T02,None
+1902=T03,None
+1725=T03,None
+2040=T03,None
+2301=T03,None
+2738=T03,None
+2806=T03,None
+2620=TC01,None
+3252=TC01,None
+3513=TC04,None
+2459=T01,None
+2390=T03,None
+2334=T05,None
+2596=T06,None
+3106=T06,None
+3440=T06,None
+3569=T06,None
+3495=T06,None
+3553=T06,None
+3945=T10,None
+3901=T12,None
+3369=T12,None
+3879=T12,None
+964=T01,None
+1226=T02,None
+1346=T10,None
+1475=T08,None
+1422=T08,None
+1737=T11,None
+1735=T07,None
+1864=T07,None
+2307=T06,None
+2826=T06,None
+3085=T06,None
+3145=T01,None
+3271=T03,None
+3457=T10,None
+3586=T08,None
+3406=T08,None
+3409=T06,None
+3846=TC04,None
+3923=T16,None
+3933=T16,None
+
+[OVERLAY]
+4030=TI1
+4029=TI1
+4028=TI1
+4027=TI1
+3996=TI1
+3986=TI1
+3985=TI1
+3984=TI1
+3983=TI1
+3966=TI8
+3964=TI5
+3933=TI9
+3932=TI8
+3923=TI1
+3922=TI1
+3921=TI3
+3920=TI9
+3919=TI8
+3902=TI12
+3901=TI12
+3900=TI6
+3869=TI6
+3868=TI12
+3867=TI12
+3859=TI7
+3858=TI3
+3854=TI11
+3838=TI11
+3837=TI2
+3805=TI1
+3804=TI2
+3803=TI3
+3774=TI10
+3344=TI1
+3343=TI7
+3342=TI11
+3311=TI2
+3310=TI8
+3309=TI9
+3308=TI4
+3307=TI12
+3306=TI11
+3281=TI6
+3280=TI9
+3279=TI5
+3278=TI6
+3277=TI6
+3258=TI9
+3257=TI3
+3256=TI3
+3255=TI11
+3245=TI7
+3244=TI2
+3243=TI12
+3242=TI11
+3241=TI3
+3240=TI1
+3239=TI8
+3217=TI10
+3216=TI2
+3214=TI1
+3213=TI2
+3194=TI1
+3193=TI1
+3192=TI5
+3191=TI4
+3129=TI10
+3128=TI1
+3127=TI12
+3063=TI5
+3015=TI2
+3014=TI12
+3013=TI4
+3011=TI6
+3010=TI12
+3009=TI2
+2961=TI12
+2958=TI8
+2951=TI4
+2950=TI6
+2949=TI11
+2947=TI6
+2946=TI12
+2945=TI9
+2899=TI7
+2897=TI11
+2894=TI7
+2854=TI8
+2849=TI7
+2835=TI2
+2834=TI10
+2833=TI3
+2832=TI11
+2831=TI7
+2791=TI5
+2790=TI6
+2789=TI9
+2788=TI7
+2787=TI5
+2786=TI8
+2785=TI10
+2769=TI12
+2768=TI10
+2724=TI3
+2723=TI2
+2722=TI9
+2659=TI5
+2658=TI12
+2520=TI1
+2519=TI11
+2518=TI6
+2459=TI4
+2458=TI4
+2457=TI10
+2456=TI9
+2455=TI11
+2396=TI4
+2395=TI3
+2394=TI2
+2393=TI10
+2370=TI5
+2369=TI5
+2360=TI7
+2359=TI4
+2307=TI6
+2306=TI12
+2305=TI9
+2296=TI4
+2243=TI5
+2242=TI1
+2241=TI3
+2233=TI12
+2232=TI3
+2179=TI9
+2178=TI4
+2177=TI2
+2170=TI5
+2169=TI2
+2168=TI5
+2139=TI2
+2138=TI8
+2137=TI5
+2113=TI3
+2106=TI6
+2105=TI6
+2075=TI4
+2074=TI4
+2073=TI11
+2072=TI3
+2042=TI5
+2041=TI8
+2009=TI5
+2008=TI2
+2007=TI9
+1943=TI2
+1942=TI11
+1885=TI12
+1884=TI11
+1820=TI5
+1819=TI2
+1755=TI4
+1754=TI10
+1753=TI1
+1752=TI8
+1689=TI12
+1688=TI7
+1649=TI7
+1648=TI9
+1647=TI5
+1646=TI9
+1624=TI10
+1623=TI7
+1598=TI3
+1597=TI1
+1596=TI9
+1595=TI11
+1586=TI8
+1585=TI11
+1584=TI2
+1582=TI11
+1581=TI5
+1575=TI11
+1574=TI2
+1573=TI12
+1533=TI3
+1532=TI1
+1531=TI12
+1522=TI6
+1512=TI10
+1511=TI4
+1510=TI7
+1509=TI4
+1470=TI7
+1469=TI11
+1468=TI2
+1458=TI10
+1448=TI9
+1446=TI2
+1445=TI3
+1444=TI10
+1443=TI8
+1421=TI11
+1406=TI11
+1405=TI4
+1358=TI8
+1357=TI10
+1294=TI9
+1293=TI10
+1230=TI3
+1229=TI8
+1166=TI8
+1165=TI12
+1102=TI7
+1101=TI10
+1062=TI2
+1036=TI11
+1018=TI10
+1017=TI5
+1016=TI12
+998=TI6
+957=TI10
+956=TI3
+955=TI1
+934=TI12
+897=TI3
+894=TI6
+893=TI6
+870=TI6
+837=TI5
+836=TI3
+835=TI10
+834=TI7
+833=TI12
+806=TI11
+805=TI6
+804=TI7
+790=TI2
+789=TI10
+785=TI6
+772=TI11
+771=TI11
+770=TI1
+769=TI1
+741=TI8
+740=TI11
+729=TI11
+728=TI4
+727=TI10
+726=TI7
+725=TI5
+721=TI12
+720=TI11
+708=TI5
+707=TI3
+706=TI1
+677=TI6
+676=TI3
+665=TI6
+664=TI4
+663=TI10
+662=TI10
+661=TI11
+657=TI1
+656=TI9
+612=TI5
+593=TI2
+592=TI8
+529=TI5
+528=TI6
+476=TI2
+475=TI7
+465=TI12
+414=TI1
+413=TI12
+412=TI6
+411=TI11
+410=TI5
+409=TI6
+408=TI6
+407=TI2
+402=TI8
+401=TI12
+343=TI9
+342=TI3
+318=TI12
+317=TI10
+260=TI5
+259=TI6
+254=TI12
+253=TI12
+252=TI7
+196=TI4
+195=TI9
+194=TI10
+193=TI5
+190=TI6
+189=TI6
+188=TI5
+131=TI8
+130=TI9
+129=TI6
+126=TI11
+125=TI9
+124=TI7
+123=TI4
+067=TI10
+066=TI12
+065=TI1
+
+[Base]
+Count=0
+
+[SMUDGE]
diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml
index bd69d46e9f..a819443999 100644
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -25,18 +25,34 @@ Player:
 	SpawnDefaultUnits:
 	
 World:
-	WaterPaletteRotation:
+#	WaterPaletteRotation:
 	BuildingInfluence:
 	UnitInfluence:
-	BridgeLoadHook:
-	PaletteFromFile@terrain_temperat:
+#	BridgeLoadHook:
+	PaletteFromFile@terrain_desert:
+		Name: terrain
+		Theater: desert
+		Filename: desert.pal
+	PaletteFromFile@terrain_temperate:
 		Name: terrain
 		Theater: temperat
 		Filename: temperat.pal
+	PaletteFromFile@terrain_winter:
+		Name: terrain
+		Theater: winter
+		Filename: winter.pal
+	PaletteFromFile@player_desert:
+		Name: player
+		Theater: desert
+		Filename: desert.pal
 	PaletteFromFile@player_temperat:
 		Name: player
 		Theater: temperat
 		Filename: temperat.pal
+	PaletteFromFile@player_winter:
+		Name: player
+		Theater: winter
+		Filename: winter.pal
 	PaletteFromFile@terrain_snow:
 		Name: terrain
 		Theater: snow
diff --git a/mods/cnc/tileSet.til b/mods/cnc/tileSet.til
index a304c4a3fe..77e764f2cf 100644
--- a/mods/cnc/tileSet.til
+++ b/mods/cnc/tileSet.til
@@ -1,154 +1,218 @@
 ; clear ground
-TSI
+DTW
 1
 ff
 clear1
 
 ; clear ground
-TSI
-1
-ffff
-clear1
-
-; clear ground
-TSI
+DTW
 1
 0000
 clear1
 
 ; plain water
-TS-
-2
+DTW
+1
 0001
-w{0}
+w1
+
+-TW
+1
+0002
+w2
 
 ; Coastline
-TS-
+-TW
 5
 0003
 sh{0}
 
-TS-
+-TW
 1
 0008
 sh11
 
-TS-
+-TW
 1
 0009
 sh12
 
-TS-
+-TW
 1
 000A
 sh13
 
-TS-
+-TW
 1
 000B
 sh14
 
-TS-
+-TW
 1
 000C
 sh15
 
 ; Cliffs
-TS-
+DTW
 38
 000D
 s{0:00}
 
 ; More Coast
-TS-
+-TW
 1
 0033
 sh32
 
-TS-
+-TW
 1
 0034
 sh33
 
-;;; TODO: Add desert only tiles
+
+D--
+1
+0035
+sh20
+
+D--
+1
+0036
+sh21
+
+D--
+1
+0037
+sh22
+
+D--
+1
+0038
+sh23
+
+
+; Bushes
+D--
+10
+0039
+br{0}
 
 ; Bones/Wall/Mud/UFO/Rock
-TS-
+DT-
 4
 0043
 p{0:00}
 
-;;; TODO: More desert only tiles
+D--
+1
+0047
+p05
 
-; Mud
-TS-
-4
+D--
+1
+0048
+p06
+
+DTW
+1
 0049
 p07
 
-TS-
-4
+-TW
+1
 004A
 p08
 
 ; Ford WU
-TS-
+-TW
 1
 004B
 sh16
 
 ; Water
-TS-
+DTW
 1
 004C
 sh17
 
 ; Water
-TS-
+DTW
 1
 004D
 sh18
 
+D--
+1
+004E
+sh19
+
+
 ; Destroyed house
-TS-
+-TW
 1
 004F
 p13
 
 ; Walls
-TS-
+-TW
 1
 0050
 p14
 
+; Snow
+--W
+1
+0051
+p15
+
 ; Rocks
-TS-
-3
+DTW
+2
 0052
 b{0}
 
+-TW
+1
+0054
+b3
+
+D--
+1
+0055
+b4
+
+D--
+1
+0056
+b5
+
+D--
+1
+0057
+b6
+
 ; More coast
-TS-
+-TW
 1
 0058
 sh6
 
-TS-
+-TW
 1
 0059
 sh7
 
-TS-
+-TW
 1
 005A
 sh8
 
-TS-
+-TW
 1
 005B
 sh9
 
-TS-
+-TW
 1
 005C
 sh10
@@ -157,7 +221,7 @@ sh10
 ; ROADS
 
 ; roads
-TS-
+DTW
 43
 005d
 d{0:00}
@@ -166,19 +230,79 @@ d{0:00}
 ; RIVERS
 
 ; rivers
-TS-
+-TW
 13
 0088
 rv{0:00}
 
+D--
+1
+0095
+rv14
+
+D--
+1
+0096
+rv15
+
+D--
+1
+0097
+rv16
+
+D--
+1
+0098
+rv17
+
+D--
+1
+0099
+rv18
+
+D--
+1
+009A
+rv19
+
+D--
+1
+009B
+rv20
+
+D--
+1
+009C
+rv21
+
+D--
+1
+009D
+rv22
+
+D--
+1
+009E
+rv23
+
+D--
+1
+00AF
+rv24
+
+D--
+1
+00A0
+rv25
+
 ; River Crossing
-TS-
+DTW
 2
 00A1
 ford{0}
 
 ; Waterfalls
-TS-
+DTW
 2
 00A3
 falls{0}
@@ -187,40 +311,271 @@ falls{0}
 ; BRIDGES
 
 ; short bridge "/"
-TS-
+-TW
 1
 00A5
 bridge1
 
 ; short bridge "/" (destroyed)
-TS-
+-TW
 1
 00A6
 bridge1d
 
 ; short bridge "\"
-TS-
+-TW
 1
 00A7
 bridge2
 
 ; short bridge "\" (destroyed)
-TS-
+-TW
 1
 00A8
 bridge2d
 
+; desert short bridge "/"
+D--
+1
+00A9
+bridge3
+
+; desert short bridge "/" (destroyed)
+D--
+1
+00AA
+bridge3d
+
+; desert short bridge "\"
+D--
+1
+00AB
+bridge4
+
+; desert short bridge "\" (destroyed)
+D--
+1
+00AC
+bridge4d
+
+; Desert coast
+D--
+1
+00AD
+sh24
+
+D--
+1
+00AE
+sh25
+
+D--
+1
+00AF
+sh26
+
+D--
+1
+00B0
+sh27
+
+D--
+1
+00B1
+sh28
+
+D--
+1
+00B2
+sh29
+
+D--
+1
+00B3
+sh30
+
+D--
+1
+00B4
+sh31
+
+; Snow
+--W
+1
+00B5
+p16
+
+--W
+1
+00B6
+p17
+
+--W
+1
+00B7
+p18
+
+--W
+1
+00B8
+p19
+
+--W
+1
+00B9
+p20
+
 ; More coast
-TS-
+-TW
 1
 00BA
 sh34
 
-TS-
+-TW
 1
 00BB
 sh35
 
+D--
+1
+00BC
+sh36
+
+D--
+1
+00BD
+sh37
+
+D--
+1
+00BE
+sh38
+
+D--
+1
+00BF
+sh39
+
+D--
+1
+00C0
+sh40
+
+D--
+1
+00C1
+sh41
+
+D--
+1
+00C2
+sh42
+
+D--
+1
+00C3
+sh43
+
+D--
+1
+00C4
+sh44
+
+D--
+1
+00C5
+sh45
+
+D--
+1
+00C6
+sh46
+
+D--
+1
+00C7
+sh47
+
+D--
+1
+00C8
+sh48
+
+D--
+1
+00C9
+sh49
+
+D--
+1
+00CA
+sh50
+
+D--
+1
+00CB
+sh51
+
+D--
+1
+00CC
+sh52
+
+D--
+1
+00CD
+sh53
+
+D--
+1
+00CE
+sh54
+
+D--
+1
+00CF
+sh55
+
+D--
+1
+00D0
+sh56
+
+D--
+1
+00D1
+sh57
+
+D--
+1
+00D2
+sh58
+
+D--
+1
+00D3
+sh59
+
+D--
+1
+00D4
+sh60
+
+D--
+1
+00D5
+sh61
+
+D--
+1
+00D6
+sh62
+
+D--
+1
+00D7
+sh63
+
 ; bogus
 TS-
 1