diff --git a/SCU01EA.INI b/SCU01EA.INI
index b78850f..211d7ed 100644
--- a/SCU01EA.INI
+++ b/SCU01EA.INI
@@ -103,7 +103,7 @@ Allies=Special
 
 [Basic]
 Name=In the thick of it
-Intro=AAGUN
+Intro=<none>
 Brief=<none>
 Win=<none>
 Lose=<none>
@@ -146,18 +146,7 @@ Height=30
 2=8AgAcAACCBAP7/HwCA
 
 [UNITS]
-0=USSR,4TNK,256,8637,0,Guard,None
-1=USSR,4TNK,256,7999,0,Guard,None
-
-[STRUCTURES]
-0=USSR,FACT,256,7863,0,None,0,0
-1=USSR,PROC,256,6843,0,None,0,0
-2=USSR,APWR,256,8133,0,None,0,0
-3=USSR,STEK,256,6723,0,None,0,0
-4=USSR,APWR,256,7113,0,None,0,0
-5=USSR,BARR,256,7883,0,None,0,0
-6=USSR,BIO,256,7095,0,None,0,0
-7=USSR,KENN,256,9035,0,None,0,0
+0=USSR,4TNK,256,7867,0,Guard,None
 
 [Base]
 Player=USSR
@@ -173,5 +162,5 @@ Count=0
 4=Direct Tanya to destroy the westmost power plants to take them off-line.
 
 [Digest]
-1=PiAoEnI3N561zfpmapveIIQHqFE=
+1=EwOfEw8wu+RAo5MXzV1zOUK2LeU=
 
diff --git a/cache.mix b/cache.mix
new file mode 100644
index 0000000..0590bab
Binary files /dev/null and b/cache.mix differ
diff --git a/code/external/imgui/imgui_draw.cpp b/code/external/imgui/imgui_draw.cpp
index e345581..13a1180 100644
--- a/code/external/imgui/imgui_draw.cpp
+++ b/code/external/imgui/imgui_draw.cpp
@@ -1258,6 +1258,9 @@ void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& p_min, cons
     if ((col & IM_COL32_A_MASK) == 0)
         return;
 
+    if (user_texture_id == NULL)
+        return;
+
     const bool push_texture_id = _TextureIdStack.empty() || user_texture_id != _TextureIdStack.back();
     if (push_texture_id)
         PushTextureID(user_texture_id);
diff --git a/code/redalert/cdata.cpp b/code/redalert/cdata.cpp
index e676b0a..b20771f 100644
--- a/code/redalert/cdata.cpp
+++ b/code/redalert/cdata.cpp
@@ -63,1425 +63,833 @@ static TemplateTypeClass const Clear(
 static TemplateTypeClass const Road01(
 	TEMPLATE_ROAD01,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D01",
+	"CLEAR01",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road02(
 	TEMPLATE_ROAD02,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D02",
+	"DROADC02",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road03(
 	TEMPLATE_ROAD03,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D03",
+	"DROADC03",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road04(
 	TEMPLATE_ROAD04,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D04",
+	"DROADC04",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road05(
 	TEMPLATE_ROAD05,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D05",
+	"DROADC05",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road06(
 	TEMPLATE_ROAD06,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D06",
+	"DROADC06",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road07(
 	TEMPLATE_ROAD07,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D07",
+	"DROADC07",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road08(
 	TEMPLATE_ROAD08,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D08",
+	"DROADC08",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road09(
 	TEMPLATE_ROAD09,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D09",
+	"DROADC09",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road10(
 	TEMPLATE_ROAD10,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D10",
+	"DROADC10",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road11(
 	TEMPLATE_ROAD11,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D11",
+	"DROADC11",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road12(
 	TEMPLATE_ROAD12,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D12",
+	"DROADC12",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road13(
 	TEMPLATE_ROAD13,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D13",
+	"DROADC13",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road14(
 	TEMPLATE_ROAD14,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D14",
+	"DROADC14",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road15(
 	TEMPLATE_ROAD15,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D15",
+	"DROADC15",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road16(
 	TEMPLATE_ROAD16,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D16",
+	"DROADC16",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road17(
 	TEMPLATE_ROAD17,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D17",
+	"DROADC17",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road18(
 	TEMPLATE_ROAD18,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D18",
+	"DROADC18",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road19(
 	TEMPLATE_ROAD19,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D19",
+	"DROADC19",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road20(
 	TEMPLATE_ROAD20,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D20",
+	"DROADC20",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road21(
 	TEMPLATE_ROAD21,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D21",
+	"DROADC21",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road22(
 	TEMPLATE_ROAD22,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D22",
+	"DROADC22",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road23(
 	TEMPLATE_ROAD23,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D23",
+	"DROADC23",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road24(
 	TEMPLATE_ROAD24,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D24",
+	"DROADC24",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road25(
 	TEMPLATE_ROAD25,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D25",
+	"DROADC01",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road26(
 	TEMPLATE_ROAD26,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D26",
+	"DROADC02",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road27(
 	TEMPLATE_ROAD27,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D27",
+	"DROADC02",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road28(
 	TEMPLATE_ROAD28,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D28",
+	"DROADC03",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road29(
 	TEMPLATE_ROAD29,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D29",
+	"DROADC04",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road30(
 	TEMPLATE_ROAD30,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D30",
+	"DROADC05",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road31(
 	TEMPLATE_ROAD31,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D31",
+	"DROADC06",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road32(
 	TEMPLATE_ROAD32,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D32",
+	"DROADC07",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road33(
 	TEMPLATE_ROAD33,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D33",
+	"DROADC08",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road34(
 	TEMPLATE_ROAD34,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D34",
+	"DROADC09",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road35(
 	TEMPLATE_ROAD35,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D35",
+	"DROADC10",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road36(
 	TEMPLATE_ROAD36,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D36",
+	"DROADC11",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road37(
 	TEMPLATE_ROAD37,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D37",
+	"DROADC12",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road38(
 	TEMPLATE_ROAD38,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D38",
+	"DROADC13",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road39(
 	TEMPLATE_ROAD39,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D39",
+	"DROADC14",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road40(
 	TEMPLATE_ROAD40,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D40",
+	"DROADC15",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road41(
 	TEMPLATE_ROAD41,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D41",
+	"DROADC16",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road42(
 	TEMPLATE_ROAD42,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D42",
+	"DROADC17",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road43(
 	TEMPLATE_ROAD43,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D43",
+	"DROADC18",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road44(
 	TEMPLATE_ROAD44,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D44",
+	"DROADC19",
 	TXT_ROAD
 );
 static TemplateTypeClass const Road45(
 	TEMPLATE_ROAD45,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"D45",
+	"DROADC20",
 	TXT_ROAD
 );
 static TemplateTypeClass const Water(
 	TEMPLATE_WATER,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"W1",
+	"WATER01",
 	TXT_WATER
 );
 static TemplateTypeClass const Water2(
 	TEMPLATE_WATER2,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"W2",
+	"WATER02",
 	TXT_WATER
 );
 static TemplateTypeClass const Shore01(
 	TEMPLATE_SHORE01,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH01",
+	"SHORE01",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore02(
 	TEMPLATE_SHORE02,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH02",
+	"SHORE02",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore03(
 	TEMPLATE_SHORE03,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH03",
+	"SHORE03",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore04(
 	TEMPLATE_SHORE04,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH04",
+	"SHORE04",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore05(
 	TEMPLATE_SHORE05,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH05",
+	"SHORE05",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore06(
 	TEMPLATE_SHORE06,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH06",
+	"SHORE06",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore07(
 	TEMPLATE_SHORE07,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH07",
+	"SHORE07",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore08(
 	TEMPLATE_SHORE08,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH08",
+	"SHORE08",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore09(
 	TEMPLATE_SHORE09,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH09",
+	"SHORE09",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore10(
 	TEMPLATE_SHORE10,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH10",
+	"SHORE10",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore11(
 	TEMPLATE_SHORE11,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH11",
+	"SHORE11",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore12(
 	TEMPLATE_SHORE12,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH12",
+	"SHORE12",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore13(
 	TEMPLATE_SHORE13,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH13",
+	"SHORE13",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore14(
 	TEMPLATE_SHORE14,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH14",
+	"SHORE14",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore15(
 	TEMPLATE_SHORE15,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH15",
+	"SHORE15",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore16(
 	TEMPLATE_SHORE16,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH16",
+	"SHORE16",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore17(
 	TEMPLATE_SHORE17,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH17",
+	"SHORE17",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore18(
 	TEMPLATE_SHORE18,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH18",
+	"SHORE18",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore19(
 	TEMPLATE_SHORE19,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH19",
+	"SHORE19",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore20(
 	TEMPLATE_SHORE20,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH20",
+	"SHORE20",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore21(
 	TEMPLATE_SHORE21,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH21",
+	"SHORE21",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore22(
 	TEMPLATE_SHORE22,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH22",
+	"SHORE22",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore23(
 	TEMPLATE_SHORE23,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH23",
+	"SHORE23",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore24(
 	TEMPLATE_SHORE24,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH24",
+	"SHORE24",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore25(
 	TEMPLATE_SHORE25,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH25",
+	"SHORE25",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore26(
 	TEMPLATE_SHORE26,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH26",
+	"SHORE26",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore27(
 	TEMPLATE_SHORE27,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH27",
+	"SHORE27",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore28(
 	TEMPLATE_SHORE28,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH28",
+	"SHORE28",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore29(
 	TEMPLATE_SHORE29,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH29",
+	"SHORE29",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore30(
 	TEMPLATE_SHORE30,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH30",
+	"SHORE30",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore31(
 	TEMPLATE_SHORE31,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH31",
+	"SHORE31",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore32(
 	TEMPLATE_SHORE32,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH32",
+	"SHORE32",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore33(
 	TEMPLATE_SHORE33,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH33",
+	"SHORE33",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore34(
 	TEMPLATE_SHORE34,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH34",
+	"SHORE4",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore35(
 	TEMPLATE_SHORE35,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH35",
+	"SHORE35",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore36(
 	TEMPLATE_SHORE36,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH36",
+	"SHORE36",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore37(
 	TEMPLATE_SHORE37,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH37",
+	"SHORE37",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore38(
 	TEMPLATE_SHORE38,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH38",
+	"SHORE38",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore39(
 	TEMPLATE_SHORE39,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH39",
+	"SHORE39",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore40(
 	TEMPLATE_SHORE40,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH40",
+	"SHORE40",
 	TXT_SHORE
 );
 static TemplateTypeClass const Shore41(
 	TEMPLATE_SHORE41,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH41",
+	"SHORE41",
 	TXT_SHORE
 );
-static TemplateTypeClass const Shore42(
-	TEMPLATE_SHORE42,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH42",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore43(
-	TEMPLATE_SHORE43,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH43",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore44(
-	TEMPLATE_SHORE44,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH44",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore45(
-	TEMPLATE_SHORE45,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH45",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore46(
-	TEMPLATE_SHORE46,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH46",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore47(
-	TEMPLATE_SHORE47,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH47",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore48(
-	TEMPLATE_SHORE48,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH48",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore49(
-	TEMPLATE_SHORE49,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH49",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore50(
-	TEMPLATE_SHORE50,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH50",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore51(
-	TEMPLATE_SHORE51,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH51",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore52(
-	TEMPLATE_SHORE52,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH52",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore53(
-	TEMPLATE_SHORE53,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH53",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore54(
-	TEMPLATE_SHORE54,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH54",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore55(
-	TEMPLATE_SHORE55,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH55",
-	TXT_SHORE
-);
-static TemplateTypeClass const Shore56(
-	TEMPLATE_SHORE56,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"SH56",
-	TXT_SHORE
-);
-static TemplateTypeClass const Boulder1(
-	TEMPLATE_BOULDER1,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B1",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Boulder2(
-	TEMPLATE_BOULDER2,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B2",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Boulder3(
-	TEMPLATE_BOULDER3,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B3",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Boulder4(
-	TEMPLATE_BOULDER4,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B4",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Boulder5(
-	TEMPLATE_BOULDER5,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B5",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Boulder6(
-	TEMPLATE_BOULDER6,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"B6",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope01(
-	TEMPLATE_SLOPE01,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S01",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope02(
-	TEMPLATE_SLOPE02,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S02",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope03(
-	TEMPLATE_SLOPE03,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S03",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope04(
-	TEMPLATE_SLOPE04,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S04",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope05(
-	TEMPLATE_SLOPE05,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S05",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope06(
-	TEMPLATE_SLOPE06,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S06",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope07(
-	TEMPLATE_SLOPE07,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S07",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope08(
-	TEMPLATE_SLOPE08,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S08",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope09(
-	TEMPLATE_SLOPE09,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S09",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope10(
-	TEMPLATE_SLOPE10,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S10",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope11(
-	TEMPLATE_SLOPE11,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S11",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope12(
-	TEMPLATE_SLOPE12,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S12",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope13(
-	TEMPLATE_SLOPE13,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S13",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope14(
-	TEMPLATE_SLOPE14,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S14",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope15(
-	TEMPLATE_SLOPE15,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S15",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope16(
-	TEMPLATE_SLOPE16,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S16",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope17(
-	TEMPLATE_SLOPE17,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S17",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope18(
-	TEMPLATE_SLOPE18,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S18",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope19(
-	TEMPLATE_SLOPE19,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S19",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope20(
-	TEMPLATE_SLOPE20,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S20",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope21(
-	TEMPLATE_SLOPE21,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S21",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope22(
-	TEMPLATE_SLOPE22,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S22",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope23(
-	TEMPLATE_SLOPE23,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S23",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope24(
-	TEMPLATE_SLOPE24,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S24",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope25(
-	TEMPLATE_SLOPE25,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S25",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope26(
-	TEMPLATE_SLOPE26,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S26",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope27(
-	TEMPLATE_SLOPE27,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S27",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope28(
-	TEMPLATE_SLOPE28,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S28",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope29(
-	TEMPLATE_SLOPE29,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S29",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope30(
-	TEMPLATE_SLOPE30,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S30",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope31(
-	TEMPLATE_SLOPE31,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S31",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope32(
-	TEMPLATE_SLOPE32,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S32",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope33(
-	TEMPLATE_SLOPE33,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S33",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope34(
-	TEMPLATE_SLOPE34,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S34",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope35(
-	TEMPLATE_SLOPE35,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S35",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope36(
-	TEMPLATE_SLOPE36,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S36",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope37(
-	TEMPLATE_SLOPE37,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S37",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Slope38(
-	TEMPLATE_SLOPE38,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"S38",
-	TXT_SLOPE
-);
-static TemplateTypeClass const Patch01(
-	TEMPLATE_PATCH01,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P01",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch02(
-	TEMPLATE_PATCH02,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P02",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch03(
-	TEMPLATE_PATCH03,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P03",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch04(
-	TEMPLATE_PATCH04,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P04",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch07(
-	TEMPLATE_PATCH07,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P07",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch08(
-	TEMPLATE_PATCH08,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P08",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch13(
-	TEMPLATE_PATCH13,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P13",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch14(
-	TEMPLATE_PATCH14,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P14",
-	TXT_PATCH
-);
-static TemplateTypeClass const Patch15(
-	TEMPLATE_PATCH15,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"P15",
-	TXT_PATCH
-);
-static TemplateTypeClass const River01(
-	TEMPLATE_RIVER01,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV01",
-	TXT_RIVER
-);
-static TemplateTypeClass const River02(
-	TEMPLATE_RIVER02,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV02",
-	TXT_RIVER
-);
-static TemplateTypeClass const River03(
-	TEMPLATE_RIVER03,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV03",
-	TXT_RIVER
-);
-static TemplateTypeClass const River04(
-	TEMPLATE_RIVER04,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV04",
-	TXT_RIVER
-);
-static TemplateTypeClass const River05(
-	TEMPLATE_RIVER05,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV05",
-	TXT_RIVER
-);
-static TemplateTypeClass const River06(
-	TEMPLATE_RIVER06,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV06",
-	TXT_RIVER
-);
-static TemplateTypeClass const River07(
-	TEMPLATE_RIVER07,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV07",
-	TXT_RIVER
-);
-static TemplateTypeClass const River08(
-	TEMPLATE_RIVER08,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV08",
-	TXT_RIVER
-);
-static TemplateTypeClass const River09(
-	TEMPLATE_RIVER09,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV09",
-	TXT_RIVER
-);
-static TemplateTypeClass const River10(
-	TEMPLATE_RIVER10,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV10",
-	TXT_RIVER
-);
-static TemplateTypeClass const River11(
-	TEMPLATE_RIVER11,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV11",
-	TXT_RIVER
-);
-static TemplateTypeClass const River12(
-	TEMPLATE_RIVER12,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV12",
-	TXT_RIVER
-);
-static TemplateTypeClass const River13(
-	TEMPLATE_RIVER13,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV13",
-	TXT_RIVER
-);
-static TemplateTypeClass const River14(
-	TEMPLATE_RIVER14,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV14",
-	TXT_RIVER
-);
-static TemplateTypeClass const River15(
-	TEMPLATE_RIVER15,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"RV15",
-	TXT_RIVER
-);
-static TemplateTypeClass const Ford1(
-	TEMPLATE_FORD1,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FORD1",
-	TXT_RIVER
-);
-static TemplateTypeClass const Ford2(
-	TEMPLATE_FORD2,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FORD2",
-	TXT_RIVER
-);
-static TemplateTypeClass const Falls1(
-	TEMPLATE_FALLS1,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FALLS1",
-	TXT_RIVER
-);
-static TemplateTypeClass const Falls1a(
-	TEMPLATE_FALLS1A,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FALLS1A",
-	TXT_RIVER
-);
-static TemplateTypeClass const Falls2(
-	TEMPLATE_FALLS2,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FALLS2",
-	TXT_RIVER
-);
-static TemplateTypeClass const Falls2a(
-	TEMPLATE_FALLS2A,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"FALLS2A",
-	TXT_RIVER
-);
+// jmarshall
 static TemplateTypeClass const Bridge1x(
 	TEMPLATE_BRIDGE1X,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE1X",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1(
 	TEMPLATE_BRIDGE1,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE1",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1h(
 	TEMPLATE_BRIDGE1H,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE1H",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1d(
 	TEMPLATE_BRIDGE1D,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE1D",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2x(
 	TEMPLATE_BRIDGE2X,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE2X",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2(
 	TEMPLATE_BRIDGE2,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE2",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2h(
 	TEMPLATE_BRIDGE2H,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE2H",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2d(
 	TEMPLATE_BRIDGE2D,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BRIDGE2D",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1ax(
 	TEMPLATE_BRIDGE_1AX,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR1X",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1a(
 	TEMPLATE_BRIDGE_1A,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR1A",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1b(
 	TEMPLATE_BRIDGE_1B,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR1B",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge1c(
 	TEMPLATE_BRIDGE_1C,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR1C",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2ax(
 	TEMPLATE_BRIDGE_2AX,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR2X",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2a(
 	TEMPLATE_BRIDGE_2A,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR2A",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2b(
 	TEMPLATE_BRIDGE_2B,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR2B",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge2c(
 	TEMPLATE_BRIDGE_2C,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR2C",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3a(
 	TEMPLATE_BRIDGE_3A,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3A",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3b(
 	TEMPLATE_BRIDGE_3B,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3B",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3c(
 	TEMPLATE_BRIDGE_3C,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3C",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3d(
 	TEMPLATE_BRIDGE_3D,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3D",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3e(
 	TEMPLATE_BRIDGE_3E,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3E",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const Bridge3f(
 	TEMPLATE_BRIDGE_3F,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"BR3F",
+	"WCLIFF01",
 	TXT_BRIDGE
 );
 static TemplateTypeClass const ShoreCliff01(
 	TEMPLATE_SHORECLIFF01,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC01",
+	"WCLIFF01",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff02(
 	TEMPLATE_SHORECLIFF02,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC02",
+	"WCLIFF02",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff03(
 	TEMPLATE_SHORECLIFF03,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC03",
+	"WCLIFF03",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff04(
 	TEMPLATE_SHORECLIFF04,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC04",
+	"WCLIFF04",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff05(
 	TEMPLATE_SHORECLIFF05,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC05",
+	"WCLIFF05",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff06(
 	TEMPLATE_SHORECLIFF06,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC06",
+	"WCLIFF06",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff07(
 	TEMPLATE_SHORECLIFF07,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC07",
+	"WCLIFF07",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff08(
 	TEMPLATE_SHORECLIFF08,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC08",
+	"WCLIFF08",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff09(
 	TEMPLATE_SHORECLIFF09,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC09",
+	"WCLIFF09",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff10(
 	TEMPLATE_SHORECLIFF10,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC10",
+	"WCLIFF10",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff11(
 	TEMPLATE_SHORECLIFF11,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC11",
+	"WCLIFF11",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff12(
 	TEMPLATE_SHORECLIFF12,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC12",
+	"WCLIFF12",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff13(
 	TEMPLATE_SHORECLIFF13,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC13",
+	"WCLIFF13",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff14(
 	TEMPLATE_SHORECLIFF14,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC14",
+	"WCLIFF14",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff15(
 	TEMPLATE_SHORECLIFF15,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC15",
+	"WCLIFF15",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff16(
 	TEMPLATE_SHORECLIFF16,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC16",
+	"WCLIFF16",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff17(
 	TEMPLATE_SHORECLIFF17,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC17",
+	"WCLIFF17",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff18(
 	TEMPLATE_SHORECLIFF18,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC18",
+	"WCLIFF18",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff19(
 	TEMPLATE_SHORECLIFF19,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC19",
+	"WCLIFF19",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff20(
 	TEMPLATE_SHORECLIFF20,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC20",
+	"WCLIFF20",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff21(
 	TEMPLATE_SHORECLIFF21,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC21",
+	"WCLIFF21",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff22(
 	TEMPLATE_SHORECLIFF22,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC22",
+	"WCLIFF22",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff23(
 	TEMPLATE_SHORECLIFF23,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC23",
+	"WCLIFF23",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff24(
 	TEMPLATE_SHORECLIFF24,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC24",
+	"WCLIFF24",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff25(
 	TEMPLATE_SHORECLIFF25,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC25",
+	"WCLIFF25",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff26(
 	TEMPLATE_SHORECLIFF26,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC26",
+	"WCLIFF26",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff27(
 	TEMPLATE_SHORECLIFF27,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC27",
+	"WCLIFF27",
 	TXT_SHORE
 );
 static TemplateTypeClass const ShoreCliff28(
 	TEMPLATE_SHORECLIFF28,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC28",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff29(
-	TEMPLATE_SHORECLIFF29,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC29",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff30(
-	TEMPLATE_SHORECLIFF30,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC30",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff31(
-	TEMPLATE_SHORECLIFF31,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC31",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff32(
-	TEMPLATE_SHORECLIFF32,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC32",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff33(
-	TEMPLATE_SHORECLIFF33,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC33",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff34(
-	TEMPLATE_SHORECLIFF34,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC34",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff35(
-	TEMPLATE_SHORECLIFF35,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC35",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff36(
-	TEMPLATE_SHORECLIFF36,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC36",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff37(
-	TEMPLATE_SHORECLIFF37,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC37",
-	TXT_SHORE
-);
-static TemplateTypeClass const ShoreCliff38(
-	TEMPLATE_SHORECLIFF38,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	"WC38",
+	"WCLIFF28",
 	TXT_SHORE
 );
+
 static TemplateTypeClass const Rough01(
 	TEMPLATE_ROUGH01,
 	THEATERF_TEMPERATE|THEATERF_SNOW,
@@ -2570,8 +1978,8 @@ static void _Watcom_Ugh_Hack(void)
 	(void)new TemplateTypeClass(Rough11);			// TEMPLATE_ROUGH11
 	(void)new TemplateTypeClass(Road44);			//	TEMPLATE_ROAD44
 	(void)new TemplateTypeClass(Road45);			//	TEMPLATE_ROAD45
-	(void)new TemplateTypeClass(River14);			//	TEMPLATE_RIVER14
-	(void)new TemplateTypeClass(River15);			//	TEMPLATE_RIVER15
+//	(void)new TemplateTypeClass(River14);			//	TEMPLATE_RIVER14
+//	(void)new TemplateTypeClass(River15);			//	TEMPLATE_RIVER15
 	(void)new TemplateTypeClass(RiverCliff01);	//	TEMPLATE_RIVERCLIFF01
 	(void)new TemplateTypeClass(RiverCliff02);	//	TEMPLATE_RIVERCLIFF02
 	(void)new TemplateTypeClass(RiverCliff03);	//	TEMPLATE_RIVERCLIFF03
@@ -2802,21 +2210,6 @@ void TemplateTypeClass::Init_Heap(void)
 	(void)new TemplateTypeClass(Shore39);			//	TEMPLATE_SHORE39
 	(void)new TemplateTypeClass(Shore40);			//	TEMPLATE_SHORE40
 	(void)new TemplateTypeClass(Shore41);			//	TEMPLATE_SHORE41
-	(void)new TemplateTypeClass(Shore42);			//	TEMPLATE_SHORE42
-	(void)new TemplateTypeClass(Shore43);			//	TEMPLATE_SHORE43
-	(void)new TemplateTypeClass(Shore44);			//	TEMPLATE_SHORE44
-	(void)new TemplateTypeClass(Shore45);			//	TEMPLATE_SHORE45
-	(void)new TemplateTypeClass(Shore46);			//	TEMPLATE_SHORE46
-	(void)new TemplateTypeClass(Shore47);			//	TEMPLATE_SHORE47
-	(void)new TemplateTypeClass(Shore48);			//	TEMPLATE_SHORE48
-	(void)new TemplateTypeClass(Shore49);			//	TEMPLATE_SHORE49
-	(void)new TemplateTypeClass(Shore50);			//	TEMPLATE_SHORE50
-	(void)new TemplateTypeClass(Shore51);			//	TEMPLATE_SHORE51
-	(void)new TemplateTypeClass(Shore52);			//	TEMPLATE_SHORE52
-	(void)new TemplateTypeClass(Shore53);			//	TEMPLATE_SHORE53
-	(void)new TemplateTypeClass(Shore54);			//	TEMPLATE_SHORE54
-	(void)new TemplateTypeClass(Shore55);			//	TEMPLATE_SHORE55
-	(void)new TemplateTypeClass(Shore56);			//	TEMPLATE_SHORE56
 	(void)new TemplateTypeClass(ShoreCliff01);	//	TEMPLATE_SHORECLIFF01
 	(void)new TemplateTypeClass(ShoreCliff02);	//	TEMPLATE_SHORECLIFF02
 	(void)new TemplateTypeClass(ShoreCliff03);	//	TEMPLATE_SHORECLIFF03
@@ -2845,92 +2238,10 @@ void TemplateTypeClass::Init_Heap(void)
 	(void)new TemplateTypeClass(ShoreCliff26);	//	TEMPLATE_SHORECLIFF26
 	(void)new TemplateTypeClass(ShoreCliff27);	//	TEMPLATE_SHORECLIFF27
 	(void)new TemplateTypeClass(ShoreCliff28);	//	TEMPLATE_SHORECLIFF28
-	(void)new TemplateTypeClass(ShoreCliff29);	//	TEMPLATE_SHORECLIFF29
-	(void)new TemplateTypeClass(ShoreCliff30);	//	TEMPLATE_SHORECLIFF30
-	(void)new TemplateTypeClass(ShoreCliff31);	//	TEMPLATE_SHORECLIFF31
-	(void)new TemplateTypeClass(ShoreCliff32);	//	TEMPLATE_SHORECLIFF32
-	(void)new TemplateTypeClass(ShoreCliff33);	//	TEMPLATE_SHORECLIFF33
-	(void)new TemplateTypeClass(ShoreCliff34);	//	TEMPLATE_SHORECLIFF34
-	(void)new TemplateTypeClass(ShoreCliff35);	//	TEMPLATE_SHORECLIFF35
-	(void)new TemplateTypeClass(ShoreCliff36);	//	TEMPLATE_SHORECLIFF36
-	(void)new TemplateTypeClass(ShoreCliff37);	//	TEMPLATE_SHORECLIFF37
-	(void)new TemplateTypeClass(ShoreCliff38);	//	TEMPLATE_SHORECLIFF38
-	(void)new TemplateTypeClass(Boulder1);			//	TEMPLATE_BOULDER1
-	(void)new TemplateTypeClass(Boulder2);			//	TEMPLATE_BOULDER2
-	(void)new TemplateTypeClass(Boulder3);			//	TEMPLATE_BOULDER3
-	(void)new TemplateTypeClass(Boulder4);			// TEMPLATE_BOULDER4
-	(void)new TemplateTypeClass(Boulder5);			//	TEMPLATE_BOULDER5
-	(void)new TemplateTypeClass(Boulder6);			//	TEMPLATE_BOULDER6
-	(void)new TemplateTypeClass(Patch01);			//	TEMPLATE_PATCH1
-	(void)new TemplateTypeClass(Patch02);			//	TEMPLATE_PATCH2
-	(void)new TemplateTypeClass(Patch03);			//	TEMPLATE_PATCH3
-	(void)new TemplateTypeClass(Patch04);			//	TEMPLATE_PATCH4
-	(void)new TemplateTypeClass(Patch07);			//	TEMPLATE_PATCH7
-	(void)new TemplateTypeClass(Patch08);			//	TEMPLATE_PATCH8
-	(void)new TemplateTypeClass(Patch13);			//	TEMPLATE_PATCH13
-	(void)new TemplateTypeClass(Patch14);			//	TEMPLATE_PATCH14
-	(void)new TemplateTypeClass(Patch15);			//	TEMPLATE_PATCH15
-	(void)new TemplateTypeClass(River01);			//	TEMPLATE_RIVER1
-	(void)new TemplateTypeClass(River02);			//	TEMPLATE_RIVER2
-	(void)new TemplateTypeClass(River03);			//	TEMPLATE_RIVER3
-	(void)new TemplateTypeClass(River04);			//	TEMPLATE_RIVER4
-	(void)new TemplateTypeClass(River05);			//	TEMPLATE_RIVER5
-	(void)new TemplateTypeClass(River06);			//	TEMPLATE_RIVER6
-	(void)new TemplateTypeClass(River07);			//	TEMPLATE_RIVER7
-	(void)new TemplateTypeClass(River08);			//	TEMPLATE_RIVER8
-	(void)new TemplateTypeClass(River09);			//	TEMPLATE_RIVER9
-	(void)new TemplateTypeClass(River10);			//	TEMPLATE_RIVER10
-	(void)new TemplateTypeClass(River11);			//	TEMPLATE_RIVER11
-	(void)new TemplateTypeClass(River12);			//	TEMPLATE_RIVER12
-	(void)new TemplateTypeClass(River13);			//	TEMPLATE_RIVER13
-	(void)new TemplateTypeClass(Falls1);			//	TEMPLATE_FALLS1
-	(void)new TemplateTypeClass(Falls1a);			//	TEMPLATE_FALLS1A
-	(void)new TemplateTypeClass(Falls2);			//	TEMPLATE_FALLS2
-	(void)new TemplateTypeClass(Falls2a);			//	TEMPLATE_FALLS2A
-	(void)new TemplateTypeClass(Ford1);				//	TEMPLATE_FORD1
-	(void)new TemplateTypeClass(Ford2);				//	TEMPLATE_FORD2
 	(void)new TemplateTypeClass(Bridge1);			//	TEMPLATE_BRIDGE1
 	(void)new TemplateTypeClass(Bridge1d);			//	TEMPLATE_BRIDGE1D
 	(void)new TemplateTypeClass(Bridge2);			//	TEMPLATE_BRIDGE2
 	(void)new TemplateTypeClass(Bridge2d);			//	TEMPLATE_BRIDGE2D
-	(void)new TemplateTypeClass(Slope01);			//	TEMPLATE_SLOPE1
-	(void)new TemplateTypeClass(Slope02);			//	TEMPLATE_SLOPE2
-	(void)new TemplateTypeClass(Slope03);			//	TEMPLATE_SLOPE3
-	(void)new TemplateTypeClass(Slope04);			//	TEMPLATE_SLOPE4
-	(void)new TemplateTypeClass(Slope05);			//	TEMPLATE_SLOPE5
-	(void)new TemplateTypeClass(Slope06);			//	TEMPLATE_SLOPE6
-	(void)new TemplateTypeClass(Slope07);			//	TEMPLATE_SLOPE7
-	(void)new TemplateTypeClass(Slope08);			//	TEMPLATE_SLOPE8
-	(void)new TemplateTypeClass(Slope09);			//	TEMPLATE_SLOPE9
-	(void)new TemplateTypeClass(Slope10);			//	TEMPLATE_SLOPE10
-	(void)new TemplateTypeClass(Slope11);			//	TEMPLATE_SLOPE11
-	(void)new TemplateTypeClass(Slope12);			//	TEMPLATE_SLOPE12
-	(void)new TemplateTypeClass(Slope13);			//	TEMPLATE_SLOPE13
-	(void)new TemplateTypeClass(Slope14);			//	TEMPLATE_SLOPE14
-	(void)new TemplateTypeClass(Slope15);			//	TEMPLATE_SLOPE15
-	(void)new TemplateTypeClass(Slope16);			//	TEMPLATE_SLOPE16
-	(void)new TemplateTypeClass(Slope17);			//	TEMPLATE_SLOPE17
-	(void)new TemplateTypeClass(Slope18);			//	TEMPLATE_SLOPE18
-	(void)new TemplateTypeClass(Slope19);			//	TEMPLATE_SLOPE19
-	(void)new TemplateTypeClass(Slope20);			//	TEMPLATE_SLOPE20
-	(void)new TemplateTypeClass(Slope21);			//	TEMPLATE_SLOPE21
-	(void)new TemplateTypeClass(Slope22);			//	TEMPLATE_SLOPE22
-	(void)new TemplateTypeClass(Slope23);			//	TEMPLATE_SLOPE23
-	(void)new TemplateTypeClass(Slope24);			//	TEMPLATE_SLOPE24
-	(void)new TemplateTypeClass(Slope25);			//	TEMPLATE_SLOPE25
-	(void)new TemplateTypeClass(Slope26);			//	TEMPLATE_SLOPE26
-	(void)new TemplateTypeClass(Slope27);			//	TEMPLATE_SLOPE27
-	(void)new TemplateTypeClass(Slope28);			//	TEMPLATE_SLOPE28
-	(void)new TemplateTypeClass(Slope29);			//	TEMPLATE_SLOPE29
-	(void)new TemplateTypeClass(Slope30);			//	TEMPLATE_SLOPE30
-	(void)new TemplateTypeClass(Slope31);			//	TEMPLATE_SLOPE31
-	(void)new TemplateTypeClass(Slope32);			//	TEMPLATE_SLOPE32
-	(void)new TemplateTypeClass(Slope33);			//	TEMPLATE_SLOPE33
-	(void)new TemplateTypeClass(Slope34);			//	TEMPLATE_SLOPE34
-	(void)new TemplateTypeClass(Slope35);			//	TEMPLATE_SLOPE35
-	(void)new TemplateTypeClass(Slope36);			//	TEMPLATE_SLOPE36
-	(void)new TemplateTypeClass(Slope37);			//	TEMPLATE_SLOPE37
-	(void)new TemplateTypeClass(Slope38);			//	TEMPLATE_SLOPE38
 	(void)new TemplateTypeClass(Road01);			//	TEMPLATE_ROAD1
 	(void)new TemplateTypeClass(Road02);			//	TEMPLATE_ROAD2
 	(void)new TemplateTypeClass(Road03);			//	TEMPLATE_ROAD3
@@ -3121,9 +2432,14 @@ void TemplateTypeClass::Init(TheaterType theater)
 	char fullname[_MAX_FNAME+_MAX_EXT];	// Fully constructed iconset name.
 	void const * ptr;		// Working loaded iconset pointer.
 
+	void *terrainPalette = (void *)MFCD::Retrieve(Theaters[theater].IsoPalette);
+
 	for (TemplateType index = TEMPLATE_FIRST; index < TEMPLATE_COUNT; index++) {
 		TemplateTypeClass	const & tplate = As_Reference(index);
-
+// jmarshall - temp hack
+		if (index > TEMPLATE_SHORE41)
+			break;
+// jmarshall end
 		((void const *&)tplate.ImageData) = NULL;
 		if (tplate.Theater & (1<<theater)) {
 			_makepath(fullname, NULL, NULL, tplate.IniName, Theaters[theater].Suffix);
@@ -3148,7 +2464,7 @@ void TemplateTypeClass::Init(TheaterType theater)
 				// If no HD assets, load the legacy assets into a texture.
 				char tmp[512];
 				sprintf(tmp, "icon_%s", fullname);
-				((void const*&)tplate.HDImageData) = Load_Stamp(fullname, tplate.ImageData);
+				((void const*&)tplate.HDImageData) = Load_Stamp(fullname, tplate.ImageData, terrainPalette);
 			}
 		}
 	}
diff --git a/code/redalert/const.cpp b/code/redalert/const.cpp
index eb2efcc..105f3b9 100644
--- a/code/redalert/const.cpp
+++ b/code/redalert/const.cpp
@@ -647,9 +647,9 @@ GroundType Ground[LAND_COUNT];
 **	These are the names of the theaters.
 */
 TheaterDataType const Theaters[THEATER_COUNT] = {
-	{"TEMPERATE","TEMPERAT","TEM"},
-	{"SNOW","SNOW","SNO"},
-	{"INTERIOR","INTERIOR","INT"},
+	{"TEMPERATE","TEMPERAT","TEM", "ISOSNO.PAL"},
+	{"SNOW","SNOW","SNO", "ISOSNO.PAL"},
+	{"INTERIOR","INTERIOR","INT", "ISOSNO.PAL"},
 };
 
 
diff --git a/code/redalert/defines.h b/code/redalert/defines.h
index 25981d7..cf0cbbf 100644
--- a/code/redalert/defines.h
+++ b/code/redalert/defines.h
@@ -1785,21 +1785,21 @@ typedef enum TemplateType : unsigned short {
 	TEMPLATE_SHORE39,
 	TEMPLATE_SHORE40,
 	TEMPLATE_SHORE41,
-	TEMPLATE_SHORE42,
-	TEMPLATE_SHORE43,
-	TEMPLATE_SHORE44,
-	TEMPLATE_SHORE45,
-	TEMPLATE_SHORE46,
-	TEMPLATE_SHORE47,
-	TEMPLATE_SHORE48,
-	TEMPLATE_SHORE49,
-	TEMPLATE_SHORE50,
-	TEMPLATE_SHORE51,
-	TEMPLATE_SHORE52,
-	TEMPLATE_SHORE53,
-	TEMPLATE_SHORE54,
-	TEMPLATE_SHORE55,
-	TEMPLATE_SHORE56,
+	//TEMPLATE_SHORE42,
+	//TEMPLATE_SHORE43,
+	//TEMPLATE_SHORE44,
+	//TEMPLATE_SHORE45,
+	//TEMPLATE_SHORE46,
+	//TEMPLATE_SHORE47,
+	//TEMPLATE_SHORE48,
+	//TEMPLATE_SHORE49,
+	//TEMPLATE_SHORE50,
+	//TEMPLATE_SHORE51,
+	//TEMPLATE_SHORE52,
+	//TEMPLATE_SHORE53,
+	//TEMPLATE_SHORE54,
+	//TEMPLATE_SHORE55,
+	//TEMPLATE_SHORE56,
 	TEMPLATE_SHORECLIFF01,
 	TEMPLATE_SHORECLIFF02,
 	TEMPLATE_SHORECLIFF03,
@@ -1828,92 +1828,86 @@ typedef enum TemplateType : unsigned short {
 	TEMPLATE_SHORECLIFF26,
 	TEMPLATE_SHORECLIFF27,
 	TEMPLATE_SHORECLIFF28,
-	TEMPLATE_SHORECLIFF29,
-	TEMPLATE_SHORECLIFF30,
-	TEMPLATE_SHORECLIFF31,
-	TEMPLATE_SHORECLIFF32,
-	TEMPLATE_SHORECLIFF33,
-	TEMPLATE_SHORECLIFF34,
-	TEMPLATE_SHORECLIFF35,
-	TEMPLATE_SHORECLIFF36,
-	TEMPLATE_SHORECLIFF37,
-	TEMPLATE_SHORECLIFF38,
-	TEMPLATE_BOULDER1,
-	TEMPLATE_BOULDER2,
-	TEMPLATE_BOULDER3,
-	TEMPLATE_BOULDER4,
-	TEMPLATE_BOULDER5,
-	TEMPLATE_BOULDER6,
-	TEMPLATE_PATCH01,
-	TEMPLATE_PATCH02,
-	TEMPLATE_PATCH03,
-	TEMPLATE_PATCH04,
-	TEMPLATE_PATCH07,
-	TEMPLATE_PATCH08,
-	TEMPLATE_PATCH13,
-	TEMPLATE_PATCH14,
-	TEMPLATE_PATCH15,
-	TEMPLATE_RIVER01,
-	TEMPLATE_RIVER02,
-	TEMPLATE_RIVER03,
-	TEMPLATE_RIVER04,
-	TEMPLATE_RIVER05,
-	TEMPLATE_RIVER06,
-	TEMPLATE_RIVER07,
-	TEMPLATE_RIVER08,
-	TEMPLATE_RIVER09,
-	TEMPLATE_RIVER10,
-	TEMPLATE_RIVER11,
-	TEMPLATE_RIVER12,
-	TEMPLATE_RIVER13,
-	TEMPLATE_FALLS1,
-	TEMPLATE_FALLS1A,
-	TEMPLATE_FALLS2,
-	TEMPLATE_FALLS2A,
-	TEMPLATE_FORD1,
-	TEMPLATE_FORD2,
+	//TEMPLATE_SHORECLIFF29,
+	//TEMPLATE_SHORECLIFF30,
+	//TEMPLATE_SHORECLIFF31,
+	//TEMPLATE_SHORECLIFF32,
+	//TEMPLATE_SHORECLIFF33,
+	//TEMPLATE_SHORECLIFF34,
+	//TEMPLATE_SHORECLIFF35,
+	//TEMPLATE_SHORECLIFF36,
+	//TEMPLATE_SHORECLIFF37,
+	//TEMPLATE_SHORECLIFF38,
+	//TEMPLATE_BOULDER1,
+	//TEMPLATE_BOULDER2,
+	//TEMPLATE_BOULDER3,
+	//TEMPLATE_BOULDER4,
+	//TEMPLATE_BOULDER5,
+	//TEMPLATE_BOULDER6,
+	//TEMPLATE_PATCH01,
+	//TEMPLATE_PATCH02,
+	//TEMPLATE_PATCH03,
+	//TEMPLATE_PATCH04,
+	//TEMPLATE_PATCH07,
+	//TEMPLATE_PATCH08,
+	//TEMPLATE_PATCH13,
+	//TEMPLATE_PATCH14,
+	//TEMPLATE_PATCH15,
+	//TEMPLATE_RIVER01,
+	//TEMPLATE_RIVER02,
+	//TEMPLATE_RIVER03,
+	//TEMPLATE_RIVER04,
+	//TEMPLATE_RIVER05,
+	//TEMPLATE_RIVER06,
+	//TEMPLATE_RIVER07,
+	//TEMPLATE_RIVER08,
+	//TEMPLATE_RIVER09,
+	//TEMPLATE_RIVER10,
+	//TEMPLATE_RIVER11,
+	//TEMPLATE_RIVER12,
+	//TEMPLATE_RIVER13,
 	TEMPLATE_BRIDGE1,
 	TEMPLATE_BRIDGE1D,
 	TEMPLATE_BRIDGE2,
 	TEMPLATE_BRIDGE2D,
-	TEMPLATE_SLOPE01,
-	TEMPLATE_SLOPE02,
-	TEMPLATE_SLOPE03,
-	TEMPLATE_SLOPE04,
-	TEMPLATE_SLOPE05,
-	TEMPLATE_SLOPE06,
-	TEMPLATE_SLOPE07,
-	TEMPLATE_SLOPE08,
-	TEMPLATE_SLOPE09,
-	TEMPLATE_SLOPE10,
-	TEMPLATE_SLOPE11,
-	TEMPLATE_SLOPE12,
-	TEMPLATE_SLOPE13,
-	TEMPLATE_SLOPE14,
-	TEMPLATE_SLOPE15,
-	TEMPLATE_SLOPE16,
-	TEMPLATE_SLOPE17,
-	TEMPLATE_SLOPE18,
-	TEMPLATE_SLOPE19,
-	TEMPLATE_SLOPE20,
-	TEMPLATE_SLOPE21,
-	TEMPLATE_SLOPE22,
-	TEMPLATE_SLOPE23,
-	TEMPLATE_SLOPE24,
-	TEMPLATE_SLOPE25,
-	TEMPLATE_SLOPE26,
-	TEMPLATE_SLOPE27,
-	TEMPLATE_SLOPE28,
-	TEMPLATE_SLOPE29,
-	TEMPLATE_SLOPE30,
-	TEMPLATE_SLOPE31,
-	TEMPLATE_SLOPE32,
-	TEMPLATE_SLOPE33,
-	TEMPLATE_SLOPE34,
-	TEMPLATE_SLOPE35,
-	TEMPLATE_SLOPE36,
-	TEMPLATE_SLOPE37,
-	TEMPLATE_SLOPE38,
+	//TEMPLATE_SLOPE01,
+	//TEMPLATE_SLOPE02,
+	//TEMPLATE_SLOPE03,
+	//TEMPLATE_SLOPE04,
+	//TEMPLATE_SLOPE05,
+	//TEMPLATE_SLOPE06,
+	//TEMPLATE_SLOPE07,
+	//TEMPLATE_SLOPE08,
+	//TEMPLATE_SLOPE09,
+	//TEMPLATE_SLOPE10,
+	//TEMPLATE_SLOPE11,
+	//TEMPLATE_SLOPE12,
+	//TEMPLATE_SLOPE13,
+	//TEMPLATE_SLOPE14,
+	//TEMPLATE_SLOPE15,
+	//TEMPLATE_SLOPE16,
+	//TEMPLATE_SLOPE17,
+	//TEMPLATE_SLOPE18,
+	//TEMPLATE_SLOPE19,
+	//TEMPLATE_SLOPE20,
+	//TEMPLATE_SLOPE21,
+	//TEMPLATE_SLOPE22,
+	//TEMPLATE_SLOPE23,
+	//TEMPLATE_SLOPE24,
+	//TEMPLATE_SLOPE25,
+	//TEMPLATE_SLOPE26,
+	//TEMPLATE_SLOPE27,
+	//TEMPLATE_SLOPE28,
+	//TEMPLATE_SLOPE29,
+	//TEMPLATE_SLOPE30,
+	//TEMPLATE_SLOPE31,
+	//TEMPLATE_SLOPE32,
+	//TEMPLATE_SLOPE33,
+	//TEMPLATE_SLOPE34,
+	//TEMPLATE_SLOPE35,
+	//TEMPLATE_SLOPE36,
+	//TEMPLATE_SLOPE37,
+	//TEMPLATE_SLOPE38,
 	TEMPLATE_ROAD01,
 	TEMPLATE_ROAD02,
 	TEMPLATE_ROAD03,
@@ -2165,26 +2159,26 @@ inline TemplateType operator++(TemplateType &n) { n = (TemplateType)(((int)n) +
 */
 typedef enum TerrainType : char {
 	TERRAIN_NONE=-1,
-	TERRAIN_TREE1,
-	TERRAIN_TREE2,
-	TERRAIN_TREE3,
-	TERRAIN_TREE5,
-	TERRAIN_TREE6,
-	TERRAIN_TREE7,
-	TERRAIN_TREE8,
-	TERRAIN_TREE10,
-	TERRAIN_TREE11,
-	TERRAIN_TREE12,
-	TERRAIN_TREE13,
-	TERRAIN_TREE14,
-	TERRAIN_TREE15,
-	TERRAIN_TREE16,
-	TERRAIN_TREE17,
-	TERRAIN_CLUMP1,
-	TERRAIN_CLUMP2,
-	TERRAIN_CLUMP3,
-	TERRAIN_CLUMP4,
-	TERRAIN_CLUMP5,
+	//TERRAIN_TREE1,
+	//TERRAIN_TREE2,
+	//TERRAIN_TREE3,
+	//TERRAIN_TREE5,
+	//TERRAIN_TREE6,
+	//TERRAIN_TREE7,
+	//TERRAIN_TREE8,
+	//TERRAIN_TREE10,
+	//TERRAIN_TREE11,
+	//TERRAIN_TREE12,
+	//TERRAIN_TREE13,
+	//TERRAIN_TREE14,
+	//TERRAIN_TREE15,
+	//TERRAIN_TREE16,
+	//TERRAIN_TREE17,
+	//TERRAIN_CLUMP1,
+	//TERRAIN_CLUMP2,
+	//TERRAIN_CLUMP3,
+	//TERRAIN_CLUMP4,
+	//TERRAIN_CLUMP5,
 
 	TERRAIN_ICE01,
 	TERRAIN_ICE02,
@@ -2192,17 +2186,17 @@ typedef enum TerrainType : char {
 	TERRAIN_ICE04,
 	TERRAIN_ICE05,
 
-	TERRAIN_BOXES01,
-	TERRAIN_BOXES02,
-	TERRAIN_BOXES03,
-	TERRAIN_BOXES04,
-	TERRAIN_BOXES05,
-	TERRAIN_BOXES06,
-	TERRAIN_BOXES07,
-	TERRAIN_BOXES08,
-	TERRAIN_BOXES09,
-
-	TERRAIN_MINE,
+	//TERRAIN_BOXES01,
+	//TERRAIN_BOXES02,
+	//TERRAIN_BOXES03,
+	//TERRAIN_BOXES04,
+	//TERRAIN_BOXES05,
+	//TERRAIN_BOXES06,
+	//TERRAIN_BOXES07,
+	//TERRAIN_BOXES08,
+	//TERRAIN_BOXES09,
+	//
+	//TERRAIN_MINE,
 
 	TERRAIN_COUNT,
 	TERRAIN_FIRST=0
@@ -2966,6 +2960,7 @@ typedef struct {
 	char		Name[16];
 	char		Root[10];
 	char		Suffix[4];
+	char		*IsoPalette;
 } TheaterDataType;
 
 
diff --git a/code/redalert/display.cpp b/code/redalert/display.cpp
index 9392b04..36db138 100644
--- a/code/redalert/display.cpp
+++ b/code/redalert/display.cpp
@@ -231,9 +231,11 @@ void DisplayClass::One_Time(void)
 	/*
 	**	Load the generic transparent icon set.
 	*/
-	TransIconset = MFCD::Retrieve("TRANS.ICN");
 // jmarshall
-	TransIconsetHD = Load_Stamp("TRANS_ICON", TransIconset);
+//	TransIconset = MFCD::Retrieve("TRANS.ICN");
+//// jmarshall
+//	TransIconsetHD = Load_Stamp("TRANS_ICON", TransIconset);
+//// jmarshall end
 // jmarshall end
 
 	#ifndef NDEBUG
diff --git a/code/redalert/image.h b/code/redalert/image.h
index 35534ef..d400d1d 100644
--- a/code/redalert/image.h
+++ b/code/redalert/image.h
@@ -23,12 +23,12 @@ struct Image_t {
 	int renderheight[MAX_IMAGE_SHAPES];
 	bool perFrameRenderDimen;
 	int numFrames;
-	void* IconMapPtr;
 	uint8_t* ScratchBuffer;
+	struct IsoTile* isoTileInfo;
 };
 
 __forceinline Image_t::Image_t() {
-	IconMapPtr = NULL;
+	isoTileInfo = NULL;
 	numAnimFrames = 0;
 	ScratchBuffer = NULL;
 	perFrameRenderDimen = false;
@@ -43,9 +43,9 @@ __forceinline Image_t::~Image_t() {
 }
 
 Image_t* Image_LoadImage(const char* name, bool loadAnims = false, bool loadHouseColor = false);
-Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsigned char* data, unsigned char *remap = NULL);
+Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsigned char* data, unsigned char *remap = NULL, unsigned char *palette = NULL);
 Image_t* Find_Image(const char* name);
-void Image_Add8BitImage(Image_t* image, int HouseId, int ShapeID, int Width, int Height, unsigned char* data, unsigned char* remap);
+void Image_Add8BitImage(Image_t* image, int HouseId, int ShapeID, int Width, int Height, unsigned char* data, unsigned char* remap, unsigned char* palette = NULL);
 bool Image_Add32BitImage(const char* name, Image_t* image, int HouseId, int ShapeID, int frameId);
 
 Image_t* Image_CreateBlankImage(const char* name, int width, int height);
diff --git a/code/redalert/init.cpp b/code/redalert/init.cpp
index b17da39..671170a 100644
--- a/code/redalert/init.cpp
+++ b/code/redalert/init.cpp
@@ -3072,6 +3072,15 @@ static void Init_Bootstrap_Mixfiles(void)
 	assert(ok);
 #endif	//WIN32
 
+
+// Isometric Files 
+	new MFCD("cache.mix", &FastKey, MIX_FILE_TS);
+	{
+		bool ok = MFCD::Cache("cache.mix");
+		assert(ok);
+	}
+// jmarshall end
+
 	RequiredCD = temp;
 }
 
diff --git a/code/redalert/tdata.cpp b/code/redalert/tdata.cpp
index e1cf90f..3bfdfc9 100644
--- a/code/redalert/tdata.cpp
+++ b/code/redalert/tdata.cpp
@@ -74,116 +74,116 @@ static short const _List1111[] = {0, 1, MAP_CELL_W, MAP_CELL_W+1, REFRESH_EOL};
 static short const _List111000010110[] = {0, 1, 2, MAP_CELL_W+3, MAP_CELL_W*2+1, MAP_CELL_W*2+2, REFRESH_EOL};
 
 
-static TerrainTypeClass const Mine(
-	TERRAIN_MINE,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"MINE",
-	TXT_ORE_MINE,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes01(
-	TERRAIN_BOXES01,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES01",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes02(
-	TERRAIN_BOXES02,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES02",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes03(
-	TERRAIN_BOXES03,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES03",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes04(
-	TERRAIN_BOXES04,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES04",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes05(
-	TERRAIN_BOXES05,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES05",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes06(
-	TERRAIN_BOXES06,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES06",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes07(
-	TERRAIN_BOXES07,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES07",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes08(
-	TERRAIN_BOXES08,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES08",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
-static TerrainTypeClass const Boxes09(
-	TERRAIN_BOXES09,
-	THEATERF_INTERIOR,
-	XYP_COORD(12,24),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"BOXES09",
-	TXT_CRATES,
-	(short const *)_List10,
-	NULL
-);
+//static TerrainTypeClass const Mine(
+//	TERRAIN_MINE,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"MINE",
+//	TXT_ORE_MINE,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes01(
+//	TERRAIN_BOXES01,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES01",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes02(
+//	TERRAIN_BOXES02,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES02",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes03(
+//	TERRAIN_BOXES03,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES03",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes04(
+//	TERRAIN_BOXES04,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES04",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes05(
+//	TERRAIN_BOXES05,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES05",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes06(
+//	TERRAIN_BOXES06,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES06",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes07(
+//	TERRAIN_BOXES07,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES07",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes08(
+//	TERRAIN_BOXES08,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES08",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
+//static TerrainTypeClass const Boxes09(
+//	TERRAIN_BOXES09,
+//	THEATERF_INTERIOR,
+//	XYP_COORD(12,24),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"BOXES09",
+//	TXT_CRATES,
+//	(short const *)_List10,
+//	NULL
+//);
 
 static TerrainTypeClass const Ice01(
 	TERRAIN_ICE01,
@@ -191,7 +191,7 @@ static TerrainTypeClass const Ice01(
 	XYP_COORD(24,24),		// Center base coordinate offset.
 		true,					// Is it immune to normal combat damage?
 		true,					// Is based on the water?
-	"ICE01",
+	"ICE0101",
 	TXT_ICE,
 	(short const *)_List1111,
 	NULL
@@ -202,7 +202,7 @@ static TerrainTypeClass const Ice02(
 	XYP_COORD(12,24),		// Center base coordinate offset.
 		true,					// Is it immune to normal combat damage?
 		true,					// Is based on the water?
-	"ICE02",
+	"ICE0102",
 	TXT_ICE,
 	(short const *)_List1010,
 	NULL
@@ -213,7 +213,7 @@ static TerrainTypeClass const Ice03(
 	XYP_COORD(24,12),		// Center base coordinate offset.
 		true,					// Is it immune to normal combat damage?
 		true,					// Is based on the water?
-	"ICE03",
+	"ICE0103",
 	TXT_ICE,
 	(short const *)_List11,
 	NULL
@@ -224,7 +224,7 @@ static TerrainTypeClass const Ice04(
 	XYP_COORD(12,12),		// Center base coordinate offset.
 		true,					// Is it immune to normal combat damage?
 		true,					// Is based on the water?
-	"ICE04",
+	"ICE0104",
 	TXT_ICE,
 	(short const *)_List10,
 	NULL
@@ -235,251 +235,251 @@ static TerrainTypeClass const Ice05(
 	XYP_COORD(12,12),		// Center base coordinate offset.
 		true,					// Is it immune to normal combat damage?
 		true,					// Is based on the water?
-	"ICE05",
+	"ICE0105",
 	TXT_ICE,
 	(short const *)_List10,
 	NULL
 );
 
-static TerrainTypeClass const Tree1Class(
-	TERRAIN_TREE1,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(11,41),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T01",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree2Class(
-	TERRAIN_TREE2,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(11,44),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T02",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree3Class(
-	TERRAIN_TREE3,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(12,45),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T03",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree5Class(
-	TERRAIN_TREE5,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(15,41),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T05",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree6Class(
-	TERRAIN_TREE6,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(16,37),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T06",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree7Class(
-	TERRAIN_TREE7,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(15,41),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T07",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree8Class(
-	TERRAIN_TREE8,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(14,22),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T08",
-	TXT_TREE,
-	(short const *)_List10,
-	(short const *)_List01
-);
-
-static TerrainTypeClass const Tree10Class(
-	TERRAIN_TREE10,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(25,43),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T10",
-	TXT_TREE,
-	(short const *)_List0011,
-	(short const *)_List1100
-);
-
-static TerrainTypeClass const Tree11Class(
-	TERRAIN_TREE11,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(23,44),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T11",
-	TXT_TREE,
-	(short const *)_List0011,
-	(short const *)_List1100
-);
-
-static TerrainTypeClass const Tree12Class(
-	TERRAIN_TREE12,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(14,36),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T12",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree13Class(
-	TERRAIN_TREE13,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(19,40),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T13",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1101
-);
-
-static TerrainTypeClass const Tree14Class(
-	TERRAIN_TREE14,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(19,40),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T14",
-	TXT_TREE,
-	(short const *)_List0011,
-	(short const *)_List1100
-);
-
-static TerrainTypeClass const Tree15Class(
-	TERRAIN_TREE15,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(19,40),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T15",
-	TXT_TREE,
-	(short const *)_List0011,
-	(short const *)_List1100
-);
-
-static TerrainTypeClass const Tree16Class(
-	TERRAIN_TREE16,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(13,36),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T16",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Tree17Class(
-	TERRAIN_TREE17,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(18,44),		// Center base coordinate offset.
-		false,				// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"T17",
-	TXT_TREE,
-	(short const *)_List0010,
-	(short const *)_List1001
-);
-
-static TerrainTypeClass const Clump1Class(
-	TERRAIN_CLUMP1,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(28,41),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"TC01",
-	TXT_TREE,
-	(short const *)_List000110,
-	(short const *)_List110001
-);
-
-static TerrainTypeClass const Clump2Class(
-	TERRAIN_CLUMP2,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(38,41),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"TC02",
-	TXT_TREE,
-	(short const *)_List010110,
-	(short const *)_List101001
-);
-
-static TerrainTypeClass const Clump3Class(
-	TERRAIN_CLUMP3,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(33,35),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"TC03",
-	TXT_TREE,
-	(short const *)_List110110,
-	(short const *)_List001
-);
-
-static TerrainTypeClass const Clump4Class(
-	TERRAIN_CLUMP4,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(44,49),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"TC04",
-	TXT_TREE,
-	(short const *)_List000011101000,
-	(short const *)_List111000010110
-);
-
-static TerrainTypeClass const Clump5Class(
-	TERRAIN_CLUMP5,
-	THEATERF_TEMPERATE|THEATERF_SNOW,
-	XYP_COORD(49,58),		// Center base coordinate offset.
-		true,					// Is it immune to normal combat damage?
-		false,				// Is based on the water?
-	"TC05",
-	TXT_TREE,
-	(short const *)_List001011100110,
-	(short const *)_List110000011001
-);
+//static TerrainTypeClass const Tree1Class(
+//	TERRAIN_TREE1,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(11,41),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T01",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree2Class(
+//	TERRAIN_TREE2,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(11,44),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T02",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree3Class(
+//	TERRAIN_TREE3,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(12,45),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T03",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree5Class(
+//	TERRAIN_TREE5,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(15,41),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T05",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree6Class(
+//	TERRAIN_TREE6,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(16,37),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T06",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree7Class(
+//	TERRAIN_TREE7,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(15,41),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T07",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree8Class(
+//	TERRAIN_TREE8,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(14,22),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T08",
+//	TXT_TREE,
+//	(short const *)_List10,
+//	(short const *)_List01
+//);
+//
+//static TerrainTypeClass const Tree10Class(
+//	TERRAIN_TREE10,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(25,43),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T10",
+//	TXT_TREE,
+//	(short const *)_List0011,
+//	(short const *)_List1100
+//);
+//
+//static TerrainTypeClass const Tree11Class(
+//	TERRAIN_TREE11,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(23,44),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T11",
+//	TXT_TREE,
+//	(short const *)_List0011,
+//	(short const *)_List1100
+//);
+//
+//static TerrainTypeClass const Tree12Class(
+//	TERRAIN_TREE12,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(14,36),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T12",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree13Class(
+//	TERRAIN_TREE13,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(19,40),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T13",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1101
+//);
+//
+//static TerrainTypeClass const Tree14Class(
+//	TERRAIN_TREE14,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(19,40),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T14",
+//	TXT_TREE,
+//	(short const *)_List0011,
+//	(short const *)_List1100
+//);
+//
+//static TerrainTypeClass const Tree15Class(
+//	TERRAIN_TREE15,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(19,40),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T15",
+//	TXT_TREE,
+//	(short const *)_List0011,
+//	(short const *)_List1100
+//);
+//
+//static TerrainTypeClass const Tree16Class(
+//	TERRAIN_TREE16,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(13,36),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T16",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Tree17Class(
+//	TERRAIN_TREE17,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(18,44),		// Center base coordinate offset.
+//		false,				// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"T17",
+//	TXT_TREE,
+//	(short const *)_List0010,
+//	(short const *)_List1001
+//);
+//
+//static TerrainTypeClass const Clump1Class(
+//	TERRAIN_CLUMP1,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(28,41),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"TC01",
+//	TXT_TREE,
+//	(short const *)_List000110,
+//	(short const *)_List110001
+//);
+//
+//static TerrainTypeClass const Clump2Class(
+//	TERRAIN_CLUMP2,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(38,41),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"TC02",
+//	TXT_TREE,
+//	(short const *)_List010110,
+//	(short const *)_List101001
+//);
+//
+//static TerrainTypeClass const Clump3Class(
+//	TERRAIN_CLUMP3,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(33,35),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"TC03",
+//	TXT_TREE,
+//	(short const *)_List110110,
+//	(short const *)_List001
+//);
+//
+//static TerrainTypeClass const Clump4Class(
+//	TERRAIN_CLUMP4,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(44,49),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"TC04",
+//	TXT_TREE,
+//	(short const *)_List000011101000,
+//	(short const *)_List111000010110
+//);
+//
+//static TerrainTypeClass const Clump5Class(
+//	TERRAIN_CLUMP5,
+//	THEATERF_TEMPERATE|THEATERF_SNOW,
+//	XYP_COORD(49,58),		// Center base coordinate offset.
+//		true,					// Is it immune to normal combat damage?
+//		false,				// Is based on the water?
+//	"TC05",
+//	TXT_TREE,
+//	(short const *)_List001011100110,
+//	(short const *)_List110000011001
+//);
 
 
 /***********************************************************************************************
@@ -595,41 +595,41 @@ void TerrainTypeClass::Init_Heap(void)
 	**	are specified in the TerrainType enumeration. This is necessary because the heap
 	**	allocation block index serves double duty as the type number index.
 	*/
-	new TerrainTypeClass(Tree1Class);		//	TERRAIN_TREE1
-	new TerrainTypeClass(Tree2Class);		//	TERRAIN_TREE2
-	new TerrainTypeClass(Tree3Class);		//	TERRAIN_TREE3
-	new TerrainTypeClass(Tree5Class);		//	TERRAIN_TREE5
-	new TerrainTypeClass(Tree6Class);		//	TERRAIN_TREE6
-	new TerrainTypeClass(Tree7Class);		//	TERRAIN_TREE7
-	new TerrainTypeClass(Tree8Class);		//	TERRAIN_TREE8
-	new TerrainTypeClass(Tree10Class);		//	TERRAIN_TREE10
-	new TerrainTypeClass(Tree11Class);		//	TERRAIN_TREE11
-	new TerrainTypeClass(Tree12Class);		//	TERRAIN_TREE12
-	new TerrainTypeClass(Tree13Class);		//	TERRAIN_TREE13
-	new TerrainTypeClass(Tree14Class);		//	TERRAIN_TREE14
-	new TerrainTypeClass(Tree15Class);		//	TERRAIN_TREE15
-	new TerrainTypeClass(Tree16Class);		//	TERRAIN_TREE16
-	new TerrainTypeClass(Tree17Class);		//	TERRAIN_TREE17
-	new TerrainTypeClass(Clump1Class);		//	TERRAIN_CLUMP1
-	new TerrainTypeClass(Clump2Class);		//	TERRAIN_CLUMP2
-	new TerrainTypeClass(Clump3Class);		//	TERRAIN_CLUMP3
-	new TerrainTypeClass(Clump4Class);		//	TERRAIN_CLUMP4
-	new TerrainTypeClass(Clump5Class);		//	TERRAIN_CLUMP5
+	//new TerrainTypeClass(Tree1Class);		//	TERRAIN_TREE1
+	//new TerrainTypeClass(Tree2Class);		//	TERRAIN_TREE2
+	//new TerrainTypeClass(Tree3Class);		//	TERRAIN_TREE3
+	//new TerrainTypeClass(Tree5Class);		//	TERRAIN_TREE5
+	//new TerrainTypeClass(Tree6Class);		//	TERRAIN_TREE6
+	//new TerrainTypeClass(Tree7Class);		//	TERRAIN_TREE7
+	//new TerrainTypeClass(Tree8Class);		//	TERRAIN_TREE8
+	//new TerrainTypeClass(Tree10Class);		//	TERRAIN_TREE10
+	//new TerrainTypeClass(Tree11Class);		//	TERRAIN_TREE11
+	//new TerrainTypeClass(Tree12Class);		//	TERRAIN_TREE12
+	//new TerrainTypeClass(Tree13Class);		//	TERRAIN_TREE13
+	//new TerrainTypeClass(Tree14Class);		//	TERRAIN_TREE14
+	//new TerrainTypeClass(Tree15Class);		//	TERRAIN_TREE15
+	//new TerrainTypeClass(Tree16Class);		//	TERRAIN_TREE16
+	//new TerrainTypeClass(Tree17Class);		//	TERRAIN_TREE17
+	//new TerrainTypeClass(Clump1Class);		//	TERRAIN_CLUMP1
+	//new TerrainTypeClass(Clump2Class);		//	TERRAIN_CLUMP2
+	//new TerrainTypeClass(Clump3Class);		//	TERRAIN_CLUMP3
+	//new TerrainTypeClass(Clump4Class);		//	TERRAIN_CLUMP4
+	//new TerrainTypeClass(Clump5Class);		//	TERRAIN_CLUMP5
 	new TerrainTypeClass(Ice01);				//	TERRAIN_ICE01
 	new TerrainTypeClass(Ice02);				//	TERRAIN_ICE02
 	new TerrainTypeClass(Ice03);				//	TERRAIN_ICE03
 	new TerrainTypeClass(Ice04);				//	TERRAIN_ICE04
 	new TerrainTypeClass(Ice05);				//	TERRAIN_ICE05
-	new TerrainTypeClass(Boxes01);			//	TERRAIN_BOXES01
-	new TerrainTypeClass(Boxes02);			//	TERRAIN_BOXES02
-	new TerrainTypeClass(Boxes03);			//	TERRAIN_BOXES03
-	new TerrainTypeClass(Boxes04);			//	TERRAIN_BOXES04
-	new TerrainTypeClass(Boxes05);			//	TERRAIN_BOXES05
-	new TerrainTypeClass(Boxes06);			//	TERRAIN_BOXES06
-	new TerrainTypeClass(Boxes07);			//	TERRAIN_BOXES07
-	new TerrainTypeClass(Boxes08);			//	TERRAIN_BOXES08
-	new TerrainTypeClass(Boxes09);			//	TERRAIN_BOXES09
-	new TerrainTypeClass(Mine);				// TERRAIN_MINE
+	//new TerrainTypeClass(Boxes01);			//	TERRAIN_BOXES01
+	//new TerrainTypeClass(Boxes02);			//	TERRAIN_BOXES02
+	//new TerrainTypeClass(Boxes03);			//	TERRAIN_BOXES03
+	//new TerrainTypeClass(Boxes04);			//	TERRAIN_BOXES04
+	//new TerrainTypeClass(Boxes05);			//	TERRAIN_BOXES05
+	//new TerrainTypeClass(Boxes06);			//	TERRAIN_BOXES06
+	//new TerrainTypeClass(Boxes07);			//	TERRAIN_BOXES07
+	//new TerrainTypeClass(Boxes08);			//	TERRAIN_BOXES08
+	//new TerrainTypeClass(Boxes09);			//	TERRAIN_BOXES09
+	//new TerrainTypeClass(Mine);				// TERRAIN_MINE
 }
 
 
@@ -670,6 +670,8 @@ void TerrainTypeClass::One_Time(void)
  *=============================================================================================*/
 void TerrainTypeClass::Init(TheaterType theater)
 {
+	void* terrainPalette = (void*)MFCD::Retrieve(Theaters[theater].IsoPalette);
+
 	if (theater != LastTheater) {
 
 		for (TerrainType index = TERRAIN_FIRST; index < TERRAIN_COUNT; index++) {
@@ -701,12 +703,12 @@ void TerrainTypeClass::Init(TheaterType theater)
 				{
 					char tmp[512];
 					sprintf(tmp, "icon_%s", fullname);
-					((void const*&)terrain.HDImageData) = Load_Stamp(fullname, terrain.ImageData);
+					((void const*&)terrain.HDImageData) = Load_Stamp(fullname, terrain.ImageData, terrainPalette);
 				}
 
 				IsTheaterShape = true;	//Let Build_Frame know that this is a theater specific shape
 				if (terrain.RadarIcon != NULL) delete[] (char *)terrain.RadarIcon;
-				((void const *&)terrain.RadarIcon) = Get_Radar_Icon(terrain.Get_Image_Data(), 0, 1, 3);
+//				((void const *&)terrain.RadarIcon) = Get_Radar_Icon(terrain.Get_Image_Data(), 0, 1, 3);
 				IsTheaterShape = false;
 
 			}
diff --git a/code/redalert/terrain.cpp b/code/redalert/terrain.cpp
index f166f96..7984e8a 100644
--- a/code/redalert/terrain.cpp
+++ b/code/redalert/terrain.cpp
@@ -491,10 +491,11 @@ void TerrainClass::AI(void)
 	assert(IsActive);
 
 	ObjectClass::AI();
-
-	if ((*this == TERRAIN_MINE) && (Frame % (Rule.GrowthRate * TICKS_PER_MINUTE)) == 0) {
-		Map[::As_Cell(As_Target())].Spread_Tiberium(true);
-	}
+// jmarshall - add back terrain mine
+	//if ((*this == TERRAIN_MINE) && (Frame % (Rule.GrowthRate * TICKS_PER_MINUTE)) == 0) {
+	//	Map[::As_Cell(As_Target())].Spread_Tiberium(true);
+	//}
+// jmarshall end
 	if (StageClass::Graphic_Logic()) {
 		Mark();
 
diff --git a/code/redalert/tileset.cpp b/code/redalert/tileset.cpp
index a596563..9c698b1 100644
--- a/code/redalert/tileset.cpp
+++ b/code/redalert/tileset.cpp
@@ -30,183 +30,124 @@ using std::memcpy;
 
 class GraphicViewPortClass;
 
-#define TD_TILESET_CHECK 0x20
-
-/**
-* @brief union is to handle the parts of the header which vary between TD and RA format tiles.
-*/
-struct IconControlType
-{
-	uint8_t* Get_Icon_Data()
-	{
-		if (td.icons == TD_TILESET_CHECK) {
-			return reinterpret_cast<uint8_t*>(this) + td.icons;
-		}
-		else {
-			return reinterpret_cast<uint8_t*>(this) + ra.icons;
-		}
-	}
-
-	uint8_t* Get_Icon_Map()
-	{
-		if (td.icons == TD_TILESET_CHECK) {
-			return reinterpret_cast<uint8_t*>(this) + td.map;
-		}
-		else {
-			return reinterpret_cast<uint8_t*>(this) + ra.map;
-		}
-	}
-
-	int16_t width; // always 24 (ICON_WIDTH)
-	int16_t height; // always 24 (ICON_HEIGHT)
-	int16_t count; // count of cells in set, not same as images
-	int16_t allocated; // is treated like a bool, always 0 in the file?
-
-	union
-	{
-		struct
-		{
-			int32_t size; // filesize
-			int32_t icons; // always 0x00000020
-			int32_t palettes; // seems to always be 0x00000000
-			int32_t remaps; // unknown, bitfield?
-			int32_t trans_flag; // array of images length, unknown
-			int32_t map; // image index for each cell
-		} td;
-
-		struct
-		{
-			int16_t map_width; // tile width in cells
-			int16_t map_height; // tile height in cells
-			int32_t size; // filesize
-			int32_t icons; // always 0x00000028
-			int32_t palettes; // seems to always be 0x00000000
-			int32_t remaps; // unknown, bitfield?
-			int32_t trans_flag; // array of images length, unknown
-			int32_t color_map; // terrain type index, ra only
-			int32_t map; // image index for each cell
-		} ra;
-	};
+struct IsoTileHeader_t {
+	int TileWidth;
+	int TileHeight;
+	int TileImageWidth;
+	int TileImageHeight;
 };
 
-static int IconEntry;
-static void* IconData;
-static IconControlType* LastIconset;
-static uint8_t* StampPtr;
-static uint8_t* TransFlagPtr;
-static uint8_t* MapPtr;
-static int IconWidth;
-static int IconHeight;
-static int IconSize;
-static int IconCount;
+byte TempTSStampData[48 * 24 * 4];
 
-void __cdecl Init_Stamps(IconControlType* iconset)
-{    
-    if (iconset && LastIconset != iconset) {
-        IconCount = (iconset->count);
-        IconWidth = (iconset->width);
-        IconHeight = (iconset->height);
-        LastIconset = iconset;
-        IconSize = IconWidth * IconHeight;
-
-        // TD and RA tileset headers are slightly different, so check a constant that only exists in one type.
-        if ((iconset->td.icons) == TD_TILESET_CHECK) {
-            MapPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->td.map);
-            StampPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->td.icons);
-            TransFlagPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->td.trans_flag);
-        }
-        else {
-            MapPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->ra.map);
-            StampPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->ra.icons);
-            TransFlagPtr = reinterpret_cast<uint8_t*>(iconset) + (iconset->ra.trans_flag);
-        }
-    }
-}
-
-void __cdecl Buffer_Draw_Stamp2(GraphicViewPortClass& viewport, IconControlType* tileset, int icon, int x, int y, const void* remapper)
+struct IsoTileImageHeader
 {
-    if (!tileset) {
-        return;
+	int TileX;
+	int TileY;
+    uint8_t* GetExtraData(IsoTile *tile)
+    {
+        return reinterpret_cast<uint8_t*>(tile) + ExtraOffset;
     }
 
-    if (LastIconset != tileset) {
-        Init_Stamps(tileset);
+	uint8_t* GetZData(IsoTile* tile)
+	{
+		return reinterpret_cast<uint8_t*>(tile) + ZDataoffset;
+	}
+
+	uint8_t* GetExtraZData(IsoTile* tile)
+	{
+		return reinterpret_cast<uint8_t*>(tile) + ExtraZOffset;
+	}
+
+    uint8_t* GetData() {
+        return reinterpret_cast<uint8_t*>(this) + sizeof(IsoTileImageHeader);
     }
 
-    int32_t icon_index = MapPtr != nullptr ? MapPtr[icon] : icon;
+    // https://xhp.xwis.net/documents/TMP_TS_Format.html
+    uint8_t* GetRasterizedData() {
+        memset(TempTSStampData, 0, sizeof(TempTSStampData));
+        uint8_t* tileData = GetData();
+        byte* w_line = TempTSStampData;
+		int x = 24;
+        int global_cx = 48;
+		int cx = 0;
+		for (int y = 0; y < 12; y++)
+		{
+			cx += 4;
+			x -= 2;
+			memcpy(w_line + x, tileData, cx);
+            tileData += cx;
+			w_line += global_cx;
+		}
+		for (; y < 23; y++)
+		{
+			cx -= 4;
+			x += 2;
+			memcpy(w_line + x, tileData, cx);
+            tileData += cx;
+			w_line += global_cx;
+		}
 
-    if (icon_index < IconCount) {
-
-        int32_t fullpitch = viewport.Get_Full_Pitch(); //(viewport.Get_Pitch() + viewport.Get_XAdd() + viewport.Get_Width());
-        uint8_t* dst = (x * 4) + (y * 4) * fullpitch + (uint8_t*)(viewport.Get_Offset());
-        int32_t blitpitch = fullpitch - IconWidth;
-        uint8_t* src = &StampPtr[IconSize * icon_index];
-
-        if (remapper) {
-            const uint8_t* remap = static_cast<const uint8_t*>(remapper);
-            for (int i = 0; i < IconHeight; ++i) {
-                for (int j = 0; j < IconWidth; ++j) {
-                    uint8_t cur_byte = remap[*src++];
-
-                    if (cur_byte) {
-                        dst[0] = backbuffer_data_raw[(cur_byte * 3) + 0];
-                        dst[1] = backbuffer_data_raw[(cur_byte * 3) + 1];
-                        dst[2] = backbuffer_data_raw[(cur_byte * 3) + 2];
-                        dst[3] = 255;
-                    }
-
-                    dst+=4;
-                }
-
-                dst += blitpitch;
-            }
-
-        }
-        else if (TransFlagPtr[icon_index]) {
-            for (int i = 0; i < IconHeight; ++i) {
-                for (int j = 0; j < IconWidth; ++j) {
-                    uint8_t cur_byte = *src++;
-
-					if (cur_byte) {
-						dst[0] = backbuffer_data_raw[(cur_byte * 3) + 0];
-						dst[1] = backbuffer_data_raw[(cur_byte * 3) + 1];
-						dst[2] = backbuffer_data_raw[(cur_byte * 3) + 2];
-						dst[3] = 255;
-					}
-
-					dst += 4;
-                }
-
-                dst += blitpitch;
-            }
-        }
-        else {
-            for (int32_t i = 0; i < IconHeight; ++i) {
-                FastScanlinePaletteBlit(dst, src, IconWidth);
-                dst += fullpitch;
-                src += IconWidth * 4;
-            }
-        }
+        return TempTSStampData;
     }
-}
+
+	int32_t ExtraOffset;
+	int32_t ZDataoffset;
+	int32_t ExtraZOffset;
+	signed int ExtraX;
+	signed int ExtraY;
+	int ExtraWidth;
+	int ExtraHeight;
+	struct Flags
+	{
+		unsigned int HasExtraData : 1; //1
+		unsigned int HasZData : 1; //2
+		unsigned int HasDamagedData : 1; //4
+		// invalid cause memory wasn'y cleared so all bitfields are at 0xCD by default
+		//unsigned int Bit8 : 1; //8
+		//unsigned int Bit16 : 1; //16
+		//unsigned int Bit32 : 1; //32
+		//unsigned int Bit64 : 1; //64
+		//unsigned int Bit128 : 1; //128
+
+	};
+	unsigned char Height;
+	unsigned char TileType;
+	unsigned char RampType;
+	RGBClass LowRGB;
+	RGBClass HighRGB;
+	unsigned char Padding[3];
+};
+
+class IsoTile {
+public:
+    int TileImageWidth() { return header.TileImageWidth; }
+    int TileImageHeight() { return header.TileImageHeight; }
+
+    IsoTileImageHeader *GetTileInfo(int idx) { 
+        uint8_t* ptr = reinterpret_cast<uint8_t*>(this);
+        ptr += sizeof(IsoTileHeader_t);
+        uint32_t* offsets = (uint32_t*)ptr;        
+        IsoTileImageHeader* tileImageHeaders = (IsoTileImageHeader * )(((uint8_t*)this) + offsets[idx]);
+        return tileImageHeaders;
+    }
+    int NumTiles(void) { return header.TileWidth * header.TileHeight; }
+private:
+    IsoTileHeader_t header;
+};
 
 Image_t* Load_StampHD(int theater, const char* iconName, const void* icondata) {
     char filename[2048];
     Image_t* image = NULL;
 
-	IconControlType* tileset = (IconControlType*)icondata;    
-
-	if (!tileset) {
-		return NULL;
-	}
-
-	if (LastIconset != tileset) {
-		Init_Stamps(tileset);
-	}
+    IsoTile* isoTile = (IsoTile*)icondata;
+    if (!isoTile) {
+        return NULL;
+    }
+	
 
     // This is because were trying to avoid parsing the XML's and the filenames aren't consistant.
     const char* theaterName = Theaters[theater].Name;
-    for (int i = 0; i < IconCount; i++)
+    for (int i = 0; i < isoTile->NumTiles(); i++)
     {        
         char filename[512];
         char fixedIconName[512];
@@ -256,9 +197,9 @@ Image_t* Load_StampHD(int theater, const char* iconName, const void* icondata) {
 }
 
 void Get_Stamp_Size(const void* icondata, int* width, int* height) {
-	IconControlType* tileset = (IconControlType*)icondata;
+    IsoTile* isoTile = (IsoTile*)icondata;
 
-	if (!tileset) {
+	if (!isoTile) {
         for (int i = 0; i < MAX_IMAGE_SHAPES; i++) {
             *width = -1;
             *height = -1;
@@ -266,37 +207,19 @@ void Get_Stamp_Size(const void* icondata, int* width, int* height) {
 		return;
 	}
 
-	if (LastIconset != tileset) {
-		Init_Stamps(tileset);
-	}
-
     for (int i = 0; i < MAX_IMAGE_SHAPES; i++) {
-        width[i] = IconWidth;
-        height[i] = IconHeight;
+        width[i] = isoTile->TileImageWidth();
+        height[i] = isoTile->TileImageHeight();
     }
 }
 
-Image_t * Load_Stamp(const char *name, const void* icondata)
+Image_t * Load_Stamp(const char *name, const void* icondata, void* terrainPalette)
 {
-	IconControlType* tileset = (IconControlType*)icondata;
-
-	if (!tileset) {
-		return NULL;
-	}
-
-	if (LastIconset != tileset) {
-		Init_Stamps(tileset);
-	}
-
-
-	int icon_index = 0;
-
-    if (icon_index >= IconCount) {
+    IsoTile* isoTile = (IsoTile*)icondata;
+    if (!isoTile) {
         return NULL;
     }
 	
-    uint8_t* src = &StampPtr[IconSize * icon_index]; 
-    
     // Check to see if the image is already loaded.
     {
         Image_t* image = Find_Image(name);
@@ -305,30 +228,35 @@ Image_t * Load_Stamp(const char *name, const void* icondata)
         }
     }
 
-	Image_t *image = Image_CreateImageFrom8Bit(name, IconWidth, IconHeight, (unsigned char*)src);
-    image->IconMapPtr = MapPtr;
-    if (IconCount == 1)
-        return image;    
+    uint8_t* src = isoTile->GetTileInfo(0)->GetRasterizedData();
+	Image_t *image = Image_CreateImageFrom8Bit(name, isoTile->TileImageWidth(), isoTile->TileImageHeight(), (unsigned char*)src, NULL, (unsigned char *)terrainPalette);
+    if (image == NULL) {
+        return NULL;
+    }
 
-    for (int i = 1; i < IconCount; i++) {
-        icon_index = i;
-        src = &StampPtr[IconSize * icon_index];
-        Image_Add8BitImage(image, 0, i, IconWidth, IconHeight, src, NULL);
+    image->isoTileInfo = isoTile;
+
+    for (int i = 1; i < isoTile->NumTiles(); i++) {  
+        src = isoTile->GetTileInfo(i)->GetRasterizedData();
+        Image_Add8BitImage(image, 0, i, isoTile->TileImageWidth(), isoTile->TileImageHeight(), src, NULL, (unsigned char*)terrainPalette);
     }
 
     return image;
 }
 
 int Stamp_GetIconIndex(Image_t* iconImage, int icon) {
-    uint8_t* MapPtr = (uint8_t*)iconImage->IconMapPtr;
-    return MapPtr != nullptr ? MapPtr[icon] : icon;
+    return icon;
 }
 
 void __cdecl Buffer_Draw_Stamp_Clip2(GraphicViewPortClass& viewport, const void *icondata, int icon, int x, int y, const void* remapper, int left, int top, int right, int bottom)
 {
     Image_t* iconImage = (Image_t*)icondata;
-    uint8_t* MapPtr = (uint8_t * )iconImage->IconMapPtr;
-	int icon_index = MapPtr != nullptr ? MapPtr[icon] : icon;
+    IsoTile* isoTile = iconImage->isoTileInfo;
+
+    if (icon > isoTile->NumTiles())
+        icon = isoTile->NumTiles() - 1;
+    IsoTileImageHeader* isoStampImage = isoTile->GetTileInfo(icon);
+    int icon_index = icon;
 	{
         int blit_height = CELL_PIXEL_H;
         int blit_width = CELL_PIXEL_W;
@@ -339,14 +267,14 @@ void __cdecl Buffer_Draw_Stamp_Clip2(GraphicViewPortClass& viewport, const void
         int ystart = top + y;
 
 
-        if (xstart < width && ystart < height && IconHeight + ystart > top && IconWidth + xstart > left) {
+        if (xstart < width && ystart < height && iconImage->isoTileInfo->TileImageHeight() + ystart > top && iconImage->isoTileInfo->TileImageWidth() + xstart > left) {
             if (xstart < left) {
 //                src += left - xstart;
                 blit_width -= left - xstart;
                 xstart = left;
             }
     
-            int src_pitch = IconWidth - blit_width;
+            int src_pitch = iconImage->isoTileInfo->TileImageWidth() - blit_width;
     
             if (blit_width + xstart > width) {
                 src_pitch += blit_width - (width - xstart);
@@ -354,7 +282,7 @@ void __cdecl Buffer_Draw_Stamp_Clip2(GraphicViewPortClass& viewport, const void
             }
     
             if (top > ystart) {
-                blit_height = IconHeight - (top - ystart);
+                blit_height = iconImage->isoTileInfo->TileImageHeight() - (top - ystart);
   //              src += IconWidth * (top - ystart);
                 ystart = top;
             }
@@ -430,19 +358,19 @@ extern "C" void __cdecl Buffer_Draw_Stamp_Clip(void const* this_object, void con
 }
 
 extern "C" void __cdecl Buffer_Draw_Stamp(void const* thisptr, void const* icondata, int icon, int x_pixel, int y_pixel, void const* remap) {
-    Buffer_Draw_Stamp2(*((GraphicViewPortClass*)thisptr), (IconControlType*)icondata, icon, x_pixel, y_pixel, remap);
+    // NOT USED
 }
 
 uint8_t* Get_Icon_Set_Map(void* temp)
 {
-    if (temp != nullptr) {
-        if ((static_cast<IconControlType*>(temp)->td.icons) == TD_TILESET_CHECK) {
-            return static_cast<uint8_t*>(temp) + (static_cast<IconControlType*>(temp)->td.icons);
-        }
-        else {
-            return static_cast<uint8_t*>(temp) + (static_cast<IconControlType*>(temp)->ra.icons);
-        }
-    }
+    //if (temp != nullptr) {
+    //    if ((static_cast<IconControlType*>(temp)->td.icons) == TD_TILESET_CHECK) {
+    //        return static_cast<uint8_t*>(temp) + (static_cast<IconControlType*>(temp)->td.icons);
+    //    }
+    //    else {
+    //        return static_cast<uint8_t*>(temp) + (static_cast<IconControlType*>(temp)->ra.icons);
+    //    }
+    //}
 
     return nullptr;
 }
diff --git a/code/redalert/win32lib/drawbuff.h b/code/redalert/win32lib/drawbuff.h
index 67ba5fe..a90e02c 100644
--- a/code/redalert/win32lib/drawbuff.h
+++ b/code/redalert/win32lib/drawbuff.h
@@ -63,7 +63,7 @@ extern "C" {
 
 struct Image_t;
 
-Image_t* Load_Stamp(const char* name, const void* icondata);
+Image_t* Load_Stamp(const char* name, const void* icondata, void *terrainPalette);
 int Stamp_GetIconIndex(Image_t* iconImage, int icon);
 void Get_Stamp_Size(const void* icondata, int *width, int *height);
 Image_t* Load_StampHD(int theater, const char* iconName, const void *icondata);
diff --git a/code/redalert/winstub.cpp b/code/redalert/winstub.cpp
index 63cc9bc..0c02f7d 100644
--- a/code/redalert/winstub.cpp
+++ b/code/redalert/winstub.cpp
@@ -389,7 +389,7 @@ Image_t *Find_Image(const char* name) {
 	return NULL;
 }
 
-Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsigned char *data, unsigned char* remap) {
+Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsigned char *data, unsigned char* remap, unsigned char* ccpalete) {
 	int64_t hash = generateHashValue(name, strlen(name));
 
 	int image_table_size = loaded_images.size();
@@ -405,7 +405,9 @@ Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsi
 		}
 	}
 
-	unsigned char* ccpalete = (unsigned char*)CCPalette.Get_Data();
+	if (ccpalete == NULL)
+		ccpalete = (unsigned char*)CCPalette.Get_Data();
+
 
 	Image_t* image = new Image_t();
 	unsigned char *buffer = new unsigned char[Width * Height * 4];
@@ -427,6 +429,9 @@ Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsi
 			b = 0;			
 			a = 128;
 		}
+		else if (r == 0 && g == 0 && b == 0) {
+			r = g = b = a = 0;
+		}
 		else if (c != 0) {
 			a = 255;
 		}
@@ -459,9 +464,12 @@ Image_t* Image_CreateImageFrom8Bit(const char* name, int Width, int Height, unsi
 	return image;
 }
 
-void Image_Add8BitImage(Image_t *image, int HouseId, int ShapeID, int Width, int Height, unsigned char* data, unsigned char* remap) {	
+void Image_Add8BitImage(Image_t *image, int HouseId, int ShapeID, int Width, int Height, unsigned char* data, unsigned char* remap, unsigned char *palette) {	
 	unsigned char* buffer = new unsigned char[Width * Height * 4];
 	unsigned char* ccpalete = (unsigned char*)CCPalette.Get_Data();
+	if (palette) {
+		ccpalete = palette;
+	}
 
 	if (image->width != Width || image->height != Height) {
 		assert(!"Image_Add8BitImage: Invalid new dimensions!");