diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c901964b85..a44f21bee7 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -6,6 +6,7 @@
 4a60fd30f78754db103f40d07983e64715b28258
 9492513da453edf2ad2fb2ff4ea18d6128a248ab
 4efd9e4c0200db4f253fe800ca6c86f0859f6084
+6e9c3767ed30e84cc13df2674fd8a141d761b084
 
 # Mass comment update
 f3ae9af4b92021cbfcf14ced7714968532b96b78
diff --git a/modules/zelda/ZeldaSubscreen.txt b/modules/zelda/ZeldaSubscreen.txt
index da5731ac80..5ae7009a8a 100644
--- a/modules/zelda/ZeldaSubscreen.txt
+++ b/modules/zelda/ZeldaSubscreen.txt
@@ -5,6 +5,7 @@ set(ZELDA_SUBSCREEN_SOURCES
 # Add or remove files here
 ################################
 src/subscr.cpp
+src/new_subscr.cpp
 src/zc/zc_subscr.cpp
 src/md5.cpp
 src/midi.cpp
diff --git a/modules/zquest/ZQuestCore.txt b/modules/zquest/ZQuestCore.txt
index b0390d8f84..85cfe3543c 100644
--- a/modules/zquest/ZQuestCore.txt
+++ b/modules/zquest/ZQuestCore.txt
@@ -16,6 +16,7 @@ src/qst.cpp
 src/sprite.cpp
 src/solidobject.cpp
 src/subscr.cpp
+src/new_subscr.cpp
 src/zc/zc_custom.cpp
 src/init.cpp
 src/zinfo.cpp
diff --git a/src/base/mapscr.cpp b/src/base/mapscr.cpp
index 481567a52d..523fc7502a 100644
--- a/src/base/mapscr.cpp
+++ b/src/base/mapscr.cpp
@@ -2,6 +2,10 @@
 #include "base/zsys.h"
 #include "base/qrs.h"
 
+std::vector<mapscr> TheMaps;
+std::vector<word> map_autolayers;
+word map_count = 0;
+
 byte mapscr::ffEffectWidth(size_t ind) const
 {
 	return (byte)ffcs[ind].hit_width;
diff --git a/src/base/mapscr.h b/src/base/mapscr.h
index c616377744..8d0267d7c4 100644
--- a/src/base/mapscr.h
+++ b/src/base/mapscr.h
@@ -3,6 +3,7 @@
 
 #include "base/zdefs.h"
 #include "ffc.h"
+#include <vector>
 
 struct mapscr
 {
@@ -294,5 +295,9 @@ enum
 	rMAX
 };
 
+extern std::vector<mapscr> TheMaps;
+extern std::vector<word>   map_autolayers;
+extern word map_count;
+
 #endif
 
diff --git a/src/base/qrs.h b/src/base/qrs.h
index e6a8bd6a5f..e2f156c144 100644
--- a/src/base/qrs.h
+++ b/src/base/qrs.h
@@ -176,7 +176,7 @@ enum
 	qr_SCROLLWARP_NO_RESET_FRAME, qr_BROKEN_RAFT_SCROLL, qr_BROKEN_INPUT_DOWN_STATE, qr_OLD_GUY_HANDLING,
 	//52
 	qr_FREEFORM_SUBSCREEN_CURSOR, qr_SUBSCR_PRESS_TO_EQUIP, qr_FAIRY_FLAG_COMPAT, qr_MIRROR_PRISM_LAYERS,
-	qr_OLD_LENS_LAYEREFFECT, qr_PUSHBLOCK_SPRITE_LAYER,
+	qr_OLD_LENS_LAYEREFFECT, qr_PUSHBLOCK_SPRITE_LAYER, qr_OLD_SUBSCR,
 	//EMILY SPOT
 	//60
 	//CONNOR SPOT qr_ = 60*8,
diff --git a/src/base/zdefs.h b/src/base/zdefs.h
index b0106ac465..5f86690bd3 100644
--- a/src/base/zdefs.h
+++ b/src/base/zdefs.h
@@ -243,16 +243,16 @@ enum {ENC_METHOD_192B104=0, ENC_METHOD_192B105, ENC_METHOD_192B185, ENC_METHOD_2
 #define V_GUYS            47
 #define V_MIDIS            4
 #define V_CHEATS           1
-#define V_SAVEGAME        33
+#define V_SAVEGAME        34
 #define V_COMBOALIASES     4
 #define V_HEROSPRITES      16
-#define V_SUBSCREEN        7
+#define V_SUBSCREEN        8
 #define V_ITEMDROPSETS     2
 #define V_FFSCRIPT         21
 #define V_SFX              8
 #define V_FAVORITES        3
 
-#define V_COMPATRULE       52
+#define V_COMPATRULE       53
 #define V_ZINFO            3
 
 //= V_SHOPS is under V_MISC
@@ -2625,6 +2625,8 @@ struct gamedata
 	std::vector< ZCArray <int32_t> > globalRAM;
 	
 	byte awpn, bwpn, xwpn, ywpn;											// Currently selected weapon slots
+	byte awpnpg, bwpnpg, xwpnpg, ywpnpg;
+	int16_t abtn_itm = -1, bbtn_itm = -1, xbtn_itm = -1, ybtn_itm = -1;
 	int16_t forced_awpn = -1, forced_bwpn = -1, forced_xwpn = -1, forced_ywpn = -1;
 	bool isclearing; // The gamedata is being cleared
 	//115456 (260)
diff --git a/src/dialog/quest_rules.cpp b/src/dialog/quest_rules.cpp
index abefbc6765..35400f5fc4 100644
--- a/src/dialog/quest_rules.cpp
+++ b/src/dialog/quest_rules.cpp
@@ -13,6 +13,7 @@
 #include "gui/use_size.h"
 #include "zq/zq_files.h"
 #include "base/qrs.h"
+#include "base/mapscr.h"
 
 bool mapcount_will_affect_layers(word newmapcount);
 void update_map_count(word newmapcount);
@@ -925,6 +926,8 @@ static GUI::ListData compatRulesList
 	{ "Old (Buggy) ZScript Volume Access", qr_OLD_SCRIPT_VOLUME,
 		"If enabled, Audio->AdjustMusicVolume() and Audio->AdjustSFXVolume() will use their old behavior,"
 		" which was bugged and wrote directly to the volume sliders." },
+	{ "Old Engine Subscreen Quirks", qr_OLD_SUBSCR,
+		"If enabled, the subscreen behaves in a way needed for compat."},
 };
 
 static GUI::ListData enemiesRulesList
diff --git a/src/dialog/subscr_props.cpp b/src/dialog/subscr_props.cpp
index 907a1d723a..00254c5d30 100644
--- a/src/dialog/subscr_props.cpp
+++ b/src/dialog/subscr_props.cpp
@@ -9,31 +9,16 @@
 #include "gui/common.h"
 #include "base/misctypes.h"
 
-void printobj(subscreen_object const& obj)
-{
-	zprint2("PRINTOUT--:\n");
-	zprint2("d1: %d\n", obj.d1);
-	zprint2("d2: %d\n", obj.d2);
-	zprint2("d3: %d\n", obj.d3);
-	zprint2("d4: %d\n", obj.d4);
-	zprint2("d5: %d\n", obj.d5);
-	zprint2("d6: %d\n", obj.d6);
-	zprint2("d7: %d\n", obj.d7);
-	zprint2("d8: %d\n", obj.d8);
-	zprint2("d9: %d\n", obj.d9);
-	zprint2("d10: %d\n", obj.d10);
-}
-
 static bool dlg_retval = false;
-bool call_subscrprop_dialog(subscreen_object *ref, int32_t obj_ind)
+bool call_subscrprop_dialog(SubscrWidget* widg, int32_t obj_ind)
 {
-	SubscrPropDialog(ref,obj_ind).show();
+	SubscrPropDialog(widg,obj_ind).show();
 	return dlg_retval;
 }
 
-SubscrPropDialog::SubscrPropDialog(subscreen_object *ref, int32_t obj_ind) :
-	local_subref(*ref), subref(ref), index(obj_ind),
-	list_font(GUI::ZCListData::fonts(true,true,true)),
+SubscrPropDialog::SubscrPropDialog(SubscrWidget* widg, int32_t obj_ind) :
+	local_subref(widg->clone()), subref(widg), index(obj_ind),
+	list_font(GUI::ZCListData::fonts(false,true,true)),
 	list_shadtype(GUI::ZCListData::shadow_types()),
 	list_aligns(GUI::ZCListData::alignments()),
 	list_buttons(GUI::ZCListData::buttons()),
@@ -44,8 +29,8 @@ SubscrPropDialog::SubscrPropDialog(subscreen_object *ref, int32_t obj_ind) :
 
 static const GUI::ListData two_three_rows
 {
-	{ "Two", 0 },
-	{ "Three", 1 }
+	{ "Two", 2 },
+	{ "Three", 3 }
 };
 static const GUI::ListData special_tile_list
 {
@@ -59,103 +44,102 @@ static const GUI::ListData wrapping_type_list
 	{ "Word", 1 }
 };
 
-#define NUM_FIELD(member,_min,_max) \
+#define NUM_FIELD(var,_min,_max) \
 TextField( \
 	fitParent = true, \
 	type = GUI::TextField::type::INT_DECIMAL, \
-	low = _min, high = _max, val = local_subref.member, \
-	onValChangedFunc = [&](GUI::TextField::type,std::string_view,int32_t val) \
+	low = _min, high = _max, val = var, \
+	onValChangedFunc = [=](GUI::TextField::type,std::string_view,int32_t val) \
 	{ \
-		local_subref.member = val; \
+		var = val; \
 	})
 
-#define MISC_COLOR_SEL(txt, num) \
+#define MISC_COLOR_SEL(var, txt, num) \
 Frame( \
 	title = txt, \
 	col_sel[num-1] = MiscColorSel( \
-		c1 = local_subref.colortype##num, \
-		c2 = local_subref.color##num, \
-		onUpdate = [&](int32_t c1, int32_t c2) \
+		c1 = var.type, \
+		c2 = var.color, \
+		onUpdate = [=](int32_t c1, int32_t c2) \
 		{ \
-			local_subref.colortype##num = c1; \
-			local_subref.color##num = c2; \
+			var.type = c1; \
+			var.color = c2; \
 			updateColors(); \
 		}) \
 )
 
-#define MISC_CSET_SEL(txt, num) \
+#define MISC_CSET_SEL(var, txt, num) \
 Frame( \
 	title = txt, \
 	cs_sel[num-1] = MiscCSetSel( \
-		c1 = local_subref.colortype##num, \
-		c2 = local_subref.color##num, \
-		onUpdate = [&](int32_t c1, int32_t c2) \
+		c1 = var.type, \
+		c2 = var.color, \
+		onUpdate = [=](int32_t c1, int32_t c2) \
 		{ \
-			local_subref.colortype##num = c1; \
-			local_subref.color##num = c2; \
+			var.type = c1; \
+			var.color = c2; \
 			updateColors(); \
 		}) \
 )
 
-#define CBOX(member, bit, txt, cspan) \
+#define CBOX(var, bit, txt, cspan) \
 Checkbox( \
 	colSpan = cspan, \
 	text = txt, hAlign = 0.0, \
-	checked = local_subref.member & bit, \
-	onToggleFunc = [&](bool state) \
+	checked = var & bit, \
+	onToggleFunc = [=](bool state) \
 	{ \
-		SETFLAG(local_subref.member, bit, state); \
+		SETFLAG(var, bit, state); \
 	} \
 )
 
-#define DDL(member, lister) \
+#define DDL(var, lister) \
 DropDownList(data = lister, \
 	fitParent = true, \
-	selectedValue = local_subref.member, \
-	onSelectFunc = [&](int32_t val) \
+	selectedValue = var, \
+	onSelectFunc = [=](int32_t val) \
 	{ \
-		local_subref.member = val; \
+		var = val; \
 	} \
 )
-#define DDL_FONT(member) \
+#define DDL_FONT(var) \
 DropDownList(data = list_font, \
 	fitParent = true, \
-	selectedValue = local_subref.member, \
-	onSelectFunc = [&](int32_t val) \
+	selectedValue = var, \
+	onSelectFunc = [=](int32_t val) \
 	{ \
-		local_subref.member = val; \
-		if(fonttf) fonttf->setFont(ss_font(val)); \
+		var = val; \
+		if(fonttf) fonttf->setFont(get_zc_font(val)); \
 	} \
 )
-#define DDL_MW(member, lister, maxwid) \
+#define DDL_MW(var, lister, maxwid) \
 DropDownList(data = lister, \
 	fitParent = true, \
 	maxwidth = maxwid, \
-	selectedValue = local_subref.member, \
-	onSelectFunc = [&](int32_t val) \
+	selectedValue = var, \
+	onSelectFunc = [=](int32_t val) \
 	{ \
-		local_subref.member = val; \
+		var = val; \
 	} \
 )
 
-#define GAUGE_MINITILE(txt,mem1,mem2,mem3,bit) \
+#define GAUGE_MINITILE(txt,vMTInfo,vModflag,bit) \
 Frame(fitParent = true, Column(fitParent = true, \
 	Label(/*useFont = spfont, */text = txt), \
 	SelTileSwatch( \
 		hAlign = 0.0, \
-		tile = local_subref.mem1>>2, \
-		cset = local_subref.mem2, \
+		tile = vMTInfo.tile(), \
+		cset = vMTInfo.cset, \
 		mini = true, \
-		minicorner = local_subref.mem1 %4, \
+		minicorner = vMTInfo.crn(), \
 		showvals = false, \
-		onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t crn) \
+		onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t crn) \
 		{ \
-			local_subref.mem1 = t<<2; \
-			local_subref.mem2 = c; \
-			local_subref.mem1 |= crn; \
+			vMTInfo.setTileCrn(t,crn); \
+			vMTInfo.cset = c; \
 		} \
 	), \
-	CBOX(mem3,bit,"Mod",1) \
+	CBOX(vModflag,bit,"Mod",1) \
 ))
 
 //Tile block max preview tiledim
@@ -230,8 +214,7 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 	using namespace GUI::Builder;
 	using namespace GUI::Props;
 	char titlebuf[512];
-	sprintf(titlebuf, "%s Properties (Object #%d)", sso_name(local_subref.type), index);
-	zprint2("Opening: '%s'\n", titlebuf);
+	sprintf(titlebuf, "%s Properties (Object #%d)", sso_name(local_subref->getType()), index);
 	//Generate the basic window, with a reference to the row
 	std::shared_ptr<GUI::Grid> windowRow;
 	window = Window(
@@ -260,19 +243,19 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 	//Generate 'location' grid
 	{
 		//Generate any type-specific location data (ex special w/h things)
-		word loadw = sso_w(&local_subref);
-		word loadh = sso_h(&local_subref);
+		word loadw = local_subref->getW();
+		word loadh = local_subref->getH();
 		bool show_xy = true;
 		bool show_wh = true;
-		switch(local_subref.type)
+		switch(local_subref->getType())
 		{
 			case sso2X2FRAME:
 			case ssoCURRENTITEM:
-			case ssoTRIFORCE:
+			case ssoMCGUFFIN:
 			case ssoTILEBLOCK:
 			case ssoTEXTBOX:
-				loadw = local_subref.w;
-				loadh = local_subref.h;
+				loadw = local_subref->w;
+				loadh = local_subref->h;
 				break;
 			case ssoMAGICMETER:
 			case ssoLIFEMETER:
@@ -291,42 +274,63 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 			default: break;
 		}
 		std::shared_ptr<GUI::Grid> g1;
-		loc_grid = Row(
-				Column(
-					Label(text = "Display:"),
-					Checkbox(
-						text = "Active Up", hAlign = 0.0,
-						checked = local_subref.pos & sspUP,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.pos,sspUP,state);
-						}
-					),
-					Checkbox(
-						text = "Active Down", hAlign = 0.0,
-						checked = local_subref.pos & sspDOWN,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.pos,sspDOWN,state);
-						}
+		loc_grid = Column(
+				Row(
+					Column(
+						Label(text = "Display:"),
+						Checkbox(
+							text = "Active Up", hAlign = 0.0,
+							checked = local_subref->posflags & sspUP,
+							onToggleFunc = [=](bool state)
+							{
+								SETFLAG(local_subref->posflags,sspUP,state);
+							}
+						),
+						Checkbox(
+							text = "Active Down", hAlign = 0.0,
+							checked = local_subref->posflags & sspDOWN,
+							onToggleFunc = [=](bool state)
+							{
+								SETFLAG(local_subref->posflags,sspDOWN,state);
+							}
+						),
+						Checkbox(
+							text = "Active Scrolling", hAlign = 0.0,
+							checked = local_subref->posflags & sspSCROLLING,
+							onToggleFunc = [=](bool state)
+							{
+								SETFLAG(local_subref->posflags,sspSCROLLING,state);
+							}
+						)
 					),
-					Checkbox(
-						text = "Active Scrolling", hAlign = 0.0,
-						checked = local_subref.pos & sspSCROLLING,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.pos,sspSCROLLING,state);
-						}
-					)
+					g1 = Rows<2>()
 				),
-				g1 = Rows<2>()
+				Rows<3>(
+					CBOX(local_subref->flags,SUBSCRFLAG_SELECTABLE,"Cursor Selectable",3),
+					//
+					Label(text = "Position:", hAlign = 1.0),
+					NUM_FIELD(local_subref->pos, -9999, 9999),
+					INFOBTN("The unique position ID of this slot"),
+					Label(text = "Up Select:", hAlign = 1.0),
+					NUM_FIELD(local_subref->pos_up, -9999, 9999),
+					INFOBTN("The unique position ID to move to when pressing 'Up'"),
+					Label(text = "Down Select:", hAlign = 1.0),
+					NUM_FIELD(local_subref->pos_down, -9999, 9999),
+					INFOBTN("The unique position ID to move to when pressing 'Down'"),
+					Label(text = "Left Select:", hAlign = 1.0),
+					NUM_FIELD(local_subref->pos_left, -9999, 9999),
+					INFOBTN("The unique position ID to move to when pressing 'Left' / 'L' quickswap"),
+					Label(text = "Right Select:", hAlign = 1.0),
+					NUM_FIELD(local_subref->pos_right, -9999, 9999),
+					INFOBTN("The unique position ID to move to when pressing 'Right' / 'R' quickswap")
+				)
 			);
 		if(show_xy)
 		{
 			g1->add(Label(text = "X:"));
-			g1->add(NUM_FIELD(x,-999,9999));
+			g1->add(NUM_FIELD(local_subref->x,-999,9999));
 			g1->add(Label(text = "Y:"));
-			g1->add(NUM_FIELD(y,-999,9999));
+			g1->add(NUM_FIELD(local_subref->y,-999,9999));
 		}
 		if(show_wh)
 		{
@@ -335,9 +339,9 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				fitParent = true,
 				type = GUI::TextField::type::INT_DECIMAL,
 				low = 0, high = 999, val = loadw,
-				onValChangedFunc = [&](GUI::TextField::type,std::string_view,int32_t val)
+				onValChangedFunc = [=](GUI::TextField::type,std::string_view,int32_t val)
 				{
-					local_subref.w = val;
+					local_subref->w = val;
 					update_wh();
 				}));
 			g1->add(Label(text = "H:"));
@@ -345,9 +349,9 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				fitParent = true,
 				type = GUI::TextField::type::INT_DECIMAL,
 				low = 0, high = 999, val = loadh,
-				onValChangedFunc = [&](GUI::TextField::type,std::string_view,int32_t val)
+				onValChangedFunc = [=](GUI::TextField::type,std::string_view,int32_t val)
 				{
-					local_subref.h = val;
+					local_subref->h = val;
 					update_wh();
 				}));
 		}
@@ -362,18 +366,22 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 	bool addcolor = true;
 	//Generate 'color' grid
 	{
-		switch(local_subref.type)
+		switch(local_subref->getType())
 		{
 			case sso2X2FRAME:
 			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
+				SW_2x2Frame* w = dynamic_cast<SW_2x2Frame*>(local_subref);
+				col_grid->add(MISC_CSET_SEL(w->cs, "CSet", 1));
 				break;
 			}
 			case ssoBSTIME:
+			case ssoTIME:
+			case ssoSSTIME:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_Time* w = dynamic_cast<SW_Time*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoBUTTONITEM:
@@ -381,16 +389,18 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				break;
 			case ssoCOUNTER:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_Counter* w = dynamic_cast<SW_Counter*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoCOUNTERS:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_Counters* w = dynamic_cast<SW_Counters*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoCURRENTITEM:
@@ -398,27 +408,15 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				break;
 			case ssoCLEAR:
 			{
-				col_grid->add(MISC_COLOR_SEL("Subscreen Color", 1));
-				break;
-			}
-			case ssoTIME:
-			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
-				break;
-			}
-			case ssoSSTIME:
-			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_Clear* w = dynamic_cast<SW_Clear*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Subscreen Color", 1));
 				break;
 			}
 			case ssoLARGEMAP:
 			{
-				col_grid->add(MISC_COLOR_SEL("Room Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Player Color", 2));
+				SW_LMap* w = dynamic_cast<SW_LMap*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_room, "Room Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_plr, "Player Color", 2));
 				break;
 			}
 			case ssoLIFEGAUGE:
@@ -429,7 +427,8 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				break;
 			case ssoLINE:
 			{
-				col_grid->add(MISC_COLOR_SEL("Line Color", 1));
+				SW_Line* w = dynamic_cast<SW_Line*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_line, "Line Color", 1));
 				break;
 			}
 			case ssoMAGICGAUGE:
@@ -440,74 +439,78 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				break;
 			case ssoMINIMAP:
 			{
-				col_grid->add(MISC_COLOR_SEL("Player Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Compass Blink Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Compass Const Color", 3));
+				SW_MMap* w = dynamic_cast<SW_MMap*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_plr, "Player Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_cmp_blink, "Compass Blink Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_cmp_off, "Compass Const Color", 3));
 				break;
 			}
 			case ssoMINIMAPTITLE:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_MMapTitle* w = dynamic_cast<SW_MMapTitle*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoMINITILE:
 			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
+				SW_MiniTile* w = dynamic_cast<SW_MiniTile*>(local_subref);
+				col_grid->add(MISC_CSET_SEL(w->cs, "CSet", 1));
 				break;
 			}
 			case ssoRECT:
 			{
-				col_grid->add(MISC_COLOR_SEL("Outline Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Fill Color", 2));
+				SW_Rect* w = dynamic_cast<SW_Rect*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_outline, "Outline Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_fill, "Fill Color", 2));
 				break;
 			}
 			case ssoSELECTEDITEMNAME:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_SelectedText* w = dynamic_cast<SW_SelectedText*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoSELECTOR1:
-			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
-				break;
-			}
 			case ssoSELECTOR2:
-			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
+				addcolor = false;
 				break;
-			}
 			case ssoTEXT:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_Text* w = dynamic_cast<SW_Text*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoTEXTBOX:
 			{
-				col_grid->add(MISC_COLOR_SEL("Text Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Shadow Color", 2));
-				col_grid->add(MISC_COLOR_SEL("Background Color", 3));
+				SW_TextBox* w = dynamic_cast<SW_TextBox*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_text, "Text Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_shadow, "Shadow Color", 2));
+				col_grid->add(MISC_COLOR_SEL(w->c_bg, "Background Color", 3));
 				break;
 			}
 			case ssoTILEBLOCK:
 			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
+				SW_TileBlock* w = dynamic_cast<SW_TileBlock*>(local_subref);
+				col_grid->add(MISC_CSET_SEL(w->cs, "CSet", 1));
 				break;
 			}
 			case ssoTRIFRAME:
 			{
-				col_grid->add(MISC_COLOR_SEL("Frame Outline Color", 1));
-				col_grid->add(MISC_COLOR_SEL("Number Color", 2));
+				SW_TriFrame* w = dynamic_cast<SW_TriFrame*>(local_subref);
+				col_grid->add(MISC_COLOR_SEL(w->c_outline, "Frame Outline Color", 1));
+				col_grid->add(MISC_COLOR_SEL(w->c_number, "Number Color", 2));
 				break;
 			}
-			case ssoTRIFORCE:
+			case ssoMCGUFFIN:
 			{
-				col_grid->add(MISC_CSET_SEL("CSet", 1));
+				SW_McGuffin* w = dynamic_cast<SW_McGuffin*>(local_subref);
+				col_grid->add(MISC_CSET_SEL(w->cs, "CSet", 1));
 				break;
 			}
 		}
@@ -519,78 +522,62 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 	int32_t mergetype = mtNONE;
 	//Generate 'attributes' grid
 	{
-		switch(local_subref.type)
+		switch(local_subref->getType())
 		{
 			case sso2X2FRAME:
 			{
+				SW_2x2Frame* w = dynamic_cast<SW_2x2Frame*>(local_subref);
 				attrib_grid = Column(
 					tswatches[0] = SelTileSwatch(
 						hAlign = 0.0,
-						tile = local_subref.d1,
-						cset = subscreen_cset(cs_sel[0]->getC1(), cs_sel[0]->getC2()),
-						//flip = local_subref.d2,
+						tile = w->tile,
+						cset = w->cs.get_cset(),
+						//flip = local_subref->d2,
 						tilewid = 2, tilehei = 2,
 						showvals = false,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t)
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t)
 						{
-							local_subref.d1 = t;
-							if(local_subref.colortype1 != ssctMISC)
+							w->tile = t;
+							if(w->cs.type != ssctMISC)
 							{
-								local_subref.colortype1 = c;
+								w->cs.type = c;
 								cs_sel[0]->setC1(c);
 							}
 						}
 					),
-					Checkbox(
-						text = "Overlay", hAlign = 0.0,
-						checked = local_subref.d3,
-						onToggleFunc = [&](bool state)
-						{
-							local_subref.d3 = (state?1:0);
-						}
-					),
-					Checkbox(
-						text = "Transparent", hAlign = 0.0,
-						checked = local_subref.d4,
-						onToggleFunc = [&](bool state)
-						{
-							local_subref.d4 = (state?1:0);
-						}
-					)
+					CBOX(w->flags,SUBSCR_2X2FR_OVERLAY,"Overlay",1),
+					CBOX(w->flags,SUBSCR_2X2FR_TRANSP,"Transparent",1)
 				);
 				break;
 			}
+			case ssoTIME:
+			case ssoSSTIME:
 			case ssoBSTIME:
 			{
+				SW_Time* w = dynamic_cast<SW_Time*>(local_subref);
 				attrib_grid = Columns<3>(
 					Label(text = "Font:", hAlign = 1.0),
 					Label(text = "Style:", hAlign = 1.0),
 					Label(text = "Alignment:", hAlign = 1.0),
-					DDL_FONT(d1),
-					DDL(d3, list_shadtype),
-					DDL(d2, list_aligns)
+					DDL_FONT(w->fontid),
+					DDL(w->shadtype, list_shadtype),
+					DDL(w->align, list_aligns)
 				);
 				break;
 			}
 			case ssoBUTTONITEM:
 			{
+				SW_ButtonItem* w = dynamic_cast<SW_ButtonItem*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Button:", hAlign = 1.0),
-					DDL(d1, list_buttons),
-					Checkbox(colSpan = 2,
-						text = "Transparent", hAlign = 0.0,
-						checked = local_subref.d2,
-						onToggleFunc = [&](bool state)
-						{
-							local_subref.d2 = (state?1:0);
-						}
-					)
+					DDL(w->btn, list_buttons),
+					CBOX(w->flags,SUBSCR_BTNITM_TRANSP,"Transparent",2)
 				);
 				break;
 			}
 			case ssoCOUNTER:
 			{
-				printobj(local_subref);
+				SW_Counter* w = dynamic_cast<SW_Counter*>(local_subref);
 				mergetype = mtFORCE_TAB; //too wide to fit!
 				attrib_grid = Columns<6>(
 					Label(text = "Font:", hAlign = 1.0),
@@ -599,134 +586,83 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 					Label(text = "Item 1:", hAlign = 1.0),
 					Label(text = "Item 2:", hAlign = 1.0),
 					Label(text = "Item 3:", hAlign = 1.0),
-					DDL_FONT(d1),
-					DDL(d3, list_shadtype),
-					DDL(d2, list_aligns),
-					DDL(d7, list_counters),
-					DDL(d8, list_counters),
-					DDL(d9, list_counters),
+					DDL_FONT(w->fontid),
+					DDL(w->shadtype, list_shadtype),
+					DDL(w->align, list_aligns),
+					DDL(w->ctrs[0], list_counters),
+					DDL(w->ctrs[1], list_counters),
+					DDL(w->ctrs[2], list_counters),
 					Label(text = "Digits:", hAlign = 1.0),
 					Label(text = "Infinite:", hAlign = 1.0),
 					Label(text = "Inf Character:", hAlign = 1.0),
-					Checkbox(
-						text = "Show Zero", hAlign = 0.0,
-						checked = local_subref.d6 & 0b01,
-						colSpan = 2,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.d6, 0b01, state);
-						}
-					),
-					Checkbox(
-						colSpan = 2,
-						text = "Only Selected", hAlign = 0.0,
-						checked = local_subref.d6 & 0b10,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.d6, 0b10, state);
-						}
-					),
+					CBOX(w->flags,SUBSCR_COUNTER_SHOW0,"Show Zero",2),
+					CBOX(w->flags,SUBSCR_COUNTER_ONLYSEL,"Only Selected",2),
 					DummyWidget(colSpan = 2),
-					NUM_FIELD(d4,0,5),
-					DDL_MW(d10,list_items,100_px),
+					NUM_FIELD(w->digits,0,5),
+					DDL_MW(w->infitm,list_items,100_px),
 					TextField(maxLength = 1,
 						fitParent = true,
-						text = std::string(1,(char)local_subref.d5),
-						onValChangedFunc = [&](GUI::TextField::type,std::string_view str,int32_t)
+						text = std::string(1,(char)w->infchar),
+						onValChangedFunc = [=](GUI::TextField::type,std::string_view str,int32_t)
 						{
-							std::string name(str);
-							if(name.size())
-								local_subref.d5 = name[0];
-							else local_subref.d5 = 0;
+							std::string txt(str);
+							if(txt.size())
+								w->infchar = txt[0];
+							else w->infchar = 0;
 						})
 				);
 				break;
 			}
 			case ssoCOUNTERS:
 			{
+				SW_Counters* w = dynamic_cast<SW_Counters*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Font:", hAlign = 1.0),
-					DDL_FONT(d1),
+					DDL_FONT(w->fontid),
 					Label(text = "Style:", hAlign = 1.0),
-					DDL(d3, list_shadtype),
+					DDL(w->shadtype, list_shadtype),
 					Label(text = "Digits:", hAlign = 1.0),
-					NUM_FIELD(d4,0,5),
+					NUM_FIELD(w->digits,0,5),
 					Label(text = "Inf Character:", hAlign = 1.0),
 					TextField(maxLength = 1,
 						fitParent = true,
-						text = std::string(1,(char)local_subref.d5),
-						onValChangedFunc = [&](GUI::TextField::type,std::string_view str,int32_t)
+						text = std::string(1,(char)w->infchar),
+						onValChangedFunc = [=](GUI::TextField::type,std::string_view str,int32_t)
 						{
 							std::string name(str);
 							if(name.size())
-								local_subref.d5 = name[0];
-							else local_subref.d5 = 0;
+								w->infchar = name[0];
+							else w->infchar = 0;
 						}),
-					Checkbox(
-						text = "Use X", hAlign = 0.0,
-						checked = local_subref.d2 & 0b1,
-						colSpan = 2,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.d2, 0b1, state);
-						}
-					)
+					CBOX(w->flags,SUBSCR_COUNTERS_USEX,"Use X",2)
 				);
 				break;
 			}
 			case ssoCURRENTITEM:
 			{
+				SW_CurrentItem* w = dynamic_cast<SW_CurrentItem*>(local_subref);
 				attrib_grid = Rows<3>(
 					labels[0] = Label(text = "Item Class:", hAlign = 1.0),
-					ddl = DDL(d1, list_itemclass),
+					ddl = DDL(w->iclass, list_itemclass),
 					INFOBTN("The highest level owned of this itemclass will be tied to this item slot."),
 					Label(text = "Item Override:", hAlign = 1.0),
 					DropDownList(data = list_items,
 						fitParent = true,
 						forceFitW = true,
-						selectedValue = local_subref.d8-1,
-						onSelectFunc = [&](int32_t val)
+						selectedValue = w->iid-1,
+						onSelectFunc = [=](int32_t val)
 						{
-							local_subref.d8 = val+1;
+							w->iid = val+1;
 							ddl->setDisabled(val > -1);
 							labels[0]->setDisabled(val > -1);
 						}
 					),
 					INFOBTN("The specified item ID will be tied to this item slot (OVERRIDES 'Item Class' if set)"),
-					Label(text = "Position:", hAlign = 1.0),
-					NUM_FIELD(d3, -9999, 9999),
-					INFOBTN("The unique position ID of this slot"),
-					Label(text = "Up Select:", hAlign = 1.0),
-					NUM_FIELD(d4, -9999, 9999),
-					INFOBTN("The unique position ID to move to when pressing 'Up'"),
-					Label(text = "Down Select:", hAlign = 1.0),
-					NUM_FIELD(d5, -9999, 9999),
-					INFOBTN("The unique position ID to move to when pressing 'Down'"),
-					Label(text = "Left Select:", hAlign = 1.0),
-					NUM_FIELD(d6, -9999, 9999),
-					INFOBTN("The unique position ID to move to when pressing 'Left' / 'L' quickswap"),
-					Label(text = "Right Select:", hAlign = 1.0),
-					NUM_FIELD(d7, -9999, 9999),
-					INFOBTN("The unique position ID to move to when pressing 'Right' / 'R' quickswap"),
 					DummyWidget(),
-					Checkbox(
-						text = "Invisible", hAlign = 0.0,
-						checked = !(local_subref.d2 & SSCURRITEM_VISIBLE),
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.d2, SSCURRITEM_VISIBLE, !state);
-						}
-					),
+					CBOX(w->flags,SUBSCR_CURITM_INVIS,"Invisible",1),
 					INFOBTN("If checked, the item is invisible on the subscreen"),
 					DummyWidget(),
-					Checkbox(
-						text = "Non-Equippable", hAlign = 0.0,
-						checked = local_subref.d2 & SSCURRITEM_NONEQUIP,
-						onToggleFunc = [&](bool state)
-						{
-							SETFLAG(local_subref.d2, SSCURRITEM_NONEQUIP, state);
-						}
-					),
+					CBOX(w->flags,SUBSCR_CURITM_NONEQP,"Non-Equippable",1),
 					INFOBTN("If checked, the item cannot be equipped to a button."
 						" 'Always Press To Equip' is recommended if this is used." + QRHINT({qr_SUBSCR_PRESS_TO_EQUIP}))
 				);
@@ -737,59 +673,37 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				addattrib = false;
 				break;
 			}
-			case ssoTIME:
-			{
-				attrib_grid = Columns<3>(
-					Label(text = "Font:", hAlign = 1.0),
-					Label(text = "Style:", hAlign = 1.0),
-					Label(text = "Alignment:", hAlign = 1.0),
-					DDL_FONT(d1),
-					DDL(d3, list_shadtype),
-					DDL(d2, list_aligns)
-				);
-				break;
-			}
-			case ssoSSTIME:
-			{
-				attrib_grid = Columns<3>(
-					Label(text = "Font:", hAlign = 1.0),
-					Label(text = "Style:", hAlign = 1.0),
-					Label(text = "Alignment:", hAlign = 1.0),
-					DDL_FONT(d1),
-					DDL(d3, list_shadtype),
-					DDL(d2, list_aligns)
-				);
-				break;
-			}
 			case ssoLARGEMAP:
 			{
+				SW_LMap* w = dynamic_cast<SW_LMap*>(local_subref);
 				attrib_grid = Column(
-					CBOX(d1, 0b1, "Show Map", 1),
-					CBOX(d2, 0b1, "Show Rooms", 1),
-					CBOX(d3, 0b1, "Show Hero", 1),
-					CBOX(d10, 0b1, "Large", 1)
+					CBOX(w->flags, SUBSCR_LMAP_SHOWMAP, "Show Map", 1),
+					CBOX(w->flags, SUBSCR_LMAP_SHOWROOM, "Show Rooms", 1),
+					CBOX(w->flags, SUBSCR_LMAP_SHOWPLR, "Show Hero", 1),
+					CBOX(w->flags, SUBSCR_LMAP_LARGE, "Large", 1)
 				);
 				break;
 			}
 			case ssoLIFEGAUGE:
 			{
+				SW_LifeGaugePiece* w = dynamic_cast<SW_LifeGaugePiece*>(local_subref);
 				attrib_grid = Row(padding = 0_px,
 					Rows<2>(
-						GAUGE_MINITILE("Not Last",d2,colortype1,d10,0x01),
-						GAUGE_MINITILE("Last",d3,color1,d10,0x02),
-						GAUGE_MINITILE("Cap",d4,colortype2,d10,0x04),
-						GAUGE_MINITILE("After Cap",d5,color2,d10,0x08)
+						GAUGE_MINITILE("Not Last",w->mts[0],w->flags,SUBSCR_LGAUGE_MOD1),
+						GAUGE_MINITILE("Last",w->mts[1],w->flags,SUBSCR_LGAUGE_MOD2),
+						GAUGE_MINITILE("Cap",w->mts[2],w->flags,SUBSCR_LGAUGE_MOD3),
+						GAUGE_MINITILE("After Cap",w->mts[3],w->flags,SUBSCR_LGAUGE_MOD4)
 					),
 					Columns<5>(
 						Label(text = "Frames:", hAlign = 1.0),
 						Label(text = "Speed:", hAlign = 1.0),
 						Label(text = "Delay:", hAlign = 1.0),
 						Label(text = "Container:", hAlign = 1.0),
-						CBOX(d10,0x10,"Unique Last",2),
-						NUM_FIELD(d6, 0, 999),
-						NUM_FIELD(d7, 0, 999),
-						NUM_FIELD(d8, 0, 999),
-						NUM_FIELD(d1, 0, 9999),
+						CBOX(w->flags,SUBSCR_LGAUGE_UNQLAST,"Unique Last",2),
+						NUM_FIELD(w->frames, 0, 999),
+						NUM_FIELD(w->speed, 0, 999),
+						NUM_FIELD(w->delay, 0, 999),
+						NUM_FIELD(w->container, 0, 9999),
 						DummyWidget(rowSpan=3),
 						INFOBTN("The container number this piece represents. For a value of n,"
 							"\nIf the Player has exactly n containers, 'Last' displays."
@@ -803,29 +717,31 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 			}
 			case ssoLIFEMETER:
 			{
+				SW_LifeMeter* w = dynamic_cast<SW_LifeMeter*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Rows:", hAlign = 1.0),
-					DDL(d3, two_three_rows),
-					CBOX(d2, 0b1, "Start at bottom", 2)
+					DDL(w->rows, two_three_rows),
+					CBOX(w->flags, SUBSCR_LIFEMET_BOT, "Start at bottom", 2)
 				);
 				break;
 			}
 			case ssoLINE:
 			{
+				SW_Line* w = dynamic_cast<SW_Line*>(local_subref);
 				attrib_grid = Column(
-					CBOX(d1, 0b1, "Overlay", 1),
-					CBOX(d2, 0b1, "Transparent", 1)
+					CBOX(w->flags, SUBSCR_LINE_TRANSP, "Transparent", 1)
 				);
 				break;
 			}
 			case ssoMAGICGAUGE:
 			{
+				SW_MagicGaugePiece* w = dynamic_cast<SW_MagicGaugePiece*>(local_subref);
 				attrib_grid = Row(padding = 0_px,
 					Rows<2>(
-						GAUGE_MINITILE("Not Last",d2,colortype1,d10,0x01),
-						GAUGE_MINITILE("Last",d3,color1,d10,0x02),
-						GAUGE_MINITILE("Cap",d4,colortype2,d10,0x04),
-						GAUGE_MINITILE("After Cap",d5,color2,d10,0x08)
+						GAUGE_MINITILE("Not Last",w->mts[0],w->flags,SUBSCR_MGAUGE_MOD1),
+						GAUGE_MINITILE("Last",w->mts[1],w->flags,SUBSCR_MGAUGE_MOD2),
+						GAUGE_MINITILE("Cap",w->mts[2],w->flags,SUBSCR_MGAUGE_MOD3),
+						GAUGE_MINITILE("After Cap",w->mts[3],w->flags,SUBSCR_MGAUGE_MOD4)
 					),
 					Columns<6>(
 						Label(text = "Frames:", hAlign = 1.0),
@@ -833,12 +749,12 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 						Label(text = "Delay:", hAlign = 1.0),
 						Label(text = "Container:", hAlign = 1.0),
 						Label(text = "Show:", hAlign = 1.0),
-						CBOX(d10,0x10,"Unique Last",2),
-						NUM_FIELD(d6, 0, 999),
-						NUM_FIELD(d7, 0, 999),
-						NUM_FIELD(d8, 0, 999),
-						NUM_FIELD(d1, 0, 9999),
-						NUM_FIELD(d9, -1, 9999),
+						CBOX(w->flags,SUBSCR_MGAUGE_UNQLAST,"Unique Last",2),
+						NUM_FIELD(w->frames, 0, 999),
+						NUM_FIELD(w->speed, 0, 999),
+						NUM_FIELD(w->delay, 0, 999),
+						NUM_FIELD(w->container, 0, 9999),
+						NUM_FIELD(w->showdrain, -1, 9999),
 						DummyWidget(rowSpan=3),
 						INFOBTN("The container number this piece represents. For a value of n,"
 							"\nIf the Player has exactly n containers, 'Last' displays."
@@ -865,51 +781,54 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 			}
 			case ssoMINIMAP:
 			{
+				SW_MMap* w = dynamic_cast<SW_MMap*>(local_subref);
 				attrib_grid = Column(
-					CBOX(d1, 0b1, "Show Map", 1),
-					CBOX(d2, 0b1, "Show Player", 1),
-					CBOX(d3, 0b1, "Show Compass", 1)
+					CBOX(w->flags, SUBSCR_MMAP_SHOWMAP, "Show Map", 1),
+					CBOX(w->flags, SUBSCR_MMAP_SHOWPLR, "Show Player", 1),
+					CBOX(w->flags, SUBSCR_MMAP_SHOWCMP, "Show Compass", 1)
 				);
 				break;
 			}
 			case ssoMINIMAPTITLE:
 			{
+				SW_MMapTitle* w = dynamic_cast<SW_MMapTitle*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Font:", hAlign = 1.0),
-					DDL_FONT(d1),
+					DDL_FONT(w->fontid),
 					Label(text = "Style:", hAlign = 1.0),
-					DDL(d3, list_shadtype),
+					DDL(w->shadtype, list_shadtype),
 					Label(text = "Alignment:", hAlign = 1.0),
-					DDL(d2, list_aligns),
-					CBOX(d4, 0b1, "Invisible w/o Map item", 2)
+					DDL(w->align, list_aligns),
+					CBOX(w->flags, SUBSCR_MMAPTIT_REQMAP, "Invisible w/o Map item", 2)
 				);
 				break;
 			}
 			case ssoMINITILE:
 			{
+				SW_MiniTile* w = dynamic_cast<SW_MiniTile*>(local_subref);
 				mergetype = mtLOCTOP; //too wide to fit all 3 horiz, but has vert room
 				int32_t tl, tw = 1, crn;
-				if(local_subref.d1 == -1)
+				if(w->tile == -1)
 				{
-					switch(local_subref.d2)
+					switch(w->special_tile)
 					{
 						case ssmstSSVINETILE:
 							tl = wpnsbuf[iwSubscreenVine].tile;
 							tw = 3;
-							crn = local_subref.d3;
+							crn = w->crn;
 							break;
 						case ssmstMAGICMETER:
 							tl = wpnsbuf[iwMMeter].tile;
 							tw = 9;
-							crn = local_subref.d3;
+							crn = w->crn;
 							break;
 					}
 				}
 				else
 				{
-					tl = local_subref.d1 >> 2;
-					crn = (local_subref.d1 & 0b11);
-					local_subref.d2 = -1;
+					tl = w->tile;
+					crn = w->crn;
+					w->special_tile = -1;
 				}
 				attrib_grid = Rows<2>(
 					Label(text = "Tile:", hAlign = 1.0),
@@ -917,239 +836,201 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 						width = 4_px + (32_px*9),
 						hAlign = 0.0,
 						tile = tl,
-						cset = subscreen_cset(cs_sel[0]->getC1(),cs_sel[0]->getC2()),
+						cset = w->cs.get_cset(),
 						tilewid = tw,
-						minionly = local_subref.d2 != -1,
+						minionly = w->special_tile != -1,
 						mini = true,
 						minicorner = crn,
 						showvals = false,
 						showT0 = true,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t crn)
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t crn)
 						{
-							if(local_subref.d2 != -1)
+							if(w->special_tile != -1)
 							{
-								local_subref.d3 = crn;
+								w->crn = crn;
 								return;
 							}
 							
-							if(local_subref.colortype1 != ssctMISC)
+							if(w->cs.type != ssctMISC)
 							{
-								local_subref.colortype1 = c;
+								w->cs.type = c;
 								cs_sel[0]->setC1(c);
 							}
-							local_subref.d1 = t<<2;
-							local_subref.d1 |= crn&0b11;
+							w->tile = t;
+							w->crn = crn;
 						}
 					),
 					Label(text = "Special Tile:", hAlign = 1.0),
 					ddl = DropDownList(data = special_tile_list,
 						fitParent = true,
-						selectedValue = local_subref.d2,
-						onSelectFunc = [&](int32_t val)
+						selectedValue = w->special_tile,
+						onSelectFunc = [=](int32_t val)
 						{
-							if(val == local_subref.d2) return;
-							auto oldval = local_subref.d2;
-							local_subref.d2 = val;
-							int32_t newtile = 0, crn = 0;
+							if(val == w->special_tile) return;
+							auto oldval = w->special_tile;
+							w->special_tile = val;
+							int32_t newtile = 0;
 							switch(val)
 							{
 								case -1:
 									tswatches[0]->setTileWid(1);
 									tswatches[0]->setMiniOnly(false);
-									newtile = std::max(0,local_subref.d1>>2);
-									crn = local_subref.d3&0b11;
-									local_subref.d1 = (newtile<<2) | crn;
+									newtile = std::max(0,w->tile);
+									w->tile = newtile;
 									break;
 								case 0:
 									tswatches[0]->setTileWid(3);
 									tswatches[0]->setMiniOnly(true);
 									newtile = wpnsbuf[iwSubscreenVine].tile;
-									crn = (oldval==-1 ? local_subref.d1&0b11 : local_subref.d3);
-									local_subref.d1 = (newtile<<2);
-									local_subref.d3 = crn;
+									w->tile = newtile;
 									break;
 								case 1:
 									tswatches[0]->setTileWid(9);
 									tswatches[0]->setMiniOnly(true);
 									newtile = wpnsbuf[iwMMeter].tile;
-									crn = (oldval==-1 ? local_subref.d1&0b11 : local_subref.d3);
-									local_subref.d1 = (newtile<<2);
-									local_subref.d3 = crn;
+									w->tile = newtile;
 									break;
 							}
 							tswatches[0]->setTile(newtile);
-							tswatches[0]->setMiniCrn(crn);
+							tswatches[0]->setMiniCrn(w->crn);
 						}
 					),
-					CBOX(d5, 0b1, "Overlay", 2),
-					CBOX(d6, 0b1, "Transparent", 2)
+					CBOX(w->flags, SUBSCR_MINITL_OVERLAY, "Overlay", 2),
+					CBOX(w->flags, SUBSCR_MINITL_TRANSP, "Transparent", 2)
 				);
 				break;
 			}
 			case ssoRECT:
 			{
+				SW_Rect* w = dynamic_cast<SW_Rect*>(local_subref);
 				attrib_grid = Column(
-					CBOX(d1, 0b1, "Filled", 1),
-					CBOX(d2, 0b1, "Transparent", 1)
+					CBOX(w->flags, SUBSCR_RECT_FILLED, "Filled", 1),
+					CBOX(w->flags, SUBSCR_RECT_TRANSP, "Transparent", 1)
 				);
 				break;
 			}
 			case ssoSELECTEDITEMNAME:
 			{
+				SW_SelectedText* w = dynamic_cast<SW_SelectedText*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Font:", hAlign = 1.0),
-					DDL_FONT(d1),
+					DDL_FONT(w->fontid),
 					Label(text = "Style:", hAlign = 1.0),
-					DDL(d3, list_shadtype),
+					DDL(w->shadtype, list_shadtype),
 					Label(text = "Alignment:", hAlign = 1.0),
-					DDL(d2, list_aligns),
-					Label(text = "Wrapping:", hAlign = 1.0),
-					DDL(d4, wrapping_type_list),
-					Label(text = "Tab Size:", hAlign = 1.0),
-					NUM_FIELD(d5,0,99)
+					DDL(w->align, list_aligns),
+					Label(text = "Tabsize:", hAlign = 0.0),
+					NUM_FIELD(w->tabsize,0,99),
+					//
+					CBOX(w->flags,SUBSCR_SELTEXT_WORDWRAP,"Word Wrap",2)
 				);
 				break;
 			}
 			case ssoSELECTOR1:
 			case ssoSELECTOR2:
 			{
-				attrib_grid = Rows<2>(
-					Label(text = "Tile:", hAlign = 1.0),
-					tswatches[0] = SelTileSwatch(
-						hAlign = 0.0,
-						tile = local_subref.d1,
-						cset = subscreen_cset(cs_sel[0]->getC1(), cs_sel[0]->getC2()),
-						flip = local_subref.d2,
-						showvals = false,
-						showFlip = true,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t f,int32_t)
-						{
-							local_subref.d1 = t;
-							local_subref.d2 = f;
-							if(local_subref.colortype1 != ssctMISC)
-							{
-								local_subref.colortype1 = c;
-								cs_sel[0]->setC1(c);
-							}
-						}
-					),
-					CBOX(d3, 0b1, "Overlay", 2),
-					CBOX(d4, 0b1, "Transparent", 2),
-					CBOX(d5, 0b1, "Large", 2)
+				SW_Selector* w = dynamic_cast<SW_Selector*>(local_subref);
+				attrib_grid = Column(
+					CBOX(w->flags, SUBSCR_SELECTOR_TRANSP, "Transparent", 1),
+					CBOX(w->flags, SUBSCR_SELECTOR_LARGE, "Large", 1),
+					CBOX(w->flags, SUBSCR_SELECTOR_USEB, "Use Selector 2", 1)
 				);
 				break;
 			}
 			case ssoTEXT:
 			{
-				if(local_subref.dp1) //needs deep copy, not shallow
-				{
-					strcpy(tbuf, (char const*)local_subref.dp1);
-				}
+				SW_Text* w = dynamic_cast<SW_Text*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Font:", hAlign = 1.0),
-					DDL_FONT(d1),
+					DDL_FONT(w->fontid),
 					Label(text = "Style:", hAlign = 1.0),
-					DDL(d3, list_shadtype),
+					DDL(w->shadtype, list_shadtype),
 					Label(text = "Alignment:", hAlign = 1.0),
-					DDL(d2, list_aligns),
+					DDL(w->align, list_aligns),
 					Label(text = "Text:", hAlign = 0.0),
 					DummyWidget(),
 					fonttf = TextField(
 						maxLength = 256,
 						colSpan = 2,
-						text = tbuf,
+						text = w->text,
 						width = 300_px,
 						minheight = 15_px,
 						fitParent = true,
-						useFont = ss_font(local_subref.d1),
-						onValChangedFunc = [&](GUI::TextField::type,std::string_view str,int32_t)
+						useFont = get_zc_font(w->fontid),
+						onValChangedFunc = [=](GUI::TextField::type,std::string_view str,int32_t)
 						{
 							std::string txt(str);
-							strcpy(tbuf, txt.c_str());
+							w->text = txt;
 						})
 				);
 				break;
 			}
 			case ssoTEXTBOX:
 			{
-				if(local_subref.dp1) //needs deep copy, not shallow
-				{
-					char const* dp1 = (char const*)local_subref.dp1;
-					repl_escchar(tbuf, dp1, false);
-				}
+				SW_TextBox* w = dynamic_cast<SW_TextBox*>(local_subref);
 				attrib_grid = Rows<2>(
 					Label(text = "Font:", hAlign = 1.0),
-					DDL_FONT(d1),
+					DDL_FONT(w->fontid),
 					Label(text = "Style:", hAlign = 1.0),
-					DDL(d3, list_shadtype),
+					DDL(w->shadtype, list_shadtype),
 					Label(text = "Alignment:", hAlign = 1.0),
-					DDL(d2, list_aligns),
+					DDL(w->align, list_aligns),
+					Label(text = "Tabsize:", hAlign = 0.0),
+					NUM_FIELD(w->tabsize,0,99),
+					//
+					CBOX(w->flags,SUBSCR_TEXTBOX_WORDWRAP,"Word Wrap",2),
+					//
 					Label(text = "Text:", hAlign = 0.0),
 					DummyWidget(),
 					fonttf = TextField(
 						maxLength = 1024,
 						colSpan = 2,
-						text = (local_subref.dp1 ? (char*)local_subref.dp1 : ""),
+						text = w->text,
 						width = 300_px,
 						minheight = 15_px,
 						fitParent = true,
-						useFont = ss_font(local_subref.d1),
-						onValChangedFunc = [&](GUI::TextField::type,std::string_view str,int32_t)
+						useFont = get_zc_font(w->fontid),
+						onValChangedFunc = [=](GUI::TextField::type,std::string_view str,int32_t)
 						{
 							std::string txt(str);
-							if(local_subref.dp1)
-								delete[] (char*)local_subref.dp1;
-							local_subref.dp1 = new char[txt.size()+1];
-							strcpy((char*)local_subref.dp1, txt.c_str());
+							w->text = txt;
 						})
 				);
 				break;
 			}
 			case ssoTILEBLOCK:
 			{
+				SW_TileBlock* w = dynamic_cast<SW_TileBlock*>(local_subref);
 				mergetype = mtLOCTOP; //too wide to fit all 3 horiz, but has vert room
 				attrib_grid = Column(
 					tswatches[0] = SelTileSwatch(
 						hAlign = 0.0,
 						minwidth = 32_px*TB_LA+4_px,
 						minheight = 32_px*TB_LA+4_px,
-						tile = local_subref.d1,
-						cset = subscreen_cset(cs_sel[0]->getC1(), cs_sel[0]->getC2()),
+						tile = w->tile,
+						cset = w->cs.get_cset(),
 						showvals = false,
-						tilewid = std::min(local_subref.w, (word)TB_LA),
-						tilehei = std::min(local_subref.h, (word)TB_LA),
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t)
+						tilewid = std::min(local_subref->w, (word)TB_LA),
+						tilehei = std::min(local_subref->h, (word)TB_LA),
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t)
 						{
-							local_subref.d1 = t;
-							if(local_subref.colortype1 != ssctMISC)
+							w->tile = t;
+							if(w->cs.type != ssctMISC)
 							{
-								local_subref.colortype1 = c;
+								w->cs.type = c;
 								cs_sel[0]->setC1(c);
 							}
 						}
 					),
 					Label(text = "Note: Preview max size is " + std::to_string(TB_LA) + "x" + std::to_string(TB_LA)),
-					Checkbox(
-						text = "Overlay", hAlign = 0.0,
-						checked = local_subref.d3,
-						onToggleFunc = [&](bool state)
-						{
-							local_subref.d3 = (state?1:0);
-						}
-					),
-					Checkbox(
-						text = "Transparent", hAlign = 0.0,
-						checked = local_subref.d4,
-						onToggleFunc = [&](bool state)
-						{
-							local_subref.d4 = (state?1:0);
-						}
-					)
+					CBOX(w->flags, SUBSCR_TILEBL_OVERLAY, "Overlay", 1),
+					CBOX(w->flags, SUBSCR_TILEBL_TRANSP, "Transparent", 1)
 				);
 				break;
 			}
 			case ssoTRIFRAME:
 			{
+				SW_TriFrame* w = dynamic_cast<SW_TriFrame*>(local_subref);
 				mergetype = mtFORCE_TAB; //Way too wide to fit
 				attrib_grid = Columns<3>(padding = 0_px,
 					Label(text = "Frame Tileblock"),
@@ -1158,17 +1039,17 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 						rowSpan = 2,
 						minwidth = 32_px*7+4_px,
 						minheight = 32_px*7+4_px,
-						tile = local_subref.d1,
-						cset = local_subref.d2,
+						tile = w->frame_tile,
+						cset = w->frame_cset,
 						showvals = false,
-						tilewid = local_subref.d7 ? 7 : 6,
-						tilehei = local_subref.d7 ? 7 : 3,
+						tilewid = (w->flags&SUBSCR_TRIFR_LGPC) ? 7 : 6,
+						tilehei = (w->flags&SUBSCR_TRIFR_LGPC) ? 7 : 3,
 						deftile = QMisc.colors.triframe_tile,
 						defcs = QMisc.colors.triframe_cset,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t)
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t)
 						{
-							local_subref.d1 = t;
-							local_subref.d2 = c;
+							w->frame_tile = t;
+							w->frame_cset = c;
 						}
 					),
 					Label(text = "Piece Tile"),
@@ -1176,31 +1057,31 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 						hAlign = 0.0,
 						minwidth = 32_px*2+4_px,
 						minheight = 32_px*3+4_px,
-						tile = local_subref.d3,
-						cset = local_subref.d4,
+						tile = w->piece_tile,
+						cset = w->piece_cset,
 						showvals = false,
-						tilewid = local_subref.d7 ? 2 : 1,
-						tilehei = local_subref.d7 ? 3 : 1,
+						tilewid = (w->flags&SUBSCR_TRIFR_LGPC) ? 2 : 1,
+						tilehei = (w->flags&SUBSCR_TRIFR_LGPC) ? 3 : 1,
 						deftile = QMisc.colors.triforce_tile,
 						defcs = QMisc.colors.triforce_cset,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t)
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t)
 						{
-							local_subref.d3 = t;
-							local_subref.d4 = c;
+							w->piece_tile = t;
+							w->piece_cset = c;
 						}
 					),
 					Column(padding = 0_px,
 						colSpan = 2,
 						labels[0] = Label(text = "Tile 0 uses a preset from"
 							"\n'Quest->Graphics->Map Styles'"),
-						CBOX(d5,0b1,"Show Frame",1),
-						CBOX(d6,0b1,"Show Pieces",1),
+						CBOX(w->flags,SUBSCR_TRIFR_SHOWFR,"Show Frame",1),
+						CBOX(w->flags,SUBSCR_TRIFR_SHOWPC,"Show Pieces",1),
 						Checkbox(
 							text = "Large Pieces", hAlign = 0.0,
-							checked = local_subref.d7 & 0b1,
-							onToggleFunc = [&](bool state)
+							checked = w->flags & SUBSCR_TRIFR_LGPC,
+							onToggleFunc = [=](bool state)
 							{
-								SETFLAG(local_subref.d7, 0b1, state);
+								SETFLAG(w->flags, SUBSCR_TRIFR_LGPC, state);
 								tswatches[0]->setTileWid(state ? 7 : 6);
 								tswatches[0]->setTileHei(state ? 7 : 3);
 								tswatches[1]->setTileWid(state ? 2 : 1);
@@ -1211,35 +1092,36 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 				);
 				break;
 			}
-			case ssoTRIFORCE:
+			case ssoMCGUFFIN:
 			{
+				SW_McGuffin* w = dynamic_cast<SW_McGuffin*>(local_subref);
 				mergetype = mtLOCTOP;
 				attrib_grid = Rows<2>(padding = 0_px,
 					Label(text = "Tile:", hAlign = 1.0),
 					tswatches[0] = SelTileSwatch(
 						hAlign = 0.0,
-						tile = local_subref.d1,
-						cset = local_subref.d2,
+						tile = w->tile,
+						cset = w->cset,
 						showvals = false,
-						// tilewid = local_subref.d7 ? 2 : 1,
-						// tilehei = local_subref.d7 ? 3 : 1,
+						// tilewid = local_subref->d7 ? 2 : 1,
+						// tilehei = local_subref->d7 ? 3 : 1,
 						deftile = QMisc.colors.triforce_tile,
 						defcs = QMisc.colors.triforce_cset,
-						onSelectFunc = [&](int32_t t, int32_t c, int32_t,int32_t)
+						onSelectFunc = [=](int32_t t, int32_t c, int32_t,int32_t)
 						{
-							local_subref.d1 = t;
-							local_subref.d2 = c;
+							w->tile = t;
+							w->cset = c;
 						}
 					),
 					Column(padding = 0_px,
 						colSpan = 2,
 						labels[0] = Label(text = "Tile 0 uses a preset from"
 							"\n'Quest->Graphics->Map Styles'"),
-						CBOX(d3,0b1,"Overlay",1),
-						CBOX(d4,0b1,"Transparent",1)
+						CBOX(w->flags,SUBSCR_MCGUF_OVERLAY,"Overlay",1),
+						CBOX(w->flags,SUBSCR_MCGUF_TRANSP,"Transparent",1)
 					),
 					Label(text = "Piece #:", hAlign = 1.0),
-					NUM_FIELD(d5,0,999)
+					NUM_FIELD(w->number,0,999)
 				);
 				break;
 			}
@@ -1289,13 +1171,13 @@ std::shared_ptr<GUI::Widget> SubscrPropDialog::view()
 
 void SubscrPropDialog::updateColors()
 {
-	switch(local_subref.type)
+	switch(local_subref->getType())
 	{
 		case sso2X2FRAME:
 		case ssoMINITILE:
 		case ssoTILEBLOCK:
 		{
-			tswatches[0]->setCSet(subscreen_cset(cs_sel[0]->getC1(), cs_sel[0]->getC2()));
+			tswatches[0]->setCSet(SubscrColorInfo::get_cset(cs_sel[0]->getC1(), cs_sel[0]->getC2()));
 			break;
 		}
 	}
@@ -1303,49 +1185,11 @@ void SubscrPropDialog::updateColors()
 
 void SubscrPropDialog::update_wh()
 {
-	switch(local_subref.type)
+	switch(local_subref->getType())
 	{
 		case ssoTILEBLOCK:
-			tswatches[0]->setTileWid(std::min(local_subref.w, (word)TB_LA));
-			tswatches[0]->setTileHei(std::min(local_subref.h, (word)TB_LA));
-			break;
-	}
-}
-
-void save_sso(subscreen_object const& src, subscreen_object* dest)
-{
-	printobj(src);
-	switch(src.type) //Special closing handling
-	{
-		case ssoMINITILE:
-		{
-			memcpy(dest, &src, sizeof(subscreen_object));
-			if(dest->d2 != -1)
-			{
-				dest->d1 = -1;
-			}
-			else dest->d2 = 0;
-			break;
-		}
-		case ssoTEXT:
-		{
-			if(dest->dp1)
-				delete[] (char*)dest->dp1;
-			memcpy(dest, &src, sizeof(subscreen_object));
-			dest->dp1 = new char[strlen(tbuf)+1];
-			strcpy((char*)dest->dp1, tbuf);
-			break;
-		}
-		case ssoTEXTBOX:
-		{
-			if(dest->dp1)
-				delete[] (char*)dest->dp1;
-			memcpy(dest, &src, sizeof(subscreen_object));
-			dest->dp1 = repl_escchar(nullptr, tbuf, true);
-			break;
-		}
-		default:
-			memcpy(dest, &src, sizeof(subscreen_object));
+			tswatches[0]->setTileWid(std::min(local_subref->w, (word)TB_LA));
+			tswatches[0]->setTileHei(std::min(local_subref->h, (word)TB_LA));
 			break;
 	}
 }
@@ -1355,7 +1199,7 @@ bool SubscrPropDialog::handleMessage(const GUI::DialogMessage<message>& msg)
 	switch(msg.message)
 	{
 		case message::OK:
-			save_sso(local_subref, subref);
+			subref->copy_prop(local_subref,true);
 			dlg_retval = true;
 			return true;
 		case message::CANCEL:
diff --git a/src/dialog/subscr_props.h b/src/dialog/subscr_props.h
index 6860795f1b..91773a1890 100644
--- a/src/dialog/subscr_props.h
+++ b/src/dialog/subscr_props.h
@@ -14,7 +14,7 @@
 #include <string_view>
 #include "subscr.h"
 
-bool call_subscrprop_dialog(subscreen_object *ref, int32_t obj_ind);
+bool call_subscrprop_dialog(SubscrWidget* widg, int32_t obj_ind);
 
 // A basic dialog that just shows some lines of text and a close button.
 class SubscrPropDialog: public GUI::Dialog<SubscrPropDialog>
@@ -25,7 +25,7 @@ class SubscrPropDialog: public GUI::Dialog<SubscrPropDialog>
 		REFR_INFO, OK, CANCEL
 	};
 
-	SubscrPropDialog(subscreen_object *ref, int32_t obj_ind);
+	SubscrPropDialog(SubscrWidget* widg, int32_t obj_ind);
 
 	std::shared_ptr<GUI::Widget> view() override;
 	bool handleMessage(const GUI::DialogMessage<message>& msg);
@@ -38,8 +38,8 @@ class SubscrPropDialog: public GUI::Dialog<SubscrPropDialog>
 	std::shared_ptr<GUI::DropDownList> ddl;
 	std::shared_ptr<GUI::TextField> fonttf;
 	std::shared_ptr<GUI::Label> labels[2];
-	subscreen_object *subref;
-	subscreen_object local_subref;
+	SubscrWidget* subref;
+	SubscrWidget* local_subref;
 	int32_t index;
 	
 	GUI::ListData list_font, list_shadtype, list_aligns, list_buttons, list_items,
diff --git a/src/init.cpp b/src/init.cpp
index abc400b62f..f34a5c588b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -76,10 +76,6 @@ extern int32_t onHelp();
 extern int32_t startdmapxy[6];
 extern void onInitOK();
 
-std::map<int32_t, int32_t> listidx2biic;
-//sorted by family id
-static std::map<int32_t, std::vector<Family> > families;
-
 int32_t d_line_proc(int32_t msg, DIALOG *d, int32_t c)
 {
     //these are here to bypass compiler warnings about unused arguments
@@ -966,74 +962,7 @@ const char *itype_names[itype_max] = { "Swords", "Boomerangs", "Arrows", "Candle
 //New Item Classes dfor 2.54 andd above. 
 const char *itype_new_names[itype_max] = { "Script 1","Script 2","Script 3","Script 4","Script 5","Script 6","Script 7","Script 8","Script 9","Script 10", "Ice Rod"
                                      };
-				     
-const char *familylist(int32_t index, int32_t *list_size);
-
-
-item_class_struct biic[itype_max];
-int32_t biic_cnt=-1;
-
-void build_biic_list()
-{
-	int32_t start=biic_cnt=0;
-	std::map<std::string, int32_t> fams;
-	std::set<std::string> famnames;
-	
-	for(int32_t i=start; i<itype_max; ++i)
-	{
-		if(!ZI.isUsableItemclass(i))
-			continue; //Hidden
-		char const* itname = ZI.getItemClassName(i);
-        if(i < itype_last || itname[0] != 0 )
-		{
-            char* name = new char[strlen(itname) + 7];
-            sprintf(name, "%s (%03d)", itname, i);
-            std::string sname(name);
-
-			fams[sname] = i;
-			famnames.insert(sname);
-			delete[] name;
-		}
-		else 
-		{
-			char *name = new char[12];
-			sprintf(name, "zz%03d (%03d)", i, i);
-			std::string sname(name);
-			
-			fams[sname] = i;
-			famnames.insert(sname);
-			delete[] name;
-		}
-	}
-	
-	for(std::set<std::string>::iterator it = famnames.begin(); it != famnames.end(); ++it)
-	{
-		biic[biic_cnt].s = new char[(*it).length() + 1];
-		strcpy(biic[biic_cnt].s, it->c_str()); //The user could do this, with an editor panel, to rename them, but saving the user strings would be an ordeal. -Z
-		biic[biic_cnt].i = fams[*it];
-		++biic_cnt;
-	}
-}
 
-void deallocate_biic_list()
-{
-    for(int32_t i(0); i < 255; i++) //I don't know what this really is.
-    {
-        if(biic[i].s)
-            delete [] biic[i].s;
-    }
-}
-
-const char *item_class_list(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = biic_cnt;
-        return NULL;
-    }
-    
-    return biic[index].s;
-}
 
 #include "dialog/init_data.h"
 int32_t doInit(zinitdata *local_zinit, bool isZC)
@@ -1042,18 +971,6 @@ int32_t doInit(zinitdata *local_zinit, bool isZC)
     return D_O_K;
 }
 
-
-const char *familylist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = (int32_t)listidx2biic.size();
-        return NULL;
-    }
-    
-    return biic[listidx2biic[index]].s;
-}
-
 // NOTE: This method has been severely hacked to fix an annoying problem at game start:
 // items (ie the Small Wallet) which modify max counter values need to be processed after
 // the values for those counters specified in init data, as the author expects these items
diff --git a/src/init.h b/src/init.h
index 4ee4a7ed2d..873997dfc0 100644
--- a/src/init.h
+++ b/src/init.h
@@ -25,15 +25,9 @@ typedef struct item_class_struct
     int32_t i;
 } item_class_struct;
 
-extern item_class_struct biic[itype_max];
 extern const char *itype_names[itype_max];
 extern const char *itype_new_names[itype_max];
 
-extern int32_t biic_cnt;
-void build_biic_list();
-void deallocate_biic_list();
-const char *item_class_list(int32_t index, int32_t *list_size);
-
 int32_t d_line_proc(int32_t msg, DIALOG *d, int32_t c);
 int32_t d_maxbombsedit_proc(int32_t msg,DIALOG *d,int32_t c);
 int32_t d_bombratio_proc(int32_t msg,DIALOG *d,int32_t c);
diff --git a/src/items.cpp b/src/items.cpp
index 7a3cd60828..d72dc2f3ca 100644
--- a/src/items.cpp
+++ b/src/items.cpp
@@ -612,7 +612,8 @@ void putitem2(BITMAP *dest,int32_t x,int32_t y,int32_t item_id, int32_t &aclk, i
 //some methods for dealing with items
 int32_t getItemFamily(itemdata* items, int32_t item)
 {
-	return items[item].family;
+	if(item < 0 || (item&0xFFF) >= MAXITEMS) return -1;
+	return items[item&0xFFF].family;
 }
 
 void removeItemsOfFamily(gamedata *g, itemdata *items, int32_t family)
diff --git a/src/new_subscr.cpp b/src/new_subscr.cpp
new file mode 100644
index 0000000000..2c5c85754c
--- /dev/null
+++ b/src/new_subscr.cpp
@@ -0,0 +1,3588 @@
+#include "base/zdefs.h"
+#include "new_subscr.h"
+#include "subscr.h"
+#include "base/misctypes.h"
+#include "base/fonts.h"
+#include "base/zsys.h"
+#include "base/dmap.h"
+#include "base/qrs.h"
+#include "base/mapscr.h"
+#include "base/packfile.h"
+#include "tiles.h"
+#include "qst.h"
+#include "items.h"
+#include "sprite.h"
+#include <set>
+
+#ifdef IS_PLAYER
+extern int32_t directItem;
+extern sprite_list Lwpns;
+#endif
+
+extern gamedata* game; //!TODO ZDEFSCLEAN move to gamedata.h
+extern zinitdata zinit; //!TODO ZDEFSCLEAN move to zinit.h
+int32_t get_dlevel();
+int32_t get_currdmap();
+int32_t get_homescr();
+bool has_item(int32_t item_type, int32_t item);
+
+//!TODO subscr.h/subscr.cpp trim
+extern item *sel_a, *sel_b;
+void subscreenitem(BITMAP *dest, int32_t x, int32_t y, int32_t itemtype);
+int32_t subscreen_color(int32_t c1, int32_t c2);
+void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT *tempfont, char const*thetext, bool wword, int32_t tabsize, int32_t alignment, int32_t textstyle, int32_t color, int32_t shadowcolor, int32_t backcolor);
+void lifegauge(BITMAP *dest,int32_t x,int32_t y, int32_t container, int32_t notlast_tile, int32_t notlast_cset, bool notlast_mod, int32_t last_tile, int32_t last_cset, bool last_mod,
+			   int32_t cap_tile, int32_t cap_cset, bool cap_mod, int32_t aftercap_tile, int32_t aftercap_cset, bool aftercap_mod, int32_t frames, int32_t speed, int32_t delay, bool unique_last);
+void magicgauge(BITMAP *dest,int32_t x,int32_t y, int32_t container, int32_t notlast_tile, int32_t notlast_cset, bool notlast_mod, int32_t last_tile, int32_t last_cset, bool last_mod,
+				int32_t cap_tile, int32_t cap_cset, bool cap_mod, int32_t aftercap_tile, int32_t aftercap_cset, bool aftercap_mod, int32_t frames, int32_t speed, int32_t delay, bool unique_last, int32_t show);
+
+int32_t to_real_font(int32_t ss_font)
+{
+	switch(ss_font)
+	{
+		case ssfSMALL: return font_sfont;
+		case ssfSMALLPROP: return font_spfont;
+		case ssfSS1: return font_ssfont1;
+		case ssfSS2: return font_ssfont2;
+		case ssfSS3: return font_ssfont3;
+		case ssfSS4: return font_ssfont4;
+		case ssfZTIME: return font_ztfont;
+		case ssfZELDA: return font_zfont;
+		case ssfZ3: return font_z3font;
+		case ssfZ3SMALL: return font_z3smallfont;
+		case ssfGBLA: return font_gblafont;
+		case ssfGORON: return font_goronfont;
+		case ssfZORAN: return font_zoranfont;
+		case ssfHYLIAN1: return font_hylian1font;
+		case ssfHYLIAN2: return font_hylian2font;
+		case ssfHYLIAN3: return font_hylian3font;
+		case ssfHYLIAN4: return font_hylian4font;
+		case ssfGBORACLE: return font_gboraclefont;
+		case ssfGBORACLEP: return font_gboraclepfont;
+		case ssfDSPHANTOM: return font_dsphantomfont;
+		case ssfDSPHANTOMP: return font_dsphantompfont;
+		case ssfAT800: return font_atari800font;
+		case ssfACORN: return font_acornfont;
+		case ssADOS: return font_adosfont;
+		case ssfALLEG: return font_baseallegrofont;
+		case ssfAPL2: return font_apple2font;
+		case ssfAPL280: return font_apple280colfont;
+		case ssfAPL2GS: return font_apple2gsfont;
+		case ssfAQUA: return font_aquariusfont;
+		case ssfAT400: return font_atari400font;
+		case ssfC64: return font_c64font;
+		case ssfC64HR: return font_c64hiresfont;
+		case ssfCGA: return font_cgafont;
+		case ssfCOCO: return font_cocofont;
+		case ssfCOCO2: return font_coco2font;
+		case ssfCOUPE: return font_coupefont;
+		case ssfCPC: return font_cpcfont;
+		case ssfFANTASY: return font_fantasyfont;
+		case ssfFDSKANA: return font_fdskanafont;
+		case ssfFDSLIKE: return font_fdslikefont;
+		case ssfFDSROM: return font_fdsromanfont;
+		case ssfFF: return font_finalffont;
+		case ssfFUTHARK: return font_futharkfont;
+		case ssfGAIA: return font_gaiafont;
+		case ssfHIRA: return font_hirafont;
+		case ssfJP: return font_jpfont;
+		case ssfKONG: return font_kongfont;
+		case ssfMANA: return font_manafont;
+		case ssfML: return font_mlfont;
+		case ssfMOT: return font_motfont;
+		case ssfMSX0: return font_msxmode0font;
+		case ssfMSX1: return font_msxmode1font;
+		case ssfPET: return font_petfont;
+		case ssfPSTART: return font_pstartfont;
+		case ssfSATURN: return font_saturnfont;
+		case ssfSCIFI: return font_scififont;
+		case ssfSHERW: return font_sherwoodfont;
+		case ssfSINQL: return font_sinqlfont;
+		case ssfSPEC: return font_spectrumfont;
+		case ssfSPECLG: return font_speclgfont;
+		case ssfTI99: return font_ti99font;
+		case ssfTRS: return font_trsfont;
+		case ssfZ2: return font_z2font;
+		case ssfZX: return font_zxfont;
+		case ssfLISA: return font_lisafont;
+	}
+	return font_zfont;
+}
+
+int shadow_x(int shadow)
+{
+	switch(shadow)
+	{
+		case sstsSHADOWU:
+		case sstsOUTLINE8:
+		case sstsOUTLINEPLUS:
+		case sstsOUTLINEX:
+		case sstsSHADOWEDU:
+		case sstsOUTLINED8:
+		case sstsOUTLINEDPLUS:
+		case sstsOUTLINEDX:
+			return -1;
+	}
+	return 0;
+}
+int shadow_y(int shadow)
+{
+	switch(shadow)
+	{
+		case sstsOUTLINE8:
+		case sstsOUTLINEPLUS:
+		case sstsOUTLINEX:
+		case sstsOUTLINED8:
+		case sstsOUTLINEDPLUS:
+		case sstsOUTLINEDX:
+			return -1;
+	}
+	return 0;
+}
+int shadow_w(int shadow)
+{
+	switch(shadow)
+	{
+		case sstsSHADOW:
+		case sstsSHADOWU:
+		case sstsOUTLINE8:
+		case sstsOUTLINEPLUS:
+		case sstsOUTLINEX:
+		case sstsSHADOWED:
+		case sstsSHADOWEDU:
+		case sstsOUTLINED8:
+		case sstsOUTLINEDPLUS:
+		case sstsOUTLINEDX:
+			return 1;
+	}
+	return 0;
+}
+int shadow_h(int shadow)
+{
+	switch(shadow)
+	{
+		case sstsSHADOW:
+		case sstsSHADOWU:
+		case sstsOUTLINE8:
+		case sstsOUTLINEPLUS:
+		case sstsOUTLINEX:
+		case sstsSHADOWED:
+		case sstsSHADOWEDU:
+		case sstsOUTLINED8:
+		case sstsOUTLINEDPLUS:
+		case sstsOUTLINEDX:
+			return 1;
+	}
+	return 0;
+}
+
+int32_t SubscrColorInfo::get_color() const
+{
+	return get_color(type,color);
+}
+int32_t SubscrColorInfo::get_color(byte type, int16_t color)
+{
+	int32_t ret;
+	
+	switch(type)
+	{
+		case ssctSYSTEM:
+			ret=(color==-1)?color:vc(color);
+			break;
+			
+		case ssctMISC:
+			switch(color)
+			{
+				case ssctTEXT:
+					ret=QMisc.colors.text;
+					break;
+					
+				case ssctCAPTION:
+					ret=QMisc.colors.caption;
+					break;
+					
+				case ssctOVERWBG:
+					ret=QMisc.colors.overw_bg;
+					break;
+					
+				case ssctDNGNBG:
+					ret=QMisc.colors.dngn_bg;
+					break;
+					
+				case ssctDNGNFG:
+					ret=QMisc.colors.dngn_fg;
+					break;
+					
+				case ssctCAVEFG:
+					ret=QMisc.colors.cave_fg;
+					break;
+					
+				case ssctBSDK:
+					ret=QMisc.colors.bs_dk;
+					break;
+					
+				case ssctBSGOAL:
+					ret=QMisc.colors.bs_goal;
+					break;
+					
+				case ssctCOMPASSLT:
+					ret=QMisc.colors.compass_lt;
+					break;
+					
+				case ssctCOMPASSDK:
+					ret=QMisc.colors.compass_dk;
+					break;
+					
+				case ssctSUBSCRBG:
+					ret=QMisc.colors.subscr_bg;
+					break;
+					
+				case ssctSUBSCRSHADOW:
+					ret=QMisc.colors.subscr_shadow;
+					break;
+					
+				case ssctTRIFRAMECOLOR:
+					ret=QMisc.colors.triframe_color;
+					break;
+					
+				case ssctBMAPBG:
+					ret=QMisc.colors.bmap_bg;
+					break;
+					
+				case ssctBMAPFG:
+					ret=QMisc.colors.bmap_fg;
+					break;
+					
+				case ssctHERODOT:
+					ret=QMisc.colors.hero_dot;
+					break;
+					
+				default:
+					ret=(zc_oldrand()*1000)%256;
+					break;
+			}
+			
+			break;
+			
+		default:
+			ret=(type<<4)+color;
+	}
+	
+	return ret;
+}
+
+int32_t SubscrColorInfo::get_cset() const
+{
+	return get_cset(type,color);
+}
+int32_t SubscrColorInfo::get_cset(byte type, int16_t color)
+{
+	int32_t ret=type;
+	
+	switch(type)
+	{
+		case ssctMISC:
+			switch(color)
+			{
+				case sscsTRIFORCECSET:
+					ret=QMisc.colors.triforce_cset;
+					break;
+					
+				case sscsTRIFRAMECSET:
+					ret=QMisc.colors.triframe_cset;
+					break;
+					
+				case sscsOVERWORLDMAPCSET:
+					ret=QMisc.colors.overworld_map_cset;
+					break;
+					
+				case sscsDUNGEONMAPCSET:
+					ret=QMisc.colors.dungeon_map_cset;
+					break;
+					
+				case sscsBLUEFRAMECSET:
+					ret=QMisc.colors.blueframe_cset;
+					break;
+					
+				case sscsHCPIECESCSET:
+					ret=QMisc.colors.HCpieces_cset;
+					break;
+					
+				case sscsSSVINECSET:
+					ret=wpnsbuf[iwSubscreenVine].csets&15;
+					break;
+					
+				default:
+					ret=(zc_oldrand()*1000)%256;
+					break;
+			}
+			break;
+	}
+	
+	return ret;
+}
+
+int32_t SubscrColorInfo::read(PACKFILE *f, word s_version)
+{
+	if(!p_getc(&type,f))
+		return qe_invalid;
+	if(!p_igetw(&color,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SubscrColorInfo::write(PACKFILE *f) const
+{
+	if(!p_putc(type,f))
+		new_return(1);
+	if(!p_iputw(color,f))
+		new_return(2);
+	return 0;
+}
+
+void SubscrColorInfo::load_old(subscreen_object const& old, int indx)
+{
+	if(indx < 1 || indx > 3) return;
+	switch(indx)
+	{
+		case 1:
+			type = old.colortype1;
+			color = old.color1;
+			break;
+		case 2:
+			type = old.colortype2;
+			color = old.color2;
+			break;
+		case 3:
+			type = old.colortype3;
+			color = old.color3;
+			break;
+	}
+}
+
+int32_t SubscrMTInfo::tile() const
+{
+	return tilecrn>>2;
+}
+byte SubscrMTInfo::crn() const
+{
+	return tilecrn%2;
+}
+void SubscrMTInfo::setTileCrn(int32_t tile, byte crn)
+{
+	tilecrn = (tile<<2)|(crn%4);
+}
+int32_t SubscrMTInfo::read(PACKFILE *f, word s_version)
+{
+	if(!p_igetl(&tilecrn,f))
+		return qe_invalid;
+	if(!p_getc(&cset,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SubscrMTInfo::write(PACKFILE *f) const
+{
+	if(!p_iputl(tilecrn,f))
+		new_return(1);
+	if(!p_putc(cset,f))
+		new_return(2);
+	return 0;
+}
+
+SubscrWidget::SubscrWidget(byte ty) : SubscrWidget()
+{
+	type = ty;
+}
+SubscrWidget::SubscrWidget(subscreen_object const& old) : SubscrWidget()
+{
+	load_old(old);
+}
+bool SubscrWidget::load_old(subscreen_object const& old)
+{
+	type = old.type;
+	posflags = old.pos;
+	x = old.x;
+	y = old.y;
+	w = old.w;
+	h = old.h;
+	if(unsigned(old.d1) >= ssfMAX)
+		compat_flags |= SUBSCRCOMPAT_FONT_RAND;
+	return true;
+}
+int16_t SubscrWidget::getX() const
+{
+	return x;
+}
+int16_t SubscrWidget::getY() const
+{
+	return y;
+}
+word SubscrWidget::getW() const
+{
+	return w;
+}
+word SubscrWidget::getH() const
+{
+	return h;
+}
+int16_t SubscrWidget::getXOffs() const
+{
+	return 0;
+}
+int16_t SubscrWidget::getYOffs() const
+{
+	return 0;
+}
+byte SubscrWidget::getType() const
+{
+	return type;
+}
+int32_t SubscrWidget::getItemVal(bool display) const
+{
+	return -1;
+}
+void SubscrWidget::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	
+}
+bool SubscrWidget::visible(byte pos, bool showtime) const
+{
+	return posflags&pos;
+}
+SubscrWidget* SubscrWidget::clone() const
+{
+	return new SubscrWidget(*this);
+}
+bool SubscrWidget::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	flags = src->flags;
+	posflags &= ~(sspUP|sspDOWN|sspSCROLLING);
+	posflags |= src->posflags&(sspUP|sspDOWN|sspSCROLLING);
+	if(all)
+	{
+		posflags = src->posflags;
+		x = src->x;
+		y = src->y;
+		w = src->w;
+		h = src->h;
+		pos = src->pos;
+		pos_up = src->pos_up;
+		pos_down = src->pos_down;
+		pos_left = src->pos_left;
+		pos_right = src->pos_right;
+		override_text = src->override_text;
+		gen_script_btns = src->gen_script_btns;
+		generic_script = src->generic_script;
+		type = src->type;
+	}
+	return true;
+}
+int32_t SubscrWidget::read(PACKFILE *f, word s_version)
+{
+	//does not 'p_getc(&type)', SubscrWidget::readWidg() handles that
+	if(!p_getc(&posflags,f))
+		return qe_invalid;
+	if(!p_igetw(&x,f))
+		return qe_invalid;
+	if(!p_igetw(&y,f))
+		return qe_invalid;
+	if(!p_igetw(&w,f))
+		return qe_invalid;
+	if(!p_igetw(&h,f))
+		return qe_invalid;
+	if(!p_igetl(&flags,f))
+		return qe_invalid;
+	if(flags&SUBSCRFLAG_SELECTABLE)
+	{
+		if(!p_igetl(&pos,f))
+			return qe_invalid;
+		if(!p_igetl(&pos_up,f))
+			return qe_invalid;
+		if(!p_igetl(&pos_down,f))
+			return qe_invalid;
+		if(!p_igetl(&pos_left,f))
+			return qe_invalid;
+		if(!p_igetl(&pos_right,f))
+			return qe_invalid;
+		if(!p_getcstr(&override_text,f))
+			return qe_invalid;
+		if(!p_getc(&gen_script_btns,f))
+			return qe_invalid;
+		if(!p_igetw(&generic_script,f))
+			return qe_invalid;
+	}
+	return 0;
+}
+int32_t SubscrWidget::write(PACKFILE *f) const
+{
+	if(!p_putc(type,f))
+		new_return(1);
+	if(!p_putc(posflags,f))
+		new_return(2);
+	if(!p_iputw(x,f))
+		new_return(3);
+	if(!p_iputw(y,f))
+		new_return(4);
+	if(!p_iputw(w,f))
+		new_return(5);
+	if(!p_iputw(h,f))
+		new_return(6);
+	if(!p_iputl(flags,f))
+		new_return(7);
+	if(flags&SUBSCRFLAG_SELECTABLE)
+	{
+		if(!p_iputl(pos,f))
+			new_return(8);
+		if(!p_iputl(pos_up,f))
+			new_return(9);
+		if(!p_iputl(pos_down,f))
+			new_return(10);
+		if(!p_iputl(pos_left,f))
+			new_return(11);
+		if(!p_iputl(pos_right,f))
+			new_return(12);
+		if(!p_putcstr(override_text,f))
+			new_return(13);
+		if(!p_putc(gen_script_btns,f))
+			new_return(14);
+		if(!p_iputw(generic_script,f))
+			new_return(15);
+	}
+	return 0;
+}
+void SubscrWidget::replay_rand_compat() const
+{
+	if(compat_flags & SUBSCRCOMPAT_FONT_RAND)
+		zc_oldrand();
+}
+
+SW_2x2Frame::SW_2x2Frame(subscreen_object const& old) : SW_2x2Frame()
+{
+	load_old(old);
+}
+bool SW_2x2Frame::load_old(subscreen_object const& old)
+{
+	if(old.type != sso2X2FRAME)
+		return false;
+	SubscrWidget::load_old(old);
+	tile = old.d1;
+	cs.load_old(old,1);
+	SETFLAG(flags,SUBSCR_2X2FR_TRANSP,old.d4);
+	SETFLAG(flags,SUBSCR_2X2FR_OVERLAY,old.d3);
+	return true;
+}
+word SW_2x2Frame::getW() const
+{
+	return w*8;
+}
+word SW_2x2Frame::getH() const
+{
+	return h*8;
+}
+byte SW_2x2Frame::getType() const
+{
+	return sso2X2FRAME;
+}
+void SW_2x2Frame::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	frame2x2(dest, x+xofs, y+yofs, tile, cs.get_cset(), w, h, 0,
+		flags&SUBSCR_2X2FR_OVERLAY, flags&SUBSCR_2X2FR_TRANSP);
+}
+SubscrWidget* SW_2x2Frame::clone() const
+{
+	return new SW_2x2Frame(*this);
+}
+bool SW_2x2Frame::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_2x2Frame const* other = dynamic_cast<SW_2x2Frame const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	cs = other->cs;
+	tile = other->tile;
+	return true;
+}
+int32_t SW_2x2Frame::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&tile,f))
+		return qe_invalid;
+	if(auto ret = cs.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_2x2Frame::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(tile,f))
+		return qe_invalid;
+	if(auto ret = cs.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Text::SW_Text(subscreen_object const& old) : SW_Text()
+{
+	load_old(old);
+}
+bool SW_Text::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoTEXT)
+		return false;
+	SubscrWidget::load_old(old);
+	if(old.dp1) text = (char*)old.dp1;
+	else text.clear();
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	shadtype = old.d3;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	return true;
+}
+int16_t SW_Text::getX() const
+{
+	return x+shadow_x(shadtype);
+}
+int16_t SW_Text::getY() const
+{
+	return y+shadow_y(shadtype);
+}
+word SW_Text::getW() const
+{
+	return text_length(get_zc_font(fontid), text.c_str());
+}
+word SW_Text::getH() const
+{
+	return text_height(get_zc_font(fontid));
+}
+int16_t SW_Text::getXOffs() const
+{
+	switch(align)
+	{
+		case sstaCENTER:
+			return -getW()/2;
+		case sstaRIGHT:
+			return -getW();
+	}
+	return 0;
+}
+byte SW_Text::getType() const
+{
+	return ssoTEXT;
+}
+void SW_Text::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	textout_styled_aligned_ex(dest,tempfont,text.c_str(),x+xofs,y+yofs,
+		shadtype,align,c_text.get_color(),c_shadow.get_color(),c_bg.get_color());
+}
+SubscrWidget* SW_Text::clone() const
+{
+	return new SW_Text(*this);
+}
+bool SW_Text::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Text const* other = dynamic_cast<SW_Text const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	text = other->text;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	return true;
+}
+int32_t SW_Text::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(!p_getwstr(&text,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Text::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(!p_putwstr(text,f))
+		new_return(4);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Line::SW_Line(subscreen_object const& old) : SW_Line()
+{
+	load_old(old);
+}
+bool SW_Line::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoLINE)
+		return false;
+	SubscrWidget::load_old(old);
+	SETFLAG(flags,SUBSCR_LINE_TRANSP,old.d4);
+	c_line.load_old(old,1);
+	return true;
+}
+byte SW_Line::getType() const
+{
+	return ssoLINE;
+}
+void SW_Line::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	if(flags&SUBSCR_LINE_TRANSP)
+		drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
+	
+	line(dest, x+xofs, y+yofs, x+xofs+w-1, y+yofs+h-1, c_line.get_color());
+	
+	if(flags&SUBSCR_LINE_TRANSP)
+		drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
+}
+SubscrWidget* SW_Line::clone() const
+{
+	return new SW_Line(*this);
+}
+bool SW_Line::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Line const* other = dynamic_cast<SW_Line const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	c_line = other->c_line;
+	return true;
+}
+int32_t SW_Line::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(auto ret = c_line.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Line::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(auto ret = c_line.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Rect::SW_Rect(subscreen_object const& old) : SW_Rect()
+{
+	load_old(old);
+}
+bool SW_Rect::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoRECT)
+		return false;
+	SubscrWidget::load_old(old);
+	SETFLAG(flags,SUBSCR_RECT_TRANSP,old.d2);
+	SETFLAG(flags,SUBSCR_RECT_FILLED,old.d1);
+	c_fill.load_old(old,2);
+	c_outline.load_old(old,1);
+	return true;
+}
+byte SW_Rect::getType() const
+{
+	return ssoRECT;
+}
+void SW_Rect::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	if(flags&SUBSCR_RECT_TRANSP)
+		drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
+	
+	auto x2 = x+xofs, y2 = y+yofs;
+	if(flags&SUBSCR_RECT_FILLED)
+		rectfill(dest, x2, y2, x2+w-1, y2+h-1, c_fill.get_color());
+	
+	rect(dest, x2, y2, x2+w-1, y2+h-1, c_outline.get_color());
+	
+	if(flags&SUBSCR_RECT_TRANSP)
+		drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
+}
+SubscrWidget* SW_Rect::clone() const
+{
+	return new SW_Rect(*this);
+}
+bool SW_Rect::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Rect const* other = dynamic_cast<SW_Rect const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	c_fill = other->c_fill;
+	c_outline = other->c_outline;
+	return true;
+}
+int32_t SW_Rect::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(auto ret = c_fill.read(f,s_version))
+		return ret;
+	if(auto ret = c_outline.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Rect::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(auto ret = c_fill.write(f))
+		return ret;
+	if(auto ret = c_outline.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Time::SW_Time(byte ty) : SubscrWidget(ty){}
+SW_Time::SW_Time(subscreen_object const& old) : SW_Time()
+{
+	load_old(old);
+}
+bool SW_Time::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoBSTIME && old.type != ssoTIME
+		&& old.type != ssoSSTIME)
+		return false;
+	SubscrWidget::load_old(old);
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	shadtype = old.d3;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	return true;
+}
+int16_t SW_Time::getX() const
+{
+	return x+shadow_x(shadtype);
+}
+int16_t SW_Time::getY() const
+{
+	return y+shadow_y(shadtype);
+}
+word SW_Time::getW() const
+{
+	char *ts;
+	auto tm = game ? game->get_time() : 0;
+	switch(type)
+	{
+		case ssoBSTIME:
+			ts = time_str_short2(tm);
+			break;
+		case ssoTIME:
+		case ssoSSTIME:
+			ts = time_str_med(tm);
+			break;
+	}
+	return text_length(get_zc_font(fontid), ts) + shadow_w(shadtype);
+}
+word SW_Time::getH() const
+{
+	return text_height(get_zc_font(fontid)) + shadow_h(shadtype);
+}
+int16_t SW_Time::getXOffs() const
+{
+	switch(align)
+	{
+		case sstaCENTER:
+			return -getW()/2;
+		case sstaRIGHT:
+			return -getW();
+	}
+	return 0;
+}
+byte SW_Time::getType() const
+{
+	return type; //ssoBSTIME,ssoTIME,ssoSSTIME
+}
+void SW_Time::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	char *ts;
+	auto tm = game ? game->get_time() : 0;
+	switch(type)
+	{
+		case ssoBSTIME:
+			ts = time_str_short2(tm);
+			break;
+		case ssoTIME:
+		case ssoSSTIME:
+			ts = time_str_med(tm);
+			break;
+	}
+	FONT* tempfont = get_zc_font(fontid);
+	textout_styled_aligned_ex(dest,tempfont,ts,x+xofs,y+yofs,
+		shadtype,align,c_text.get_color(),c_shadow.get_color(),c_bg.get_color());
+}
+bool SW_Time::visible(byte pos, bool showtime) const
+{
+	return showtime && SubscrWidget::visible(pos,showtime);
+}
+SubscrWidget* SW_Time::clone() const
+{
+	return new SW_Time(*this);
+}
+bool SW_Time::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Time const* other = dynamic_cast<SW_Time const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	return true;
+}
+int32_t SW_Time::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Time::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+SW_MagicMeter::SW_MagicMeter(subscreen_object const& old) : SW_MagicMeter()
+{
+	load_old(old);
+}
+bool SW_MagicMeter::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMAGICMETER)
+		return false;
+	SubscrWidget::load_old(old);
+	return true;
+}
+int16_t SW_MagicMeter::getX() const
+{
+	return x-10;
+}
+word SW_MagicMeter::getW() const
+{
+	return 82;
+}
+word SW_MagicMeter::getH() const
+{
+	return 8;
+}
+byte SW_MagicMeter::getType() const
+{
+	return ssoMAGICMETER;
+}
+void SW_MagicMeter::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	magicmeter(dest, getX()+xofs, getY()+yofs);
+}
+SubscrWidget* SW_MagicMeter::clone() const
+{
+	return new SW_MagicMeter(*this);
+}
+bool SW_MagicMeter::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_MagicMeter const* other = dynamic_cast<SW_MagicMeter const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	return true;
+}
+int32_t SW_MagicMeter::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_MagicMeter::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	return 0;
+}
+
+SW_LifeMeter::SW_LifeMeter(subscreen_object const& old) : SW_LifeMeter()
+{
+	load_old(old);
+}
+bool SW_LifeMeter::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoLIFEMETER)
+		return false;
+	SubscrWidget::load_old(old);
+	rows = old.d3 ? 3 : 2;
+	SETFLAG(flags,SUBSCR_LIFEMET_BOT,old.d2);
+	return true;
+}
+int16_t SW_LifeMeter::getY() const
+{
+	if(flags&SUBSCR_LIFEMET_BOT)
+		return y;
+	return y+(4-rows)*8;
+}
+word SW_LifeMeter::getW() const
+{
+	return 64;
+}
+word SW_LifeMeter::getH() const
+{
+	return 8*rows;
+}
+byte SW_LifeMeter::getType() const
+{
+	return ssoLIFEMETER;
+}
+void SW_LifeMeter::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	lifemeter(dest, getX()+xofs, y+yofs, 1, flags&SUBSCR_LIFEMET_BOT);
+}
+SubscrWidget* SW_LifeMeter::clone() const
+{
+	return new SW_LifeMeter(*this);
+}
+bool SW_LifeMeter::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_LifeMeter const* other = dynamic_cast<SW_LifeMeter const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	rows = other->rows;
+	return true;
+}
+int32_t SW_LifeMeter::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_getc(&rows,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_LifeMeter::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_putc(rows,f))
+		new_return(1);
+	return 0;
+}
+
+SW_ButtonItem::SW_ButtonItem(subscreen_object const& old) : SW_ButtonItem()
+{
+	load_old(old);
+}
+bool SW_ButtonItem::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoBUTTONITEM)
+		return false;
+	SubscrWidget::load_old(old);
+	btn = old.d1;
+	SETFLAG(flags,SUBSCR_BTNITM_TRANSP,old.d2);
+	return true;
+}
+word SW_ButtonItem::getW() const
+{
+	return 16;
+}
+word SW_ButtonItem::getH() const
+{
+	return 16;
+}
+byte SW_ButtonItem::getType() const
+{
+	return ssoBUTTONITEM;
+}
+void SW_ButtonItem::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	if(flags&SUBSCR_BTNITM_TRANSP)
+		drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
+	
+	buttonitem(dest, btn, x, y);
+	
+	if(flags&SUBSCR_BTNITM_TRANSP)
+		drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
+}
+SubscrWidget* SW_ButtonItem::clone() const
+{
+	return new SW_ButtonItem(*this);
+}
+bool SW_ButtonItem::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_ButtonItem const* other = dynamic_cast<SW_ButtonItem const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	btn = other->btn;
+	return true;
+}
+int32_t SW_ButtonItem::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_getc(&btn,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_ButtonItem::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_putc(btn,f))
+		new_return(1);
+	return 0;
+}
+
+SW_Counter::SW_Counter(subscreen_object const& old) : SW_Counter()
+{
+	load_old(old);
+}
+bool SW_Counter::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoCOUNTER)
+		return false;
+	SubscrWidget::load_old(old);
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	shadtype = old.d3;
+	ctrs[0] = old.d7;
+	ctrs[1] = old.d8;
+	ctrs[2] = old.d9;
+	SETFLAG(flags,SUBSCR_COUNTER_SHOW0,old.d6&0b01);
+	SETFLAG(flags,SUBSCR_COUNTER_ONLYSEL,old.d6&0b10);
+	digits = old.d4;
+	infitm = old.d10;
+	infchar = old.d5;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	return true;
+}
+int16_t SW_Counter::getX() const
+{
+	return x+shadow_x(shadtype);
+}
+int16_t SW_Counter::getY() const
+{
+	return y+shadow_y(shadtype);
+}
+word SW_Counter::getW() const
+{
+	return text_length(get_zc_font(fontid), "0")*zc_max(1,digits) + shadow_w(shadtype);
+}
+word SW_Counter::getH() const
+{
+	return text_height(get_zc_font(fontid)) + shadow_h(shadtype);
+}
+int16_t SW_Counter::getXOffs() const
+{
+	switch(align)
+	{
+		case sstaCENTER:
+			return -getW()/2;
+		case sstaRIGHT:
+			return -getW();
+	}
+	return 0;
+}
+byte SW_Counter::getType() const
+{
+	return ssoCOUNTER;
+}
+void SW_Counter::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	counter(dest, x+xofs,y+yofs, tempfont, c_text.get_color(),
+		c_shadow.get_color(), c_bg.get_color(),align,shadtype,digits,infchar,
+		flags&SUBSCR_COUNTER_SHOW0, ctrs[0], ctrs[1], ctrs[2], infitm,
+		flags&SUBSCR_COUNTER_ONLYSEL);
+}
+SubscrWidget* SW_Counter::clone() const
+{
+	return new SW_Counter(*this);
+}
+bool SW_Counter::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Counter const* other = dynamic_cast<SW_Counter const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	ctrs[0] = other->ctrs[0];
+	ctrs[1] = other->ctrs[1];
+	ctrs[2] = other->ctrs[2];
+	digits = other->digits;
+	infitm = other->infitm;
+	infchar = other->infchar;
+	return true;
+}
+int32_t SW_Counter::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	if(!p_igetl(&ctrs[0],f))
+		return qe_invalid;
+	if(!p_igetl(&ctrs[1],f))
+		return qe_invalid;
+	if(!p_igetl(&ctrs[2],f))
+		return qe_invalid;
+	if(!p_getc(&digits,f))
+		return qe_invalid;
+	if(!p_igetl(&infitm,f))
+		return qe_invalid;
+	if(!p_getc(&infchar,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_Counter::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	if(!p_iputl(ctrs[0],f))
+		new_return(4);
+	if(!p_iputl(ctrs[1],f))
+		new_return(5);
+	if(!p_iputl(ctrs[2],f))
+		new_return(6);
+	if(!p_putc(digits,f))
+		new_return(7);
+	if(!p_iputl(infitm,f))
+		new_return(8);
+	if(!p_putc(infchar,f))
+		new_return(9);
+	return 0;
+}
+
+SW_Counters::SW_Counters(subscreen_object const& old) : SW_Counters()
+{
+	load_old(old);
+}
+bool SW_Counters::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoCOUNTERS)
+		return false;
+	SubscrWidget::load_old(old);
+	fontid = to_real_font(old.d1);
+	SETFLAG(flags,SUBSCR_COUNTERS_USEX,old.d2);
+	shadtype = old.d3;
+	digits = old.d4;
+	infitm = old.d10;
+	infchar = old.d5;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	return true;
+}
+int16_t SW_Counters::getX() const
+{
+	return x+shadow_x(shadtype);
+}
+int16_t SW_Counters::getY() const
+{
+	return y+shadow_y(shadtype);
+}
+word SW_Counters::getW() const
+{
+	return 32 + shadow_w(shadtype);
+}
+word SW_Counters::getH() const
+{
+	return 32 + shadow_h(shadtype);
+}
+byte SW_Counters::getType() const
+{
+	return ssoCOUNTERS;
+}
+void SW_Counters::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	defaultcounters(dest, x+xofs, y+yofs, tempfont, c_text.get_color(),
+		c_shadow.get_color(), c_bg.get_color(),flags&SUBSCR_COUNTERS_USEX,shadtype,
+		digits,infchar);
+}
+SubscrWidget* SW_Counters::clone() const
+{
+	return new SW_Counters(*this);
+}
+bool SW_Counters::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Counters const* other = dynamic_cast<SW_Counters const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	digits = other->digits;
+	infitm = other->infitm;
+	infchar = other->infchar;
+	return true;
+}
+int32_t SW_Counters::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	if(!p_getc(&digits,f))
+		return qe_invalid;
+	if(!p_igetl(&infitm,f))
+		return qe_invalid;
+	if(!p_getc(&infchar,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_Counters::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(shadtype,f))
+		new_return(2);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	if(!p_putc(digits,f))
+		new_return(3);
+	if(!p_iputl(infitm,f))
+		new_return(4);
+	if(!p_putc(infchar,f))
+		new_return(5);
+	return 0;
+}
+
+SW_MMapTitle::SW_MMapTitle(subscreen_object const& old) : SW_MMapTitle()
+{
+	load_old(old);
+}
+bool SW_MMapTitle::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMINIMAPTITLE)
+		return false;
+	SubscrWidget::load_old(old);
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	SETFLAG(flags,SUBSCR_MMAPTIT_REQMAP,old.d4);
+	shadtype = old.d3;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	return true;
+}
+word SW_MMapTitle::getW() const
+{
+	return 80;
+}
+word SW_MMapTitle::getH() const
+{
+	return 16;
+}
+int16_t SW_MMapTitle::getXOffs() const
+{
+	switch(align)
+	{
+		case sstaCENTER:
+			return -getW()/2;
+		case sstaRIGHT:
+			return -getW();
+	}
+	return 0;
+}
+byte SW_MMapTitle::getType() const
+{
+	return ssoMINIMAPTITLE;
+}
+void SW_MMapTitle::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	if(!(flags&SUBSCR_MMAPTIT_REQMAP) || has_item(itype_map, get_dlevel()))
+		minimaptitle(dest, getX()+xofs, getY()+yofs, tempfont, c_text.get_color(),
+			c_shadow.get_color(),c_bg.get_color(), align, shadtype);
+}
+SubscrWidget* SW_MMapTitle::clone() const
+{
+	return new SW_MMapTitle(*this);
+}
+bool SW_MMapTitle::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_MMapTitle const* other = dynamic_cast<SW_MMapTitle const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	return true;
+}
+int32_t SW_MMapTitle::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_MMapTitle::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+SW_MMap::SW_MMap(subscreen_object const& old) : SW_MMap()
+{
+	load_old(old);
+}
+bool SW_MMap::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMINIMAP)
+		return false;
+	SubscrWidget::load_old(old);
+	SETFLAG(flags,SUBSCR_MMAP_SHOWMAP,old.d1);
+	SETFLAG(flags,SUBSCR_MMAP_SHOWPLR,old.d2);
+	SETFLAG(flags,SUBSCR_MMAP_SHOWCMP,old.d3);
+	c_plr.load_old(old,1);
+	c_cmp_blink.load_old(old,2);
+	c_cmp_off.load_old(old,3);
+	return true;
+}
+word SW_MMap::getW() const
+{
+	return 80;
+}
+word SW_MMap::getH() const
+{
+	return 48;
+}
+byte SW_MMap::getType() const
+{
+	return ssoMINIMAP;
+}
+void SW_MMap::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	bool showplr = (flags&SUBSCR_MMAP_SHOWPLR) && !(TheMaps[(DMaps[get_currdmap()].map*MAPSCRS)+get_homescr()].flags7&fNOHEROMARK);
+	bool showcmp = (flags&SUBSCR_MMAP_SHOWCMP) && !(DMaps[get_currdmap()].flags&dmfNOCOMPASS);
+	drawdmap(dest, getX()+xofs, getY()+yofs, flags&SUBSCR_MMAP_SHOWMAP, showplr,
+		showcmp, c_plr.get_color(), c_cmp_blink.get_color(), c_cmp_off.get_color());
+}
+SubscrWidget* SW_MMap::clone() const
+{
+	return new SW_MMap(*this);
+}
+bool SW_MMap::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_MMap const* other = dynamic_cast<SW_MMap const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	c_plr = other->c_plr;
+	c_cmp_blink = other->c_cmp_blink;
+	c_cmp_off = other->c_cmp_off;
+	return true;
+}
+int32_t SW_MMap::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(auto ret = c_plr.read(f,s_version))
+		return ret;
+	if(auto ret = c_cmp_blink.read(f,s_version))
+		return ret;
+	if(auto ret = c_cmp_off.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_MMap::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(auto ret = c_plr.write(f))
+		return ret;
+	if(auto ret = c_cmp_blink.write(f))
+		return ret;
+	if(auto ret = c_cmp_off.write(f))
+		return ret;
+	return 0;
+}
+
+SW_LMap::SW_LMap(subscreen_object const& old) : SW_LMap()
+{
+	load_old(old);
+}
+bool SW_LMap::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoLARGEMAP)
+		return false;
+	SubscrWidget::load_old(old);
+	SETFLAG(flags,SUBSCR_LMAP_SHOWMAP,old.d1);
+	SETFLAG(flags,SUBSCR_LMAP_SHOWROOM,old.d2);
+	SETFLAG(flags,SUBSCR_LMAP_SHOWPLR,old.d3);
+	SETFLAG(flags,SUBSCR_LMAP_LARGE,old.d10);
+	c_room.load_old(old,1);
+	c_plr.load_old(old,2);
+	return true;
+}
+word SW_LMap::getW() const
+{
+	return 16*((flags&SUBSCR_LMAP_LARGE)?9:7);
+}
+word SW_LMap::getH() const
+{
+	return 80;
+}
+byte SW_LMap::getType() const
+{
+	return ssoLARGEMAP;
+}
+void SW_LMap::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	putBmap(dest, getX()+xofs, getY()+yofs, flags&SUBSCR_LMAP_SHOWMAP,
+		flags&SUBSCR_LMAP_SHOWROOM, flags&SUBSCR_LMAP_SHOWPLR, c_room.get_color(),
+		c_plr.get_color(), flags&SUBSCR_LMAP_LARGE);
+}
+SubscrWidget* SW_LMap::clone() const
+{
+	return new SW_LMap(*this);
+}
+bool SW_LMap::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_LMap const* other = dynamic_cast<SW_LMap const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	c_room = other->c_room;
+	c_plr = other->c_plr;
+	return true;
+}
+int32_t SW_LMap::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(auto ret = c_room.read(f,s_version))
+		return ret;
+	if(auto ret = c_plr.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_LMap::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(auto ret = c_room.write(f))
+		return ret;
+	if(auto ret = c_plr.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Clear::SW_Clear(subscreen_object const& old) : SW_Clear()
+{
+	load_old(old);
+}
+bool SW_Clear::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoCLEAR)
+		return false;
+	SubscrWidget::load_old(old);
+	c_bg.load_old(old,1);
+	return true;
+}
+word SW_Clear::getW() const
+{
+	return 5;
+}
+word SW_Clear::getH() const
+{
+	return 5;
+}
+byte SW_Clear::getType() const
+{
+	return ssoCLEAR;
+}
+void SW_Clear::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	clear_to_color(dest,c_bg.get_color());
+}
+SubscrWidget* SW_Clear::clone() const
+{
+	return new SW_Clear(*this);
+}
+bool SW_Clear::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Clear const* other = dynamic_cast<SW_Clear const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	c_bg = other->c_bg;
+	return true;
+}
+int32_t SW_Clear::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(auto ret =  c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Clear::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(auto ret =  c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+SW_CurrentItem::SW_CurrentItem(subscreen_object const& old) : SW_CurrentItem()
+{
+	load_old(old);
+}
+bool SW_CurrentItem::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoCURRENTITEM)
+		return false;
+	SubscrWidget::load_old(old);
+	iclass = old.d1;
+	iid = old.d8;
+	pos = old.d3;
+	pos_up = old.d4;
+	pos_down = old.d5;
+	pos_left = old.d6;
+	pos_right = old.d7;
+	SETFLAG(flags,SUBSCRFLAG_SELECTABLE,pos>=0);
+	SETFLAG(flags,SUBSCR_CURITM_INVIS,!(old.d2&0x1));
+	SETFLAG(flags,SUBSCR_CURITM_NONEQP,old.d2&0x2);
+	return true;
+}
+word SW_CurrentItem::getW() const
+{
+	return 16;
+}
+word SW_CurrentItem::getH() const
+{
+	return 16;
+}
+byte SW_CurrentItem::getType() const
+{
+	return ssoCURRENTITEM;
+}
+int32_t SW_CurrentItem::getItemVal(bool display) const
+{
+#ifdef IS_PLAYER
+	if(iid > 0)
+	{
+		bool select = false;
+		switch(itemsbuf[iid-1].family)
+		{
+			case itype_bomb:
+				if(display && get_qr(qr_NEVERDISABLEAMMOONSUBSCREEN))
+					select = true;
+				else if((game->get_bombs() ||
+						// Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
+						(itemsbuf[iid-1].misc1==0 && findWeaponWithParent(iid-1, wLitBomb))) ||
+						current_item_power(itype_bombbag))
+				{
+					select=true;
+				}
+				break;
+			case itype_bowandarrow:
+			case itype_arrow:
+				if(current_item_id(itype_bow)>-1)
+				{
+					select=true;
+				}
+				break;
+			case itype_letterpotion:
+				break;
+			case itype_sbomb:
+			{
+				int32_t bombbagid = current_item_id(itype_bombbag);
+				
+				if(display && get_qr(qr_NEVERDISABLEAMMOONSUBSCREEN))
+					select = true;
+				else if((game->get_sbombs() ||
+						// Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
+						(itemsbuf[iid-1].misc1==0 && findWeaponWithParent(iid-1, wLitSBomb))) ||
+						(current_item_power(itype_bombbag) && bombbagid>-1 && (itemsbuf[bombbagid].flags & ITEM_FLAG1)))
+				{
+					select=true;
+				}
+				break;
+			}
+			case itype_sword:
+			{
+				if(get_qr(qr_SELECTAWPN))
+					select=true;
+				break;
+			}
+			default:
+				select = true;
+				break;
+		}
+		if(select && !item_disabled(iid-1) && game->get_item(iid-1))
+		{
+			directItem = iid-1;
+			auto ret = iid-1;
+			if(ret>-1 && itemsbuf[ret].family == itype_arrow)
+				ret += 0xF000; //bow
+			return ret;
+		}
+		else return -1;
+	}
+	int32_t family = -1;
+	switch(iclass)
+	{
+		case itype_bomb:
+		{
+			int32_t bombid = current_item_id(itype_bomb);
+			
+			if(display && get_qr(qr_NEVERDISABLEAMMOONSUBSCREEN))
+				family=itype_bomb;
+			else if((game->get_bombs() ||
+					// Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
+					(bombid>-1 && itemsbuf[bombid].misc1==0 && Lwpns.idCount(wLitBomb)>0)) ||
+					current_item_power(itype_bombbag))
+			{
+				family=itype_bomb;
+			}
+			break;
+		}
+		case itype_bowandarrow:
+		case itype_arrow:
+			if(current_item_id(itype_bow)>-1 && current_item_id(itype_arrow)>-1)
+			{
+				family=itype_arrow;
+			}
+			break;
+		case itype_letterpotion:
+			if(current_item_id(itype_potion)>-1)
+				family=itype_potion;
+			else if(current_item_id(itype_letter)>-1)
+				family=itype_letter;
+			break;
+		case itype_sbomb:
+		{
+			int32_t bombbagid = current_item_id(itype_bombbag);
+			int32_t sbombid = current_item_id(itype_sbomb);
+			
+			if(display && get_qr(qr_NEVERDISABLEAMMOONSUBSCREEN))
+				family=itype_sbomb;
+			else if((game->get_sbombs() ||
+					// Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
+					(sbombid>-1 && itemsbuf[sbombid].misc1==0 && Lwpns.idCount(wLitSBomb)>0)) ||
+					(current_item_power(itype_bombbag) && bombbagid>-1 && (itemsbuf[bombbagid].flags & ITEM_FLAG1)))
+			{
+				family=itype_sbomb;
+			}
+			break;
+		}
+		case itype_sword:
+		{
+			if(get_qr(qr_SELECTAWPN))
+				family=itype_sword;
+			break;
+		}
+		default:
+			family = iclass;
+			break;
+	}
+	if(family < 0)
+		return -1;
+	int32_t itemid = current_item_id(family);
+	if(item_disabled(itemid))
+		return -1;
+	if(iclass == itype_bowandarrow)
+		return itemid+0xF000;
+	return itemid;
+#else
+	if(iid > 0) return iid;
+	int fam = iclass;
+	switch(fam)
+	{
+		case itype_letterpotion:
+			if(current_item_id(itype_potion)==-1)
+				fam = itype_letter;
+			else fam = itype_potion;
+			break;
+		case itype_bowandarrow:
+			fam = itype_arrow;
+			break;
+		case itype_map:
+			return iMap;
+		case itype_compass:
+			return iCompass;
+		case itype_bosskey:
+			return iBossKey;
+		case itype_heartpiece:
+			return iHCPiece;
+	}
+	int itemid = current_item_id(fam,false);
+	if(itemid == -1) return -1;
+	if(fam == itype_bowandarrow)
+		itemid |= 0xF000;
+	return itemid;
+#endif
+}
+void SW_CurrentItem::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	#ifdef IS_PLAYER
+	if(flags&SUBSCR_CURITM_INVIS)
+		return;
+	#else
+	if((flags&SUBSCR_CURITM_INVIS) && !(zinit.ss_flags&ssflagSHOWINVIS))
+		return;
+	#endif
+	subscreenitem(dest, getX()+xofs,getY()+yofs, iid ? (iid|0x8000) : iclass);
+}
+SubscrWidget* SW_CurrentItem::clone() const
+{
+	return new SW_CurrentItem(*this);
+}
+bool SW_CurrentItem::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_CurrentItem const* other = dynamic_cast<SW_CurrentItem const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	iid = other->iid;
+	iclass = other->iclass;
+	return true;
+}
+int32_t SW_CurrentItem::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&iclass,f))
+		return qe_invalid;
+	if(!p_igetl(&iid,f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_CurrentItem::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(iclass,f))
+		new_return(1);
+	if(!p_iputl(iid,f))
+		new_return(2);
+	return 0;
+}
+
+SW_TriFrame::SW_TriFrame(subscreen_object const& old) : SW_TriFrame()
+{
+	load_old(old);
+}
+bool SW_TriFrame::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoTRIFRAME)
+		return false;
+	SubscrWidget::load_old(old);
+	frame_tile = old.d1;
+	frame_cset = old.d2;
+	piece_tile = old.d3;
+	piece_cset = old.d4;
+	SETFLAG(flags,SUBSCR_TRIFR_SHOWFR,old.d5);
+	SETFLAG(flags,SUBSCR_TRIFR_SHOWPC,old.d6);
+	SETFLAG(flags,SUBSCR_TRIFR_LGPC,old.d7);
+	c_outline.load_old(old,1);
+	c_number.load_old(old,2);
+	return true;
+}
+word SW_TriFrame::getW() const
+{
+	return 16*((flags&SUBSCR_TRIFR_LGPC)?7:6);
+}
+word SW_TriFrame::getH() const
+{
+	return 16*((flags&SUBSCR_TRIFR_LGPC)?7:3);
+}
+byte SW_TriFrame::getType() const
+{
+	return ssoTRIFRAME;
+}
+void SW_TriFrame::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	puttriframe(dest, getX()+xofs,getY()+yofs, c_outline.get_color(), c_number.get_color(),
+		frame_tile, frame_cset, piece_tile, piece_cset, flags&SUBSCR_TRIFR_SHOWFR,
+		flags&SUBSCR_TRIFR_SHOWPC, flags&SUBSCR_TRIFR_LGPC);
+}
+SubscrWidget* SW_TriFrame::clone() const
+{
+	return new SW_TriFrame(*this);
+}
+bool SW_TriFrame::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_TriFrame const* other = dynamic_cast<SW_TriFrame const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	frame_tile = other->frame_tile;
+	piece_tile = other->piece_tile;
+	frame_cset = other->frame_cset;
+	piece_cset = other->piece_cset;
+	c_outline = other->c_outline;
+	c_number = other->c_number;
+	return true;
+}
+int32_t SW_TriFrame::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&frame_tile,f))
+		return qe_invalid;
+	if(!p_igetl(&piece_tile,f))
+		return qe_invalid;
+	if(!p_getc(&frame_cset,f))
+		return qe_invalid;
+	if(!p_getc(&piece_cset,f))
+		return qe_invalid;
+	if(auto ret =  c_outline.read(f,s_version))
+		return ret;
+	if(auto ret =  c_number.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_TriFrame::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(frame_tile,f))
+		new_return(1);
+	if(!p_iputl(piece_tile,f))
+		new_return(2);
+	if(!p_putc(frame_cset,f))
+		new_return(3);
+	if(!p_putc(piece_cset,f))
+		new_return(4);
+	if(auto ret =  c_outline.write(f))
+		return ret;
+	if(auto ret =  c_number.write(f))
+		return ret;
+	return 0;
+}
+
+SW_McGuffin::SW_McGuffin(subscreen_object const& old) : SW_McGuffin()
+{
+	load_old(old);
+}
+bool SW_McGuffin::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMCGUFFIN)
+		return false;
+	SubscrWidget::load_old(old);
+	tile = old.d1;
+	cset = old.d2;
+	number = old.d5;
+	SETFLAG(flags,SUBSCR_MCGUF_OVERLAY,old.d3);
+	SETFLAG(flags,SUBSCR_MCGUF_TRANSP,old.d4);
+	cs.load_old(old,1);
+	return true;
+}
+word SW_McGuffin::getW() const
+{
+	return 16;
+}
+word SW_McGuffin::getH() const
+{
+	return 16;
+}
+byte SW_McGuffin::getType() const
+{
+	return ssoMCGUFFIN;
+}
+void SW_McGuffin::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	puttriforce(dest,getX()+xofs,getY()+yofs,tile,cs.get_cset(),w,h,
+		cset,flags&SUBSCR_MCGUF_OVERLAY,flags&SUBSCR_MCGUF_TRANSP,number);
+}
+SubscrWidget* SW_McGuffin::clone() const
+{
+	return new SW_McGuffin(*this);
+}
+bool SW_McGuffin::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_McGuffin const* other = dynamic_cast<SW_McGuffin const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	tile = other->tile;
+	number = other->number;
+	cset = other->cset;
+	cs = other->cs;
+	return true;
+}
+int32_t SW_McGuffin::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&tile,f))
+		return qe_invalid;
+	if(!p_igetl(&number,f))
+		return qe_invalid;
+	if(!p_getc(&cset,f))
+		return qe_invalid;
+	if(auto ret =  cs.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_McGuffin::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(tile,f))
+		new_return(1);
+	if(!p_iputl(number,f))
+		new_return(2);
+	if(!p_putc(cset,f))
+		new_return(3);
+	if(auto ret =  cs.write(f))
+		return ret;
+	return 0;
+}
+
+SW_TileBlock::SW_TileBlock(subscreen_object const& old) : SW_TileBlock()
+{
+	load_old(old);
+}
+bool SW_TileBlock::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoTILEBLOCK)
+		return false;
+	SubscrWidget::load_old(old);
+	tile = old.d1;
+	flip = old.d2;
+	SETFLAG(flags,SUBSCR_TILEBL_OVERLAY,old.d3);
+	SETFLAG(flags,SUBSCR_TILEBL_TRANSP,old.d4);
+	cs.load_old(old,1);
+	return true;
+}
+word SW_TileBlock::getW() const
+{
+	return w * 16;
+}
+word SW_TileBlock::getH() const
+{
+	return h * 16;
+}
+byte SW_TileBlock::getType() const
+{
+	return ssoTILEBLOCK;
+}
+void SW_TileBlock::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	draw_block_flip(dest,getX()+xofs,getY()+yofs,tile,cs.get_cset(),
+		w,h,flip,flags&SUBSCR_TILEBL_OVERLAY,flags&SUBSCR_TILEBL_TRANSP);
+}
+SubscrWidget* SW_TileBlock::clone() const
+{
+	return new SW_TileBlock(*this);
+}
+bool SW_TileBlock::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_TileBlock const* other = dynamic_cast<SW_TileBlock const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	tile = other->tile;
+	flip = other->flip;
+	cs = other->cs;
+	return true;
+}
+int32_t SW_TileBlock::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&tile,f))
+		return qe_invalid;
+	if(!p_getc(&flip,f))
+		return qe_invalid;
+	if(auto ret =  cs.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_TileBlock::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(tile,f))
+		new_return(1);
+	if(!p_putc(flip,f))
+		new_return(2);
+	if(auto ret =  cs.write(f))
+		return ret;
+	return 0;
+}
+
+SW_MiniTile::SW_MiniTile(subscreen_object const& old) : SW_MiniTile()
+{
+	load_old(old);
+}
+bool SW_MiniTile::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMINITILE)
+		return false;
+	SubscrWidget::load_old(old);
+	if(old.d1 == -1)
+	{
+		tile = -1;
+		crn = old.d3;
+	}
+	else
+	{
+		tile = old.d1>>2;
+		crn = old.d1&0b11;
+	}
+	special_tile = old.d2;
+	flip = old.d4;
+	SETFLAG(flags,SUBSCR_MINITL_OVERLAY,old.d5);
+	SETFLAG(flags,SUBSCR_MINITL_TRANSP,old.d6);
+	cs.load_old(old,1);
+	return true;
+}
+word SW_MiniTile::getW() const
+{
+	return 8;
+}
+word SW_MiniTile::getH() const
+{
+	return 8;
+}
+byte SW_MiniTile::getType() const
+{
+	return ssoMINITILE;
+}
+int32_t SW_MiniTile::get_tile() const
+{
+	if(tile == -1)
+	{
+		switch(special_tile)
+		{
+			case ssmstSSVINETILE:
+				return wpnsbuf[iwSubscreenVine].tile;
+			case ssmstMAGICMETER:
+				return wpnsbuf[iwMMeter].tile;
+			default:
+				return (zc_oldrand()*100000)%32767;
+		}
+	}
+	else return tile;
+}
+void SW_MiniTile::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	auto t = (get_tile()<<2)+crn;
+	auto tx = getX()+xofs, ty = getY()+yofs;
+	byte cset = cs.get_cset();
+	if(flags&SUBSCR_MINITL_OVERLAY)
+	{
+		if(flags&SUBSCR_MINITL_TRANSP)
+			overtiletranslucent8(dest,t,tx,ty,cset,flip,128);
+		else
+			overtile8(dest,t,tx,ty,cset,flip);
+	}
+	else
+	{
+		if(flags&SUBSCR_MINITL_TRANSP)
+			puttiletranslucent8(dest,t,tx,ty,cset,flip,128);
+		else
+			oldputtile8(dest,t,tx,ty,cset,flip);
+	}
+}
+SubscrWidget* SW_MiniTile::clone() const
+{
+	return new SW_MiniTile(*this);
+}
+bool SW_MiniTile::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_MiniTile const* other = dynamic_cast<SW_MiniTile const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	tile = other->tile;
+	special_tile = other->special_tile;
+	crn = other->crn;
+	flip = other->flip;
+	cs = other->cs;
+	return true;
+}
+int32_t SW_MiniTile::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&tile,f))
+		return qe_invalid;
+	if(!p_igetl(&special_tile,f))
+		return qe_invalid;
+	if(!p_getc(&crn,f))
+		return qe_invalid;
+	if(!p_getc(&flip,f))
+		return qe_invalid;
+	if(auto ret =  cs.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_MiniTile::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(tile,f))
+		new_return(1);
+	if(!p_iputl(special_tile,f))
+		new_return(2);
+	if(!p_putc(crn,f))
+		new_return(3);
+	if(!p_putc(flip,f))
+		new_return(4);
+	if(auto ret =  cs.write(f))
+		return ret;
+	return 0;
+}
+
+SW_Selector::SW_Selector(byte ty) : SubscrWidget(ty)
+{
+	SETFLAG(flags, SUBSCR_SELECTOR_USEB, ty==ssoSELECTOR2);
+}
+SW_Selector::SW_Selector(subscreen_object const& old) : SW_Selector()
+{
+	load_old(old);
+}
+bool SW_Selector::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoSELECTOR1 && old.type != ssoSELECTOR2)
+		return false;
+	SubscrWidget::load_old(old);
+	SETFLAG(flags,SUBSCR_SELECTOR_TRANSP,old.d4);
+	SETFLAG(flags,SUBSCR_SELECTOR_LARGE,old.d5);
+	SETFLAG(flags,SUBSCR_SELECTOR_USEB,old.type==ssoSELECTOR2);
+	return true;
+}
+word SW_Selector::getW() const
+{
+	return (flags&SUBSCR_SELECTOR_LARGE)?32:16;
+}
+word SW_Selector::getH() const
+{
+	return (flags&SUBSCR_SELECTOR_LARGE)?32:16;
+}
+byte SW_Selector::getType() const
+{
+	return ssoSELECTOR1;
+}
+void SW_Selector::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	SubscrWidget* selitm = page.get_sel_widg();
+	
+	bool big_sel=flags&SUBSCR_SELECTOR_LARGE;
+	item *tempsel=(flags&SUBSCR_SELECTOR_USEB)?sel_b:sel_a;
+	int32_t temptile=tempsel->tile;
+	tempsel->drawstyle=0;
+	
+	if(flags&SUBSCR_SELECTOR_TRANSP)
+		tempsel->drawstyle=1;
+	int32_t id = selitm ? selitm->getItemVal() : -1;
+	itemdata const& tmpitm = itemsbuf[id];
+	bool oldsel = get_qr(qr_SUBSCR_OLD_SELECTOR);
+	if(!oldsel) big_sel = false;
+	int32_t sw = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : (tempsel->extend > 2 ? tempsel->hit_width : 16),
+		sh = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : (tempsel->extend > 2 ? tempsel->hit_height : 16),
+		dw = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_WIDTH) ? tmpitm.hxsz : 16),
+		dh = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_HEIGHT) ? tmpitm.hysz : 16);
+	int32_t sxofs = oldsel ? 0 : (tempsel->extend > 2 ? tempsel->hxofs : 0),
+		syofs = oldsel ? 0 : (tempsel->extend > 2 ? tempsel->hyofs : 0),
+		dxofs = oldsel ? (tempsel->extend > 2 ? (int)tempsel->xofs : 0) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_X_OFFSET) ? tmpitm.hxofs : 0) + (tempsel->extend > 2 ? (int)tempsel->xofs : 0),
+		dyofs = oldsel ? (tempsel->extend > 2 ? (int)tempsel->yofs : 0) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_Y_OFFSET) ? tmpitm.hyofs : 0) + (tempsel->extend > 2 ? (int)tempsel->yofs : 0);
+	BITMAP* tmpbmp = create_bitmap_ex(8,sw,sh);
+	for(int32_t j=0; j<4; ++j)
+	{
+		clear_bitmap(tmpbmp);
+		if(selitm)
+		{
+			tempsel->x=0;
+			tempsel->y=0;
+			int32_t tmpx = selitm->x+xofs+(big_sel?(j%2?8:-8):0);
+			int32_t tmpy = selitm->y+yofs+(big_sel?(j>1?8:-8):0);
+			tempsel->tile+=(zc_max(itemsbuf[tempsel->id].frames,1)*j);
+			
+			if(temptile)
+			{
+				tempsel->drawzcboss(tmpbmp);
+				tempsel->tile=temptile;
+			}
+			masked_stretch_blit(tmpbmp, dest, vbound(sxofs, 0, sw), vbound(syofs, 0, sh), sw-vbound(sxofs, 0, sw), sh-vbound(syofs, 0, sh), tmpx+dxofs, tmpy+dyofs, dw, dh);
+			
+			if(!big_sel)
+				break;
+		}
+	}
+	destroy_bitmap(tmpbmp);
+}
+SubscrWidget* SW_Selector::clone() const
+{
+	return new SW_Selector(*this);
+}
+bool SW_Selector::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_Selector const* other = dynamic_cast<SW_Selector const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	return true;
+}
+int32_t SW_Selector::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_Selector::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	return 0;
+}
+
+SW_LifeGaugePiece::SW_LifeGaugePiece(subscreen_object const& old) : SW_LifeGaugePiece()
+{
+	load_old(old);
+}
+bool SW_LifeGaugePiece::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoLIFEGAUGE)
+		return false;
+	SubscrWidget::load_old(old);
+	mts[0].tilecrn = old.d2;
+	mts[0].cset = old.colortype1;
+	mts[1].tilecrn = old.d3;
+	mts[1].cset = old.color1;
+	mts[2].tilecrn = old.d4;
+	mts[2].cset = old.colortype2;
+	mts[3].tilecrn = old.d5;
+	mts[3].cset = old.color2;
+	SETFLAG(flags, SUBSCR_LGAUGE_MOD1, old.d10&0x01);
+	SETFLAG(flags, SUBSCR_LGAUGE_MOD2, old.d10&0x02);
+	SETFLAG(flags, SUBSCR_LGAUGE_MOD3, old.d10&0x04);
+	SETFLAG(flags, SUBSCR_LGAUGE_MOD4, old.d10&0x08);
+	SETFLAG(flags, SUBSCR_LGAUGE_UNQLAST, old.d10&0x10);
+	frames = old.d6;
+	speed = old.d7;
+	delay = old.d8;
+	container = old.d1;
+	return true;
+}
+word SW_LifeGaugePiece::getW() const
+{
+	return 8;
+}
+word SW_LifeGaugePiece::getH() const
+{
+	return 8;
+}
+byte SW_LifeGaugePiece::getType() const
+{
+	return ssoLIFEGAUGE;
+}
+void SW_LifeGaugePiece::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	lifegauge(dest, x, y, container,
+		mts[0].tilecrn, mts[0].cset, flags&SUBSCR_LGAUGE_MOD1,
+		mts[1].tilecrn, mts[1].cset, flags&SUBSCR_LGAUGE_MOD2,
+		mts[2].tilecrn, mts[2].cset, flags&SUBSCR_LGAUGE_MOD3,
+		mts[3].tilecrn, mts[3].cset, flags&SUBSCR_LGAUGE_MOD4,
+		frames, speed, delay, flags&SUBSCR_LGAUGE_UNQLAST);
+}
+SubscrWidget* SW_LifeGaugePiece::clone() const
+{
+	return new SW_LifeGaugePiece(*this);
+}
+bool SW_LifeGaugePiece::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_LifeGaugePiece const* other = dynamic_cast<SW_LifeGaugePiece const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	mts[0] = other->mts[0];
+	mts[1] = other->mts[1];
+	mts[2] = other->mts[2];
+	mts[3] = other->mts[3];
+	frames = other->frames;
+	speed = other->speed;
+	delay = other->delay;
+	if(all) container = other->container;
+	return true;
+}
+int32_t SW_LifeGaugePiece::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	for(auto q = 0; q < 4; ++q)
+		if(auto ret = mts[q].read(f,s_version))
+			return ret;
+	if(!p_igetw(&frames, f))
+		return qe_invalid;
+	if(!p_igetw(&speed, f))
+		return qe_invalid;
+	if(!p_igetw(&delay, f))
+		return qe_invalid;
+	if(!p_igetw(&container, f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_LifeGaugePiece::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	for(auto q = 0; q < 4; ++q)
+		if(auto ret = mts[q].write(f))
+			return ret;
+	if(!p_iputw(frames, f))
+		new_return(1);
+	if(!p_iputw(speed, f))
+		new_return(2);
+	if(!p_iputw(delay, f))
+		new_return(3);
+	if(!p_iputw(container, f))
+		new_return(4);
+	return 0;
+}
+
+SW_MagicGaugePiece::SW_MagicGaugePiece(subscreen_object const& old) : SW_MagicGaugePiece()
+{
+	load_old(old);
+}
+bool SW_MagicGaugePiece::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoMAGICGAUGE)
+		return false;
+	SubscrWidget::load_old(old);
+	mts[0].tilecrn = old.d2;
+	mts[0].cset = old.colortype1;
+	mts[1].tilecrn = old.d3;
+	mts[1].cset = old.color1;
+	mts[2].tilecrn = old.d4;
+	mts[2].cset = old.colortype2;
+	mts[3].tilecrn = old.d5;
+	mts[3].cset = old.color2;
+	SETFLAG(flags, SUBSCR_MGAUGE_MOD1, old.d10&0x01);
+	SETFLAG(flags, SUBSCR_MGAUGE_MOD2, old.d10&0x02);
+	SETFLAG(flags, SUBSCR_MGAUGE_MOD3, old.d10&0x04);
+	SETFLAG(flags, SUBSCR_MGAUGE_MOD4, old.d10&0x08);
+	SETFLAG(flags, SUBSCR_MGAUGE_UNQLAST, old.d10&0x10);
+	frames = old.d6;
+	speed = old.d7;
+	delay = old.d8;
+	container = old.d1;
+	showdrain = old.d9;
+	return true;
+}
+word SW_MagicGaugePiece::getW() const
+{
+	return 8;
+}
+word SW_MagicGaugePiece::getH() const
+{
+	return 8;
+}
+byte SW_MagicGaugePiece::getType() const
+{
+	return ssoMAGICGAUGE;
+}
+void SW_MagicGaugePiece::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	magicgauge(dest, x, y, container,
+		mts[0].tilecrn, mts[0].cset, flags&SUBSCR_MGAUGE_MOD1,
+		mts[1].tilecrn, mts[1].cset, flags&SUBSCR_MGAUGE_MOD2,
+		mts[2].tilecrn, mts[2].cset, flags&SUBSCR_MGAUGE_MOD3,
+		mts[3].tilecrn, mts[3].cset, flags&SUBSCR_MGAUGE_MOD4,
+		frames, speed, delay, flags&SUBSCR_MGAUGE_UNQLAST, showdrain);
+}
+SubscrWidget* SW_MagicGaugePiece::clone() const
+{
+	return new SW_MagicGaugePiece(*this);
+}
+bool SW_MagicGaugePiece::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_MagicGaugePiece const* other = dynamic_cast<SW_MagicGaugePiece const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	mts[0] = other->mts[0];
+	mts[1] = other->mts[1];
+	mts[2] = other->mts[2];
+	mts[3] = other->mts[3];
+	frames = other->frames;
+	speed = other->speed;
+	delay = other->delay;
+	if(all) container = other->container;
+	return true;
+}
+int32_t SW_MagicGaugePiece::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	for(auto q = 0; q < 4; ++q)
+		if(auto ret = mts[q].read(f,s_version))
+			return ret;
+	if(!p_igetw(&frames, f))
+		return qe_invalid;
+	if(!p_igetw(&speed, f))
+		return qe_invalid;
+	if(!p_igetw(&delay, f))
+		return qe_invalid;
+	if(!p_igetw(&container, f))
+		return qe_invalid;
+	if(!p_igetw(&showdrain, f))
+		return qe_invalid;
+	return 0;
+}
+int32_t SW_MagicGaugePiece::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	for(auto q = 0; q < 4; ++q)
+		if(auto ret = mts[q].write(f))
+			return ret;
+	if(!p_iputw(frames, f))
+		new_return(1);
+	if(!p_iputw(speed, f))
+		new_return(2);
+	if(!p_iputw(delay, f))
+		new_return(3);
+	if(!p_iputw(container, f))
+		new_return(4);
+	if(!p_iputw(showdrain, f))
+		new_return(5);
+	return 0;
+}
+
+
+SW_TextBox::SW_TextBox(subscreen_object const& old) : SW_TextBox()
+{
+	load_old(old);
+}
+bool SW_TextBox::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoTEXTBOX)
+		return false;
+	SubscrWidget::load_old(old);
+	if(old.dp1) text = (char*)old.dp1;
+	else text.clear();
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	shadtype = old.d3;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	SETFLAG(flags,SUBSCR_TEXTBOX_WORDWRAP,old.d4);
+	tabsize = old.d5;
+	return true;
+}
+byte SW_TextBox::getType() const
+{
+	return ssoTEXTBOX;
+}
+void SW_TextBox::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	draw_textbox(dest, getX()+xofs, getY()+yofs, getW(), getH(), tempfont, text.c_str(),
+		flags&SUBSCR_TEXTBOX_WORDWRAP, tabsize, align, shadtype,
+		c_text.get_color(),c_shadow.get_color(),c_bg.get_color());
+}
+SubscrWidget* SW_TextBox::clone() const
+{
+	return new SW_TextBox(*this);
+}
+bool SW_TextBox::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_TextBox const* other = dynamic_cast<SW_TextBox const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	if(all) text = other->text;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	tabsize = other->tabsize;
+	return true;
+}
+int32_t SW_TextBox::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(!p_getc(&tabsize,f))
+		return qe_invalid;
+	if(!p_getwstr(&text,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_TextBox::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(!p_putc(tabsize,f))
+		new_return(4);
+	if(!p_putwstr(text,f))
+		new_return(5);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+SW_SelectedText::SW_SelectedText(subscreen_object const& old) : SW_SelectedText()
+{
+	load_old(old);
+}
+bool SW_SelectedText::load_old(subscreen_object const& old)
+{
+	if(old.type != ssoSELECTEDITEMNAME)
+		return false;
+	SubscrWidget::load_old(old);
+	fontid = to_real_font(old.d1);
+	align = old.d2;
+	shadtype = old.d3;
+	c_text.load_old(old,1);
+	c_shadow.load_old(old,2);
+	c_bg.load_old(old,3);
+	SETFLAG(flags,SUBSCR_SELTEXT_WORDWRAP,old.d4);
+	tabsize = old.d5;
+	return true;
+}
+byte SW_SelectedText::getType() const
+{
+	return ssoSELECTEDITEMNAME;
+}
+void SW_SelectedText::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
+{
+	FONT* tempfont = get_zc_font(fontid);
+	std::string str;
+	
+	int32_t itemid=page.get_sel_item(true);
+	if(itemid > -1)
+	{
+		// If it's a combined bow and arrow, the item ID will have 0xF000 added.
+		if(itemid>=0xF000)
+			itemid-=0xF000;
+		
+		// 0 can mean either the item with index 0 is selected or there's no
+		// valid item to select, so be sure Hero has whatever it would be.
+		if(!game->get_item(itemid))
+			return;
+		
+		itemdata const& itm = itemsbuf[itemid];
+		str = itm.get_name();
+	}
+	if(str.size())
+		draw_textbox(dest, getX()+xofs, getY()+yofs, getW(), getH(), tempfont,
+			str.c_str(), flags&SUBSCR_SELTEXT_WORDWRAP, tabsize, align, shadtype,
+			c_text.get_color(),c_shadow.get_color(),c_bg.get_color());
+}
+SubscrWidget* SW_SelectedText::clone() const
+{
+	return new SW_SelectedText(*this);
+}
+bool SW_SelectedText::copy_prop(SubscrWidget const* src, bool all)
+{
+	if(src->getType() != getType() || src == this)
+		return false;
+	SW_SelectedText const* other = dynamic_cast<SW_SelectedText const*>(src);
+	SubscrWidget::copy_prop(other,all);
+	fontid = other->fontid;
+	align = other->align;
+	shadtype = other->shadtype;
+	c_text = other->c_text;
+	c_shadow = other->c_shadow;
+	c_bg = other->c_bg;
+	tabsize = other->tabsize;
+	return true;
+}
+int32_t SW_SelectedText::read(PACKFILE *f, word s_version)
+{
+	if(auto ret = SubscrWidget::read(f,s_version))
+		return ret;
+	if(!p_igetl(&fontid,f))
+		return qe_invalid;
+	if(!p_getc(&align,f))
+		return qe_invalid;
+	if(!p_getc(&shadtype,f))
+		return qe_invalid;
+	if(!p_getc(&tabsize,f))
+		return qe_invalid;
+	if(auto ret = c_text.read(f,s_version))
+		return ret;
+	if(auto ret = c_shadow.read(f,s_version))
+		return ret;
+	if(auto ret = c_bg.read(f,s_version))
+		return ret;
+	return 0;
+}
+int32_t SW_SelectedText::write(PACKFILE *f) const
+{
+	if(auto ret = SubscrWidget::write(f))
+		return ret;
+	if(!p_iputl(fontid,f))
+		new_return(1);
+	if(!p_putc(align,f))
+		new_return(2);
+	if(!p_putc(shadtype,f))
+		new_return(3);
+	if(!p_putc(tabsize,f))
+		new_return(4);
+	if(auto ret = c_text.write(f))
+		return ret;
+	if(auto ret = c_shadow.write(f))
+		return ret;
+	if(auto ret = c_bg.write(f))
+		return ret;
+	return 0;
+}
+
+
+bool new_widget_type(int ty)
+{
+	switch(ty)
+	{
+		//These have been upgraded
+		case sso2X2FRAME:
+		case ssoTEXT:
+		case ssoLINE:
+		case ssoRECT:
+		case ssoBSTIME:
+		case ssoTIME:
+		case ssoSSTIME:
+		case ssoMAGICMETER:
+		case ssoLIFEMETER:
+		case ssoBUTTONITEM:
+		case ssoCOUNTER:
+		case ssoCOUNTERS:
+		case ssoMINIMAPTITLE:
+		case ssoMINIMAP:
+		case ssoLARGEMAP:
+		case ssoCLEAR:
+		case ssoCURRENTITEM:
+		case ssoTRIFRAME:
+		case ssoMCGUFFIN:
+		case ssoTILEBLOCK:
+		case ssoMINITILE:
+			return true;
+		//These ones are just empty
+		case ssoITEM:
+		case ssoICON:
+		case ssoNULL:
+		case ssoNONE:
+			return true;
+	}
+	return false;
+}
+SubscrWidget* SubscrWidget::fromOld(subscreen_object const& old)
+{
+	switch(old.type)
+	{
+		case sso2X2FRAME:
+			return new SW_2x2Frame(old);
+		case ssoTEXT:
+			return new SW_Text(old);
+		case ssoLINE:
+			return new SW_Line(old);
+		case ssoRECT:
+			return new SW_Rect(old);
+		case ssoBSTIME:
+		case ssoTIME:
+		case ssoSSTIME:
+			return new SW_Time(old);
+		case ssoMAGICMETER:
+			return new SW_MagicMeter(old);
+		case ssoLIFEMETER:
+			return new SW_LifeMeter(old);
+		case ssoBUTTONITEM:
+			return new SW_ButtonItem(old);
+		case ssoCOUNTER:
+			return new SW_Counter(old);
+		case ssoCOUNTERS:
+			return new SW_Counters(old);
+		case ssoMINIMAPTITLE:
+			return new SW_MMapTitle(old);
+		case ssoMINIMAP:
+			return new SW_MMap(old);
+		case ssoLARGEMAP:
+			return new SW_LMap(old);
+		case ssoCLEAR:
+			return new SW_Clear(old);
+		case ssoCURRENTITEM:
+			return new SW_CurrentItem(old);
+		case ssoTRIFRAME:
+			return new SW_TriFrame(old);
+		case ssoMCGUFFIN:
+			return new SW_McGuffin(old);
+		case ssoTILEBLOCK:
+			return new SW_TileBlock(old);
+		case ssoMINITILE:
+			return new SW_MiniTile(old);
+		case ssoSELECTOR1:
+		case ssoSELECTOR2:
+			return new SW_Selector(old);
+		case ssoLIFEGAUGE:
+			return new SW_LifeGaugePiece(old);
+		case ssoMAGICGAUGE:
+			return new SW_MagicGaugePiece(old);
+		case ssoTEXTBOX:
+			return new SW_TextBox(old);
+		case ssoSELECTEDITEMNAME:
+			return new SW_SelectedText(old);
+		case ssoITEM:
+		{
+			SubscrWidget* ret = new SubscrWidget(old);
+			ret->w = 16;
+			ret->h = 16;
+			return ret;
+		}
+		case ssoICON:
+		{
+			SubscrWidget* ret = new SubscrWidget(old);
+			ret->w = 8;
+			ret->h = 8;
+			return ret;
+		}
+		case ssoNULL:
+		case ssoNONE:
+		case ssoCURRENTITEMTILE:
+		case ssoSELECTEDITEMTILE:
+		case ssoCURRENTITEMTEXT:
+		case ssoCURRENTITEMNAME:
+		case ssoCURRENTITEMCLASSTEXT:
+		case ssoCURRENTITEMCLASSNAME:
+		case ssoSELECTEDITEMCLASSNAME:
+			break; //Nothingness
+	}
+	return nullptr;
+}
+SubscrWidget* SubscrWidget::readWidg(PACKFILE* f, word s_version)
+{
+	byte ty;
+	if(!p_getc(&ty,f))
+		return nullptr;
+	SubscrWidget* widg = newType(ty);
+	if(widg && widg->read(f,s_version))
+		widg = nullptr;
+	return widg;
+}
+SubscrWidget* SubscrWidget::newType(byte ty)
+{
+	SubscrWidget* widg = nullptr;
+	switch(ty)
+	{
+		case sso2X2FRAME:
+			widg = new SW_2x2Frame();
+			break;
+		case ssoTEXT:
+		{
+			SW_Text* tmp;
+			widg = tmp = new SW_Text();
+			tmp->c_text.type = ssctMISC;
+			break;
+		}
+		case ssoLINE:
+			widg = new SW_Line();
+			break;
+		case ssoRECT:
+			widg = new SW_Rect();
+			break;
+		case ssoBSTIME:
+		case ssoTIME:
+		case ssoSSTIME:
+		{
+			SW_Time* tmp;
+			widg = tmp = new SW_Time(ty);
+			tmp->c_text.type = ssctMISC;
+			break;
+		}
+		case ssoMAGICMETER:
+			widg = new SW_MagicMeter();
+			break;
+		case ssoLIFEMETER:
+			widg = new SW_LifeMeter();
+			break;
+		case ssoBUTTONITEM:
+			widg = new SW_ButtonItem();
+			break;
+		case ssoCOUNTER:
+		{
+			SW_Counter* tmp;
+			widg = tmp = new SW_Counter();
+			tmp->infitm = -1; //(None) inf item
+			tmp->c_text.type = ssctMISC; //Default text color
+			break;
+		}
+		case ssoCOUNTERS:
+		{
+			SW_Counters* tmp;
+			widg = tmp = new SW_Counters();
+			tmp->c_text.type = ssctMISC;
+			break;
+		}
+		case ssoMINIMAPTITLE:
+		{
+			SW_MMapTitle* tmp;
+			widg = tmp = new SW_MMapTitle();
+			tmp->c_text.type = ssctMISC;
+			break;
+		}
+		case ssoMINIMAP:
+			widg = new SW_MMap();
+			break;
+		case ssoLARGEMAP:
+			widg = new SW_LMap();
+			break;
+		case ssoCLEAR:
+			widg = new SW_Clear();
+			break;
+		case ssoCURRENTITEM:
+			widg = new SW_CurrentItem();
+			break;
+		case ssoTRIFRAME:
+			widg = new SW_TriFrame();
+			break;
+		case ssoMCGUFFIN:
+			widg = new SW_McGuffin();
+			break;
+		case ssoTILEBLOCK:
+			widg = new SW_TileBlock();
+			break;
+		case ssoMINITILE:
+			widg = new SW_MiniTile();
+			break;
+		case ssoSELECTOR1:
+		case ssoSELECTOR2:
+			widg = new SW_Selector(ty);
+			break;
+		case ssoLIFEGAUGE:
+			widg = new SW_LifeGaugePiece();
+			break;
+		case ssoMAGICGAUGE:
+			widg = new SW_MagicGaugePiece();
+			break;
+		case ssoTEXTBOX:
+			widg = new SW_TextBox();
+			break;
+		case ssoSELECTEDITEMNAME:
+			widg = new SW_SelectedText();
+			break;
+		case ssoITEM:
+		{
+			widg = new SubscrWidget(ty);
+			widg->w = 16;
+			widg->h = 16;
+			break;
+		}
+		case ssoICON:
+		{
+			widg = new SubscrWidget(ty);
+			widg->w = 8;
+			widg->h = 8;
+			break;
+		}
+		case ssoNULL:
+		case ssoNONE:
+		case ssoCURRENTITEMTILE:
+		case ssoSELECTEDITEMTILE:
+		case ssoCURRENTITEMTEXT:
+		case ssoCURRENTITEMNAME:
+		case ssoCURRENTITEMCLASSTEXT:
+		case ssoCURRENTITEMCLASSNAME:
+		case ssoSELECTEDITEMCLASSNAME:
+			widg = new SubscrWidget(ty); //Nothingness
+			break;
+	}
+	if(widg && !widg->type)
+		widg->type = ty;
+	return widg;
+}
+
+void SubscrPage::move_cursor(int dir, bool item_only)
+{
+	//what will be returned when all else fails.
+	//don't return the forbiddenpos... no matter what -DD
+	
+	// verify startpos
+	if(cursor_pos < 0 || cursor_pos >= 0xFF)
+		cursor_pos = 0;
+	
+	auto& objects = contents;
+	
+	item_only = item_only || !get_qr(qr_FREEFORM_SUBSCREEN_CURSOR);
+	bool verify = dir==SEL_VERIFY_RIGHT || dir==SEL_VERIFY_LEFT;
+	
+	if(verify)
+	{
+		SubscrWidget* widg = get_widg_pos(cursor_pos);
+		if(widg && widg->getType() == ssoCURRENTITEM
+			&& (widg->flags & SUBSCRFLAG_SELECTABLE)
+			&& !(widg->flags & SUBSCR_CURITM_NONEQP)
+			&& widg->getItemVal() > 0)
+			return;
+	}
+	
+	int32_t p=-1;
+	int32_t curpos = cursor_pos;
+	int32_t firstValidPos=-1;
+	
+	for(int32_t i=0; i < contents.size(); ++i)
+	{
+		if(contents[i]->flags&SUBSCRFLAG_SELECTABLE)
+		{
+			if(firstValidPos==-1 && contents[i]->pos>=0)
+				firstValidPos=i;
+			
+			if(contents[i]->pos==curpos)
+				p=i;
+			if(p>-1 && firstValidPos>-1)
+				break;
+		}
+	}
+	
+	if(p == -1)
+	{
+		if(firstValidPos>=0)
+			cursor_pos = contents[firstValidPos]->pos;
+		return;
+	}
+	
+	//remember we've been here
+	std::set<int32_t> oldPositions;
+	oldPositions.insert(curpos);
+	
+	//1. Perform any shifts required by the above
+	//2. If that's not possible, go to position 1 and reset the b weapon.
+	//2a.  -if we arrive at a position we've already visited, give up and stay there
+	//3. Get the weapon at the new slot
+	//4. If it's not possible, go to step 1.
+	SubscrWidget* widg = contents[p];
+	for(;;)
+	{
+		//shift
+		switch(dir)
+		{
+			case SEL_LEFT:
+			case SEL_VERIFY_LEFT:
+				curpos = widg->pos_left;
+				break;
+				
+			case SEL_RIGHT:
+			case SEL_VERIFY_RIGHT:
+				curpos = widg->pos_right;
+				break;
+				
+			case SEL_DOWN:
+				curpos = widg->pos_down;
+				break;
+				
+			case SEL_UP:
+				curpos = widg->pos_up;
+				break;
+		}
+		
+		//find our new position
+		widg = get_widg_pos(curpos,false);
+		
+		if(!widg)
+			return;
+		
+		//if we've already been here, give up
+		if(oldPositions.find(curpos) != oldPositions.end())
+			return;
+		
+		//else, remember we've been here
+		oldPositions.insert(curpos);
+		
+		//Valid stop point?
+		if((widg->flags & SUBSCRFLAG_SELECTABLE) && (!item_only || widg->getItemVal()))
+		{
+			cursor_pos = curpos;
+			return;
+		}
+	}
+}
+int32_t SubscrPage::move_legacy(int dir, int startp, int fp, int fp2, int fp3, bool equip_only, bool item_only)
+{
+	//what will be returned when all else fails.
+	//don't return the forbiddenpos... no matter what -DD
+	
+	int32_t failpos(0);
+	
+	if(startp == fp || startp == fp2 || startp == fp3)
+		failpos = 0xFF;
+	else failpos = startp;
+	
+	// verify startpos
+	if(startp < 0 || startp >= 0xFF)
+		startp = 0;
+	
+	auto& objects = contents;
+	
+	item_only = item_only || !get_qr(qr_FREEFORM_SUBSCREEN_CURSOR);
+	bool verify = dir==SEL_VERIFY_RIGHT || dir==SEL_VERIFY_LEFT;
+	
+	if(verify)
+	{
+		SubscrWidget* widg = get_widg_pos(startp);
+		int32_t wpn = widg ? widg->getItemVal() : -1;
+		equip_only = item_only = true;
+		if(widg->getType() != ssoCURRENTITEM || (widg->flags&SUBSCR_CURITM_NONEQP))
+			wpn = -1;
+		
+		if(wpn > 0 && startp != fp && startp != fp2 && startp != fp3)
+		{
+			return startp;
+		}
+	}
+	
+	int32_t p=-1;
+	int32_t curpos = startp;
+	int32_t firstValidPos=-1, firstValidEquipPos=-1;
+	
+	for(int32_t i=0; i < contents.size(); ++i)
+	{
+		if(contents[i]->getType()==ssoCURRENTITEM && (contents[i]->flags&SUBSCRFLAG_SELECTABLE))
+		{
+			if(firstValidPos==-1 && contents[i]->pos>=0)
+				firstValidPos=i;
+			if(firstValidEquipPos==-1 && contents[i]->pos>=0)
+				if(!equip_only || !(contents[i]->flags&SUBSCR_CURITM_NONEQP))
+					firstValidEquipPos=i;
+			
+			if(contents[i]->pos==curpos)
+				p=i;
+			if(p>-1 && firstValidPos>-1 && firstValidEquipPos>-1)
+				break;
+		}
+	}
+	
+	if(p == -1)
+	{
+		//can't find the current position
+		// Switch to a valid weapon if there is one; otherwise,
+		// the selector can simply disappear
+		if(firstValidEquipPos>=0)
+			return contents[firstValidEquipPos]->pos;
+		if(firstValidPos>=0)
+			return contents[firstValidPos]->pos;
+		//FAILURE
+		else return failpos;
+	}
+	
+	//remember we've been here
+	std::set<int32_t> oldPositions;
+	oldPositions.insert(curpos);
+	
+	//1. Perform any shifts required by the above
+	//2. If that's not possible, go to position 1 and reset the b weapon.
+	//2a.  -if we arrive at a position we've already visited, give up and stay there
+	//3. Get the weapon at the new slot
+	//4. If it's not possible, go to step 1.
+	SubscrWidget* widg = contents[p];
+	for(;;)
+	{
+		//shift
+		switch(dir)
+		{
+			case SEL_LEFT:
+			case SEL_VERIFY_LEFT:
+				curpos = widg->pos_left;
+				break;
+				
+			case SEL_RIGHT:
+			case SEL_VERIFY_RIGHT:
+				curpos = widg->pos_right;
+				break;
+				
+			case SEL_DOWN:
+				curpos = widg->pos_down;
+				break;
+				
+			case SEL_UP:
+				curpos = widg->pos_up;
+				break;
+		}
+		
+		//find our new position
+		widg = get_widg_pos(curpos,false);
+		
+		if(!widg)
+			return failpos;
+		
+		//if we've already been here, give up
+		if(oldPositions.find(curpos) != oldPositions.end())
+			return failpos;
+		
+		//else, remember we've been here
+		oldPositions.insert(curpos);
+		
+		//Valid stop point?
+		if(widg->flags & SUBSCRFLAG_SELECTABLE)
+			if(curpos != fp && curpos != fp2 && curpos != fp3)
+				if(!equip_only || !(widg->flags & SUBSCR_CURITM_NONEQP))
+					if(!item_only || widg->getItemVal()>-1)
+						return curpos;
+	}
+}
+SubscrWidget* SubscrPage::get_widg_pos(int32_t pos, bool sel_only)
+{
+	for(size_t q = 0; q < contents.size(); ++q)
+	{
+		if(!(contents[q]->flags & SUBSCRFLAG_SELECTABLE))
+			continue;
+		if (sel_only && contents[q]->getType() == ssoCURRENTITEM)
+			if (static_cast<SW_CurrentItem*>(contents[q])->flags & SUBSCR_CURITM_NONEQP)
+				continue;
+		if(contents[q]->pos == pos)
+			return contents[q];
+	}
+	return nullptr;
+}
+int32_t SubscrPage::get_item_pos(int32_t pos, bool sel_only)
+{
+	auto* w = get_widg_pos(pos,sel_only);
+	if(w)
+		return w->getItemVal();
+	return -1;
+}
+SubscrWidget* SubscrPage::get_sel_widg()
+{
+	return get_widg_pos(cursor_pos);
+}
+int32_t SubscrPage::get_sel_item(bool display)
+{
+	auto* w = get_sel_widg();
+	if(w)
+		return w->getItemVal(display);
+	return -1;
+}
+int32_t SubscrPage::get_pos_of_item(int32_t id)
+{
+	for(SubscrWidget* widg : contents)
+	{
+		if(id == widg->getItemVal())
+			return widg->pos;
+	}
+	return -1;
+}
+
+void SubscrPage::clear()
+{
+	cursor_pos = 0;
+	for (SubscrWidget* ptr : contents)
+		delete ptr;
+	contents.clear();
+}
+void SubscrPage::draw(BITMAP* dest, int32_t xofs, int32_t yofs, byte pos, bool showtime)
+{
+	for(SubscrWidget* widg : contents)
+	{
+		widg->replay_rand_compat();
+		if(widg->visible(pos,showtime))
+			widg->draw(dest,xofs,yofs,*this);
+	}
+}
+SubscrPage::~SubscrPage()
+{
+	clear();
+}
+SubscrPage& SubscrPage::operator=(SubscrPage const& other)
+{
+	clear();
+	cursor_pos = other.cursor_pos;
+	for(SubscrWidget* widg : other.contents)
+	{
+		contents.push_back(widg->clone());
+	}
+	return *this;
+}
+SubscrPage::SubscrPage(const SubscrPage& other)
+{
+	*this = other;
+}
+int32_t SubscrPage::read(PACKFILE *f, word s_version)
+{
+	clear();
+    if(!p_igetl(&cursor_pos,f))
+        return qe_invalid;
+	word sz;
+	if(!p_igetw(&sz,f))
+        return qe_invalid;
+	for(word q = 0; q < sz; ++q)
+	{
+		SubscrWidget* widg = SubscrWidget::readWidg(f,s_version);
+		if(!widg)
+			return qe_invalid;
+		contents.push_back(widg);
+	}
+	return 0;
+}
+int32_t SubscrPage::write(PACKFILE *f) const
+{
+    if(!p_iputl(cursor_pos,f))
+        new_return(1);
+	word sz = zc_min(65535,contents.size());
+	if(!p_iputw(sz,f))
+		new_return(2);
+	for(word q = 0; q < sz; ++q)
+		if(auto ret = contents[q]->write(f))
+			return ret;
+	
+	return 0;
+}
+
+SubscrPage& ZCSubscreen::cur_page()
+{
+	if(pages.empty())
+		pages.emplace_back();
+	curpage = vbound(curpage,pages.size()-1,0);
+	return pages[curpage];
+}
+SubscrPage* ZCSubscreen::get_page(byte id)
+{
+	if(id >= pages.size()) return nullptr;
+	return &pages[id];
+}
+bool ZCSubscreen::get_page_pos(int32_t itmid, byte& pg, byte& pos)
+{
+	for(byte q = 0; q < pages.size(); ++q)
+	{
+		int p = pages[q].get_pos_of_item(itmid);
+		if(p > -1)
+		{
+			pg = q;
+			pos = p;
+			return true;
+		}
+	}
+	return false;
+}
+int32_t ZCSubscreen::get_item_pos(byte pos, byte pg)
+{
+	if(pg >= pages.size()) return -1;
+	return pages[pg].get_item_pos(pos);
+}
+void ZCSubscreen::clear()
+{
+	*this = ZCSubscreen();
+}
+void ZCSubscreen::draw(BITMAP* dest, int32_t xofs, int32_t yofs, byte pos, bool showtime)
+{
+	if(pages.empty()) return;
+	size_t page = curpage;
+	if(page >= pages.size()) page = 0;
+	//!TODO SUBSCR handle animations between multiple pages?
+	pages[page].draw(dest,xofs,yofs,pos,showtime);
+}
+void ZCSubscreen::load_old(subscreen_group const& g)
+{
+	name = g.name;
+	sub_type = g.ss_type;
+	pages.clear();
+	SubscrPage& p = pages.emplace_back();
+	for(int ind = 0; ind < MAXSUBSCREENITEMS && g.objects[ind].type != ssoNULL; ++ind)
+	{
+		auto* w = SubscrWidget::fromOld(g.objects[ind]);
+		if(w)
+			p.contents.push_back(w);
+	}
+}
+void ZCSubscreen::load_old(subscreen_object const* arr)
+{
+	pages.clear();
+	SubscrPage& p = pages.emplace_back();
+	for(int ind = 0; ind < MAXSUBSCREENITEMS && arr[ind].type != ssoNULL; ++ind)
+	{
+		SubscrWidget* w = SubscrWidget::fromOld(arr[ind]);
+		if(!w) continue;
+		if(w->getType() == ssoNONE || w->getType() == ssoNULL)
+		{
+			delete w;
+			continue;
+		}
+		p.contents.push_back(w);
+	}
+}
+int32_t ZCSubscreen::read(PACKFILE *f, word s_version)
+{
+    if(!p_getcstr(&name,f))
+        return qe_invalid;
+	if(!p_getc(&sub_type,f))
+        return qe_invalid;
+	byte pagecnt;
+	if(!p_getc(&pagecnt,f))
+        return qe_invalid;
+	pages.clear();
+	for(byte q = 0; q < pagecnt; ++q)
+	{
+		SubscrPage& pg = pages.emplace_back();
+		if(auto ret = pg.read(f, s_version))
+			return ret;
+	}
+	return 0;
+}
+int32_t ZCSubscreen::write(PACKFILE *f) const
+{
+    if(!p_putcstr(name,f))
+        new_return(1);
+	if(!p_putc(sub_type,f))
+		new_return(2);
+	byte pagecnt = zc_min(255,pages.size());
+	if(!p_putc(pagecnt,f))
+		new_return(3);
+	for(byte q = 0; q < pagecnt; ++q)
+		if(auto ret = pages[q].write(f))
+			return ret;
+	
+	return 0;
+}
+
diff --git a/src/new_subscr.h b/src/new_subscr.h
new file mode 100644
index 0000000000..b250ad6188
--- /dev/null
+++ b/src/new_subscr.h
@@ -0,0 +1,834 @@
+#ifndef _NEW_SUBSCR_H_
+#define _NEW_SUBSCR_H_
+
+#include "base/ints.h"
+#include "base/zc_alleg.h"
+#include "base/general.h"
+#include <string>
+#include <vector>
+
+struct SubscrPage;
+struct PACKFILE;
+
+//Old subscreen stuff
+struct subscreen_object
+{
+	byte  type;
+	byte  pos;
+	int16_t  x;
+	int16_t  y;
+	word  w;
+	word  h;
+	byte  colortype1;
+	int16_t color1;
+	byte  colortype2;
+	int16_t color2;
+	byte  colortype3;
+	int16_t color3;
+	int32_t   d1;
+	int32_t   d2;
+	int32_t   d3; //pos
+	int32_t   d4; //up
+	int32_t   d5; //down
+	int32_t   d6; //left
+	int32_t   d7; //right
+	int32_t   d8;
+	int32_t   d9;
+	int32_t   d10;
+	byte  frames;
+	byte  speed;
+	byte  delay;
+	word  frame;
+	void  *dp1;
+};
+struct subscreen_group
+{
+	byte             ss_type;
+	char             name[64];
+	subscreen_object objects[MAXSUBSCREENITEMS];
+};
+//
+
+struct SubscrColorInfo
+{
+	byte type;
+	int16_t color;
+	int32_t get_cset() const;
+	int32_t get_color() const;
+	void load_old(subscreen_object const& old, int indx);
+	int32_t read(PACKFILE *f, word s_version);
+	int32_t write(PACKFILE *f) const;
+	static int32_t get_cset(byte c1, int16_t c2);
+	static int32_t get_color(byte c1, int16_t c2);
+};
+
+struct SubscrMTInfo
+{
+	int32_t tilecrn;
+	byte cset;
+	
+	int32_t tile() const;
+	byte crn() const;
+	void setTileCrn(int32_t tile, byte crn);
+	
+	int32_t read(PACKFILE *f, word s_version);
+	int32_t write(PACKFILE *f) const;
+};
+
+enum //selection directions
+{
+	SEL_UP,
+	SEL_LEFT,
+	SEL_DOWN,
+	SEL_RIGHT,
+	SEL_VERIFY_LEFT,
+	SEL_VERIFY_RIGHT
+};
+
+enum //old subscreen object types
+{
+	ssoNULL, ssoNONE,
+	sso2X2FRAME, ssoTEXT, ssoLINE, ssoRECT, ssoBSTIME,
+	ssoTIME, ssoSSTIME, ssoMAGICMETER, ssoLIFEMETER, ssoBUTTONITEM,
+	ssoICON, ssoCOUNTER, ssoCOUNTERS, ssoMINIMAPTITLE, ssoMINIMAP,
+	ssoLARGEMAP, ssoCLEAR, ssoCURRENTITEM, ssoITEM, ssoTRIFRAME, ssoMCGUFFIN,
+	ssoTILEBLOCK, ssoMINITILE, ssoSELECTOR1, ssoSELECTOR2, ssoMAGICGAUGE,
+	ssoLIFEGAUGE, ssoTEXTBOX, ssoCURRENTITEMTILE, ssoSELECTEDITEMTILE, 
+	ssoCURRENTITEMTEXT, ssoCURRENTITEMNAME, ssoSELECTEDITEMNAME,
+	ssoCURRENTITEMCLASSTEXT, ssoCURRENTITEMCLASSNAME, ssoSELECTEDITEMCLASSNAME,
+	ssoMAX, ssoTEMPOLD
+};
+
+//Misc constants
+enum //text styles
+{
+	sstsNORMAL, sstsSHADOW, sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS,
+	sstsOUTLINEX, sstsSHADOWED, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS,
+	sstsOUTLINEDX, sstsMAX
+};
+enum //subscreen fonts
+{ 
+	ssfZELDA, ssfSS1, ssfSS2, ssfSS3, ssfSS4, ssfZTIME, ssfSMALL, ssfSMALLPROP, ssfZ3SMALL,
+	ssfGBLA, ssfZ3, ssfGORON, ssfZORAN, ssfHYLIAN1, ssfHYLIAN2, ssfHYLIAN3, ssfHYLIAN4,
+	ssfPROP, ssfGBORACLE, ssfGBORACLEP, ssfDSPHANTOM, ssfDSPHANTOMP, ssfAT800, ssfACORN,
+	ssADOS, ssfALLEG, ssfAPL2, ssfAPL280, ssfAPL2GS, ssfAQUA, ssfAT400, ssfC64, ssfC64HR,
+	ssfCGA, ssfCOCO, ssfCOCO2, ssfCOUPE, ssfCPC, ssfFANTASY, ssfFDSKANA, ssfFDSLIKE,
+	ssfFDSROM, ssfFF, ssfFUTHARK, ssfGAIA, ssfHIRA, ssfJP, ssfKONG, ssfMANA, ssfML, ssfMOT,
+	ssfMSX0, ssfMSX1, ssfPET, ssfPSTART, ssfSATURN, ssfSCIFI, ssfSHERW, ssfSINQL, ssfSPEC,
+	ssfSPECLG, ssfTI99, ssfTRS, ssfZ2, ssfZX, ssfLISA,
+	ssfMAX
+};
+enum // subscreen color types
+{
+	ssctSYSTEM=0xFE,
+	ssctMISC=0xFF
+};
+enum // special colors
+{
+	ssctTEXT, ssctCAPTION, ssctOVERWBG, ssctDNGNBG, ssctDNGNFG,
+	ssctCAVEFG, ssctBSDK, ssctBSGOAL, ssctCOMPASSLT, ssctCOMPASSDK,
+	ssctSUBSCRBG, ssctSUBSCRSHADOW, ssctTRIFRAMECOLOR, ssctBMAPBG, ssctBMAPFG,
+	ssctHERODOT, ssctMSGTEXT, ssctMAX
+};
+enum // special csets
+{
+	sscsTRIFORCECSET, sscsTRIFRAMECSET, sscsOVERWORLDMAPCSET, sscsDUNGEONMAPCSET,
+	sscsBLUEFRAMECSET, sscsHCPIECESCSET, sscsSSVINECSET, sscsMAX
+};
+enum // special tiles
+{
+	ssmstSSVINETILE, ssmstMAGICMETER, ssmstMAX
+};
+enum // counter objects
+{
+	sscRUPEES, sscBOMBS, sscSBOMBS, sscARROWS,
+	sscGENKEYMAGIC, sscGENKEYNOMAGIC, sscLEVKEYMAGIC, sscLEVKEYNOMAGIC,
+	sscANYKEYMAGIC, sscANYKEYNOMAGIC, sscSCRIPT1, sscSCRIPT2,
+	sscSCRIPT3, sscSCRIPT4, sscSCRIPT5, sscSCRIPT6,
+	sscSCRIPT7, sscSCRIPT8, sscSCRIPT9, sscSCRIPT10,
+	sscSCRIPT11, sscSCRIPT12, sscSCRIPT13, sscSCRIPT14,
+	sscSCRIPT15, sscSCRIPT16, sscSCRIPT17, sscSCRIPT18,
+	sscSCRIPT19, sscSCRIPT20, sscSCRIPT21, sscSCRIPT22,
+	sscSCRIPT23, sscSCRIPT24, sscSCRIPT25, sscLIFE, sscMAGIC, sscMAXHP, sscMAXMP,
+	sscSCRIPT26, sscSCRIPT27, sscSCRIPT28, sscSCRIPT29, sscSCRIPT30,
+	sscSCRIPT31, sscSCRIPT32, sscSCRIPT33, sscSCRIPT34, sscSCRIPT35,
+	sscSCRIPT36, sscSCRIPT37, sscSCRIPT38, sscSCRIPT39, sscSCRIPT40,
+	sscSCRIPT41, sscSCRIPT42, sscSCRIPT43, sscSCRIPT44, sscSCRIPT45,
+	sscSCRIPT46, sscSCRIPT47, sscSCRIPT48, sscSCRIPT49, sscSCRIPT50,
+	sscSCRIPT51, sscSCRIPT52, sscSCRIPT53, sscSCRIPT54, sscSCRIPT55,
+	sscSCRIPT56, sscSCRIPT57, sscSCRIPT58, sscSCRIPT59, sscSCRIPT60,
+	sscSCRIPT61, sscSCRIPT62, sscSCRIPT63, sscSCRIPT64, sscSCRIPT65,
+	sscSCRIPT66, sscSCRIPT67, sscSCRIPT68, sscSCRIPT69, sscSCRIPT70,
+	sscSCRIPT71, sscSCRIPT72, sscSCRIPT73, sscSCRIPT74, sscSCRIPT75,
+	sscSCRIPT76, sscSCRIPT77, sscSCRIPT78, sscSCRIPT79, sscSCRIPT80,
+	sscSCRIPT81, sscSCRIPT82, sscSCRIPT83, sscSCRIPT84, sscSCRIPT85,
+	sscSCRIPT86, sscSCRIPT87, sscSCRIPT88, sscSCRIPT89, sscSCRIPT90,
+	sscSCRIPT91, sscSCRIPT92, sscSCRIPT93, sscSCRIPT94, sscSCRIPT95,
+	sscSCRIPT96, sscSCRIPT97, sscSCRIPT98, sscSCRIPT99, sscSCRIPT100,
+	sscMAX
+};
+enum //subscreen text alignment
+{
+	sstaLEFT, sstaCENTER, sstaRIGHT
+};
+
+#define SUBSCRFLAG_SELECTABLE  0x00000001
+
+#define SUBSCRFLAG_GENERAL     0x0000FFFF
+
+#define SUBSCRFLAG_SPEC_01     0x00010000
+#define SUBSCRFLAG_SPEC_02     0x00020000
+#define SUBSCRFLAG_SPEC_03     0x00040000
+#define SUBSCRFLAG_SPEC_04     0x00080000
+#define SUBSCRFLAG_SPEC_05     0x00100000
+#define SUBSCRFLAG_SPEC_06     0x00200000
+#define SUBSCRFLAG_SPEC_07     0x00400000
+#define SUBSCRFLAG_SPEC_08     0x00800000
+#define SUBSCRFLAG_SPEC_09     0x01000000
+#define SUBSCRFLAG_SPEC_10     0x02000000
+#define SUBSCRFLAG_SPEC_11     0x04000000
+#define SUBSCRFLAG_SPEC_12     0x08000000
+#define SUBSCRFLAG_SPEC_13     0x10000000
+#define SUBSCRFLAG_SPEC_14     0x20000000
+#define SUBSCRFLAG_SPEC_15     0x40000000
+#define SUBSCRFLAG_SPEC_16     0x80000000
+#define SUBSCRFLAG_SPECIFIC    0xFFFF0000
+
+#define SUBSCRCOMPAT_FONT_RAND       0x01
+struct SubscrWidget
+{
+	byte posflags;
+	int16_t x;
+	int16_t y;
+	word w;
+	word h;
+	dword flags;
+	
+	//if SUBSCRFLAG_SELECTABLE...
+	int32_t pos;
+	int32_t pos_up;
+	int32_t pos_down;
+	int32_t pos_left;
+	int32_t pos_right;
+	std::string override_text;
+	
+	byte gen_script_btns;
+	word generic_script;
+	//!TODO Generic InitD[]?
+	
+	SubscrWidget() = default;
+	SubscrWidget(byte ty);
+	SubscrWidget(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old);
+	virtual int16_t getX() const; //Returns x in pixels
+	virtual int16_t getY() const; //Returns y in pixels
+	virtual word getW() const; //Returns width in pixels
+	virtual word getH() const; //Returns height in pixels
+	virtual int16_t getXOffs() const; //Returns any special x-offset
+	virtual int16_t getYOffs() const; //Returns any special y-offset
+	virtual byte getType() const;
+	virtual int32_t getItemVal(bool display = false) const;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const;
+	virtual bool visible(byte pos, bool showtime) const;
+	virtual SubscrWidget* clone() const;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false);
+	virtual int32_t write(PACKFILE *f) const;
+	
+	void replay_rand_compat() const;
+	static SubscrWidget* fromOld(subscreen_object const& old);
+	static SubscrWidget* readWidg(PACKFILE* f, word s_version);
+	static SubscrWidget* newType(byte type);
+protected:
+	byte type;
+	byte compat_flags;
+	
+	virtual int32_t read(PACKFILE *f, word s_version);
+};
+
+#define SUBSCR_2X2FR_TRANSP    SUBSCRFLAG_SPEC_01
+#define SUBSCR_2X2FR_OVERLAY   SUBSCRFLAG_SPEC_02
+struct SW_2x2Frame : public SubscrWidget
+{
+	SubscrColorInfo cs;
+	int32_t tile;
+	
+	SW_2x2Frame() = default;
+	SW_2x2Frame(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+struct SW_Text : public SubscrWidget
+{
+	int32_t fontid;
+	std::string text;
+	byte align, shadtype;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	
+	SW_Text() = default;
+	SW_Text(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getX() const override; //Returns x in pixels
+	virtual int16_t getY() const override; //Returns y in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual int16_t getXOffs() const override; //Returns any special x-offset
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_LINE_TRANSP     SUBSCRFLAG_SPEC_01
+struct SW_Line : public SubscrWidget
+{
+	SubscrColorInfo c_line;
+	
+	SW_Line() = default;
+	SW_Line(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_RECT_TRANSP     SUBSCRFLAG_SPEC_01
+#define SUBSCR_RECT_FILLED     SUBSCRFLAG_SPEC_02
+struct SW_Rect : public SubscrWidget
+{
+	SubscrColorInfo c_fill, c_outline;
+	
+	SW_Rect() = default;
+	SW_Rect(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+struct SW_Time : public SubscrWidget
+{
+	int32_t fontid;
+	byte align, shadtype;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	
+	SW_Time() = default;
+	SW_Time(byte ty);
+	SW_Time(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getX() const override; //Returns x in pixels
+	virtual int16_t getY() const override; //Returns y in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual int16_t getXOffs() const override; //Returns any special x-offset
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual bool visible(byte pos, bool showtime) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+struct SW_MagicMeter : public SubscrWidget
+{
+	SW_MagicMeter() = default;
+	SW_MagicMeter(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getX() const override; //Returns x in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_LIFEMET_BOT     SUBSCRFLAG_SPEC_01
+struct SW_LifeMeter : public SubscrWidget
+{
+	byte rows;
+	
+	SW_LifeMeter() = default;
+	SW_LifeMeter(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getY() const override; //Returns y in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_BTNITM_TRANSP   SUBSCRFLAG_SPEC_01
+struct SW_ButtonItem : public SubscrWidget
+{
+	byte btn;
+	SW_ButtonItem() = default;
+	SW_ButtonItem(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_COUNTER_SHOW0   SUBSCRFLAG_SPEC_01
+#define SUBSCR_COUNTER_ONLYSEL SUBSCRFLAG_SPEC_02
+struct SW_Counter : public SubscrWidget
+{
+	int32_t fontid;
+	byte align, shadtype;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	int32_t ctrs[3];
+	byte digits;
+	int32_t infitm;
+	char infchar;
+	
+	SW_Counter() = default;
+	SW_Counter(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getX() const override; //Returns x in pixels
+	virtual int16_t getY() const override; //Returns y in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual int16_t getXOffs() const override; //Returns any special x-offset
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_COUNTERS_USEX   SUBSCRFLAG_SPEC_01
+struct SW_Counters : public SubscrWidget
+{
+	int32_t fontid;
+	byte shadtype;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	byte digits;
+	int32_t infitm;
+	char infchar;
+	
+	SW_Counters() = default;
+	SW_Counters(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual int16_t getX() const override; //Returns x in pixels
+	virtual int16_t getY() const override; //Returns y in pixels
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_MMAPTIT_REQMAP  SUBSCRFLAG_SPEC_01
+struct SW_MMapTitle : public SubscrWidget
+{
+	int32_t fontid;
+	byte align, shadtype;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	
+	SW_MMapTitle() = default;
+	SW_MMapTitle(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual int16_t getXOffs() const override; //Returns any special x-offset
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_MMAP_SHOWMAP    SUBSCRFLAG_SPEC_01
+#define SUBSCR_MMAP_SHOWPLR    SUBSCRFLAG_SPEC_02
+#define SUBSCR_MMAP_SHOWCMP    SUBSCRFLAG_SPEC_03
+struct SW_MMap : public SubscrWidget
+{
+	SubscrColorInfo c_plr, c_cmp_blink, c_cmp_off;
+	
+	SW_MMap() = default;
+	SW_MMap(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_LMAP_SHOWMAP    SUBSCRFLAG_SPEC_01
+#define SUBSCR_LMAP_SHOWROOM   SUBSCRFLAG_SPEC_02
+#define SUBSCR_LMAP_SHOWPLR    SUBSCRFLAG_SPEC_03
+#define SUBSCR_LMAP_LARGE      SUBSCRFLAG_SPEC_04
+struct SW_LMap : public SubscrWidget
+{
+	SubscrColorInfo c_room, c_plr;
+	
+	SW_LMap() = default;
+	SW_LMap(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+struct SW_Clear : public SubscrWidget
+{
+	SubscrColorInfo c_bg;
+	
+	SW_Clear() = default;
+	SW_Clear(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_CURITM_INVIS    SUBSCRFLAG_SPEC_01
+#define SUBSCR_CURITM_NONEQP   SUBSCRFLAG_SPEC_02
+struct SW_CurrentItem : public SubscrWidget
+{
+	int32_t iclass, iid;
+	
+	SW_CurrentItem() = default;
+	SW_CurrentItem(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual int32_t getItemVal(bool display = false) const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_TRIFR_SHOWFR    SUBSCRFLAG_SPEC_01
+#define SUBSCR_TRIFR_SHOWPC    SUBSCRFLAG_SPEC_02
+#define SUBSCR_TRIFR_LGPC      SUBSCRFLAG_SPEC_03
+struct SW_TriFrame : public SubscrWidget
+{
+	int32_t frame_tile, piece_tile;
+	byte frame_cset, piece_cset;
+	SubscrColorInfo c_outline, c_number;
+	
+	SW_TriFrame() = default;
+	SW_TriFrame(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_MCGUF_OVERLAY   SUBSCRFLAG_SPEC_01
+#define SUBSCR_MCGUF_TRANSP    SUBSCRFLAG_SPEC_02
+struct SW_McGuffin : public SubscrWidget
+{
+	int32_t tile, number;
+	byte cset;
+	SubscrColorInfo cs;
+	
+	SW_McGuffin() = default;
+	SW_McGuffin(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_TILEBL_OVERLAY  SUBSCRFLAG_SPEC_01
+#define SUBSCR_TILEBL_TRANSP   SUBSCRFLAG_SPEC_02
+struct SW_TileBlock : public SubscrWidget
+{
+	int32_t tile;
+	byte flip;
+	SubscrColorInfo cs;
+	
+	SW_TileBlock() = default;
+	SW_TileBlock(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_MINITL_OVERLAY  SUBSCRFLAG_SPEC_01
+#define SUBSCR_MINITL_TRANSP   SUBSCRFLAG_SPEC_02
+struct SW_MiniTile : public SubscrWidget
+{
+	int32_t tile, special_tile;
+	byte crn, flip;
+	SubscrColorInfo cs;
+	
+	SW_MiniTile() = default;
+	SW_MiniTile(subscreen_object const& old);
+	
+	int32_t get_tile() const;
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_SELECTOR_TRANSP   SUBSCRFLAG_SPEC_01
+#define SUBSCR_SELECTOR_LARGE    SUBSCRFLAG_SPEC_02
+#define SUBSCR_SELECTOR_USEB     SUBSCRFLAG_SPEC_03
+struct SW_Selector : public SubscrWidget
+{
+	SW_Selector() = default;
+	SW_Selector(byte ty);
+	SW_Selector(subscreen_object const& old);
+
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_LGAUGE_MOD1     SUBSCRFLAG_SPEC_01
+#define SUBSCR_LGAUGE_MOD2     SUBSCRFLAG_SPEC_02
+#define SUBSCR_LGAUGE_MOD3     SUBSCRFLAG_SPEC_03
+#define SUBSCR_LGAUGE_MOD4     SUBSCRFLAG_SPEC_04
+#define SUBSCR_LGAUGE_UNQLAST  SUBSCRFLAG_SPEC_05
+struct SW_LifeGaugePiece : public SubscrWidget
+{
+	SubscrMTInfo mts[4];
+	word frames, speed, delay, container;
+	
+	SW_LifeGaugePiece() = default;
+	SW_LifeGaugePiece(subscreen_object const& old);
+
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_MGAUGE_MOD1     SUBSCRFLAG_SPEC_01
+#define SUBSCR_MGAUGE_MOD2     SUBSCRFLAG_SPEC_02
+#define SUBSCR_MGAUGE_MOD3     SUBSCRFLAG_SPEC_03
+#define SUBSCR_MGAUGE_MOD4     SUBSCRFLAG_SPEC_04
+#define SUBSCR_MGAUGE_UNQLAST  SUBSCRFLAG_SPEC_05
+struct SW_MagicGaugePiece : public SubscrWidget
+{
+	SubscrMTInfo mts[4];
+	word frames, speed, delay, container;
+	int16_t showdrain = -1;
+	
+	SW_MagicGaugePiece() = default;
+	SW_MagicGaugePiece(subscreen_object const& old);
+
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual word getW() const override; //Returns width in pixels
+	virtual word getH() const override; //Returns height in pixels
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_TEXTBOX_WORDWRAP     SUBSCRFLAG_SPEC_01
+struct SW_TextBox : public SubscrWidget
+{
+	int32_t fontid;
+	std::string text;
+	byte align, shadtype, tabsize = 4;
+	SubscrColorInfo c_text, c_shadow, c_bg;
+	
+	SW_TextBox() = default;
+	SW_TextBox(subscreen_object const& old);
+
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+#define SUBSCR_SELTEXT_WORDWRAP     SUBSCRFLAG_SPEC_01
+struct SW_SelectedText : public SubscrWidget
+{
+	int32_t fontid;
+	byte align, shadtype, tabsize = 4;
+	SubscrColorInfo c_text = {ssctMISC,0}, c_shadow, c_bg;
+	
+	SW_SelectedText() = default;
+	SW_SelectedText(subscreen_object const& old);
+	
+	virtual bool load_old(subscreen_object const& old) override;
+	virtual byte getType() const override;
+	virtual void draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const override;
+	virtual SubscrWidget* clone() const override;
+	virtual bool copy_prop(SubscrWidget const* src, bool all = false) override;
+	virtual int32_t write(PACKFILE *f) const override;
+protected:
+	virtual int32_t read(PACKFILE *f, word s_version) override;
+};
+
+struct SubscrPage
+{
+	std::vector<SubscrWidget*> contents;
+	int32_t cursor_pos, init_cursor_pos;
+	
+	void move_cursor(int dir, bool item_only = false);
+	int32_t move_legacy(int dir, int startp, int fp=-1, int fp2=-1, int fp3=-1, bool equip_only=true, bool item_only=true);
+	SubscrWidget* get_widg_pos(int32_t pos, bool sel_only = true);
+	SubscrWidget* get_sel_widg();
+	int32_t get_item_pos(int32_t pos, bool sel_only = true);
+	int32_t get_sel_item(bool display = false);
+	int32_t get_pos_of_item(int32_t itemid);
+	
+	void clear();
+	void draw(BITMAP* dest, int32_t xofs, int32_t yofs, byte pos, bool showtime);
+	
+	SubscrPage() = default;
+	~SubscrPage();
+	SubscrPage& operator=(SubscrPage const& other);
+	SubscrPage(const SubscrPage& other);
+	
+	int32_t read(PACKFILE *f, word s_version);
+	int32_t write(PACKFILE *f) const;
+};
+struct ZCSubscreen
+{
+	std::vector<SubscrPage> pages;
+	byte curpage, sub_type;
+	std::string name;
+	
+	SubscrPage& cur_page();
+	SubscrPage* get_page(byte ind);
+	bool get_page_pos(int32_t itmid, byte& pg, byte& pos);
+	int32_t get_item_pos(byte pos, byte pg);
+	void clear();
+	void draw(BITMAP* dest, int32_t xofs, int32_t yofs, byte pos, bool showtime);
+	void load_old(subscreen_group const& g);
+	void load_old(subscreen_object const* arr);
+	int32_t read(PACKFILE *f, word s_version);
+	int32_t write(PACKFILE *f) const;
+};
+
+bool new_widget_type(int ty);
+#endif
+
diff --git a/src/qst.cpp b/src/qst.cpp
index a7a3356155..5a9f1191a4 100644
--- a/src/qst.cpp
+++ b/src/qst.cpp
@@ -86,8 +86,6 @@ using std::pair;
 
 // extern bool                debug;
 extern int32_t                 hero_animation_speed; //lower is faster animation
-extern std::vector<mapscr> TheMaps;
-extern std::vector<word>   map_autolayers;
 extern zcmap               *ZCMaps;
 extern byte                *colordata;
 //extern byte              *tilebuf;
@@ -3778,6 +3776,8 @@ int32_t readrules(PACKFILE *f, zquestheader *Header)
 		set_qr(qr_PUSHBLOCK_SPRITE_LAYER,1);
 	if (compatrule_version < 52)
 		set_qr(qr_OLD_SCRIPT_VOLUME, 1);
+	if(compatrule_version < 53)
+		set_qr(qr_OLD_SUBSCR,1);
 	
 	set_qr(qr_ANIMATECUSTOMWEAPONS,0);
 	if (s_version < 16)
@@ -11272,568 +11272,484 @@ int32_t readherosprites(PACKFILE *f, zquestheader *Header)
     else return readherosprites2(f, s_version, dummy);
 }
 
-int32_t readsubscreens(PACKFILE *f, zquestheader *Header)
+int32_t read_old_subscreens(PACKFILE *f, word s_version)
 {
-    int32_t dummy;
-    word s_version=0, s_cversion=0;
-    
-    //section version info
-    if(!p_igetw(&s_version,f))
-    {
-        return qe_invalid;
-    }
-    
-    FFCore.quest_format[vSubscreen] = s_version;
-    
-    //al_trace("Subscreens version %d\n", s_version);
-    if(!p_igetw(&s_cversion,f))
-    {
-        return qe_invalid;
-    }
-    
-    //section size
-    if(!p_igetl(&dummy,f))
-    {
-        return qe_invalid;
-    }
-    
-    //finally...  section data
-    for(int32_t i=0; i<MAXCUSTOMSUBSCREENS; i++)
-    {
-        int32_t ret = read_one_subscreen(f, Header, i, s_version, s_cversion);
-        
-        if(ret!=0) return ret;
-    }
-    
-    return 0;
+	new_subscreen.clear();
+	for(int32_t i=0; i<MAXCUSTOMSUBSCREENS; i++)
+	{
+		subscreen_group g;
+		memset(&g,0,sizeof(subscreen_group));
+		int32_t ret = read_one_old_subscreen(f, &g, s_version);
+		if(ret!=0)
+			return ret;
+		if(g.objects[0].type == ssoNULL) continue;
+		ZCSubscreen& sub = new_subscreen.emplace_back();
+		sub.load_old(g);
+	}
+	
+	return 0;
 }
 
-int32_t read_one_subscreen(PACKFILE *f, zquestheader *, int32_t i, word s_version, word)
+int32_t read_one_old_subscreen(PACKFILE *f, subscreen_group* g, word s_version)
 {
-    int32_t numsub=0;
-    byte temp_ss=0;
+	int32_t numsub=0;
+	byte temp_ss=0;
 	subscreen_object temp_sub_stack;
-    subscreen_object *temp_sub = &temp_sub_stack;
-    
-    char tempname[64];
+	subscreen_object *temp_sub = &temp_sub_stack;
+	
+	char tempname[64];
 
 	// FWIW I never saw anything bigger than 20.
 	#define MAX_DP1_LEN 1024
 	char tempdp1[MAX_DP1_LEN];
-    
-    if(!pfread(tempname,64,f))
-    {
-        return qe_invalid;
-    }
-    
-    if(s_version > 1)
-    {
-        if(!p_getc(&temp_ss,f))
-        {
-            return qe_invalid;
-        }
-    }
-    
-    if(s_version < 4)
-    {
-        uint8_t tmp=0;
-        
-        if(!p_getc(&tmp,f))
-        {
-            return qe_invalid;
-        }
-        
-        numsub = (int32_t)tmp;
-    }
-    else
-    {
-        word tmp;
-        
-        if(!p_igetw(&tmp, f))
-        {
-            return qe_invalid;
-        }
-        
-        numsub = (int32_t)tmp;
-    }
-    
-    int32_t j;
-    
-    for(j=0; (j<MAXSUBSCREENITEMS&&j<numsub); j++)
-    {
+	
+	if(!pfread(tempname,64,f))
+	{
+		return qe_invalid;
+	}
+	
+	if(s_version > 1)
+	{
+		if(!p_getc(&temp_ss,f))
+		{
+			return qe_invalid;
+		}
+	}
+	
+	if(s_version < 4)
+	{
+		uint8_t tmp=0;
+		
+		if(!p_getc(&tmp,f))
+		{
+			return qe_invalid;
+		}
+		
+		numsub = (int32_t)tmp;
+	}
+	else
+	{
+		word tmp;
+		
+		if(!p_igetw(&tmp, f))
+		{
+			return qe_invalid;
+		}
+		
+		numsub = (int32_t)tmp;
+	}
+	
+	int32_t j;
+	
+	for(j=0; (j<MAXSUBSCREENITEMS&&j<numsub); j++)
+	{
 		memset(temp_sub,0,sizeof(subscreen_object));
 		
-		switch(custom_subscreen[i].objects[j].type)
+		switch(g->objects[j].type)
+		{
+			case ssoTEXT:
+			case ssoTEXTBOX:
+			case ssoCURRENTITEMTEXT:
+			case ssoCURRENTITEMCLASSTEXT:
+				if(g->objects[j].dp1 != NULL) delete [](char *)g->objects[j].dp1;
+				
+				//fall through
+			default:
+				memset(&g->objects[j],0,sizeof(subscreen_object));
+				break;
+		}
+		
+		if(!p_getc(&(temp_sub->type),f))
+			return qe_invalid;
+		
+		if(!p_getc(&(temp_sub->pos),f))
+			return qe_invalid;
+		
+		if(s_version < 5)
+		{
+			switch(temp_sub->pos)
+			{
+				case 0:
+					temp_sub->pos = sspUP | sspDOWN | sspSCROLLING;
+					break;
+					
+				case 1:
+					temp_sub->pos = sspUP;
+					break;
+					
+				case 2:
+					temp_sub->pos = sspDOWN;
+					break;
+					
+				default:
+					temp_sub->pos = 0;
+			}
+		}
+		
+		if(!p_igetw(&(temp_sub->x),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->y),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->w),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->h),f))
+			return qe_invalid;
+		
+		if(!p_getc(&(temp_sub->colortype1),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->color1),f))
+			return qe_invalid;
+		
+		if(!p_getc(&(temp_sub->colortype2),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->color2),f))
+			return qe_invalid;
+		
+		if(!p_getc(&(temp_sub->colortype3),f))
+			return qe_invalid;
+		
+		if(!p_igetw(&(temp_sub->color3),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d1),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d2),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d3),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d4),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d5),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d6),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d7),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d8),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d9),f))
+			return qe_invalid;
+		
+		if(!p_igetd(&(temp_sub->d10),f))
+			return qe_invalid;
+		
+		if(s_version < 2)
+		{
+			if(!p_igetl(&(temp_sub->speed),f))
+				return qe_invalid;
+			
+			if(!p_igetl(&(temp_sub->delay),f))
+				return qe_invalid;
+			
+			if(!p_igetl(&(temp_sub->frame),f))
+				return qe_invalid;
+		}
+		else
+		{
+			if(!p_getc(&(temp_sub->speed),f))
+				return qe_invalid;
+			
+			if(!p_getc(&(temp_sub->delay),f))
+				return qe_invalid;
+			
+			if(!p_igetw(&(temp_sub->frame),f))
+				return qe_invalid;
+		}
+		
+		int32_t temp_size=0;
+		
+		// bool deletets = false;
+		switch(temp_sub->type)
 		{
 		case ssoTEXT:
 		case ssoTEXTBOX:
 		case ssoCURRENTITEMTEXT:
 		case ssoCURRENTITEMCLASSTEXT:
-			if(custom_subscreen[i].objects[j].dp1 != NULL) delete [](char *)custom_subscreen[i].objects[j].dp1;
+		{
+			word temptempsize;
 			
-			//fall through
-		default:
-			memset(&custom_subscreen[i].objects[j],0,sizeof(subscreen_object));
+			if(!p_igetw(&temptempsize,f))
+			{
+				return qe_invalid;
+			}
+			
+			//temptempsize = temp1 + (temp2 << 8);
+			temp_size = (int32_t)temptempsize;
+			uint32_t char_length = temp_size+2;
+			if (char_length > MAX_DP1_LEN)
+			{
+				return qe_invalid;
+			}
+			tempdp1[char_length - 1] = '\0';
+			
+			if(temp_size)
+				if(!pfread(tempdp1,temp_size+1,f))
+					return qe_invalid;
 			break;
 		}
-        
-        if(!p_getc(&(temp_sub->type),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_getc(&(temp_sub->pos),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(s_version < 5)
-        {
-            switch(temp_sub->pos)
-            {
-            case 0:
-                temp_sub->pos = sspUP | sspDOWN | sspSCROLLING;
-                break;
-                
-            case 1:
-                temp_sub->pos = sspUP;
-                break;
-                
-            case 2:
-                temp_sub->pos = sspDOWN;
-                break;
-                
-            default:
-                temp_sub->pos = 0;
-            }
-        }
-        
-        if(!p_igetw(&(temp_sub->x),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->y),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->w),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->h),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_getc(&(temp_sub->colortype1),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->color1),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_getc(&(temp_sub->colortype2),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->color2),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_getc(&(temp_sub->colortype3),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetw(&(temp_sub->color3),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d1),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d2),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d3),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d4),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d5),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d6),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d7),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d8),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d9),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(!p_igetd(&(temp_sub->d10),f))
-        {
-            return qe_invalid;
-        }
-        
-        if(s_version < 2)
-        {
-            if(!p_igetl(&(temp_sub->speed),f))
-            {
-                return qe_invalid;
-            }
-            
-            if(!p_igetl(&(temp_sub->delay),f))
-            {
-                return qe_invalid;
-            }
-            
-            if(!p_igetl(&(temp_sub->frame),f))
-            {
-                return qe_invalid;
-            }
-        }
-        else
-        {
-            if(!p_getc(&(temp_sub->speed),f))
-            {
-                return qe_invalid;
-            }
-            
-            if(!p_getc(&(temp_sub->delay),f))
-            {
-                return qe_invalid;
-            }
-            
-            if(!p_igetw(&(temp_sub->frame),f))
-            {
-                return qe_invalid;
-            }
-        }
-        
-        int32_t temp_size=0;
-        
-        // bool deletets = false;
-        switch(temp_sub->type)
-        {
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoCURRENTITEMTEXT:
-        case ssoCURRENTITEMCLASSTEXT:
-		{
-            word temptempsize;
-            
-            if(!p_igetw(&temptempsize,f))
-            {
-                return qe_invalid;
-            }
-            
-            //temptempsize = temp1 + (temp2 << 8);
-            temp_size = (int32_t)temptempsize;
-
-		
-			uint32_t char_length = temp_size+2;
-			if (char_length > MAX_DP1_LEN)
-			{
+			
+		case ssoLIFEMETER:
+			if(get_bit(deprecated_rules, 12) != 0) // qr_24HC
+				temp_sub->d3 = 1;
+			
+			if(!p_getc(&(temp_sub->dp1),f))
 				return qe_invalid;
-			}
-			tempdp1[char_length - 1] = '\0';
 			
-			if(temp_size)
+			break;
+			
+			
+		case ssoCURRENTITEM:
+		
+			if(s_version < 6)
 			{
-				if(!pfread(tempdp1,temp_size+1,f))
+				switch(temp_sub->d1)
 				{
-					return qe_invalid;
-				}
-			}
-		}
-        break;
-            
-        case ssoLIFEMETER:
-            if(get_bit(deprecated_rules, 12) != 0) // qr_24HC
-                temp_sub->d3 = 1;
-                
-            if(!p_getc(&(temp_sub->dp1),f))
-            {
-                return qe_invalid;
-            }
-            
-            break;
-            
-            
-        case ssoCURRENTITEM:
-        
-            if(s_version < 6)
-            {
-                switch(temp_sub->d1)
-                {
-                case ssiBOMB:
-                    temp_sub->d1 = itype_bomb;
-                    break;
-                    
-                case ssiSWORD:
-                    temp_sub->d1 = itype_sword;
-                    break;
-                    
-                case ssiSHIELD:
-                    temp_sub->d1 = itype_shield;
-                    break;
-                    
-                case ssiCANDLE:
-                    temp_sub->d1 = itype_candle;
-                    break;
-                    
-                case ssiLETTER:
-                    temp_sub->d1 = itype_letter;
-                    break;
-                    
-                case ssiPOTION:
-                    temp_sub->d1 = itype_potion;
-                    break;
-                    
-                case ssiLETTERPOTION:
-                    temp_sub->d1 = itype_letterpotion;
-                    break;
-                    
-                case ssiBOW:
-                    temp_sub->d1 = itype_bow;
-                    break;
-                    
-                case ssiARROW:
-                    temp_sub->d1 = itype_arrow;
-                    break;
-                    
-                case ssiBOWANDARROW:
-                    temp_sub->d1 = itype_bowandarrow;
-                    break;
-                    
-                case ssiBAIT:
-                    temp_sub->d1 = itype_bait;
-                    break;
-                    
-                case ssiRING:
-                    temp_sub->d1 = itype_ring;
-                    break;
-                    
-                case ssiBRACELET:
-                    temp_sub->d1 = itype_bracelet;
-                    break;
-                    
-                case ssiMAP:
-                    temp_sub->d1 = itype_map;
-                    break;
-                    
-                case ssiCOMPASS:
-                    temp_sub->d1 = itype_compass;
-                    break;
-                    
-                case ssiBOSSKEY:
-                    temp_sub->d1 = itype_bosskey;
-                    break;
-                    
-                case ssiMAGICKEY:
-                    temp_sub->d1 = itype_magickey;
-                    break;
-                    
-                case ssiBRANG:
-                    temp_sub->d1 = itype_brang;
-                    break;
-                    
-                case ssiWAND:
-                    temp_sub->d1 = itype_wand;
-                    break;
-                    
-                case ssiRAFT:
-                    temp_sub->d1 = itype_raft;
-                    break;
-                    
-                case ssiLADDER:
-                    temp_sub->d1 = itype_ladder;
-                    break;
-                    
-                case ssiWHISTLE:
-                    temp_sub->d1 = itype_whistle;
-                    break;
-                    
-                case ssiBOOK:
-                    temp_sub->d1 = itype_book;
-                    break;
-                    
-                case ssiWALLET:
-                    temp_sub->d1 = itype_wallet;
-                    break;
-                    
-                case ssiSBOMB:
-                    temp_sub->d1 = itype_sbomb;
-                    break;
-                    
-                case ssiHCPIECE:
-                    temp_sub->d1 = itype_heartpiece;
-                    break;
-                    
-                case ssiAMULET:
-                    temp_sub->d1 = itype_amulet;
-                    break;
-                    
-                case ssiFLIPPERS:
-                    temp_sub->d1 = itype_flippers;
-                    break;
-                    
-                case ssiHOOKSHOT:
-                    temp_sub->d1 = itype_hookshot;
-                    break;
-                    
-                case ssiLENS:
-                    temp_sub->d1 = itype_lens;
-                    break;
-                    
-                case ssiHAMMER:
-                    temp_sub->d1 = itype_hammer;
-                    break;
-                    
-                case ssiBOOTS:
-                    temp_sub->d1 = itype_boots;
-                    break;
-                    
-                case ssiDIVINEFIRE:
-                    temp_sub->d1 = itype_divinefire;
-                    break;
-                    
-                case ssiDIVINEESCAPE:
-                    temp_sub->d1 = itype_divineescape;
-                    break;
-                    
-                case ssiDIVINEPROTECTION:
-                    temp_sub->d1 = itype_divineprotection;
-                    break;
-                    
-                case ssiQUIVER:
-                    temp_sub->d1 = itype_quiver;
-                    break;
-                    
-                case ssiBOMBBAG:
-                    temp_sub->d1 = itype_bombbag;
-                    break;
-                    
-                case ssiCBYRNA:
-                    temp_sub->d1 = itype_cbyrna;
-                    break;
-                    
-                case ssiROCS:
-                    temp_sub->d1 = itype_rocs;
-                    break;
-                    
-                case ssiHOVERBOOTS:
-                    temp_sub->d1 = itype_hoverboots;
-                    break;
-                    
-                case ssiSPINSCROLL:
-                    temp_sub->d1 = itype_spinscroll;
-                    break;
-                    
-                case ssiCROSSSCROLL:
-                    temp_sub->d1 = itype_crossscroll;
-                    break;
-                    
-                case ssiQUAKESCROLL:
-                    temp_sub->d1 = itype_quakescroll;
-                    break;
-                    
-                case ssiWHISPRING:
-                    temp_sub->d1 = itype_whispring;
-                    break;
-                    
-                case ssiCHARGERING:
-                    temp_sub->d1 = itype_chargering;
-                    break;
-                    
-                case ssiPERILSCROLL:
-                    temp_sub->d1 = itype_perilscroll;
-                    break;
-                    
-                case ssiWEALTHMEDAL:
-                    temp_sub->d1 = itype_wealthmedal;
-                    break;
-                    
-                case ssiHEARTRING:
-                    temp_sub->d1 = itype_heartring;
-                    break;
-                    
-                case ssiMAGICRING:
-                    temp_sub->d1 = itype_magicring;
-                    break;
-                    
-                case ssiSPINSCROLL2:
-                    temp_sub->d1 = itype_spinscroll2;
-                    break;
-                    
-                case ssiQUAKESCROLL2:
-                    temp_sub->d1 = itype_quakescroll2;
-                    break;
-                    
-                case ssiAGONY:
-                    temp_sub->d1 = itype_agony;
-                    break;
-                    
-                case ssiSTOMPBOOTS:
-                    temp_sub->d1 = itype_stompboots;
-                    break;
-                    
-                case ssiWHIMSICALRING:
-                    temp_sub->d1 = itype_whimsicalring;
-                    break;
-                    
-                case ssiPERILRING:
-                    temp_sub->d1 = itype_perilring;
-                    break;
-                    
-                default:
-                    temp_sub->d1 += itype_custom1 - ssiMAX;
-                }
-            }
-            
-            //fall-through
-        default:
-            if(!p_getc(&(temp_sub->dp1),f))
-            {
-                return qe_invalid;
-            }
-            
-            break;
-        }
-        
+				case ssiBOMB:
+					temp_sub->d1 = itype_bomb;
+					break;
+					
+				case ssiSWORD:
+					temp_sub->d1 = itype_sword;
+					break;
+					
+				case ssiSHIELD:
+					temp_sub->d1 = itype_shield;
+					break;
+					
+				case ssiCANDLE:
+					temp_sub->d1 = itype_candle;
+					break;
+					
+				case ssiLETTER:
+					temp_sub->d1 = itype_letter;
+					break;
+					
+				case ssiPOTION:
+					temp_sub->d1 = itype_potion;
+					break;
+					
+				case ssiLETTERPOTION:
+					temp_sub->d1 = itype_letterpotion;
+					break;
+					
+				case ssiBOW:
+					temp_sub->d1 = itype_bow;
+					break;
+					
+				case ssiARROW:
+					temp_sub->d1 = itype_arrow;
+					break;
+					
+				case ssiBOWANDARROW:
+					temp_sub->d1 = itype_bowandarrow;
+					break;
+					
+				case ssiBAIT:
+					temp_sub->d1 = itype_bait;
+					break;
+					
+				case ssiRING:
+					temp_sub->d1 = itype_ring;
+					break;
+					
+				case ssiBRACELET:
+					temp_sub->d1 = itype_bracelet;
+					break;
+					
+				case ssiMAP:
+					temp_sub->d1 = itype_map;
+					break;
+					
+				case ssiCOMPASS:
+					temp_sub->d1 = itype_compass;
+					break;
+					
+				case ssiBOSSKEY:
+					temp_sub->d1 = itype_bosskey;
+					break;
+					
+				case ssiMAGICKEY:
+					temp_sub->d1 = itype_magickey;
+					break;
+					
+				case ssiBRANG:
+					temp_sub->d1 = itype_brang;
+					break;
+					
+				case ssiWAND:
+					temp_sub->d1 = itype_wand;
+					break;
+					
+				case ssiRAFT:
+					temp_sub->d1 = itype_raft;
+					break;
+					
+				case ssiLADDER:
+					temp_sub->d1 = itype_ladder;
+					break;
+					
+				case ssiWHISTLE:
+					temp_sub->d1 = itype_whistle;
+					break;
+					
+				case ssiBOOK:
+					temp_sub->d1 = itype_book;
+					break;
+					
+				case ssiWALLET:
+					temp_sub->d1 = itype_wallet;
+					break;
+					
+				case ssiSBOMB:
+					temp_sub->d1 = itype_sbomb;
+					break;
+					
+				case ssiHCPIECE:
+					temp_sub->d1 = itype_heartpiece;
+					break;
+					
+				case ssiAMULET:
+					temp_sub->d1 = itype_amulet;
+					break;
+					
+				case ssiFLIPPERS:
+					temp_sub->d1 = itype_flippers;
+					break;
+					
+				case ssiHOOKSHOT:
+					temp_sub->d1 = itype_hookshot;
+					break;
+					
+				case ssiLENS:
+					temp_sub->d1 = itype_lens;
+					break;
+					
+				case ssiHAMMER:
+					temp_sub->d1 = itype_hammer;
+					break;
+					
+				case ssiBOOTS:
+					temp_sub->d1 = itype_boots;
+					break;
+					
+				case ssiDIVINEFIRE:
+					temp_sub->d1 = itype_divinefire;
+					break;
+					
+				case ssiDIVINEESCAPE:
+					temp_sub->d1 = itype_divineescape;
+					break;
+					
+				case ssiDIVINEPROTECTION:
+					temp_sub->d1 = itype_divineprotection;
+					break;
+					
+				case ssiQUIVER:
+					temp_sub->d1 = itype_quiver;
+					break;
+					
+				case ssiBOMBBAG:
+					temp_sub->d1 = itype_bombbag;
+					break;
+					
+				case ssiCBYRNA:
+					temp_sub->d1 = itype_cbyrna;
+					break;
+					
+				case ssiROCS:
+					temp_sub->d1 = itype_rocs;
+					break;
+					
+				case ssiHOVERBOOTS:
+					temp_sub->d1 = itype_hoverboots;
+					break;
+					
+				case ssiSPINSCROLL:
+					temp_sub->d1 = itype_spinscroll;
+					break;
+					
+				case ssiCROSSSCROLL:
+					temp_sub->d1 = itype_crossscroll;
+					break;
+					
+				case ssiQUAKESCROLL:
+					temp_sub->d1 = itype_quakescroll;
+					break;
+					
+				case ssiWHISPRING:
+					temp_sub->d1 = itype_whispring;
+					break;
+					
+				case ssiCHARGERING:
+					temp_sub->d1 = itype_chargering;
+					break;
+					
+				case ssiPERILSCROLL:
+					temp_sub->d1 = itype_perilscroll;
+					break;
+					
+				case ssiWEALTHMEDAL:
+					temp_sub->d1 = itype_wealthmedal;
+					break;
+					
+				case ssiHEARTRING:
+					temp_sub->d1 = itype_heartring;
+					break;
+					
+				case ssiMAGICRING:
+					temp_sub->d1 = itype_magicring;
+					break;
+					
+				case ssiSPINSCROLL2:
+					temp_sub->d1 = itype_spinscroll2;
+					break;
+					
+				case ssiQUAKESCROLL2:
+					temp_sub->d1 = itype_quakescroll2;
+					break;
+					
+				case ssiAGONY:
+					temp_sub->d1 = itype_agony;
+					break;
+					
+				case ssiSTOMPBOOTS:
+					temp_sub->d1 = itype_stompboots;
+					break;
+					
+				case ssiWHIMSICALRING:
+					temp_sub->d1 = itype_whimsicalring;
+					break;
+					
+				case ssiPERILRING:
+					temp_sub->d1 = itype_perilring;
+					break;
+					
+				default:
+					temp_sub->d1 += itype_custom1 - ssiMAX;
+				}
+			}
+			
+			//fall-through
+		default:
+			if(!p_getc(&(temp_sub->dp1),f))
+				return qe_invalid;
+			
+			break;
+		}
+		
 		if(s_version < 7)
 		{
 			switch(temp_sub->type)
@@ -11856,12 +11772,11 @@ int32_t read_one_subscreen(PACKFILE *f, zquestheader *, int32_t i, word s_versio
 		case ssoTEXTBOX:
 		case ssoCURRENTITEMTEXT:
 		case ssoCURRENTITEMCLASSTEXT:
-			if(custom_subscreen[i].objects[j].dp1 != NULL) delete[](char *)custom_subscreen[i].objects[j].dp1;
+			if(g->objects[j].dp1 != NULL) delete[](char *)g->objects[j].dp1;
 			
-			memcpy(&custom_subscreen[i].objects[j],temp_sub,sizeof(subscreen_object));
-			custom_subscreen[i].objects[j].dp1 = NULL;
-			custom_subscreen[i].objects[j].dp1 = new char[temp_size+2];
-			strcpy((char*)custom_subscreen[i].objects[j].dp1,tempdp1);
+			memcpy(&g->objects[j],temp_sub,sizeof(subscreen_object));
+			g->objects[j].dp1 = new char[temp_size+2];
+			strcpy((char*)g->objects[j].dp1,tempdp1);
 			break;
 			
 		case ssoCOUNTER:
@@ -11872,34 +11787,61 @@ int32_t read_one_subscreen(PACKFILE *f, zquestheader *, int32_t i, word s_versio
 			}
 			
 		default:
-			memcpy(&custom_subscreen[i].objects[j],temp_sub,sizeof(subscreen_object));
+			memcpy(&g->objects[j],temp_sub,sizeof(subscreen_object));
 			break;
 		}
 		
-		custom_subscreen[i].name[0] = '\0';
-		strncat(custom_subscreen[i].name, tempname, 64 - 1);
-		custom_subscreen[i].ss_type = temp_ss;
-    }
-    
-    for(j=numsub; j<MAXSUBSCREENITEMS; j++)
-    {
+		g->name[0] = '\0';
+		strncat(g->name, tempname, 64 - 1);
+		g->ss_type = temp_ss;
+	}
+	
+	for(j=numsub; j<MAXSUBSCREENITEMS; j++)
+	{
 		//clear all unused object in this subscreen -DD
-		switch(custom_subscreen[i].objects[j].type)
+		switch(g->objects[j].type)
 		{
 		case ssoTEXT:
 		case ssoTEXTBOX:
 		case ssoCURRENTITEMTEXT:
 		case ssoCURRENTITEMCLASSTEXT:
-			if(custom_subscreen[i].objects[j].dp1 != NULL) delete [](char *)custom_subscreen[i].objects[j].dp1;
+			if(g->objects[j].dp1 != NULL) delete [](char *)g->objects[j].dp1;
 			
 			//fall through
 		default:
-			memset(&custom_subscreen[i].objects[j],0,sizeof(subscreen_object));
+			memset(&g->objects[j],0,sizeof(subscreen_object));
 			break;
 		}
-    }
-    
-    return 0;
+	}
+	
+	return 0;
+}
+
+int32_t readsubscreens(PACKFILE *f)
+{
+	word s_version, s_cversion;
+	dword dummy;
+	if(!p_igetw(&s_version,f))
+		return qe_invalid;
+	FFCore.quest_format[vSubscreen] = s_version;
+	if(!p_igetw(&s_cversion,f))
+		return qe_invalid;
+	if(!p_igetl(&dummy,f)) //section size
+		return qe_invalid;
+	
+	if(s_version < 8)
+		return read_old_subscreens(f,s_version);
+	
+	byte sz;
+	if(!p_getc(&sz,f))
+		return qe_invalid;
+	new_subscreen.clear();
+	for(byte q = 0; q < sz; ++q)
+	{
+		ZCSubscreen& ref = new_subscreen.emplace_back();
+		ref.read(f,s_version);
+	}
+	return 0;
 }
 
 void reset_subscreen(subscreen_group *tempss)
@@ -11924,377 +11866,57 @@ void reset_subscreen(subscreen_group *tempss)
 
 void reset_subscreens()
 {
-    for(int32_t i=0; i<MAXCUSTOMSUBSCREENS; ++i)
-    {
-        reset_subscreen(&custom_subscreen[i]);
-    }
+	new_subscreen.clear();
 }
 
 int32_t setupsubscreens()
 {
     reset_subscreens();
+	//return 0;
+	for(int q = 0; q < 4; ++q)
+		new_subscreen.emplace_back();
     int32_t tempsubscreen=zinit.subscreen;
-    subscreen_object *tempsub;
     
     if(tempsubscreen>=ssdtMAX)
-    {
         tempsubscreen=0;
-    }
     
     switch(tempsubscreen)
     {
-    case ssdtOLD:
-    case ssdtNEWSUBSCR:
-    case ssdtREV2:
-    case ssdtBSZELDA:
-    case ssdtBSZELDAMODIFIED:
-    case ssdtBSZELDAENHANCED:
-    case ssdtBSZELDACOMPLETE:
-    {
-        tempsub = default_subscreen_active[tempsubscreen][0];
-        int32_t i;
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[0].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[0].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[0].objects[i].dp1 = NULL;
-                custom_subscreen[0].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[0].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[0].objects[i].d3=1;
-                else
-                    custom_subscreen[0].objects[i].d3=0;
-                    
-                break;
-            }
-	    /*
-	    case ssoTRIFRAME:
-	    {
-		memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-		custom_subscreen[0].objects[i].d1 = 8594;
-		custom_subscreen[0].objects[i].d2 = 8;
-		custom_subscreen[0].objects[i].d3 = 8771;
-		custom_subscreen[0].objects[i].d4 = 8;
-		custom_subscreen[0].objects[i].d5 = 1;
-		custom_subscreen[0].objects[i].d6 = 1;
-		break;
-	    }*/
-            
-            default:
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[0].ss_type=sstACTIVE;
-        sprintf(custom_subscreen[0].name, "Active Subscreen (Triforce)");
-        tempsub = default_subscreen_active[tempsubscreen][1];
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[1].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[1].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[1].objects[i].dp1 = NULL;
-                custom_subscreen[1].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[1].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[1].objects[i].d3=1;
-                else
-                    custom_subscreen[1].objects[i].d3=0;
-                    
-                break;
-            }
-	    /*
-	    case ssoTRIFRAME:
-	    {
-		custom_subscreen[1].objects[i].d1 = 8594;
-		custom_subscreen[1].objects[i].d2 = 8;
-		custom_subscreen[1].objects[i].d3 = 8771;
-		custom_subscreen[1].objects[i].d4 = 8;
-		custom_subscreen[1].objects[i].d5 = 1;
-		custom_subscreen[1].objects[i].d6 = 1;
-		break;
-	    }*/
-            
-            default:
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[1].ss_type=sstACTIVE;
-        sprintf(custom_subscreen[1].name, "Active Subscreen (Dungeon Map)");
-//      memset(&custom_subscreen[1].objects[i],0,sizeof(subscreen_object));
-        tempsub = default_subscreen_passive[tempsubscreen][0];
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[2].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[2].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[2].objects[i].dp1 = NULL;
-                custom_subscreen[2].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[2].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[2].objects[i].d3=1;
-                else
-                    custom_subscreen[2].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[2].ss_type=sstPASSIVE;
-        sprintf(custom_subscreen[2].name, "Passive Subscreen (Magic)");
-//      memset(&custom_subscreen[2].objects[i],0,sizeof(subscreen_object));
-        tempsub = default_subscreen_passive[tempsubscreen][1];
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[3].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[3].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[3].objects[i].dp1 = NULL;
-                custom_subscreen[3].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[3].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[3].objects[i].d3=1;
-                else
-                    custom_subscreen[3].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[3].ss_type=sstPASSIVE;
-        sprintf(custom_subscreen[3].name, "Passive Subscreen (No Magic)");
-//      memset(&custom_subscreen[3].objects[i],0,sizeof(subscreen_object));
-        break;
-    }
-    
-    case ssdtZ3:
-    {
-        tempsub = z3_active_a;
-        int32_t i;
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[0].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[0].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[0].objects[i].dp1 = NULL;
-                custom_subscreen[0].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[0].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[0].objects[i].d3=1;
-                else
-                    custom_subscreen[0].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[0].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[0].ss_type=sstACTIVE;
-//      memset(&custom_subscreen[0].objects[i],0,sizeof(subscreen_object));
-        tempsub = z3_active_ab;
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[1].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[1].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[1].objects[i].dp1 = NULL;
-                custom_subscreen[1].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[1].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[1].objects[i].d3=1;
-                else
-                    custom_subscreen[1].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[1].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[1].ss_type=sstACTIVE;
-//      memset(&custom_subscreen[1].objects[i],0,sizeof(subscreen_object));
-        tempsub = z3_passive_a;
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[2].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[2].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[2].objects[i].dp1 = NULL;
-                custom_subscreen[2].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[2].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[2].objects[i].d3=1;
-                else
-                    custom_subscreen[2].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[2].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[2].ss_type=sstPASSIVE;
-//      memset(&custom_subscreen[2].objects[i],0,sizeof(subscreen_object));
-        tempsub = z3_passive_ab;
-        
-        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-        {
-            switch(tempsub[i].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[3].objects[i].dp1 != NULL) delete [](char *)custom_subscreen[3].objects[i].dp1;
-                
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                custom_subscreen[3].objects[i].dp1 = NULL;
-                custom_subscreen[3].objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                strcpy((char*)custom_subscreen[3].objects[i].dp1,(char*)tempsub[i].dp1);
-                break;
-                
-            case ssoLIFEMETER:
-            {
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                
-                if(get_bit(deprecated_rules, 12) != 0)
-                    custom_subscreen[3].objects[i].d3=1;
-                else
-                    custom_subscreen[3].objects[i].d3=0;
-                    
-                break;
-            }
-            
-            default:
-                memcpy(&custom_subscreen[3].objects[i],&tempsub[i],sizeof(subscreen_object));
-                break;
-            }
-        }
-        
-        custom_subscreen[3].ss_type=sstPASSIVE;
-//      memset(&custom_subscreen[3].objects[i],0,sizeof(subscreen_object));
-        break;
-    }
-    }
-    
-    for(int32_t i=0; i<4; ++i)
-    {
-        purge_blank_subscreen_objects(&custom_subscreen[i]);
+		case ssdtOLD:
+		case ssdtNEWSUBSCR:
+		case ssdtREV2:
+		case ssdtBSZELDA:
+		case ssdtBSZELDAMODIFIED:
+		case ssdtBSZELDAENHANCED:
+		case ssdtBSZELDACOMPLETE:
+		{
+			new_subscreen[0].load_old(default_subscreen_active[tempsubscreen][0]);
+			new_subscreen[0].sub_type=sstACTIVE;
+			new_subscreen[0].name = "Active Subscreen (Triforce)";
+			new_subscreen[1].load_old(default_subscreen_active[tempsubscreen][1]);
+			new_subscreen[1].sub_type=sstACTIVE;
+			new_subscreen[1].name = "Active Subscreen (Dungeon Map)";
+			new_subscreen[2].load_old(default_subscreen_passive[tempsubscreen][0]);
+			new_subscreen[2].sub_type=sstPASSIVE;
+			new_subscreen[2].name = "Passive Subscreen (Magic)";
+			new_subscreen[3].load_old(default_subscreen_passive[tempsubscreen][1]);
+			new_subscreen[3].sub_type=sstPASSIVE;
+			new_subscreen[3].name = "Passive Subscreen (No Magic)";
+			break;
+		}
+		
+		case ssdtZ3:
+		{
+			new_subscreen[0].load_old(z3_active_a);
+			new_subscreen[0].sub_type=sstACTIVE;
+			new_subscreen[1].load_old(z3_active_ab);
+			new_subscreen[1].sub_type=sstACTIVE;
+			new_subscreen[2].load_old(z3_passive_a);
+			new_subscreen[2].sub_type=sstPASSIVE;
+			new_subscreen[3].load_old(z3_passive_ab);
+			new_subscreen[3].sub_type=sstPASSIVE;
+			break;
+		}
     }
     
     return 0;
@@ -21896,7 +21518,7 @@ int32_t _lq_int(const char *filename, zquestheader *Header, miscQdata *Misc, zct
                 }
                 
                 box_out("Reading Custom Subscreen Data...");
-                ret=readsubscreens(f, &tempheader);
+                ret=readsubscreens(f);
                 checkstatus(ret);
                 box_out("okay.");
                 box_eol();
diff --git a/src/qst.h b/src/qst.h
index 08f5fbb04c..d745a053cb 100644
--- a/src/qst.h
+++ b/src/qst.h
@@ -256,14 +256,16 @@ int32_t readtiles(PACKFILE *f, tiledata *buf, zquestheader *Header, word version
 int32_t readtunes(PACKFILE *f, zquestheader *Header, zctune *tunes);
 int32_t readcheatcodes(PACKFILE *f, zquestheader *Header);
 int32_t readinitdata(PACKFILE *f, zquestheader *Header);
-int32_t readsubscreens(PACKFILE *f, zquestheader *Header);
-int32_t read_one_subscreen(PACKFILE *f, zquestheader *Header, int32_t i, word s_version, word s_cversion);
 int32_t readffscript(PACKFILE *f, zquestheader *Header);
 int32_t read_one_ffscript(PACKFILE *f, zquestheader *Header, int32_t i, word s_version, word s_cversion, script_data **script, word zmeta_version);
 int32_t readsfx(PACKFILE *f, zquestheader *Header);
 int32_t readitemdropsets(PACKFILE *f, word version, word build);
 int32_t readfavorites(PACKFILE *f, int32_t, word);
 
+int32_t readsubscreens(PACKFILE *f);
+int32_t read_old_subscreens(PACKFILE *f, word s_version);
+int32_t read_one_old_subscreen(PACKFILE* f, subscreen_group* g, word s_version);
+
 void init_msgstr(MsgStr *str);
 
 int32_t get_version_and_build(PACKFILE *f, word *version, word *build);
diff --git a/src/subscr.cpp b/src/subscr.cpp
index 03e5d83f68..f2043eba44 100644
--- a/src/subscr.cpp
+++ b/src/subscr.cpp
@@ -35,10 +35,10 @@ extern sprite_list  guys, items, Ewpns, Lwpns, Sitems, chainlinks, decorations;
 extern HeroClass   Hero;
 extern FFScript FFCore;
 
-subscreen_group *current_subscreen_active;
-subscreen_group *current_subscreen_passive;
+ZCSubscreen *new_subscreen_active;
+ZCSubscreen *new_subscreen_passive;
 
-subscreen_group custom_subscreen[MAXCUSTOMSUBSCREENS];
+std::vector<ZCSubscreen> new_subscreen;
 
 static const int32_t notscrolling = sspUP | sspDOWN;
 static const int32_t pos = notscrolling | sspSCROLLING;
@@ -116,14 +116,14 @@ subscreen_object z3_active_a[80]=
     { ssoTEXT,                             pos,                     17,         105,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"INVENTORY" },
     { ssoTEXT,                             pos,                    177,          57,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"TRIFORCE" },
     { ssoTEXT,                             pos,                    177,         113,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"EQUIPMENT" },
-    { ssoTRIFORCE,                         pos,                    192,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      1,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      2,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    176,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      3,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    224,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      4,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            2,                      1,                           0,                      5,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      6,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            3,                      1,                           0,                      7,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      8,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      1,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      2,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    176,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      3,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    224,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      4,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            2,                      1,                           0,                      5,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      6,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            3,                      1,                           0,                      7,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      8,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
     { ssoTILEBLOCK,                        pos,                     16,           8,           1,            1,            1,                         0,                                 0,                         0,                                 0,                         0,                             28201,                            0,                      1,                           0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
     { ssoNULL,                             pos,                      0,           0,           0,            0,            0,                         0,                                 0,                         0,                                 0,                         0,                                 0,                            0,                      0,                           0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL }
 };
@@ -202,14 +202,14 @@ subscreen_object z3_active_ab[82]=
     { ssoTEXT,                             pos,                     17,         105,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"INVENTORY" },
     { ssoTEXT,                             pos,                    177,          57,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"TRIFORCE" },
     { ssoTEXT,                             pos,                    177,         113,           0,            0,            ssctMISC,                  ssctTEXT,                          ssctMISC,                  ssctSUBSCRSHADOW,                  ssctSYSTEM,               -1,                                 ssfZ3SMALL,                   sstaLEFT,               sstsSHADOWED,                0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0, (void *)"EQUIPMENT" },
-    { ssoTRIFORCE,                         pos,                    192,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      1,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      2,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    176,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      3,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    224,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      4,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            2,                      1,                           0,                      5,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      6,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            3,                      1,                           0,                      7,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
-    { ssoTRIFORCE,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      8,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      1,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          64,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      2,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    176,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      3,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    224,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      4,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            2,                      1,                           0,                      5,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    192,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            1,                      1,                           0,                      6,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            3,                      1,                           0,                      7,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
+    { ssoMCGUFFIN,                         pos,                    208,          80,           1,            1,            ssctMISC,                  sscsTRIFORCECSET,                  0,                         0,                                 0,                         0,                                 0,                            0,                      1,                           0,                      8,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
     { ssoTILEBLOCK,                        pos,                     16,           8,           1,            1,            1,                         0,                                 0,                         0,                                 0,                         0,                                 28200,                        0,                      1,                           0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL },
     { ssoNULL,                             pos,                      0,           0,           0,            0,            0,                         0,                                 0,                         0,                                 0,                         0,                                 0,                            0,                      0,                           0,                      0,                      0,                      0,                      0,                      0,                      0,                      0,             0,            0,            0,             NULL }
 };
@@ -1916,7 +1916,7 @@ void textprintf_styled_aligned_ex(BITMAP *bmp, const FONT *f, int32_t x, int32_t
 }
 
 
-void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT *tempfont, char *thetext, bool wword, int32_t tabsize, int32_t alignment, int32_t textstyle, int32_t color, int32_t shadowcolor, int32_t backcolor)
+void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT *tempfont, char const* thetext, bool wword, int32_t tabsize, int32_t alignment, int32_t textstyle, int32_t color, int32_t shadowcolor, int32_t backcolor)
 {
     int32_t y1 = y;
     int32_t x1;
@@ -1924,11 +1924,12 @@ void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT
     char s[16];
     char text[16];
     char space[16];
-    char *printed = text;
-    char *scanned = text;
-    char *oldscan = text;
-    char *ignore = NULL;
-    char *tmp, *ptmp;
+    char const* printed = text;
+    char const* scanned = text;
+    char const* oldscan = text;
+    char const* ignore = NULL;
+    char const* tmp;
+    char const* ptmp;
     int32_t width;
     int32_t i = 0;
     int32_t noignore;
@@ -2043,7 +2044,7 @@ void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT
         if((y1+text_height(tempfont) <= (y+h)))
         {
             int32_t tempw=0;
-            char *tempprinted=printed;
+            char const* tempprinted=printed;
             
             /* print up to the marked character */
             while(printed != scanned)
@@ -2155,7 +2156,6 @@ void draw_textbox(BITMAP *dest, int32_t x, int32_t y, int32_t w, int32_t h, FONT
 
 
 //void frame2x2(BITMAP *dest,int32_t x,int32_t y,int32_t xsize,int32_t ysize,int32_t t,int32_t c)
-//draw_block_flip(dest,x,y,css->objects[i].d1,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].w,css->objects[i].h,css->objects[i].d2,css->objects[i].d3,css->objects[i].d4);
 void frame2x2(BITMAP *dest,int32_t x,int32_t y,int32_t tile,int32_t cset,int32_t w,int32_t h,int32_t /*flip*/,bool overlay,bool trans)
 {
     /*
@@ -3216,60 +3216,7 @@ bool displaysubscreenitem(int32_t itemtype, int32_t d, int32_t id)
 	}
 }
 
-int32_t get_subscreenitem_id(int32_t itemtype, bool forceItem)
-{
-	if(forceItem && (itemtype & 0x8000))
-		return itemtype&0xFFF;
-    // We need to do a reverse loop to prevent the Bow from being drawn above the Arrow (Bow & Arrow).
-    int32_t overridecheck = 0xFFFF;
-    
-    for(int32_t i=Sitems.Count()-1; i>=0; i--)
-    {
-        if(itemtype & 0x8000) // if 0x8000, then itemtype is actually an item ID.
-        {
-            if(overridecheck==0xFFFF)
-			{
-                if(Sitems.spr(i)->id == (itemtype&0xFFF) && Sitems.spr(i)->misc==-1) overridecheck = i;
-			}
-        }
-        else if(Sitems.spr(i)->misc!=-1)
-        {
-            int32_t d= itemsbuf[Sitems.spr(i)->id].family;
-            
-            if((d==itemtype)||
-                    (itemtype==itype_letterpotion&&((d==itype_letter && current_item_id(itype_potion)==-1)||d==itype_potion))||
-                    (itemtype==itype_bowandarrow&&(d==itype_bow||d==itype_arrow)))
-            {
-				return Sitems.spr(i)->id;
-            }
-        }
-    }
-    if(forceItem)
-	{
-		bool useLowestID = get_qr(qr_SUBSCR_BACKWARDS_ID_ORDER);
-		int32_t id = -1;
-		for(auto q = 0; q < MAXITEMS; ++q)
-		{
-			if(itemsbuf[q].family == itemtype)
-			{
-				id = q;
-				if(useLowestID) break;
-			}
-		}
-		return id;
-	}
-
-    //Item Override stuff here
-    if((itemtype & 0x8000) && 
-		(!game || game->item[itemtype&0xFFF])
-            && !item_disabled(itemtype&0xFFF) && displaysubscreenitem(itemsbuf[itemtype&0xFFF].family, 0, (itemtype&0xFFF)))
-    {
-		return itemtype&0xFFF;
-    }
-	return -1;
-}
-
-item* get_subscreenitem(int32_t itemtype)
+void subscreenitem(BITMAP *dest, int32_t x, int32_t y, int32_t itemtype)
 {
     // We need to do a reverse loop to prevent the Bow from being drawn above the Arrow (Bow & Arrow).
     int32_t overridecheck = 0xFFFF;
@@ -3280,57 +3227,15 @@ item* get_subscreenitem(int32_t itemtype)
         {
             if(overridecheck==0xFFFF)
 			{
-                if(Sitems.spr(i)->id == (itemtype&0xFFF) && Sitems.spr(i)->misc==-1) overridecheck = i;
+				//al_trace("Found an override item at subscreen.cpp linere 3084, id: %d\n",Sitems.spr(i)->id);
+				if(Sitems.spr(i)->id == (itemtype&0xFFF) && Sitems.spr(i)->misc==-1)
+					overridecheck = i;
 			}
         }
         else if(Sitems.spr(i)->misc!=-1)
         {
             int32_t d= itemsbuf[Sitems.spr(i)->id].family;
             
-            if((d==itemtype)||
-                    (itemtype==itype_letterpotion&&((d==itype_letter && current_item_id(itype_potion)==-1)||d==itype_potion))||
-                    (itemtype==itype_bowandarrow&&(d==itype_bow||d==itype_arrow)))
-            {
-				return (item*)Sitems.spr(i);
-            }
-        }
-    }
-    
-    //Item Override stuff here
-    if((itemtype & 0x8000) && 
-		(!game || game->item[itemtype&0xFFF])
-            && !item_disabled(itemtype&0xFFF) && displaysubscreenitem(itemsbuf[itemtype&0xFFF].family, 0, (itemtype&0xFFF)))
-    {
-        if(overridecheck == 0xFFFF)
-        {
-            overridecheck = Sitems.Count()-1;
-		}
-		return (item*)Sitems.spr(overridecheck);
-    }
-	return NULL;
-}
-
-
-void subscreenitem(BITMAP *dest, int32_t x, int32_t y, int32_t itemtype)
-{
-    // We need to do a reverse loop to prevent the Bow from being drawn above the Arrow (Bow & Arrow).
-    int32_t overridecheck = 0xFFFF;
-    
-    for(int32_t i=Sitems.Count()-1; i>=0; i--)
-    {
-        if(itemtype & 0x8000) // if 0x8000, then itemtype is actually an item ID.
-        {
-            if(overridecheck==0xFFFF)
-	    {
-		//al_trace("Found an override item at subscreen.cpp linere 3084, id: %d\n",Sitems.spr(i)->id);
-
-                if(Sitems.spr(i)->id == (itemtype&0xFFF) && Sitems.spr(i)->misc==-1) overridecheck = i;
-	    }
-        }
-        else if(Sitems.spr(i)->misc!=-1)
-        {
-            int32_t d= itemsbuf[Sitems.spr(i)->id].family;
-            
             if((d==itemtype)||
                     (itemtype==itype_letterpotion&&((d==itype_letter && current_item_id(itype_potion)==-1)||d==itype_potion))||
                     (itemtype==itype_bowandarrow&&(d==itype_bow||d==itype_arrow)))
@@ -3464,8 +3369,6 @@ int32_t subscreen_color(int32_t c1, int32_t c2)
     return ret;
 }
 
-
-
 int32_t subscreen_cset(int32_t c1, int32_t c2)
 {
     int32_t ret=c1;
@@ -3517,161 +3420,8 @@ int32_t subscreen_cset(int32_t c1, int32_t c2)
     return ret;
 }
 
-int32_t to_real_font(int32_t ss_font)
-{
-	switch(ss_font)
-	{
-		case ssfSMALL: return font_sfont;
-		case ssfSMALLPROP: return font_spfont;
-		case ssfSS1: return font_ssfont1;
-		case ssfSS2: return font_ssfont2;
-		case ssfSS3: return font_ssfont3;
-		case ssfSS4: return font_ssfont4;
-		case ssfZTIME: return font_ztfont;
-		case ssfZELDA: return font_zfont;
-		case ssfZ3: return font_z3font;
-		case ssfZ3SMALL: return font_z3smallfont;
-		case ssfGBLA: return font_gblafont;
-		case ssfGORON: return font_goronfont;
-		case ssfZORAN: return font_zoranfont;
-		case ssfHYLIAN1: return font_hylian1font;
-		case ssfHYLIAN2: return font_hylian2font;
-		case ssfHYLIAN3: return font_hylian3font;
-		case ssfHYLIAN4: return font_hylian4font;
-		case ssfGBORACLE: return font_gboraclefont;
-		case ssfGBORACLEP: return font_gboraclepfont;
-		case ssfDSPHANTOM: return font_dsphantomfont;
-		case ssfDSPHANTOMP: return font_dsphantompfont;
-		case ssfAT800: return font_atari800font;
-		case ssfACORN: return font_acornfont;
-		case ssADOS: return font_adosfont;
-		case ssfALLEG: return font_baseallegrofont;
-		case ssfAPL2: return font_apple2font;
-		case ssfAPL280: return font_apple280colfont;
-		case ssfAPL2GS: return font_apple2gsfont;
-		case ssfAQUA: return font_aquariusfont;
-		case ssfAT400: return font_atari400font;
-		case ssfC64: return font_c64font;
-		case ssfC64HR: return font_c64hiresfont;
-		case ssfCGA: return font_cgafont;
-		case ssfCOCO: return font_cocofont;
-		case ssfCOCO2: return font_coco2font;
-		case ssfCOUPE: return font_coupefont;
-		case ssfCPC: return font_cpcfont;
-		case ssfFANTASY: return font_fantasyfont;
-		case ssfFDSKANA: return font_fdskanafont;
-		case ssfFDSLIKE: return font_fdslikefont;
-		case ssfFDSROM: return font_fdsromanfont;
-		case ssfFF: return font_finalffont;
-		case ssfFUTHARK: return font_futharkfont;
-		case ssfGAIA: return font_gaiafont;
-		case ssfHIRA: return font_hirafont;
-		case ssfJP: return font_jpfont;
-		case ssfKONG: return font_kongfont;
-		case ssfMANA: return font_manafont;
-		case ssfML: return font_mlfont;
-		case ssfMOT: return font_motfont;
-		case ssfMSX0: return font_msxmode0font;
-		case ssfMSX1: return font_msxmode1font;
-		case ssfPET: return font_petfont;
-		case ssfPSTART: return font_pstartfont;
-		case ssfSATURN: return font_saturnfont;
-		case ssfSCIFI: return font_scififont;
-		case ssfSHERW: return font_sherwoodfont;
-		case ssfSINQL: return font_sinqlfont;
-		case ssfSPEC: return font_spectrumfont;
-		case ssfSPECLG: return font_speclgfont;
-		case ssfTI99: return font_ti99font;
-		case ssfTRS: return font_trsfont;
-		case ssfZ2: return font_z2font;
-		case ssfZX: return font_zxfont;
-		case ssfLISA: return font_lisafont;
-	}
-	return font_zfont;
-} 
-int32_t to_ss_font(int32_t real_font)
-{
-	switch(real_font)
-	{
-		case font_sfont: return ssfSMALL;
-		case font_spfont: return ssfSMALLPROP;
-		case font_ssfont1: return ssfSS1;
-		case font_ssfont2: return ssfSS2;
-		case font_ssfont3: return ssfSS3;
-		case font_ssfont4: return ssfSS4;
-		case font_ztfont: return ssfZTIME;
-		case font_zfont: return ssfZELDA;
-		case font_z3font: return ssfZ3;
-		case font_z3smallfont: return ssfZ3SMALL;
-		case font_gblafont: return ssfGBLA;
-		case font_goronfont: return ssfGORON;
-		case font_zoranfont: return ssfZORAN;
-		case font_hylian1font: return ssfHYLIAN1;
-		case font_hylian2font: return ssfHYLIAN2;
-		case font_hylian3font: return ssfHYLIAN3;
-		case font_hylian4font: return ssfHYLIAN4;
-		case font_gboraclefont: return ssfGBORACLE;
-		case font_gboraclepfont: return ssfGBORACLEP;
-		case font_dsphantomfont: return ssfDSPHANTOM;
-		case font_dsphantompfont: return ssfDSPHANTOMP;
-		case font_atari800font: return ssfAT800;
-		case font_acornfont: return ssfACORN;
-		case font_adosfont: return ssADOS;
-		case font_baseallegrofont: return ssfALLEG;
-		case font_apple2font: return ssfAPL2;
-		case font_apple280colfont: return ssfAPL280;
-		case font_apple2gsfont: return ssfAPL2GS;
-		case font_aquariusfont: return ssfAQUA;
-		case font_atari400font: return ssfAT400;
-		case font_c64font: return ssfC64;
-		case font_c64hiresfont: return ssfC64HR;
-		case font_cgafont: return ssfCGA;
-		case font_cocofont: return ssfCOCO;
-		case font_coco2font: return ssfCOCO2;
-		case font_coupefont: return ssfCOUPE;
-		case font_cpcfont: return ssfCPC;
-		case font_fantasyfont: return ssfFANTASY;
-		case font_fdskanafont: return ssfFDSKANA;
-		case font_fdslikefont: return ssfFDSLIKE;
-		case font_fdsromanfont: return ssfFDSROM;
-		case font_finalffont: return ssfFF;
-		case font_futharkfont: return ssfFUTHARK;
-		case font_gaiafont: return ssfGAIA;
-		case font_hirafont: return ssfHIRA;
-		case font_jpfont: return ssfJP;
-		case font_kongfont: return ssfKONG;
-		case font_manafont: return ssfMANA;
-		case font_mlfont: return ssfML;
-		case font_motfont: return ssfMOT;
-		case font_msxmode0font: return ssfMSX0;
-		case font_msxmode1font: return ssfMSX1;
-		case font_petfont: return ssfPET;
-		case font_pstartfont: return ssfPSTART;
-		case font_saturnfont: return ssfSATURN;
-		case font_scififont: return ssfSCIFI;
-		case font_sherwoodfont: return ssfSHERW;
-		case font_sinqlfont: return ssfSINQL;
-		case font_spectrumfont: return ssfSPEC;
-		case font_speclgfont: return ssfSPECLG;
-		case font_ti99font: return ssfTI99;
-		case font_trsfont: return ssfTRS;
-		case font_z2font: return ssfZ2;
-		case font_zxfont: return ssfZX;
-		case font_lisafont: return ssfLISA;
-	}
-	return ssfZELDA;
-} 
-
-FONT *ss_font(int32_t fontnum)
-{
-    if(unsigned(fontnum) >= ssfMAX)
-        fontnum=zc_oldrand()%ssfMAX;
-	
-    return get_zc_font(to_real_font(fontnum));
-}
 item *sel_a=NULL, *sel_b=NULL;
 
-
 void delete_selectors()
 {
     if(sel_a)
@@ -3687,7 +3437,6 @@ void delete_selectors()
     }
 }
 
-
 void animate_selectors()
 {
     if(new_sel)
@@ -3710,8 +3459,9 @@ void animate_selectors()
     sel_b->animate(0);
 }
 
-void show_custom_subscreen(BITMAP *dest, subscreen_group *css, int32_t xofs, int32_t yofs, bool showtime, int32_t pos2)
+void show_custom_subscreen(BITMAP *dest, ZCSubscreen* subscr, int32_t xofs, int32_t yofs, bool showtime, int32_t pos2)
 {
+	if(!subscr) return;
 	//this is not a good place to be clearing the bitmap
 	//other stuff might already have been drawn on it that needs to be kept
 	//(eg the game screen when pulling down the subscreen) -DD
@@ -3736,377 +3486,8 @@ void show_custom_subscreen(BITMAP *dest, subscreen_group *css, int32_t xofs, int
 	#endif
 	if(animate_sel)
 		animate_selectors();
-		
-	for(int32_t i=0; i<MAXSUBSCREENITEMS&&css->objects[i].type>ssoNULL; ++i)
-	{
-		if((css->objects[i].pos & pos2) != 0)
-		{
-			FONT *tempfont=get_zc_font(font_zfont);
-			int32_t fontnum=css->objects[i].d1;
-			tempfont=ss_font(fontnum);
-			int32_t x=css->objects[i].x+xofs;
-			int32_t y=css->objects[i].y+yofs;
-			
-			switch(css->objects[i].type)
-			{
-				case sso2X2FRAME:
-				{
-					//al_trace("2x2 Frame tile is: %d\n",css->objects[i].d1);
-					//in 1.92 and earlier, the 2x2 frame object was tile 278
-					frame2x2(dest, x, y, css->objects[i].d1, subscreen_cset(css->objects[i].colortype1, css->objects[i].color1), css->objects[i].w, css->objects[i].h, css->objects[i].d2, css->objects[i].d3 != 0, css->objects[i].d4 != 0);
-					//frame2x2(dest, x, y, FFCore.getQuestHeaderInfo(vZelda) < 0x193 ? 278 : css->objects[i].d1, subscreen_cset(css->objects[i].colortype1, css->objects[i].color1), css->objects[i].w, css->objects[i].h, css->objects[i].d2, css->objects[i].d3 != 0, css->objects[i].d4 != 0);
-				}
-				break;
-				
-				case ssoBSTIME:
-				{
-					char *ts;
-					
-					if(game)
-						ts = time_str_short2(game->get_time());
-					else
-						ts = time_str_short2(0);
-						
-					//textout_shadowed_ex(dest,tempfont,ts,x,y,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-					textout_styled_aligned_ex(dest,tempfont,ts,x,y,css->objects[i].d3,css->objects[i].d2,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-				}
-				break;
-				
-				case ssoSSTIME:
-				case ssoTIME:
-				{
-					if(showtime||css->objects[i].type==ssoTIME)
-					{
-						char *ts;
-						
-						if(game)
-							ts = time_str_med(game->get_time());
-						else
-							ts = time_str_med(0);
-							
-						//textout_right_ex(dest,tempfont,ts,x,y,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2));
-						textout_styled_aligned_ex(dest,tempfont,ts,x,y,css->objects[i].d3,css->objects[i].d2,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-					}
-				}
-				break;
-				
-				case ssoTEXT:
-				{
-					//textout_styled_aligned_ex(bmp, f,       s,                          x,y,textstyle,         alignment,         color,                                                                    shadow,                                                                   bg)
-					textout_styled_aligned_ex(dest,tempfont,(char *)css->objects[i].dp1,x,y,css->objects[i].d3,css->objects[i].d2,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-				}
-				break;
-				
-				case ssoLINE:
-				{
-					if(css->objects[i].d4)
-					{
-						drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
-					}
-					
-					line(dest, x, y, x+css->objects[i].w-1, y+css->objects[i].h-1, subscreen_color(css->objects[i].colortype1, css->objects[i].color1));
-					
-					if(css->objects[i].d4)
-					{
-						drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
-					}
-				}
-				break;
-				
-				case ssoRECT:
-				{
-					if(css->objects[i].d2)
-					{
-						drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
-					}
-					
-					if(css->objects[i].d1!=0)
-					{
-						rectfill(dest, x, y, x+css->objects[i].w-1, y+css->objects[i].h-1, subscreen_color(css->objects[i].colortype2, css->objects[i].color2));
-					}
-					
-					rect(dest, x, y, x+css->objects[i].w-1, y+css->objects[i].h-1, subscreen_color(css->objects[i].colortype1, css->objects[i].color1));
-					
-					if(css->objects[i].d2)
-					{
-						drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
-					}
-				}
-				break;
-				
-				case ssoMAGICMETER:
-				{
-					magicmeter(dest, x, y);
-				}
-				break;
-				
-				case ssoLIFEMETER:
-				{
-					//lifemeter(dest, x, y, css->objects[i].d1, css->objects[i].d2 != 0);
-					lifemeter(dest, x, y, 1, css->objects[i].d2 != 0);
-				}
-				break;
-				
-				case ssoBUTTONITEM:
-				{
-					if(css->objects[i].d2)
-					{
-						drawing_mode(DRAW_MODE_TRANS, NULL, 0, 0);
-					}
-					//zprint2("Button item ID is: %d\n", css->objects[i].d1);
-					buttonitem(dest, css->objects[i].d1, x, y);
-					
-					if(css->objects[i].d2)
-					{
-						drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
-					}
-				}
-				break;
-				
-				case ssoCOUNTERS:
-				{
-					defaultcounters(dest, x, y, tempfont,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3),css->objects[i].d2 != 0,css->objects[i].d3,css->objects[i].d4,css->objects[i].d5);
-				}
-				break;
-				
-				case ssoCOUNTER:
-				{
-					counter(dest, x, y, tempfont,subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3),css->objects[i].d2,css->objects[i].d3,css->objects[i].d4,css->objects[i].d5,css->objects[i].d6&1, css->objects[i].d7, css->objects[i].d8, css->objects[i].d9, css->objects[i].d10, (css->objects[i].d6&2)!=0);
-				}
-				break;
-				
-				case ssoMINIMAPTITLE:
-				{
-					if(!css->objects[i].d4 || has_item(itype_map, get_dlevel()))
-					{
-						minimaptitle(dest, x, y, tempfont, subscreen_color(css->objects[i].colortype1, css->objects[i].color1),subscreen_color(css->objects[i].colortype2, css->objects[i].color2),subscreen_color(css->objects[i].colortype3, css->objects[i].color3), css->objects[i].d2, css->objects[i].d3);
-					}
-				}
-				break;
-				
-				case ssoMINIMAP:
-				{
-					//drawdmap(dest, x, y, showmap,                 showhero,           showcompass,        herocolor,                                                                 lccolor,                                                                   dccolor)
-					drawdmap(dest, x, y, css->objects[i].d1 != 0, css->objects[i].d2 && !(TheMaps[(DMaps[get_currdmap()].map*MAPSCRS)+get_homescr()].flags7&fNOHEROMARK),
-							 css->objects[i].d3 && !(DMaps[get_currdmap()].flags&dmfNOCOMPASS), subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-				}
-				break;
-				
-				case ssoLARGEMAP:
-				{
-					//putBmap(dest, x, y, showmap,                 showhero,              showrooms,             roomcolor,                                                                 herocolor,                                                                 large)
-					putBmap(dest, x, y, css->objects[i].d1 != 0, css->objects[i].d2!=0, css->objects[i].d3!=0, subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), css->objects[i].d10 != 0);
-				}
-				break;
-				
-				case ssoCLEAR:
-				{
-					clear_to_color(dest,subscreen_color(css->objects[i].colortype1, css->objects[i].color1));
-				}
-				break;
-				
-				case ssoCURRENTITEM:
-				{
-					// Shouldn't really be checking is_zquest here, but it's okay for now...
-					if((css->objects[i].d2&SSCURRITEM_VISIBLE) || (is_zquest() && (zinit.ss_flags&ssflagSHOWINVIS)))
-					{
-						subscreenitem(dest, x, y, css->objects[i].d8>0 ? ((css->objects[i].d8-1) | 0x8000) : css->objects[i].d1);
-					}
-				}
-				break;
-				
-				case ssoTEXTBOX:
-				{
-					//draw_textbox(dest, x, y, w,                 h,                 tempfont, thetext,                     wword,                 tabsize,            alignment,          textstyle,          color,                                                                     shadowcolor,                                                               backcolor)
-					draw_textbox(dest, x, y, css->objects[i].w, css->objects[i].h, tempfont, (char *)css->objects[i].dp1, css->objects[i].d4!=0, css->objects[i].d5, css->objects[i].d2, css->objects[i].d3, subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-					//draw_textbox(dest, 0, 0, 200, 50, get_zc_font(font_sfont), "This is a test", 1, 4, 0, 0, subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-				}
-				break;
-				
-				case ssoSELECTEDITEMNAME:
-				{
-					int32_t itemid=Bweapon(Bpos);
-					
-					// If it's a combined bow and arrow, the item ID will have 0xF000 added.
-					if(itemid>=0xF000)
-						itemid-=0xF000;
-					
-					// 0 can mean either the item with index 0 is selected or there's no
-					// valid item to select, so be sure Hero has whatever it would be.
-					if(!game->get_item(itemid))
-						break;
-						
-					itemdata const& itm = itemsbuf[itemid];
-					char itemname[256]="";
-					strncpy(itemname, itm.get_name().c_str(), 255);
-					
-					draw_textbox(dest, x, y, css->objects[i].w, css->objects[i].h, tempfont, itemname, css->objects[i].d4!=0, css->objects[i].d5, css->objects[i].d2, css->objects[i].d3, subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), subscreen_color(css->objects[i].colortype3, css->objects[i].color3));
-					// draw_textbox(dest, x, y, w,                 h,                 tempfont, thetext,  wword,                 tabsize,            alignment,          textstyle,          color,                                             shadowcolor,                                       backcolor);
-				}
-				break;
-				
-				case ssoTRIFRAME:
-				{
-					//puttriframe(dest, x, y, triframecolor,                                                             numbercolor,                                                               triframetile,       triframecset,       triforcetile,       triforcecset,       showframe,             showpieces,            largepieces)
-					puttriframe(dest, x, y, subscreen_color(css->objects[i].colortype1, css->objects[i].color1), subscreen_color(css->objects[i].colortype2, css->objects[i].color2), css->objects[i].d1, css->objects[i].d2, css->objects[i].d3, css->objects[i].d4, css->objects[i].d5!=0, css->objects[i].d6!=0, css->objects[i].d7!=0);
-				}
-				break;
-				
-				case ssoTRIFORCE:
-				{
-					puttriforce(dest,x,y,css->objects[i].d1,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].w,css->objects[i].h,css->objects[i].d2,css->objects[i].d3!=0,css->objects[i].d4!=0,css->objects[i].d5);
-				}
-				break;
-				
-				case ssoTILEBLOCK:
-				{
-					draw_block_flip(dest,x,y,css->objects[i].d1,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].w,css->objects[i].h,css->objects[i].d2,css->objects[i].d3!=0,css->objects[i].d4!=0);
-				}
-				break;
-				
-				case ssoMINITILE:
-				{
-					int32_t t=css->objects[i].d1;
-					
-					if(t==-1)
-					{
-						switch(css->objects[i].d2)
-						{
-							case ssmstSSVINETILE:
-								t=wpnsbuf[iwSubscreenVine].tile*4;
-								break;
-								
-							case ssmstMAGICMETER:
-								t=wpnsbuf[iwMMeter].tile*4;
-								break;
-								
-							default:
-								t=(zc_oldrand()*100000)%32767;
-								break;
-						}
-					}
-					
-					t+=css->objects[i].d3;
-					
-					if(css->objects[i].d5)
-					{
-						if(css->objects[i].d6)
-						{
-							overtiletranslucent8(dest,t,x,y,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].d4,128);
-						}
-						else
-						{
-							overtile8(dest,t,x,y,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].d4);
-						}
-					}
-					else
-					{
-						if(css->objects[i].d6)
-						{
-							puttiletranslucent8(dest,t,x,y,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].d4,128);
-						}
-						else
-						{
-							oldputtile8(dest,t,x,y,subscreen_cset(css->objects[i].colortype1, css->objects[i].color1),css->objects[i].d4);
-						}
-					}
-				}
-				break;
-				
-				case ssoSELECTOR1:
-				case ssoSELECTOR2:
-				{
-					int32_t p=-1;
-					
-					for(int32_t j=0; j<MAXSUBSCREENITEMS&&css->objects[j].type!=ssoNULL; ++j)
-					{
-						if(css->objects[j].type==ssoCURRENTITEM)
-						{
-							if(css->objects[j].d3==(int32_t)Bpos)
-							{
-								p=j;
-								break;
-							}
-						}
-					}
-					
-					bool big_sel=css->objects[i].d5 != 0;
-					item *tempsel=(css->objects[i].type==ssoSELECTOR1)?sel_a:sel_b;
-					int32_t temptile=tempsel->tile;
-					tempsel->drawstyle=0;
-					
-					if(css->objects[i].d4)
-					{
-						tempsel->drawstyle=1;
-					}
-					int32_t itemtype = css->objects[p].d8>0 ? ((css->objects[p].d8-1) | 0x8000) : css->objects[p].d1;
-					itemdata const& tmpitm = itemsbuf[get_subscreenitem_id(itemtype, true)];
-					bool oldsel = get_qr(qr_SUBSCR_OLD_SELECTOR);
-					if(!oldsel) big_sel = false;
-					int32_t sw = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : (tempsel->extend > 2 ? tempsel->hit_width : 16),
-						sh = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : (tempsel->extend > 2 ? tempsel->hit_height : 16),
-						dw = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_WIDTH) ? tmpitm.hxsz : 16),
-						dh = oldsel ? (tempsel->extend > 2 ? tempsel->txsz*16 : 16) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_HEIGHT) ? tmpitm.hysz : 16);
-					int32_t sxofs = oldsel ? 0 : (tempsel->extend > 2 ? tempsel->hxofs : 0),
-						syofs = oldsel ? 0 : (tempsel->extend > 2 ? tempsel->hyofs : 0),
-						dxofs = oldsel ? (tempsel->extend > 2 ? (int)tempsel->xofs : 0) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_X_OFFSET) ? tmpitm.hxofs : 0) + (tempsel->extend > 2 ? (int)tempsel->xofs : 0),
-						dyofs = oldsel ? (tempsel->extend > 2 ? (int)tempsel->yofs : 0) : ((tmpitm.overrideFLAGS & itemdataOVERRIDE_HIT_Y_OFFSET) ? tmpitm.hyofs : 0) + (tempsel->extend > 2 ? (int)tempsel->yofs : 0);
-					BITMAP* tmpbmp = create_bitmap_ex(8,sw,sh);
-					for(int32_t j=0; j<4; ++j)
-					{
-						clear_bitmap(tmpbmp);
-						if(p!=-1)
-						{
-							tempsel->x=0;
-							tempsel->y=0;
-							int32_t tmpx = css->objects[p].x+xofs+(big_sel?(j%2?8:-8):0);
-							int32_t tmpy = css->objects[p].y+yofs+(big_sel?(j>1?8:-8):0);
-							tempsel->tile+=(zc_max(itemsbuf[tempsel->id].frames,1)*j);
-							
-							if(temptile)
-							{
-								tempsel->drawzcboss(tmpbmp);
-								tempsel->tile=temptile;
-							}
-							masked_stretch_blit(tmpbmp, dest, vbound(sxofs, 0, sw), vbound(syofs, 0, sh), sw-vbound(sxofs, 0, sw), sh-vbound(syofs, 0, sh), tmpx+dxofs, tmpy+dyofs, dw, dh);
-							
-							if(!big_sel)
-							{
-								break;
-							}
-						}
-					}
-					destroy_bitmap(tmpbmp);
-				}
-				break;
-				
-				case ssoMAGICGAUGE:
-				{
-					//          void magicgauge(BITMAP *dest,int32_t x,int32_t y, int32_t container, int32_t notlast_tile, int32_t notlast_cset, bool notlast_mod, int32_t last_tile, int32_t last_cset, bool last_mod,
-					//                          int32_t cap_tile, int32_t cap_cset, bool cap_mod, int32_t aftercap_tile, int32_t aftercap_cset, bool aftercap_mod, int32_t frames, int32_t speed, int32_t delay, bool unique_last,
-					//                          int32_t show)
-					magicgauge(dest,x,y, css->objects[i].d1, css->objects[i].d2, css->objects[i].colortype1, ((css->objects[i].d10&1)?1:0), css->objects[i].d3, css->objects[i].color1, ((css->objects[i].d10&2)?1:0),
-							   css->objects[i].d4, css->objects[i].colortype2, ((css->objects[i].d10&4)?1:0), css->objects[i].d5, css->objects[i].color2, ((css->objects[i].d10&8)?1:0), css->objects[i].d6, css->objects[i].d7, css->objects[i].d8, ((css->objects[i].d10&16)?1:0),
-							   css->objects[i].d9);
-				}
-				break;
-				
-				case ssoLIFEGAUGE:
-				{
-					lifegauge(dest,x,y, css->objects[i].d1, css->objects[i].d2, css->objects[i].colortype1, ((css->objects[i].d10&1)?1:0), css->objects[i].d3, css->objects[i].color1, ((css->objects[i].d10&2)?1:0),
-							  css->objects[i].d4, css->objects[i].colortype2, ((css->objects[i].d10&4)?1:0), css->objects[i].d5, css->objects[i].color2, ((css->objects[i].d10&8)?1:0), css->objects[i].d6, css->objects[i].d7, css->objects[i].d8, ((css->objects[i].d10&16)?1:0));
-				}
-				break;
-				
-				default:
-				{
-				}
-				break;
-			}
-			
-			//sso_bounding_box(dest, css, i, vc(15));
-		}
-	}
+	
+	subscr->draw(dest,xofs,yofs,pos2,showtime);
 }
 
 std::string get_subscr_arrow_name(int itemid)
@@ -4598,7 +3979,7 @@ void put_passive_subscr(BITMAP *dest,int32_t x,int32_t y,bool showtime,int32_t p
         return;
     }
     
-    show_custom_subscreen(subscr, current_subscreen_passive, 0, 0, showtime, pos2);
+    show_custom_subscreen(subscr, new_subscreen_passive, 0, 0, showtime, pos2);
     destroy_bitmap(subscr);
 }
 
@@ -4779,7 +4160,6 @@ void puttriframe(BITMAP *dest, int32_t x, int32_t y, int32_t triframecolor, int3
     }
 }
 
-
 void puttriforce(BITMAP *dest, int32_t x, int32_t y, int32_t tile, int32_t cset, int32_t w, int32_t h, int32_t flip, bool overlay, bool trans, int32_t trinum)
 {
     if(tile==0)
@@ -4959,7 +4339,6 @@ void putBmap(BITMAP *dest, int32_t x, int32_t y,bool showmap, bool showrooms, bo
     }
 }
 
-
 void load_Sitems()
 {
     Sitems.clear();
@@ -5018,729 +4397,47 @@ void load_Sitems()
 
 void update_subscreens(int32_t dmap)
 {
-    if(dmap<0)
-        dmap=get_currdmap();
-        
-    int32_t index=DMaps[dmap].active_subscreen;
-    
-    int32_t i=-1, j=0;
-    
-    while(custom_subscreen[j].objects[0].type!=ssoNULL&&i!=index)
-    {
-        if(custom_subscreen[j].ss_type==sstACTIVE)
-        {
-            ++i;
-        }
-        
-        ++j;
-    }
-    
-    current_subscreen_active=&custom_subscreen[j-1];
-    
-    index=DMaps[dmap].passive_subscreen;
-    
-    i=-1, j=0;
-    
-    while(custom_subscreen[j].objects[0].type!=ssoNULL&&i!=index)
-    {
-        if(custom_subscreen[j].ss_type==sstPASSIVE)
-        {
-            ++i;
-        }
-        
-        ++j;
-    }
-    
-    current_subscreen_passive=&custom_subscreen[j-1];
-}
-
-int32_t ss_objects(subscreen_group *tempss)
-{
-    int32_t i=0;
-    
-    while(i<MAXSUBSCREENITEMS&&tempss->objects[i].type!=ssoNULL)
-    {
-        ++i;
-    }
-    
-    return i;
+	if(dmap<0)
+		dmap=get_currdmap();
+		
+	int32_t index=DMaps[dmap].active_subscreen;
+	
+	int32_t i=-1, j=0;
+	
+	while(j < new_subscreen.size() && i!=index)
+	{
+		if(new_subscreen[j].sub_type==sstACTIVE)
+			++i;
+		
+		++j;
+	}
+	
+	new_subscreen_active=&new_subscreen[j-1];
+	
+	index=DMaps[dmap].passive_subscreen;
+	
+	i=-1, j=0;
+	
+	while(j < new_subscreen.size() && i!=index)
+	{
+		if(new_subscreen[j].sub_type==sstPASSIVE)
+			++i;
+		
+		++j;
+	}
+	
+	new_subscreen_passive=&new_subscreen[j-1];
 }
 
-
-void purge_blank_subscreen_objects(subscreen_group *tempss)
+void sso_bounding_box(BITMAP *bmp, SubscrWidget* widg, int32_t color)
 {
-    int32_t objects=ss_objects(tempss);
-    subscreen_object tempsso;
+    if(!widg)
+		return;
     
-    //filter all the ssoNONE items to the end (yeah, bubble sort; sue me)
-    for(int32_t j=0; j<objects-1; j++)
-    {
-        for(int32_t k=0; k<objects-1-j; k++)
-        {
-            if(tempss->objects[k].type==ssoNONE)
-            {
-                tempsso=tempss->objects[k];
-                tempss->objects[k]=tempss->objects[k+1];
-                tempss->objects[k+1]=tempsso;
-            }
-        }
-    }
-    
-    //NULL out the ssoNONE items
-    for(int32_t j=0; j<objects; j++)
-    {
-        if(tempss->objects[j].type==ssoNONE)
-        {
-            tempss->objects[j].type=ssoNULL;
-        }
-    }
-}
-
-
-
-int32_t get_alignment(subscreen_object *tempsso)
-{
-    switch(tempsso->type)
-    {
-    case ssoTEXT:
-        return tempsso->d2;
-        break;
-        
-    case ssoBSTIME:
-        return sstaLEFT;
-        break;
-        
-    case ssoTIME:
-        return sstaRIGHT;
-        break;
-        
-    case ssoSSTIME:
-        return sstaRIGHT;
-        break;
-        
-    case ssoCOUNTER:
-        return tempsso->d2;
-        break;
-        
-    case ssoMINIMAPTITLE:
-        return tempsso->d2;
-        break;
-        
-    case ssoCURRENTITEMTEXT:
-    case ssoCURRENTITEMNAME:
-    case ssoSELECTEDITEMNAME:
-    case ssoCURRENTITEMCLASSTEXT:
-    case ssoCURRENTITEMCLASSNAME:
-    case ssoSELECTEDITEMCLASSNAME:
-        return sstaLEFT;
-        break;
-        
-    case ssoNONE:
-    case sso2X2FRAME:
-    case ssoLINE:
-    case ssoRECT:
-    case ssoMAGICMETER:
-    case ssoLIFEMETER:
-    case ssoBUTTONITEM:
-    case ssoICON:
-    case ssoCOUNTERS:
-    case ssoMINIMAP:
-    case ssoLARGEMAP:
-    case ssoCLEAR:
-    case ssoCURRENTITEM:
-    case ssoITEM:
-    case ssoTRIFRAME:
-    case ssoTRIFORCE:
-    case ssoTILEBLOCK:
-    case ssoMINITILE:
-    case ssoSELECTOR1:
-    case ssoSELECTOR2:
-    case ssoMAGICGAUGE:
-    case ssoLIFEGAUGE:
-    case ssoTEXTBOX:
-    case ssoCURRENTITEMTILE:
-    case ssoSELECTEDITEMTILE:
-    default:
-        return sstaLEFT;
-        break;
-    }
-    
-//  return false;//UNREACHABLE
-}
-
-//enum { sstsNORMAL, sstsSHADOW, sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsSHADOWED, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX, sstsMAX };
-//       "None",     "Shadow",   "Shadow (U)","Shadow (O)", "Shadow (+)",    "Shadow (X)", "Shadowed",   "Shadowed (U)","Shadowed (O)","Shadowed (+)",   "Shadowed (X)"
-//x-1
-//sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX
-//w+1
-//sstsSHADOW, sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsSHADOWED, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX
-//y-1
-//sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX
-//h+1
-//sstsSHADOW, sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsSHADOWED, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX
-
-int32_t sso_y(subscreen_object *tempsso)
-{
-    int32_t y=0;
-    
-    switch(tempsso->type)
-    {
-    case ssoLIFEMETER:
-        y=tempsso->y+(tempsso->d2?0:(tempsso->d3?8:16));
-        break;
-        
-    case ssoNONE:
-    case sso2X2FRAME:
-    case ssoTEXT:
-    case ssoLINE:
-    case ssoRECT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoMAGICMETER:
-    case ssoBUTTONITEM:
-    case ssoICON:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-    case ssoMINIMAPTITLE:
-    case ssoMINIMAP:
-    case ssoLARGEMAP:
-    case ssoCLEAR:
-    case ssoCURRENTITEM:
-    case ssoITEM:
-    case ssoTRIFRAME:
-    case ssoTRIFORCE:
-    case ssoTILEBLOCK:
-    case ssoMINITILE:
-    case ssoSELECTOR1:
-    case ssoSELECTOR2:
-    case ssoMAGICGAUGE:
-    case ssoLIFEGAUGE:
-    case ssoTEXTBOX:
-    case ssoCURRENTITEMTILE:
-    case ssoSELECTEDITEMTILE:
-    case ssoCURRENTITEMTEXT:
-    case ssoCURRENTITEMNAME:
-    case ssoSELECTEDITEMNAME:
-    case ssoCURRENTITEMCLASSTEXT:
-    case ssoCURRENTITEMCLASSNAME:
-    case ssoSELECTEDITEMCLASSNAME:
-        y=tempsso->y;
-        break;
-        
-    default:
-        y=(zc_oldrand()*1000)%64;
-        break;
-    }
-    
-    switch(tempsso->type)
-    {
-    case ssoTEXT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-        switch(tempsso->d3)
-        {
-        case sstsOUTLINE8:
-        case sstsOUTLINEPLUS:
-        case sstsOUTLINEX:
-        case sstsOUTLINED8:
-        case sstsOUTLINEDPLUS:
-        case sstsOUTLINEDX:
-            y-=1;
-            break;
-        }
-        
-        break;
-    }
-    
-    return y;
-}
-
-int32_t sso_x(subscreen_object *tempsso)
-{
-    int32_t x=0;
-    
-    switch(tempsso->type)
-    {
-    case ssoMAGICMETER:
-        x=tempsso->x-10;
-        break;
-        
-    case ssoNONE:
-    case sso2X2FRAME:
-    case ssoTEXT:
-    case ssoLINE:
-    case ssoRECT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoLIFEMETER:
-    case ssoBUTTONITEM:
-    case ssoICON:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-    case ssoMINIMAPTITLE:
-    case ssoMINIMAP:
-    case ssoLARGEMAP:
-    case ssoCLEAR:
-    case ssoCURRENTITEM:
-    case ssoITEM:
-    case ssoTRIFRAME:
-    case ssoTRIFORCE:
-    case ssoTILEBLOCK:
-    case ssoMINITILE:
-    case ssoSELECTOR1:
-    case ssoSELECTOR2:
-    case ssoMAGICGAUGE:
-    case ssoLIFEGAUGE:
-    case ssoTEXTBOX:
-    case ssoCURRENTITEMTILE:
-    case ssoSELECTEDITEMTILE:
-    case ssoCURRENTITEMTEXT:
-    case ssoCURRENTITEMNAME:
-    case ssoSELECTEDITEMNAME:
-    case ssoCURRENTITEMCLASSTEXT:
-    case ssoCURRENTITEMCLASSNAME:
-    case ssoSELECTEDITEMCLASSNAME:
-        x=tempsso->x;
-        break;
-        
-    default:
-        x=(zc_oldrand()*1000)%64;
-        break;
-    }
-    
-    switch(tempsso->type)
-    {
-    case ssoTEXT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-        switch(tempsso->d3)
-        {
-        case sstsSHADOWU:
-        case sstsOUTLINE8:
-        case sstsOUTLINEPLUS:
-        case sstsOUTLINEX:
-        case sstsSHADOWEDU:
-        case sstsOUTLINED8:
-        case sstsOUTLINEDPLUS:
-        case sstsOUTLINEDX:
-            x-=1;
-            break;
-        }
-        
-        break;
-    }
-    
-    return x;
-}
-
-
-
-int32_t sso_h(subscreen_object *tempsso)
-{
-    int32_t h=0;
-    
-    switch(tempsso->type)
-    {
-    case ssoNONE:
-        h=5;
-        break;
-        
-    case sso2X2FRAME:
-        h=tempsso->h*8;
-        break;
-        
-    case ssoTEXT:
-        h=text_height(ss_font(tempsso->d1));
-        break;
-        
-    case ssoLINE:
-        h=tempsso->h;
-        break;
-        
-    case ssoRECT:
-        h=tempsso->h;
-        break;
-        
-    case ssoBSTIME:
-        h=text_height(ss_font(tempsso->d1));
-        break;
-        
-    case ssoTIME:
-        h=text_height(ss_font(tempsso->d1));
-        break;
-        
-    case ssoSSTIME:
-        h=text_height(ss_font(tempsso->d1));
-        break;
-        
-    case ssoMAGICMETER:
-        h=8;
-        break;
-        
-    case ssoLIFEMETER:
-        h=tempsso->d3?24:16;
-        break;
-        
-    case ssoBUTTONITEM:
-        h=16;
-        break;
-        
-    case ssoICON:
-        h=8;
-        break;
-        
-    case ssoCOUNTER:
-        h=text_height(ss_font(tempsso->d1));
-        break;
-        
-    case ssoCOUNTERS:
-        h=32;
-        break;
-        
-    case ssoMINIMAPTITLE:
-        h=16;
-        break;
-        
-    case ssoMINIMAP:
-        h=48;
-        break;
-        
-    case ssoLARGEMAP:
-        h=80;
-        break;
-        
-    case ssoCLEAR:
-        h=5;
-        break;
-        
-    case ssoCURRENTITEM:
-        h=16;
-        break;
-        
-    case ssoITEM:
-        h=16;
-        break;
-        
-    case ssoTRIFRAME:
-        h=16*((tempsso->d7)?7:3);
-        break;
-        
-    case ssoTRIFORCE:
-        h=16;
-        break;
-        
-    case ssoTILEBLOCK:
-        h=16*(tempsso->h);
-        break;
-        
-    case ssoMINITILE:
-        h=8;
-        break;
-        
-    case ssoSELECTOR1:
-    case ssoSELECTOR2:
-        h=tempsso->d5?32:16;
-        break;
-        
-    case ssoMAGICGAUGE:
-        h=8;
-        break;
-        
-    case ssoLIFEGAUGE:
-        h=8;
-        break;
-        
-    case ssoTEXTBOX:
-        h=tempsso->h;
-        break;
-        
-    case ssoCURRENTITEMTILE:
-        h=16;
-        break;
-        
-    case ssoSELECTEDITEMTILE:
-        h=16;
-        break;
-        
-    case ssoCURRENTITEMTEXT:
-        h=16;
-        break;
-        
-    case ssoCURRENTITEMNAME:
-        h=tempsso->h;
-        break;
-        
-    case ssoSELECTEDITEMNAME:
-        h=tempsso->h;
-        break;
-        
-    case ssoCURRENTITEMCLASSTEXT:
-        h=tempsso->h;
-        break;
-        
-    case ssoCURRENTITEMCLASSNAME:
-        h=tempsso->h;
-        break;
-        
-    case ssoSELECTEDITEMCLASSNAME:
-        h=tempsso->h;
-        break;
-        
-    default:
-        h=(zc_oldrand()*1000)%64;
-        break;
-    }
-    
-    switch(tempsso->type)
-    {
-    case ssoTEXT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-        switch(tempsso->d3)
-        {
-        case sstsSHADOW:
-        case sstsSHADOWU:
-        case sstsOUTLINE8:
-        case sstsOUTLINEPLUS:
-        case sstsOUTLINEX:
-        case sstsSHADOWED:
-        case sstsSHADOWEDU:
-        case sstsOUTLINED8:
-        case sstsOUTLINEDPLUS:
-        case sstsOUTLINEDX:
-            h+=1;
-            break;
-        }
-        
-        break;
-    }
-    
-    return h;
-}
-
-int32_t sso_w(subscreen_object *tempsso)
-{
-    int32_t w=0;
-    
-    switch(tempsso->type)
-    {
-    case ssoNONE:
-        w=5;
-        break;
-        
-    case sso2X2FRAME:
-        w=tempsso->w*8;
-        break;
-        
-    case ssoTEXT:
-        w=text_length(ss_font(tempsso->d1), (char *)tempsso->dp1);
-        break;
-        
-    case ssoLINE:
-        w=tempsso->w;
-        break;
-        
-    case ssoRECT:
-        w=tempsso->w;
-        break;
-        
-    case ssoBSTIME:
-        w=text_length(ss_font(tempsso->d1), time_str_short2(game->get_time()));
-        break;
-        
-    case ssoTIME:
-        w=text_length(ss_font(tempsso->d1), time_str_med(game->get_time()));
-        break;
-        
-    case ssoSSTIME:
-        w=text_length(ss_font(tempsso->d1), time_str_med(game->get_time()));
-        break;
-        
-    case ssoMAGICMETER:
-        w=82;
-        break;
-        
-    case ssoLIFEMETER:
-        w=64;
-        break;
-        
-    case ssoBUTTONITEM:
-        w=16;
-        break;
-        
-    case ssoICON:
-        w=8;
-        break;
-        
-    case ssoCOUNTER:
-        w=text_length(ss_font(tempsso->d1), "0")*tempsso->d4;
-        break;
-        
-    case ssoCOUNTERS:
-        w=32;
-        break;
-        
-    case ssoMINIMAPTITLE:
-        w=80;
-        break;
-        
-    case ssoMINIMAP:
-        w=80;
-        break;
-        
-    case ssoLARGEMAP:
-        w=16*((tempsso->d4)?9:7);
-        break;
-        
-    case ssoCLEAR:
-        w=5;
-        break;
-        
-    case ssoCURRENTITEM:
-        w=16;
-        break;
-        
-    case ssoITEM:
-        w=16;
-        break;
-        
-    case ssoTRIFRAME:
-        w=16*((tempsso->d7)?7:6);
-        break;
-        
-    case ssoTRIFORCE:
-        w=16;
-        break;
-        
-    case ssoTILEBLOCK:
-        w=16*(tempsso->w);
-        break;
-        
-    case ssoMINITILE:
-        w=8;
-        break;
-        
-    case ssoSELECTOR1:
-    case ssoSELECTOR2:
-        w=tempsso->d5?32:16;
-        break;
-        
-    case ssoMAGICGAUGE:
-        w=8;
-        break;
-        
-    case ssoLIFEGAUGE:
-        w=8;
-        break;
-        
-    case ssoTEXTBOX:
-        w=tempsso->w;
-        break;
-        
-    case ssoCURRENTITEMTILE:
-        w=16;
-        break;
-        
-    case ssoSELECTEDITEMTILE:
-        w=16;
-        break;
-        
-    case ssoCURRENTITEMTEXT:
-        w=16;
-        break;
-        
-    case ssoCURRENTITEMNAME:
-        w=tempsso->w;
-        break;
-        
-    case ssoSELECTEDITEMNAME:
-        w=tempsso->w;
-        break;
-        
-    case ssoCURRENTITEMCLASSTEXT:
-        w=tempsso->w;
-        break;
-        
-    case ssoCURRENTITEMCLASSNAME:
-        w=tempsso->w;
-        break;
-        
-    case ssoSELECTEDITEMCLASSNAME:
-        w=tempsso->w;
-        break;
-        
-    default:
-        w=(zc_oldrand()*1000)%64;
-        break;
-    }
-    
-    switch(tempsso->type)
-    {
-    case ssoTEXT:
-    case ssoBSTIME:
-    case ssoTIME:
-    case ssoSSTIME:
-    case ssoCOUNTER:
-    case ssoCOUNTERS:
-        switch(tempsso->d3)
-        {
-        case sstsSHADOW:
-        case sstsSHADOWU:
-        case sstsOUTLINE8:
-        case sstsOUTLINEPLUS:
-        case sstsOUTLINEX:
-        case sstsSHADOWED:
-        case sstsSHADOWEDU:
-        case sstsOUTLINED8:
-        case sstsOUTLINEDPLUS:
-        case sstsOUTLINEDX:
-            w+=1;
-            break;
-        }
-        
-        break;
-    }
-    
-    return w;
-}
-
-void sso_bounding_box(BITMAP *bmp, subscreen_group *tempss, int32_t index, int32_t color)
-{
-    if(index<0)
-    {
-        return;
-    }
-    
-    int32_t x=sso_x(&tempss->objects[index]);
-    int32_t y=sso_y(&tempss->objects[index]);
-    int32_t w=sso_w(&tempss->objects[index]);
-    int32_t h=sso_h(&tempss->objects[index]);
-    
-    switch(get_alignment(&tempss->objects[index]))
-    {
-    case sstaCENTER:
-        x-=(w/2);
-        break;
-        
-    case sstaRIGHT:
-        x-=w;
-        break;
-        
-    case sstaLEFT:
-    default:
-        break;
-    }
+    int32_t x=widg->getX()+widg->getXOffs();
+    int32_t y=widg->getY();
+    int32_t w=widg->getW();
+    int32_t h=widg->getH();
     
     int32_t c=x+w/2;
     int32_t m=y+h/2;
diff --git a/src/subscr.h b/src/subscr.h
index 0537bb5fb6..a2ea26f94b 100644
--- a/src/subscr.h
+++ b/src/subscr.h
@@ -13,14 +13,12 @@
 
 #include "sprite.h"
 #include "items.h"
+#include "new_subscr.h"
 #include <stdio.h>
 
 #define ssflagSHOWGRID  1
 #define ssflagSHOWINVIS 2
 
-#define SSCURRITEM_VISIBLE  0x01
-#define SSCURRITEM_NONEQUIP 0x02
-
 extern bool show_subscreen_dmap_dots;
 extern bool show_subscreen_numbers;
 extern bool show_subscreen_items;
@@ -53,13 +51,6 @@ enum { sstACTIVE, sstPASSIVE, sstMAX };
 
 enum { sssFULLPUSH, sssFULLSLIDEDOWN, sssMAX };
 
-// subscreen object types
-enum { ssoNULL, ssoNONE, sso2X2FRAME, ssoTEXT,
-       ssoLINE, ssoRECT, ssoBSTIME, ssoTIME, ssoSSTIME, ssoMAGICMETER, ssoLIFEMETER, ssoBUTTONITEM, ssoICON, ssoCOUNTER,
-       ssoCOUNTERS, ssoMINIMAPTITLE, ssoMINIMAP, ssoLARGEMAP, ssoCLEAR, ssoCURRENTITEM, ssoITEM, ssoTRIFRAME, ssoTRIFORCE, ssoTILEBLOCK, ssoMINITILE, ssoSELECTOR1, ssoSELECTOR2,
-       ssoMAGICGAUGE, ssoLIFEGAUGE, ssoTEXTBOX, ssoCURRENTITEMTILE, ssoSELECTEDITEMTILE, ssoCURRENTITEMTEXT, ssoCURRENTITEMNAME, ssoSELECTEDITEMNAME, ssoCURRENTITEMCLASSTEXT,
-       ssoCURRENTITEMCLASSNAME, ssoSELECTEDITEMCLASSNAME, ssoMAX
-     };
 //ssoCURRENTITEM shows what item of that type you currently have.  if the itemtype is sword, it will show what sword you have
 //ssoBUTTONITEM shows what item is currently assigned to the A or B button
 //ssoITEMTILE shows a requested item
@@ -72,65 +63,6 @@ enum { ssoNULL, ssoNONE, sso2X2FRAME, ssoTEXT,
 //ssoCURRENTITEMCLASSNAME shows the name of an item if you have the item requested.  if itemtype is set to boomerang and you have a wooden boomerang, it will show the name of the item "Wooden Boomerang"
 //ssoSELECTEDITEMCLASSNAME shows the name of of the item class that the selection cursor is on.
 
-//text styles
-enum { sstsNORMAL, sstsSHADOW, sstsSHADOWU, sstsOUTLINE8, sstsOUTLINEPLUS, sstsOUTLINEX, sstsSHADOWED, sstsSHADOWEDU, sstsOUTLINED8, sstsOUTLINEDPLUS, sstsOUTLINEDX, sstsMAX };
-
-//subscreen fonts
-enum
-{ 
-	ssfZELDA, ssfSS1, ssfSS2, ssfSS3, ssfSS4, ssfZTIME, ssfSMALL, ssfSMALLPROP, ssfZ3SMALL,
-	ssfGBLA, ssfZ3, ssfGORON, ssfZORAN, ssfHYLIAN1, ssfHYLIAN2, ssfHYLIAN3, ssfHYLIAN4,
-	ssfPROP, ssfGBORACLE, ssfGBORACLEP, ssfDSPHANTOM, ssfDSPHANTOMP, ssfAT800, ssfACORN,
-	ssADOS, ssfALLEG, ssfAPL2, ssfAPL280, ssfAPL2GS, ssfAQUA, ssfAT400, ssfC64, ssfC64HR,
-	ssfCGA, ssfCOCO, ssfCOCO2, ssfCOUPE, ssfCPC, ssfFANTASY, ssfFDSKANA, ssfFDSLIKE,
-	ssfFDSROM, ssfFF, ssfFUTHARK, ssfGAIA, ssfHIRA, ssfJP, ssfKONG, ssfMANA, ssfML, ssfMOT,
-	ssfMSX0, ssfMSX1, ssfPET, ssfPSTART, ssfSATURN, ssfSCIFI, ssfSHERW, ssfSINQL, ssfSPEC,
-	ssfSPECLG, ssfTI99, ssfTRS, ssfZ2, ssfZX, ssfLISA,
-	ssfMAX
-};
-
-// subscreen color types
-enum { ssctSYSTEM=0xFE, ssctMISC=0xFF };
-
-// special colors
-enum { ssctTEXT, ssctCAPTION, ssctOVERWBG, ssctDNGNBG, ssctDNGNFG, ssctCAVEFG, ssctBSDK, ssctBSGOAL, ssctCOMPASSLT, ssctCOMPASSDK, ssctSUBSCRBG, ssctSUBSCRSHADOW,
-       ssctTRIFRAMECOLOR, ssctBMAPBG, ssctBMAPFG, ssctHERODOT, ssctMSGTEXT, ssctMAX
-     };
-
-// special csets
-enum { sscsTRIFORCECSET, sscsTRIFRAMECSET, sscsOVERWORLDMAPCSET, sscsDUNGEONMAPCSET, sscsBLUEFRAMECSET, sscsHCPIECESCSET, sscsSSVINECSET, sscsMAX };
-
-// special tiles
-enum { ssmstSSVINETILE, ssmstMAGICMETER, ssmstMAX };
-
-
-// counter objects
-enum { sscRUPEES, sscBOMBS, sscSBOMBS, sscARROWS,
-	   sscGENKEYMAGIC, sscGENKEYNOMAGIC, sscLEVKEYMAGIC, sscLEVKEYNOMAGIC,
-	   sscANYKEYMAGIC, sscANYKEYNOMAGIC, sscSCRIPT1, sscSCRIPT2,
-	   sscSCRIPT3, sscSCRIPT4, sscSCRIPT5, sscSCRIPT6,
-	   sscSCRIPT7, sscSCRIPT8, sscSCRIPT9, sscSCRIPT10,
-	   sscSCRIPT11, sscSCRIPT12, sscSCRIPT13, sscSCRIPT14,
-	   sscSCRIPT15, sscSCRIPT16, sscSCRIPT17, sscSCRIPT18,
-	   sscSCRIPT19, sscSCRIPT20, sscSCRIPT21, sscSCRIPT22,
-	   sscSCRIPT23, sscSCRIPT24, sscSCRIPT25, sscLIFE, sscMAGIC, sscMAXHP, sscMAXMP,
-	   sscSCRIPT26, sscSCRIPT27, sscSCRIPT28, sscSCRIPT29, sscSCRIPT30,
-	   sscSCRIPT31, sscSCRIPT32, sscSCRIPT33, sscSCRIPT34, sscSCRIPT35,
-	   sscSCRIPT36, sscSCRIPT37, sscSCRIPT38, sscSCRIPT39, sscSCRIPT40,
-	   sscSCRIPT41, sscSCRIPT42, sscSCRIPT43, sscSCRIPT44, sscSCRIPT45,
-	   sscSCRIPT46, sscSCRIPT47, sscSCRIPT48, sscSCRIPT49, sscSCRIPT50,
-	   sscSCRIPT51, sscSCRIPT52, sscSCRIPT53, sscSCRIPT54, sscSCRIPT55,
-	   sscSCRIPT56, sscSCRIPT57, sscSCRIPT58, sscSCRIPT59, sscSCRIPT60,
-	   sscSCRIPT61, sscSCRIPT62, sscSCRIPT63, sscSCRIPT64, sscSCRIPT65,
-	   sscSCRIPT66, sscSCRIPT67, sscSCRIPT68, sscSCRIPT69, sscSCRIPT70,
-	   sscSCRIPT71, sscSCRIPT72, sscSCRIPT73, sscSCRIPT74, sscSCRIPT75,
-	   sscSCRIPT76, sscSCRIPT77, sscSCRIPT78, sscSCRIPT79, sscSCRIPT80,
-	   sscSCRIPT81, sscSCRIPT82, sscSCRIPT83, sscSCRIPT84, sscSCRIPT85,
-	   sscSCRIPT86, sscSCRIPT87, sscSCRIPT88, sscSCRIPT89, sscSCRIPT90,
-	   sscSCRIPT91, sscSCRIPT92, sscSCRIPT93, sscSCRIPT94, sscSCRIPT95,
-	   sscSCRIPT96, sscSCRIPT97, sscSCRIPT98, sscSCRIPT99, sscSCRIPT100,
-	   sscMAX
-     };
 int32_t scounter_to_ctr(int32_t ssc);
 
 
@@ -141,8 +73,6 @@ int32_t scounter_to_ctr(int32_t ssc);
        ssiSPINSCROLL, ssiCROSSSCROLL, ssiQUAKESCROLL, ssiWHISPRING, ssiCHARGERING, ssiPERILSCROLL, ssiWEALTHMEDAL, ssiHEARTRING, ssiMAGICRING, ssiSPINSCROLL2,
        ssiQUAKESCROLL2, ssiAGONY, ssiSTOMPBOOTS, ssiWHIMSICALRING, ssiPERILRING, ssiMAX };*/
 
-//subscreen text alignment
-enum { sstaLEFT, sstaCENTER, sstaRIGHT };
 
 //when to display an element
 #define sspUP 1
@@ -158,43 +88,6 @@ struct sso_struct
 extern sso_struct bisso[ssoMAX];
 
 
-struct subscreen_object
-{
-    byte  type;
-    byte  pos;
-    int16_t  x;
-    int16_t  y;
-    word  w;
-    word  h;
-    byte  colortype1;
-    int16_t color1;
-    byte  colortype2;
-    int16_t color2;
-    byte  colortype3;
-    int16_t color3;
-    int32_t   d1;
-    int32_t   d2;
-    int32_t   d3; //pos
-    int32_t   d4; //up
-    int32_t   d5; //down
-    int32_t   d6; //left
-    int32_t   d7; //right
-    int32_t   d8;
-    int32_t   d9;
-    int32_t   d10;
-    byte  frames;
-    byte  speed;
-    byte  delay;
-    word  frame;
-    void  *dp1;
-};
-
-struct subscreen_group
-{
-    byte             ss_type;
-    char             name[64];
-    subscreen_object objects[MAXSUBSCREENITEMS];
-};
 
 
 
@@ -207,9 +100,9 @@ extern subscreen_object z3_active_a[80];
 extern subscreen_object z3_passive_a[66];
 extern subscreen_object z3_active_ab[82];
 extern subscreen_object z3_passive_ab[75];
-extern subscreen_group custom_subscreen[MAXCUSTOMSUBSCREENS];
-extern subscreen_group *current_subscreen_active;
-extern subscreen_group *current_subscreen_passive;
+extern std::vector<ZCSubscreen> new_subscreen;
+extern ZCSubscreen *new_subscreen_active;
+extern ZCSubscreen *new_subscreen_passive;
 
 extern item *Bitem, *Aitem, *Yitem, *Xitem;
 extern int32_t   Bid, Aid, Xid, Yid;
@@ -292,20 +185,12 @@ void load_Sitems();
 void textout_styled_aligned_ex(BITMAP *bmp, const FONT *f, const char *s, int32_t x, int32_t y, int32_t textstyle, int32_t alignment, int32_t color, int32_t shadow, int32_t bg);
 void textprintf_styled_aligned_ex(BITMAP *bmp, const FONT *f, int32_t x, int32_t y, int32_t textstyle, int32_t alignment, int32_t color, int32_t shadow, int32_t bg, const char *format, ...);
 void update_subscreens(int32_t dmap=-1);
-void show_custom_subscreen(BITMAP *dest, subscreen_group *css, int32_t xofs, int32_t yofs, bool showtime, int32_t pos2);
-FONT *ss_font(int32_t fontnum);
-int32_t to_real_font(int32_t ss_font);
-int32_t to_ss_font(int32_t real_font);
-int32_t ss_objects(subscreen_group *tempss);
-void purge_blank_subscreen_objects(subscreen_group *tempss);
+void show_custom_subscreen(BITMAP *dest, ZCSubscreen *subscr, int32_t xofs, int32_t yofs, bool showtime, int32_t pos2);
+
+void purge_blank_subscreen_objects(SubscrPage& pg);
 int32_t subscreen_cset(int32_t c1, int32_t c2);
 
-int32_t sso_x(subscreen_object *tempsso);
-int32_t sso_y(subscreen_object *tempsso);
-int32_t sso_h(subscreen_object *tempsso);
-int32_t sso_w(subscreen_object *tempsso);
-int32_t get_alignment(subscreen_object *tempsso);
-void sso_bounding_box(BITMAP *bmp, subscreen_group *tempss, int32_t index, int32_t color);
+void sso_bounding_box(BITMAP *bmp, SubscrWidget* widg, int32_t color);
 
 
 bool findWeaponWithParent(int32_t id, int32_t type);
diff --git a/src/zc/ffscript.cpp b/src/zc/ffscript.cpp
index ceeaeafa29..482292353c 100644
--- a/src/zc/ffscript.cpp
+++ b/src/zc/ffscript.cpp
@@ -13849,13 +13849,13 @@ void set_register(int32_t arg, int32_t value)
 			//zprint("A is: %d\n", setb);
 				
 			Awpn = seta;
-			game->awpn = seta;
+			game->awpn = game->awpnpg = 0;
 			game->forced_awpn = seta;
 			game->items_off[seta] = 0;
 			directItemA = seta;
 			
 			Bwpn = setb;
-			game->bwpn = setb;
+			game->bwpn = game->bwpnpg = 0;
 			game->forced_bwpn = setb;
 			game->items_off[setb] = 0;
 			directItemB = seta;
@@ -13894,32 +13894,32 @@ void set_register(int32_t arg, int32_t value)
 				switch(slot)
 				{
 					case 0: //b
-					Bwpn = itm;
-					game->items_off[itm] = 0;
-					game->bwpn = itm;
-					game->forced_bwpn = itm;
-					break;
+						Bwpn = itm;
+						game->items_off[itm] = 0;
+						game->bwpn = game->bwpnpg = 0;
+						game->forced_bwpn = itm;
+						break;
 					
 					case 1: //a
-					Awpn = itm;
-					game->items_off[itm] = 0;
-					game->awpn = itm;
-					game->forced_awpn = itm;
-					break;
+						Awpn = itm;
+						game->items_off[itm] = 0;
+						game->awpn = game->awpnpg = 0;
+						game->forced_awpn = itm;
+						break;
 					
 					case 2: //x
-					Xwpn = itm;
-					game->items_off[itm] = 0;
-					game->xwpn = itm;
-					game->forced_xwpn = itm;
-					break;
+						Xwpn = itm;
+						game->items_off[itm] = 0;
+						game->xwpn = game->xwpnpg = 0;
+						game->forced_xwpn = itm;
+						break;
 					
 					case 3: //y
-					Ywpn = itm;
-					game->items_off[itm] = 0;
-					game->ywpn = itm;
-					game->forced_ywpn = itm;
-					break;
+						Ywpn = itm;
+						game->items_off[itm] = 0;
+						game->ywpn = game->ywpnpg = 0;
+						game->forced_ywpn = itm;
+						break;
 				}
 			}
 			else if ( force == 1 )
@@ -13929,32 +13929,32 @@ void set_register(int32_t arg, int32_t value)
 					switch(slot)
 					{
 						case 0: //b
-						Bwpn = itm;
-						game->items_off[itm] = 0;
-						game->bwpn = itm;
-						game->forced_bwpn = itm;
-						break;
+							Bwpn = itm;
+							game->items_off[itm] = 0;
+							game->bwpn = game->bwpnpg = 0;
+							game->forced_bwpn = itm;
+							break;
 						
 						case 1: //a
-						Awpn = itm;
-						game->items_off[itm] = 0;
-						game->awpn = itm;
-						game->forced_awpn = itm;
-						break;
+							Awpn = itm;
+							game->items_off[itm] = 0;
+							game->awpn = game->awpnpg = 0;
+							game->forced_awpn = itm;
+							break;
 						
 						case 2: //x
-						Xwpn = itm;
-						game->items_off[itm] = 0;
-						game->xwpn = itm;
-						game->forced_xwpn = itm;
-						break;
+							Xwpn = itm;
+							game->items_off[itm] = 0;
+							game->xwpn = game->xwpnpg = 0;
+							game->forced_xwpn = itm;
+							break;
 						
 						case 3: //y
-						Ywpn = itm;
-						game->items_off[itm] = 0;
-						game->ywpn = itm;
-						game->forced_ywpn = itm;
-						break;
+							Ywpn = itm;
+							game->items_off[itm] = 0;
+							game->ywpn = game->ywpnpg = 0;
+							game->forced_ywpn = itm;
+							break;
 					}
 				}
 			}
@@ -13963,37 +13963,35 @@ void set_register(int32_t arg, int32_t value)
 				switch(slot)
 				{
 					case 0: //b
-					Bwpn = itm;
-					game->items_off[itm] = 0;
-					game->bwpn = itm;
-					game->forced_bwpn = itm;
-					break;
+						Bwpn = itm;
+						game->items_off[itm] = 0;
+						game->bwpn = game->bwpnpg = 0;
+						game->forced_bwpn = itm;
+						break;
 					
 					case 1: //a
-					{
 						if (get_qr(qr_SELECTAWPN))
 						{
 							Awpn = itm;
 							game->items_off[itm] = 0;
-							game->awpn = itm;
+							game->awpn = game->awpnpg = 0;
 							game->forced_awpn = itm;
 						}
-					break;
-					}
+						break;
 					
 					case 2:  //x
-					Xwpn = itm;
-					game->items_off[itm] = 0;
-					game->xwpn = itm;
-					game->forced_xwpn = itm;
-					break;
+						Xwpn = itm;
+						game->items_off[itm] = 0;
+						game->xwpn = game->xwpnpg = 0;
+						game->forced_xwpn = itm;
+						break;
 					
 					case 3: //y
-					Ywpn = itm;
-					game->items_off[itm] = 0;
-					game->ywpn = itm;
-					game->forced_ywpn = itm;
-					break;
+						Ywpn = itm;
+						game->items_off[itm] = 0;
+						game->ywpn = game->ywpnpg = 0;
+						game->forced_ywpn = itm;
+						break;
 				}
 			}
 			else if ( force == 3 ) //Flag ITM_REQUIRE_INVENTORY + ITM_REQUIRE_SLOT_A_RULE
@@ -14003,37 +14001,35 @@ void set_register(int32_t arg, int32_t value)
 					switch(slot)
 					{
 						case 0: //b
-						Bwpn = itm;
-						game->items_off[itm] = 0;
-						game->bwpn = itm;
-						game->forced_bwpn = itm;
-						break;
+							Bwpn = itm;
+							game->items_off[itm] = 0;
+							game->bwpn = game->bwpnpg = 0;
+							game->forced_bwpn = itm;
+							break;
 						
 						case 1: //a
-						{
 							if (get_qr(qr_SELECTAWPN))
 							{
 								Awpn = itm;
 								game->items_off[itm] = 0;
-								game->awpn = itm;
+								game->awpn = game->awpnpg = 0;
 								game->forced_awpn = itm;
 							}
-						break;
-						}
+							break;
 						
 						case 2: //x
-						Xwpn = itm;
-						game->items_off[itm] = 0;
-						game->xwpn = itm;
-						game->forced_xwpn = itm;
-						break;
+							Xwpn = itm;
+							game->items_off[itm] = 0;
+							game->xwpn = game->xwpnpg = 0;
+							game->forced_xwpn = itm;
+							break;
 						
 						case 3: //y
-						Ywpn = itm;
-						game->items_off[itm] = 0;
-						game->ywpn = itm;
-						game->forced_ywpn = itm;
-						break;
+							Ywpn = itm;
+							game->items_off[itm] = 0;
+							game->ywpn = game->ywpnpg = 0;
+							game->forced_ywpn = itm;
+							break;
 					}
 				}
 			}
@@ -14223,8 +14219,8 @@ void set_register(int32_t arg, int32_t value)
 			if (Bwpn != (value/10000))
 			{
 				Bwpn = value/10000;
-				int32_t wpndummy = BWeapon_to_Pos(Bwpn);
-				if (wpndummy >= 0) game->bwpn = wpndummy;
+				if(new_subscreen_active)
+					new_subscreen_active->get_page_pos(Bwpn, game->bwpn, game->bwpnpg);
 				game->forced_bwpn = value/10000;
 				game->items_off[value/10000] = 0;
 			}
@@ -14249,8 +14245,8 @@ void set_register(int32_t arg, int32_t value)
 			if (Awpn != (value/10000))
 			{
 				Awpn = value/10000;
-				int32_t wpndummy = BWeapon_to_Pos(Awpn);
-				if (wpndummy >= 0) game->awpn = wpndummy;
+				if(new_subscreen_active)
+					new_subscreen_active->get_page_pos(Awpn, game->awpn, game->awpnpg);
 				game->items_off[value/10000] = 0;
 				game->forced_awpn = value/10000;
 			}
@@ -14274,8 +14270,8 @@ void set_register(int32_t arg, int32_t value)
 			if (Xwpn != (value/10000))
 			{
 				Xwpn = value/10000;
-				int32_t wpndummy = BWeapon_to_Pos(Xwpn);
-				if (wpndummy >= 0) game->xwpn = wpndummy;
+				if(new_subscreen_active)
+					new_subscreen_active->get_page_pos(Xwpn, game->xwpn, game->xwpnpg);
 				game->items_off[value/10000] = 0;
 				game->forced_xwpn = value/10000;
 			}
@@ -14298,8 +14294,8 @@ void set_register(int32_t arg, int32_t value)
 			if (Ywpn != (value/10000))
 			{
 				Ywpn = value/10000;
-				int32_t wpndummy = BWeapon_to_Pos(Ywpn);
-				if (wpndummy >= 0) game->ywpn = wpndummy;
+				if(new_subscreen_active)
+					new_subscreen_active->get_page_pos(Ywpn, game->ywpn, game->ywpnpg);
 				game->items_off[value/10000] = 0;
 				game->forced_ywpn = value/10000;
 			}
@@ -14339,8 +14335,8 @@ void set_register(int32_t arg, int32_t value)
 			//int32_t state   = (ri->d[rINDEX2]/10000);
 			//int32_t extend = (ri->d[rINDEX2]/10000);
 			//int32_t dir = (ri->d[rINDEX]/10000);
-			Z_message("Trying to force-set the A-button item().\n");
-			Hero.setAButtonItem(vbound((value/10000),0,(MAXITEMS-1)));
+			// Z_message("Trying to force-set the A-button item().\n");
+			// Hero.setAButtonItem(vbound((value/10000),0,(MAXITEMS-1)));
 		}
 		break;
 		
@@ -14349,8 +14345,8 @@ void set_register(int32_t arg, int32_t value)
 			//int32_t state   = (ri->d[rINDEX2]/10000);
 			//int32_t extend = (ri->d[rINDEX2]/10000);
 			//int32_t dir = (ri->d[rINDEX]/10000);
-			Z_message("Trying to force-set the A-button item().\n");
-			Hero.setBButtonItem(vbound((value/10000),0,(MAXITEMS-1)));
+			// Z_message("Trying to force-set the A-button item().\n");
+			// Hero.setBButtonItem(vbound((value/10000),0,(MAXITEMS-1)));
 		}
 		break;
 		
diff --git a/src/zc/hero.cpp b/src/zc/hero.cpp
index 19f0478d36..a5523c42b2 100644
--- a/src/zc/hero.cpp
+++ b/src/zc/hero.cpp
@@ -485,17 +485,6 @@ void HeroClass::stopSubscreenFalling(bool v){
 	preventsubscreenfalling = v;
 }
 
-
-//Set the button items by brute force
-
-void HeroClass::setAButtonItem(int32_t itmslot){
-	game->awpn = itmslot;
-}
-
-void HeroClass::setBButtonItem(int32_t itmslot){
-	game->bwpn = itmslot;
-}
-
 void HeroClass::ClearhitHeroUIDs()
 { 		//Why the flidd doesn't this work?! Clearing this to 0 in a way that doesn't demolish script access is impossible. -Z
 		//All I want, is to clear it at the end of a frame, or at the start of a frame, so that if it changes to non-0
@@ -10154,32 +10143,41 @@ void HeroClass::solid_push(solid_object* obj)
 void HeroClass::deselectbombs(int32_t super)
 {
     if ( get_qr(qr_NEVERDISABLEAMMOONSUBSCREEN) || itemsbuf[game->forced_awpn].family == itype_bomb || itemsbuf[game->forced_bwpn].family == itype_bomb || itemsbuf[game->forced_xwpn].family == itype_bomb || itemsbuf[game->forced_ywpn].family == itype_bomb) return;
-    if(getItemFamily(itemsbuf,Bwpn&0x0FFF)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Bwpn==directWpn))
+    SubscrPage* pg = nullptr;
+	if(getItemFamily(itemsbuf,Bwpn)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Bwpn==directWpn))
     {
-        int32_t temp = selectWpn_new(SEL_VERIFY_LEFT, game->bwpn, game->awpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-        Bwpn = Bweapon(temp);
+		if(!new_subscreen_active || !(pg = new_subscreen_active->get_page(game->bwpnpg)))
+			return;
+        int32_t temp = pg->move_legacy(SEL_VERIFY_LEFT, game->bwpn, game->awpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+        Bwpn = pg->get_item_pos(temp);
         directItemB = directItem;
         game->bwpn = temp;
     }
     
-    else if (getItemFamily(itemsbuf,Xwpn&0x0FFF)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Xwpn==directWpn))
+    else if (getItemFamily(itemsbuf,Xwpn)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Xwpn==directWpn))
     {
-        int32_t temp = selectWpn_new(SEL_VERIFY_LEFT, game->xwpn, game->bwpn, game->awpn, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-        Xwpn = Bweapon(temp);
+		if(!new_subscreen_active || !(pg = new_subscreen_active->get_page(game->xwpnpg)))
+			return;
+        int32_t temp = pg->move_legacy(SEL_VERIFY_LEFT, game->xwpn, game->bwpn, game->awpn, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+        Xwpn = pg->get_item_pos(temp);
         directItemX = directItem;
         game->xwpn = temp;
     }
-    else if (getItemFamily(itemsbuf,Ywpn&0x0FFF)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Ywpn==directWpn))
+    else if (getItemFamily(itemsbuf,Ywpn)==(super? itype_sbomb : itype_bomb) && (directWpn<0 || Ywpn==directWpn))
     {
-        int32_t temp = selectWpn_new(SEL_VERIFY_LEFT, game->ywpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, game->awpn);
-        Ywpn = Bweapon(temp);
+		if(!new_subscreen_active || !(pg = new_subscreen_active->get_page(game->ywpnpg)))
+			return;
+        int32_t temp = pg->move_legacy(SEL_VERIFY_LEFT, game->ywpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, game->awpn);
+        Ywpn = pg->get_item_pos(temp);
         directItemY = directItem;
         game->ywpn = temp;
     }
     else
     {
-        int32_t temp = selectWpn_new(SEL_VERIFY_LEFT, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-        Awpn = Bweapon(temp);
+		if(!new_subscreen_active || !(pg = new_subscreen_active->get_page(game->awpnpg)))
+			return;
+        int32_t temp = pg->move_legacy(SEL_VERIFY_LEFT, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+        Awpn = pg->get_item_pos(temp);
         directItemA = directItem;
         game->awpn = temp;
     }
@@ -13804,25 +13802,25 @@ void HeroClass::moveheroOld()
 	{
 		if(DrunkrBbtn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Bwpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Bwpn);
 			dowpn = Bwpn&0xFFF;
 			directWpn = directItemB;
 		}
 		else if(DrunkrAbtn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Awpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Awpn);
 			dowpn = Awpn&0xFFF;
 			directWpn = directItemA;
 		}
 		else if(get_qr(qr_SET_XBUTTON_ITEMS) && DrunkrEx1btn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Xwpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Xwpn);
 			dowpn = Xwpn&0xFFF;
 			directWpn = directItemX;
 		}
 		else if(get_qr(qr_SET_YBUTTON_ITEMS) && DrunkrEx2btn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Ywpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Ywpn);
 			dowpn = Ywpn&0xFFF;
 			directWpn = directItemY;
 		}
@@ -17798,25 +17796,25 @@ bool HeroClass::premove()
 	{
 		if(DrunkrBbtn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Bwpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Bwpn);
 			dowpn = Bwpn&0xFFF;
 			directWpn = directItemB;
 		}
 		else if(DrunkrAbtn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Awpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Awpn);
 			dowpn = Awpn&0xFFF;
 			directWpn = directItemA;
 		}
 		else if(get_qr(qr_SET_XBUTTON_ITEMS) && DrunkrEx1btn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Xwpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Xwpn);
 			dowpn = Xwpn&0xFFF;
 			directWpn = directItemX;
 		}
 		else if(get_qr(qr_SET_YBUTTON_ITEMS) && DrunkrEx2btn())
 		{
-			btnwpn=getItemFamily(itemsbuf,Ywpn&0xFFF);
+			btnwpn=getItemFamily(itemsbuf,Ywpn);
 			dowpn = Ywpn&0xFFF;
 			directWpn = directItemY;
 		}
@@ -28439,208 +28437,6 @@ bool checkitem_jinx(int32_t itemid)
 	return HeroItemClk() == 0;
 }
 
-int32_t Bweapon(int32_t pos)
-{
-    if(pos < 0 || current_subscreen_active == NULL)
-    {
-        return 0;
-    }
-    
-    int32_t p=-1;
-    
-    for(int32_t i=0; current_subscreen_active->objects[i].type!=ssoNULL && i < MAXSUBSCREENITEMS; ++i)
-    {
-        if(current_subscreen_active->objects[i].type==ssoCURRENTITEM && current_subscreen_active->objects[i].d3==pos)
-        {
-            p=i;
-            break;
-        }
-    }
-    
-    if(p==-1)
-    {
-        return 0;
-    }
-    
-    int32_t actualItem = current_subscreen_active->objects[p].d8;
-    //int32_t familyCheck = actualItem ? itemsbuf[actualItem].family : current_subscreen_active->objects[p].d1
-    int32_t family = -1;
-    bool bow = false;
-    
-    if(actualItem)
-    {
-        bool select = false;
-        
-        switch(itemsbuf[actualItem-1].family)
-        {
-        case itype_bomb:
-            if((game->get_bombs() ||
-                    // Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
-                    (actualItem-1>-1 && itemsbuf[actualItem-1].misc1==0 && findWeaponWithParent(actualItem-1, wLitBomb))) ||
-                    current_item_power(itype_bombbag))
-            {
-                select=true;
-            }
-            
-            break;
-            
-        case itype_bowandarrow:
-        case itype_arrow:
-            if(actualItem-1>-1 && current_item_id(itype_bow)>-1)
-            {
-                //bow=(current_subscreen_active->objects[p].d1==itype_bowandarrow);
-                select=true;
-            }
-            
-            break;
-            
-        case itype_letterpotion:
-            /*if(current_item_id(itype_potion)>-1)
-            {
-              select=true;
-            }
-            else if(current_item_id(itype_letter)>-1)
-            {
-              select=true;
-            }*/
-            break;
-            
-        case itype_sbomb:
-        {
-            int32_t bombbagid = current_item_id(itype_bombbag);
-            
-            if((game->get_sbombs() ||
-                    // Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
-                    (actualItem-1>-1 && itemsbuf[actualItem-1].misc1==0 && findWeaponWithParent(actualItem-1, wLitSBomb))) ||
-                    (current_item_power(itype_bombbag) && bombbagid>-1 && (itemsbuf[bombbagid].flags & ITEM_FLAG1)))
-            {
-                select=true;
-            }
-            
-            break;
-        }
-        
-        case itype_sword:
-        {
-            if(!get_qr(qr_SELECTAWPN))
-                break;
-                
-            select=true;
-        }
-        break;
-        
-        default:
-            select=true;
-        }
-        
-        if(!item_disabled(actualItem-1) && game->get_item(actualItem-1) && select)
-        {
-            directItem = actualItem-1;
-            
-            if(directItem>-1 && itemsbuf[directItem].family == itype_arrow) bow=true;
-            
-            return actualItem-1+(bow?0xF000:0);
-        }
-        else return 0;
-    }
-    
-    directItem = -1;
-    
-    switch(current_subscreen_active->objects[p].d1)
-    {
-    case itype_bomb:
-    {
-        int32_t bombid = current_item_id(itype_bomb);
-        
-        if((game->get_bombs() ||
-                // Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
-                (bombid>-1 && itemsbuf[bombid].misc1==0 && Lwpns.idCount(wLitBomb)>0)) ||
-                current_item_power(itype_bombbag))
-        {
-            family=itype_bomb;
-        }
-        
-        break;
-    }
-    
-    case itype_bowandarrow:
-    case itype_arrow:
-        if(current_item_id(itype_bow)>-1 && current_item_id(itype_arrow)>-1)
-        {
-            bow=(current_subscreen_active->objects[p].d1==itype_bowandarrow);
-            family=itype_arrow;
-        }
-        
-        break;
-        
-    case itype_letterpotion:
-        if(current_item_id(itype_potion)>-1)
-        {
-            family=itype_potion;
-        }
-        else if(current_item_id(itype_letter)>-1)
-        {
-            family=itype_letter;
-        }
-        
-        break;
-        
-    case itype_sbomb:
-    {
-        int32_t bombbagid = current_item_id(itype_bombbag);
-        int32_t sbombid = current_item_id(itype_sbomb);
-        
-        if((game->get_sbombs() ||
-                // Remote Bombs: the bomb icon can still be used when an undetonated bomb is onscreen.
-                (sbombid>-1 && itemsbuf[sbombid].misc1==0 && Lwpns.idCount(wLitSBomb)>0)) ||
-                (current_item_power(itype_bombbag) && bombbagid>-1 && (itemsbuf[bombbagid].flags & ITEM_FLAG1)))
-        {
-            family=itype_sbomb;
-        }
-        
-        break;
-    }
-    
-    case itype_sword:
-    {
-        if(!get_qr(qr_SELECTAWPN))
-            break;
-            
-        family=itype_sword;
-    }
-    break;
-    
-    default:
-        family=current_subscreen_active->objects[p].d1;
-    }
-    
-    if(family==-1)
-        return 0;
-        
-    for(int32_t j=0; j<MAXITEMS; j++)
-    {
-        // Find the item that matches this subscreen object.
-        if(itemsbuf[j].family==family && j == current_item_id(family,false) && !item_disabled(j))
-        {
-            return j+(bow?0xF000:0);
-        }
-    }
-    
-    return 0;
-}
-
-int32_t BWeapon_to_Pos(int32_t bweapon)
-{
-	for (int32_t i = 0; i < MAXSUBSCREENITEMS; ++i)
-	{
-		if (Bweapon(i) == bweapon)
-		{
-			return i;
-		}
-	}
-	return -1;
-}
-
 void stopCaneOfByrna()
 {
 	for(int32_t i=0; i<Lwpns.Count(); i++)
@@ -28691,19 +28487,19 @@ bool isWpnPressed(int32_t itype)
 {
 	//0xFFF for subscreen overrides
 	//Will crash on win10 without it! -Z
-    if((itype==getItemFamily(itemsbuf,Bwpn&0xFFF)) && DrunkcBbtn()) return true;
-    if((itype==getItemFamily(itemsbuf,Awpn&0xFFF)) && DrunkcAbtn()) return true;
-    if((itype==getItemFamily(itemsbuf,Xwpn&0xFFF)) && DrunkcEx1btn()) return true;
-    if((itype==getItemFamily(itemsbuf,Ywpn&0xFFF)) && DrunkcEx2btn()) return true;
+    if((itype==getItemFamily(itemsbuf,Bwpn)) && DrunkcBbtn()) return true;
+    if((itype==getItemFamily(itemsbuf,Awpn)) && DrunkcAbtn()) return true;
+    if((itype==getItemFamily(itemsbuf,Xwpn)) && DrunkcEx1btn()) return true;
+    if((itype==getItemFamily(itemsbuf,Ywpn)) && DrunkcEx2btn()) return true;
     return false;
 }
 
 int32_t getWpnPressed(int32_t itype)
 {
-    if((itype==getItemFamily(itemsbuf,Bwpn&0xFFF)) && DrunkcBbtn()) return Bwpn;
-    if((itype==getItemFamily(itemsbuf,Awpn&0xFFF)) && DrunkcAbtn()) return Awpn;
-    if((itype==getItemFamily(itemsbuf,Xwpn&0xFFF)) && DrunkcEx1btn()) return Xwpn;
-    if((itype==getItemFamily(itemsbuf,Ywpn&0xFFF)) && DrunkcEx2btn()) return Ywpn;
+    if((itype==getItemFamily(itemsbuf,Bwpn)) && DrunkcBbtn()) return Bwpn;
+    if((itype==getItemFamily(itemsbuf,Awpn)) && DrunkcAbtn()) return Awpn;
+    if((itype==getItemFamily(itemsbuf,Xwpn)) && DrunkcEx1btn()) return Xwpn;
+    if((itype==getItemFamily(itemsbuf,Ywpn)) && DrunkcEx2btn()) return Ywpn;
     
     return -1;
 }
@@ -28723,13 +28519,13 @@ int32_t getRocsPressed()
 			return jumpid; //not pressed
 	}
 
-	if((itype_rocs==getItemFamily(itemsbuf,Bwpn&0xFFF)) && DrunkcBbtn())
+	if((itype_rocs==getItemFamily(itemsbuf,Bwpn)) && DrunkcBbtn())
 		return Bwpn;
-	if((itype_rocs==getItemFamily(itemsbuf,Awpn&0xFFF)) && DrunkcAbtn())
+	if((itype_rocs==getItemFamily(itemsbuf,Awpn)) && DrunkcAbtn())
 		return Awpn;
-	if((itype_rocs==getItemFamily(itemsbuf,Xwpn&0xFFF)) && DrunkcEx1btn())
+	if((itype_rocs==getItemFamily(itemsbuf,Xwpn)) && DrunkcEx1btn())
 		return Xwpn;
-	if((itype_rocs==getItemFamily(itemsbuf,Ywpn&0xFFF)) && DrunkcEx2btn())
+	if((itype_rocs==getItemFamily(itemsbuf,Ywpn)) && DrunkcEx2btn())
 		return Ywpn;
 
 	return -1;
@@ -28748,17 +28544,27 @@ void selectNextAWpn(int32_t type)
 {
     if(!get_qr(qr_SELECTAWPN))
         return;
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->awpnpg);
+	if(!pg)
+		return;
         
-    int32_t ret = selectWpn_new(type, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-    Awpn = Bweapon(ret);
+    int32_t ret = pg->move_legacy(type, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+    Awpn = pg->get_item_pos(ret);
     directItemA = directItem;
     game->awpn = ret;
 }
 
 void selectNextBWpn(int32_t type)
 {
-	int32_t ret = selectWpn_new(type, game->bwpn, game->awpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-	Bwpn = Bweapon(ret);
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->bwpnpg);
+	if(!pg)
+		return;
+	int32_t ret = pg->move_legacy(type, game->bwpn, game->awpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+	Bwpn = pg->get_item_pos(ret);
 	directItemB = directItem;
 	game->bwpn = ret;
 }
@@ -28766,8 +28572,13 @@ void selectNextBWpn(int32_t type)
 void selectNextXWpn(int32_t type)
 {
 	if(!get_qr(qr_SET_XBUTTON_ITEMS)) return;
-	int32_t ret = selectWpn_new(type, game->xwpn, game->awpn, game->bwpn, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
-	Xwpn = Bweapon(ret);
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->xwpnpg);
+	if(!pg)
+		return;
+	int32_t ret = pg->move_legacy(type, game->xwpn, game->awpn, game->bwpn, get_qr(qr_SET_YBUTTON_ITEMS) ? game->ywpn : -1);
+	Xwpn = pg->get_item_pos(ret);
 	directItemX = directItem;
 	game->xwpn = ret;
 }
@@ -28775,18 +28586,21 @@ void selectNextXWpn(int32_t type)
 void selectNextYWpn(int32_t type)
 {
 	if(!get_qr(qr_SET_YBUTTON_ITEMS)) return;
-	int32_t ret = selectWpn_new(type, game->ywpn, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1);
-	Ywpn = Bweapon(ret);
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->ywpnpg);
+	if(!pg)
+		return;
+	int32_t ret = pg->move_legacy(type, game->ywpn, game->awpn, game->bwpn, get_qr(qr_SET_XBUTTON_ITEMS) ? game->xwpn : -1);
+	Ywpn = pg->get_item_pos(ret);
 	directItemY = directItem;
 	game->ywpn = ret;
 }
 
 void verifyAWpn()
 {
-	if ( (game->forced_awpn != -1) )
-	{
+	if (game->forced_awpn != -1)
 		return;
-	}
     if(!get_qr(qr_SELECTAWPN))
     {
         Awpn = selectSword();
@@ -28794,46 +28608,60 @@ void verifyAWpn()
     }
     else
     {
-        game->awpn = selectWpn_new(SEL_VERIFY_RIGHT, game->awpn, game->bwpn, game->xwpn, game->ywpn);
-        Awpn = Bweapon(game->awpn);
+		if(!new_subscreen_active)
+			return;
+		SubscrPage* pg = new_subscreen_active->get_page(game->awpnpg);
+		if(!pg)
+			return;
+        game->awpn = pg->move_legacy(SEL_VERIFY_RIGHT, game->awpn, game->bwpn, game->xwpn, game->ywpn);
+        Awpn = pg->get_item_pos(game->awpn);
         directItemA = directItem;
     }
 }
 
 void verifyBWpn()
 {
-	if ( (game->forced_bwpn != -1) )
-	{
+	if (game->forced_bwpn != -1)
 		return;
-	}
-    game->bwpn = selectWpn_new(SEL_VERIFY_RIGHT, game->bwpn, game->awpn, game->xwpn, game->ywpn);
-    Bwpn = Bweapon(game->bwpn);
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->bwpnpg);
+	if(!pg)
+		return;
+    game->bwpn = pg->move_legacy(SEL_VERIFY_RIGHT, game->bwpn, game->awpn, game->xwpn, game->ywpn);
+    Bwpn = pg->get_item_pos(game->bwpn);
     directItemB = directItem;
 }
 
 void verifyXWpn()
 {
-	if ( (game->forced_xwpn != -1) )
-	{
+	if (game->forced_xwpn != -1)
+		return;
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->xwpnpg);
+	if(!pg)
 		return;
-	}
 	if(get_qr(qr_SET_XBUTTON_ITEMS))
-		game->xwpn = selectWpn_new(SEL_VERIFY_RIGHT, game->xwpn, game->awpn, game->bwpn, game->ywpn);
+		game->xwpn = pg->move_legacy(SEL_VERIFY_RIGHT, game->xwpn, game->awpn, game->bwpn, game->ywpn);
 	else game->xwpn = -1;
-    Xwpn = Bweapon(game->xwpn);
+    Xwpn = pg->get_item_pos(game->xwpn);
     directItemX = directItem;
 }
 
 void verifyYWpn()
 {
-	if ( (game->forced_ywpn != -1) )
-	{
+	if (game->forced_ywpn != -1)
+		return;
+	if(!new_subscreen_active)
+		return;
+	SubscrPage* pg = new_subscreen_active->get_page(game->ywpnpg);
+	if(!pg)
 		return;
-	}
 	if(get_qr(qr_SET_YBUTTON_ITEMS))
-		game->ywpn = selectWpn_new(SEL_VERIFY_RIGHT, game->ywpn, game->awpn, game->xwpn, game->bwpn);
+		game->ywpn = pg->move_legacy(SEL_VERIFY_RIGHT, game->ywpn, game->awpn, game->xwpn, game->bwpn);
 	else game->ywpn = -1;
-    Ywpn = Bweapon(game->ywpn);
+    Ywpn = pg->get_item_pos(game->ywpn);
     directItemY = directItem;
 }
 
@@ -28845,152 +28673,6 @@ void verifyBothWeapons()
     verifyYWpn();
 }
 
-int get_subscr_itemind(int32_t pos)
-{
-	if(current_subscreen_active == NULL)
-		return -1;
-	auto* objects = current_subscreen_active->objects;
-	for(int32_t i=0; objects[i].type!=ssoNULL; ++i)
-	{
-		if(objects[i].type==ssoCURRENTITEM)
-		{
-			if(objects[i].d3==pos)
-				return i;
-		}
-	}
-	return -1;
-}
-int32_t selectWpn_new(int32_t type, int32_t startpos, int32_t forbiddenpos, int32_t fp2, int32_t fp3, bool equip_only, bool checkwpn)
-{
-	//what will be returned when all else fails.
-	//don't return the forbiddenpos... no matter what -DD
-	
-	int32_t failpos(0);
-	
-	if(startpos == forbiddenpos || startpos == fp2 || startpos == fp3)
-		failpos = 0xFF;
-	else failpos = startpos;
-	
-	// verify startpos
-	if(startpos < 0 || startpos >= 0xFF)
-		startpos = 0;
-		
-	if(current_subscreen_active == NULL)
-		return failpos;
-	auto* objects = current_subscreen_active->objects;
-	
-	checkwpn = checkwpn || !get_qr(qr_FREEFORM_SUBSCREEN_CURSOR);
-	bool verify = type==SEL_VERIFY_RIGHT || type==SEL_VERIFY_LEFT;
-	
-	if(verify)
-	{
-		int32_t wpn = Bweapon(startpos);
-		equip_only = checkwpn = true;
-		auto startind = get_subscr_itemind(startpos);
-		if(objects[startind].type==ssoCURRENTITEM&&(objects[startind].d2&SSCURRITEM_NONEQUIP))
-			wpn = 0;
-		
-		if(wpn != 0 && startpos != forbiddenpos && startpos != fp2 && startpos != fp3)
-		{
-			return startpos;
-		}
-	}
-	
-	int32_t p=-1;
-	int32_t curpos = startpos;
-	int32_t firstValidPos=-1, firstValidEquipPos=-1;
-	
-	for(int32_t i=0; objects[i].type!=ssoNULL; ++i)
-	{
-		if(objects[i].type==ssoCURRENTITEM)
-		{
-			if(firstValidPos==-1 && objects[i].d3>=0)
-				firstValidPos=i;
-			if(firstValidEquipPos==-1 && objects[i].d3>=0)
-				if(!equip_only || !(objects[i].d2&SSCURRITEM_NONEQUIP))
-					firstValidEquipPos=i;
-			
-			if(objects[i].d3==curpos)
-				p=i;
-			if(p>-1 && firstValidPos>-1 && firstValidEquipPos>-1)
-				break;
-		}
-	}
-	
-	if(p == -1)
-	{
-		//can't find the current position
-		// Switch to a valid weapon if there is one; otherwise,
-		// the selector can simply disappear
-		if(firstValidEquipPos>=0)
-			return objects[firstValidEquipPos].d3;
-		if(firstValidPos>=0)
-			return objects[firstValidPos].d3;
-		//FAILURE
-		else return failpos;
-	}
-	
-	//remember we've been here
-	set<int32_t> oldPositions;
-	oldPositions.insert(curpos);
-	
-	//1. Perform any shifts required by the above
-	//2. If that's not possible, go to position 1 and reset the b weapon.
-	//2a.  -if we arrive at a position we've already visited, give up and stay there
-	//3. Get the weapon at the new slot
-	//4. If it's not possible, go to step 1.
-	
-	for(;;)
-	{
-		//shift
-		switch(type)
-		{
-		case SEL_LEFT:
-		case SEL_VERIFY_LEFT:
-			curpos = objects[p].d6;
-			break;
-			
-		case SEL_RIGHT:
-		case SEL_VERIFY_RIGHT:
-			curpos = objects[p].d7;
-			break;
-			
-		case SEL_DOWN:
-			curpos = objects[p].d5;
-			break;
-			
-		case SEL_UP:
-			curpos = objects[p].d4;
-			break;
-		}
-		
-		//find our new position
-		p = get_subscr_itemind(curpos);
-		
-		if(p == -1)
-		{
-			//can't find the current position
-			//FAILURE
-			return failpos;
-		}
-		
-		//if we've already been here, give up
-		if(oldPositions.find(curpos) != oldPositions.end())
-			return failpos;
-		
-		//else, remember we've been here
-		oldPositions.insert(curpos);
-		
-		//see if this weapon is acceptable
-		auto wpn = Bweapon(curpos);
-		if(curpos != forbiddenpos && curpos != fp2 && curpos != fp3)
-			if(!equip_only || !(objects[p].d2 & SSCURRITEM_NONEQUIP))
-				if(!checkwpn || wpn)
-					return curpos;
-		//keep going otherwise
-	}
-}
-
 // Select the sword for the A button if the 'select A button weapon' quest rule isn't set.
 int32_t selectSword()
 {
diff --git a/src/zc/hero.h b/src/zc/hero.h
index 62e26e5ffd..01df6fd3bf 100644
--- a/src/zc/hero.h
+++ b/src/zc/hero.h
@@ -599,10 +599,6 @@ class HeroClass : public sprite
 	bool stopSubscreenFalling();
 	void stopSubscreenFalling(bool v);
 	
-	//Set the button items by brute force
-	void setAButtonItem(int32_t subscreenslot);
-	void setBButtonItem(int32_t subscreenslot);
-	
 	bool getDiagMove(); //Diagonal movement.
 	void setDiagMove(bool newdiag);
 	bool getBigHitbox(); //Large H-itbox
@@ -655,18 +651,8 @@ bool usesSwordJinx(int32_t itemid);
 bool checkitem_jinx(int32_t itemid);
 bool checkmagiccost(int32_t itemid, bool checkTime = false);
 void paymagiccost(int32_t itemid, bool ignoreTimer = false, bool onlyTimer = false);
-int32_t Bweapon(int32_t pos);
-int32_t BWeapon_to_Pos(int32_t bweapon);
 void stopCaneOfByrna();
 //void selectWpn(int32_t xstep, int32_t ystep, bool b);
-const int32_t SEL_UP = 0;
-const int32_t SEL_LEFT = 1;
-const int32_t SEL_DOWN = 2;
-const int32_t SEL_RIGHT = 3;
-const int32_t SEL_VERIFY_LEFT = 4;
-const int32_t SEL_VERIFY_RIGHT = 5;
-int get_subscr_itemind(int32_t pos);
-int32_t selectWpn_new(int32_t type, int32_t startpos, int32_t forbiddenpos = -1, int32_t fp2 = -1, int32_t fp3 = -1, bool equip_only = true, bool checkwpn = true);
 bool isWpnPressed(int32_t wpn);
 int32_t getWpnPressed(int32_t wpn);
 int32_t getRocsPressed();
diff --git a/src/zc/saves.cpp b/src/zc/saves.cpp
index 4d88c08f4c..4e751abb36 100644
--- a/src/zc/saves.cpp
+++ b/src/zc/saves.cpp
@@ -1115,6 +1115,21 @@ static int32_t read_saves(ReadMode read_mode, std::string filename, std::vector<
 					return 108;
 			}
 		}
+		if(section_version >= 34)
+		{
+			if(!p_getc(&game.awpnpg,f))
+				return 109;
+			if(!p_getc(&game.bwpnpg,f))
+				return 110;
+			if(!p_getc(&game.xwpnpg,f))
+				return 111;
+			if(!p_getc(&game.ywpnpg,f))
+				return 112;
+		}
+		else
+		{
+			game.awpnpg = game.bwpnpg = game.xwpnpg = game.ywpnpg = 0;
+		}
 	}
 
 	return 0;
@@ -1561,6 +1576,14 @@ static int32_t write_save(PACKFILE* f, save_t* save)
 		if(!p_iputw(p.spr, f))
 			return 108;
 	}
+	if(!p_putc(game.awpnpg, f))
+		return 109;
+	if(!p_putc(game.bwpnpg, f))
+		return 110;
+	if(!p_putc(game.xwpnpg, f))
+		return 111;
+	if(!p_putc(game.ywpnpg, f))
+		return 112;
 	
 	return 0;
 }
diff --git a/src/zc/zc_subscr.cpp b/src/zc/zc_subscr.cpp
index ffc0a19453..66ab4d7cdc 100644
--- a/src/zc/zc_subscr.cpp
+++ b/src/zc/zc_subscr.cpp
@@ -36,7 +36,7 @@ void put_active_subscr(int32_t y, int32_t pos)
 {
     //Don't call Sitems.animate() - that gets called somewhere else, somehow. -L
     animate_selectors();
-    show_custom_subscreen(framebuf, current_subscreen_active, 0, 6-y, game->should_show_time(), pos);
+    show_custom_subscreen(framebuf, new_subscreen_active, 0, 6-y, game->should_show_time(), pos);
 }
 
 void dosubscr()
@@ -44,9 +44,7 @@ void dosubscr()
     PALETTE temppal;
     
     if(tmpscr->flags3&fNOSUBSCR)
-    {
         return;
-    }
     
     if(usebombpal)
     {
@@ -57,7 +55,7 @@ void dosubscr()
     
     int32_t miny;
     bool showtime = game->should_show_time();
-    load_Sitems();
+	flushItemCache();
     
     pause_sfx(WAV_BRANG);
     
@@ -84,16 +82,21 @@ void dosubscr()
 	     use_y = get_qr(qr_SET_YBUTTON_ITEMS);
 	bool b_only = !(use_a||use_x||use_y||get_qr(qr_SUBSCR_PRESS_TO_EQUIP));
 	//Set the selector to the correct position before bringing up the subscreen -DD
+	if(!new_subscreen_active) return;
+	bool compat = get_qr(qr_OLD_SUBSCR);
+	if(compat)
 	{
+		new_subscreen_active->curpage = 0;
+		auto& pg = new_subscreen_active->pages[0];
 		if(Bwpn)
-			Bpos = zc_max(game->bwpn,0);
+			pg.cursor_pos = zc_max(game->bwpn,0);
 		else if(use_a && Awpn)
-			Bpos = zc_max(game->awpn,0);
+			pg.cursor_pos = zc_max(game->awpn,0);
 		else if(use_x && Xwpn)
-			Bpos = zc_max(game->xwpn,0);
+			pg.cursor_pos = zc_max(game->xwpn,0);
 		else if(use_y && Ywpn)
-			Bpos = zc_max(game->ywpn,0);
-		else Bpos = 0;
+			pg.cursor_pos = zc_max(game->ywpn,0);
+		else pg.cursor_pos = 0;
 	}
         
     for(int32_t y=176-2; y>=6; y-=3*Hero.subscr_speed)
@@ -133,167 +136,189 @@ void dosubscr()
 
     do
     {
+		auto& pg = new_subscreen_active->cur_page();
 		if (replay_version_check(0, 11))
 			load_control_state();
-		int32_t pos = Bpos;
+		int32_t pos = pg.cursor_pos;
 		
-		if(rUp())         Bpos = selectWpn_new(SEL_UP, pos, -1, -1, -1, false, false);
-		else if(rDown())  Bpos = selectWpn_new(SEL_DOWN, pos, -1, -1, -1, false, false);
-		else if(rLeft())  Bpos = selectWpn_new(SEL_LEFT, pos, -1, -1, -1, false, false);
-		else if(rRight()) Bpos = selectWpn_new(SEL_RIGHT, pos, -1, -1, -1, false, false);
-		else if(rLbtn())
-		{
-			if (!get_qr(qr_NO_L_R_BUTTON_INVENTORY_SWAP))
-			{
-				Bpos = selectWpn_new(SEL_LEFT, pos, -1, -1, -1, false, true);
-			}
-		}
-		else if(rRbtn() )
+		if(rUp())         pg.move_cursor(SEL_UP);
+		else if(rDown())  pg.move_cursor(SEL_DOWN);
+		else if(rLeft())  pg.move_cursor(SEL_LEFT);
+		else if(rRight()) pg.move_cursor(SEL_RIGHT);
+		else if(compat)
 		{
-			if (!get_qr(qr_NO_L_R_BUTTON_INVENTORY_SWAP)) 
+			if(rLbtn())
 			{
-				Bpos = selectWpn_new(SEL_RIGHT, pos, -1, -1, -1, false, true);
-			}
-		}
-		else if(rEx3btn() )
-		{
-			if ( use_a && get_qr(qr_USE_EX1_EX2_INVENTORYSWAP) )
-			{
-				selectNextAWpn(SEL_LEFT);
-			}
-		}
-		else if(rEx4btn() )
-		{
-			if ( use_a && get_qr(qr_USE_EX1_EX2_INVENTORYSWAP) )
-			{
-				selectNextAWpn(SEL_RIGHT);
-			}
-		}
-		//Assign items to buttons
-		bool can_equip = true;
-		int p = get_subscr_itemind(Bpos);
-		if(p > -1 && (current_subscreen_active->objects[p].d2 & SSCURRITEM_NONEQUIP))
-			can_equip = false;
-		auto eqwpn = Bweapon(Bpos);
-		if(get_qr(qr_FREEFORM_SUBSCREEN_CURSOR) && !eqwpn)
-			can_equip = false;
-		if(can_equip)
-		{
-			if(rBbtn() || b_only)
-			{
-				int32_t t = eqwpn;
-				if(use_a && t == Awpn)
+				if (!get_qr(qr_NO_L_R_BUTTON_INVENTORY_SWAP))
 				{
-					Awpn = Bwpn;
-					game->awpn = game->bwpn;
-					directItemA = directItemB;
+					pg.cursor_pos = pg.move_legacy(SEL_LEFT, pos, -1, -1, -1, false, true);
 				}
-				else if(use_x && t == Xwpn)
-				{
-					Xwpn = Bwpn;
-					game->xwpn = game->bwpn;
-					directItemX = directItemB;
-				}
-				else if(use_y && t == Ywpn)
-				{
-					Ywpn = Bwpn;
-					game->ywpn = game->bwpn;
-					directItemY = directItemB;
-				}
-				
-				Bwpn = t;
-				game->forced_bwpn = -1; //clear forced if the item is selected using the actual subscreen
-				if(!b_only) sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
-				
-				game->bwpn = Bpos;
-				directItemB = directItem;
 			}
-			else if(use_a && rAbtn())
+			else if(rRbtn() )
 			{
-				int32_t t = eqwpn;
-				if(t == Bwpn)
+				if (!get_qr(qr_NO_L_R_BUTTON_INVENTORY_SWAP)) 
 				{
-					Bwpn = Awpn;
-					game->bwpn = game->awpn;
-					directItemB = directItemA;
+					pg.cursor_pos = pg.move_legacy(SEL_RIGHT, pos, -1, -1, -1, false, true);
 				}
-				else if(use_x && t == Xwpn)
-				{
-					Xwpn = Awpn;
-					game->xwpn = game->awpn;
-					directItemX = directItemA;
-				}
-				else if(use_y && t == Ywpn)
-				{
-					Ywpn = Awpn;
-					game->ywpn = game->awpn;
-					directItemY = directItemA;
-				}
-				
-				Awpn = t;
-				sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
-				game->awpn = Bpos;
-				game->forced_awpn = -1; //clear forced if the item is selected using the actual subscreen
-				directItemA = directItem;
 			}
-			else if(use_x && rEx1btn())
+			else if(rEx3btn() )
 			{
-				int32_t t = eqwpn;
-				if(t == Bwpn)
+				if ( use_a && get_qr(qr_USE_EX1_EX2_INVENTORYSWAP) )
 				{
-					Bwpn = Xwpn;
-					game->bwpn = game->xwpn;
-					directItemB = directItemX;
+					selectNextAWpn(SEL_LEFT);
 				}
-				else if(use_a && t == Awpn)
-				{
-					Awpn = Xwpn;
-					game->awpn = game->xwpn;
-					directItemA = directItemX;
-				}
-				else if(use_y && t == Ywpn)
+			}
+			else if(rEx4btn() )
+			{
+				if ( use_a && get_qr(qr_USE_EX1_EX2_INVENTORYSWAP) )
 				{
-					Ywpn = Xwpn;
-					game->ywpn = game->xwpn;
-					directItemY = directItemX;
+					selectNextAWpn(SEL_RIGHT);
 				}
-				
-				Xwpn = t;
-				sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
-				game->xwpn = Bpos;
-				game->forced_xwpn = -1; //clear forced if the item is selected using the actual subscreen
-				directItemX = directItem;
 			}
-			else if(use_y && rEx2btn())
+		}
+		//Assign items to buttons
+		bool can_equip = true;
+		
+		SubscrWidget* widg = pg.get_sel_widg();
+		
+		//!TODO SUBSCR If widg needs to respond to other buttons, check them here...
+		if(widg && !(widg->flags & SUBSCR_CURITM_NONEQP))
+		{
+			auto eqwpn = widg->getItemVal();
+			if(eqwpn > -1)
 			{
-				int32_t t = eqwpn;
-				if(t == Bwpn)
+				if(rBbtn() || b_only)
 				{
-					Bwpn = Ywpn;
-					game->bwpn = game->ywpn;
-					directItemB = directItemY;
+					int32_t t = eqwpn;
+					if(use_a && t == Awpn)
+					{
+						Awpn = Bwpn;
+						game->awpn = game->bwpn;
+						game->awpnpg = game->bwpnpg;
+						directItemA = directItemB;
+					}
+					else if(use_x && t == Xwpn)
+					{
+						Xwpn = Bwpn;
+						game->xwpn = game->bwpn;
+						game->xwpnpg = game->bwpnpg;
+						directItemX = directItemB;
+					}
+					else if(use_y && t == Ywpn)
+					{
+						Ywpn = Bwpn;
+						game->ywpn = game->bwpn;
+						game->ywpnpg = game->bwpnpg;
+						directItemY = directItemB;
+					}
+					
+					Bwpn = t;
+					game->forced_bwpn = -1; //clear forced if the item is selected using the actual subscreen
+					if(!b_only) sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
+					
+					game->bwpn = pg.cursor_pos;
+					game->bwpnpg = new_subscreen_active->curpage;
+					directItemB = directItem;
 				}
-				else if(use_a && t == Awpn)
+				else if(use_a && rAbtn())
 				{
-					Awpn = Ywpn;
-					game->awpn = game->ywpn;
-					directItemA = directItemY;
+					int32_t t = eqwpn;
+					if(t == Bwpn)
+					{
+						Bwpn = Awpn;
+						game->bwpn = game->awpn;
+						game->bwpnpg = game->awpnpg;
+						directItemB = directItemA;
+					}
+					else if(use_x && t == Xwpn)
+					{
+						Xwpn = Awpn;
+						game->xwpn = game->awpn;
+						game->xwpnpg = game->awpnpg;
+						directItemX = directItemA;
+					}
+					else if(use_y && t == Ywpn)
+					{
+						Ywpn = Awpn;
+						game->ywpn = game->awpn;
+						game->ywpnpg = game->awpnpg;
+						directItemY = directItemA;
+					}
+					
+					Awpn = t;
+					sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
+					game->awpn = pg.cursor_pos;
+					game->awpnpg = new_subscreen_active->curpage;
+					game->forced_awpn = -1; //clear forced if the item is selected using the actual subscreen
+					directItemA = directItem;
 				}
-				else if(use_x && t == Xwpn)
+				else if(use_x && rEx1btn())
 				{
-					Xwpn = Ywpn;
-					game->xwpn = game->ywpn;
-					directItemX = directItemY;
+					int32_t t = eqwpn;
+					if(t == Bwpn)
+					{
+						Bwpn = Xwpn;
+						game->bwpn = game->xwpn;
+						game->bwpnpg = game->xwpnpg;
+						directItemB = directItemX;
+					}
+					else if(use_a && t == Awpn)
+					{
+						Awpn = Xwpn;
+						game->awpn = game->xwpn;
+						game->awpnpg = game->xwpnpg;
+						directItemA = directItemX;
+					}
+					else if(use_y && t == Ywpn)
+					{
+						Ywpn = Xwpn;
+						game->ywpn = game->xwpn;
+						game->ywpnpg = game->xwpnpg;
+						directItemY = directItemX;
+					}
+					
+					Xwpn = t;
+					sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
+					game->xwpn = pg.cursor_pos;
+					game->xwpnpg = new_subscreen_active->curpage;
+					game->forced_xwpn = -1; //clear forced if the item is selected using the actual subscreen
+					directItemX = directItem;
+				}
+				else if(use_y && rEx2btn())
+				{
+					int32_t t = eqwpn;
+					if(t == Bwpn)
+					{
+						Bwpn = Ywpn;
+						game->bwpn = game->ywpn;
+						game->bwpnpg = game->ywpnpg;
+						directItemB = directItemY;
+					}
+					else if(use_a && t == Awpn)
+					{
+						Awpn = Ywpn;
+						game->awpn = game->ywpn;
+						game->awpnpg = game->ywpnpg;
+						directItemA = directItemY;
+					}
+					else if(use_x && t == Xwpn)
+					{
+						Xwpn = Ywpn;
+						game->xwpn = game->ywpn;
+						game->xwpnpg = game->ywpnpg;
+						directItemX = directItemY;
+					}
+					
+					Ywpn = t;
+					sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
+					game->ywpn = pg.cursor_pos;
+					game->ywpnpg = new_subscreen_active->curpage;
+					game->forced_ywpn = -1; //clear forced if the item is selected using the actual subscreen
+					directItemY = directItem;
 				}
-				
-				Ywpn = t;
-				sfx(QMisc.miscsfx[sfxSUBSCR_ITEM_ASSIGN]);
-				game->ywpn = Bpos;
-				game->forced_ywpn = -1; //clear forced if the item is selected using the actual subscreen
-				directItemY = directItem;
 			}
 		}
-        if(pos!=Bpos)
+        if(pos!=pg.cursor_pos)
             sfx(QMisc.miscsfx[sfxSUBSCR_CURSOR_MOVE]);
             
         do_dcounters();
diff --git a/src/zc/zc_sys.cpp b/src/zc/zc_sys.cpp
index 2e0767af03..5f2277e92c 100644
--- a/src/zc/zc_sys.cpp
+++ b/src/zc/zc_sys.cpp
@@ -2281,7 +2281,7 @@ int32_t _c_item_id_internal(int32_t itemtype, bool checkmagic, bool jinx_check)
 		if(!(HeroSwordClk() || HeroItemClk()))
 			jinx_check = false; //not jinxed
 	}
-	if(itemtype!=itype_ring && !jinx_check)  // Rings must always be checked, as must jinx checks...
+	if (itemtype != itype_ring && !jinx_check)  // Rings must always be checked, as must jinx checks...
 	{
 		std::map<int32_t,int32_t>::iterator res = itemcache.find(itemtype);
 		
@@ -5911,7 +5911,6 @@ int32_t zc_load_zmod_module_file()
 		zcm.init(true); //Load the module values.
 		moduledata.refresh_title_screen = 1;
 //		refresh_select_screen = 1;
-		build_biic_list();
 		return D_O_K;
 }
 
diff --git a/src/zc/zelda.cpp b/src/zc/zelda.cpp
index 979d73dcbe..c356ff68a1 100644
--- a/src/zc/zelda.cpp
+++ b/src/zc/zelda.cpp
@@ -378,7 +378,6 @@ word     door_combo_set_count;
 word     introclk  = 0, intropos = 0, dmapmsgclk = 0, linkedmsgclk = 0;
 int16_t    lensclk = 0;
 int32_t     lensid = 0; // Lens's item id. -1 if lens is off.
-int32_t    Bpos = 0;
 byte screengrid[22]={0};
 byte screengrid_layer[2][22]={0};
 byte ffcgrid[MAXFFCS/8]={0};
@@ -619,10 +618,7 @@ int32_t idle_count=0, active_count=0;
 zquestheader QHeader;
 byte                midi_flags[MIDIFLAGS_SIZE];
 byte                music_flags[MUSICFLAGS_SIZE];
-word                map_count=0;
 int32_t					msg_strings_size=0;
-std::vector<mapscr> TheMaps;
-std::vector<word>   map_autolayers;
 zcmap               *ZCMaps;
 byte                *quest_file;
 dword               quest_map_pos[MAPSCRS*MAXMAPS2]={0};
@@ -1688,7 +1684,7 @@ int32_t init_game()
 {
 	if(clearConsoleOnLoad)
 		clearConsole();
-	current_subscreen_active = nullptr;
+	new_subscreen_active = nullptr;
 
     // Various things use the frame counter to do random stuff (ex: runDrunkRNG).
 	// We only bother setting it to 0 here so that recordings will play back the
@@ -2016,7 +2012,7 @@ int32_t init_game()
 	lastentrance_dmap = currdmap;
 	currmap = DMaps[currdmap].map;
 	dlevel = DMaps[currdmap].level;
-	sle_x=sle_y=newscr_clk=opendoors=Bwpn=Bpos=0;
+	sle_x=sle_y=newscr_clk=opendoors=Bwpn=0;
 	fadeclk=-1;
 	
 	if(currscr < 0x80 && (DMaps[currdmap].flags&dmfVIEWMAP))
@@ -2156,10 +2152,9 @@ int32_t init_game()
 	
 	if(firstplay)
 	{
-		game->awpn=-1;
-		game->bwpn=-1;
-		game->ywpn=-1;
-		game->xwpn=-1;
+		int wval = get_qr(qr_OLD_SUBSCR) ? -1 : 0;
+		game->awpn=game->bwpn=game->ywpn=game->xwpn=wval;
+		game->awpnpg=game->bwpnpg=game->ywpnpg=game->xwpnpg=0;
 		game->forced_awpn = -1; 
 		game->forced_bwpn = -1;  
 		game->forced_xwpn = -1; 
@@ -2173,109 +2168,109 @@ int32_t init_game()
 	//load the previous weapons -DD	
 	
 	bool usesaved = (game->get_quest() == 0xFF); //What was wrong with firstplay?
-	int32_t apos = 0, bpos = 0, xpos = 0, ypos = 0;
+	int32_t apos = -1, bpos = -1, xpos = -1, ypos = -1;
 	
 	//Setup button items
 	{
 		bool use_x = get_qr(qr_SET_XBUTTON_ITEMS), use_y = get_qr(qr_SET_YBUTTON_ITEMS);
-		if(use_x || use_y)
+		if(get_qr(qr_OLD_SUBSCR))
 		{
-			if(!get_qr(qr_SELECTAWPN))
+			SubscrPage& pg = new_subscreen_active->cur_page();
+			if(use_x || use_y)
 			{
-				Awpn = selectSword();
-				apos = -1;
-				bpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF);
-				if(use_x)
-					xpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, bpos);
-				else xpos = -1;
-				if(use_y)
-					ypos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, bpos, xpos);
-				else ypos = -1;
-				directItem = -1;
-				directItemA = directItem; 
-			}
-			else
-			{
-				apos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->awpn : 0xFF);
-				bpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos);
-				if(use_x)
-					xpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos, bpos);
-				else xpos = -1;
-				if(use_y)
-					ypos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos, bpos, xpos);
-				else ypos = -1;
-				
-				if(bpos==0xFF)
-				{
-					bpos=-1;
-				}
-				if(apos==0xFF)
+				if(!get_qr(qr_SELECTAWPN))
 				{
-					apos=-1;
+					Awpn = selectSword();
+					bpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF);
+					if(use_x)
+						xpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->xwpn : 0xFF, bpos);
+					if(use_y)
+						ypos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->ywpn : 0xFF, bpos, xpos);
+					directItem = -1;
+					directItemA = -1; 
 				}
-				if(xpos==0xFF)
+				else
 				{
-					xpos=-1;
-				}
-				if(bpos==0xFF)
-				{
-					ypos=-1;
+					apos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->awpn : 0xFF);
+					bpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos);
+					if(use_x)
+						xpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->xwpn : 0xFF, apos, bpos);
+					if(use_y)
+						ypos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->ywpn : 0xFF, apos, bpos, xpos);
+					
+					if(bpos==0xFF)
+						bpos=-1;
+					if(apos==0xFF)
+						apos=-1;
+					if(xpos==0xFF)
+						xpos=-1;
+					if(ypos==0xFF)
+						ypos=-1;
+					
+					Awpn = pg.get_item_pos(apos);
+					directItemA = Awpn&0xFF;
 				}
-				
-				Awpn = Bweapon(apos); //Bweapon() sets directItem
-				directItemA = directItem;
-			}
 
-			game->awpn = apos;
-			
-			game->bwpn = bpos;
-			Bwpn = Bweapon(bpos);
-			directItemB = directItem;
-			
-			game->xwpn = xpos;
-			Xwpn = Bweapon(xpos);
-			directItemX = directItem;
-			
-			game->ywpn = ypos;
-			Ywpn = Bweapon(ypos);
-			directItemY = directItem;
-			
-			update_subscr_items();
+				game->awpn = apos;
+				
+				game->bwpn = bpos;
+				Bwpn = pg.get_item_pos(bpos);
+				directItemB = Bwpn&0xFF;
+				
+				game->xwpn = xpos;
+				Xwpn = pg.get_item_pos(xpos);
+				directItemX = Xwpn&0xFF;
+				
+				game->ywpn = ypos;
+				Ywpn = pg.get_item_pos(ypos);
+				directItemY = Ywpn&0xFF;
+				
+				update_subscr_items();
 
-			reset_subscr_items();
-		}
-		else
-		{
-			if(!get_qr(qr_SELECTAWPN))
-			{
-				Awpn = selectSword();
-				apos = -1;
-				bpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, -1);
-				directItem = -1;
-				directItemA = directItem; 
+				reset_subscr_items();
 			}
 			else
 			{
-				apos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->awpn : 0xFF);
-				bpos = selectWpn_new(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos);
-				
-				if(bpos==0xFF)
+				if(!get_qr(qr_SELECTAWPN))
 				{
-					bpos=apos;
-					apos=-1;
+					Awpn = selectSword();
+					apos = -1;
+					bpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, -1);
+					directItem = -1;
+					directItemA = directItem; 
+				}
+				else
+				{
+					apos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->awpn : 0xFF);
+					bpos = pg.move_legacy(SEL_VERIFY_RIGHT, usesaved ? game->bwpn : 0xFF, apos);
+					
+					if(bpos==0xFF)
+					{
+						bpos=apos;
+						apos=-1;
+					}
+					
+					Awpn = pg.get_item_pos(apos);
+					directItemA = Awpn&0xFF;
 				}
-				
-				Awpn = Bweapon(apos); //Bweapon() sets directItem
-				directItemA = directItem;
-			}
 
-			game->awpn = apos;
-			game->bwpn = bpos;
-			Bwpn = Bweapon(bpos);
-			directItemB = directItem;
-			update_subscr_items();
+				game->awpn = apos;
+				game->bwpn = bpos;
+				Bwpn = pg.get_item_pos(bpos);
+				directItemB = Bwpn&0xFF;
+				update_subscr_items();
 
-			reset_subscr_items();
+				reset_subscr_items();
+			}
+		}
+		else if(new_subscreen_active)
+		{
+			if(get_qr(qr_SELECTAWPN))
+				directItemA = Awpn = new_subscreen_active->get_item_pos(game->awpn,game->awpnpg);
+			else selectSword();
+			directItemB = Bwpn = new_subscreen_active->get_item_pos(game->bwpn,game->bwpnpg);
+			directItemX = Xwpn = new_subscreen_active->get_item_pos(game->xwpn,game->xwpnpg);
+			directItemY = Ywpn = new_subscreen_active->get_item_pos(game->ywpn,game->ywpnpg);
 		}
 	}
 	
@@ -3437,8 +3432,6 @@ void game_loop()
 					{
 						if(!Quit)
 						{
-							//set a B item hack
-							//Bwpn = Bweapon(Bpos);
 							replay_step_comment("hero died");
 							Quit = qGAMEOVER;
 						}
@@ -5447,10 +5440,6 @@ int main(int argc, char **argv)
 			case qQUIT:
 			case qGAMEOVER:
 			case qRELOAD:
-				//set a B item hack
-				//Bwpn = Bweapon(Bpos);
-				//game->bwpn = Bpos;
-				//directItemB = directItem;
 			case qCONT:
 			case qSAVECONT:
 			{
@@ -5729,24 +5718,7 @@ void quit_game()
 	destroy_bitmap(darkscr_bmp_scrollscr);
 	destroy_bitmap(darkscr_bmp_scrollscr_trans);
 	destroy_bitmap(lightbeam_bmp);
-	
-	al_trace("Subscreens... \n");
-	
-	for(int32_t i=0; i<4; i++)
-	{
-		for(int32_t j=0; j<MAXSUBSCREENITEMS; j++)
-		{
-			switch(custom_subscreen[i].objects[j].type)
-			{
-			case ssoTEXT:
-			case ssoTEXTBOX:
-			case ssoCURRENTITEMTEXT:
-			case ssoCURRENTITEMCLASSTEXT:
-				if(custom_subscreen[i].objects[j].dp1 != NULL) delete[](char *)custom_subscreen[i].objects[j].dp1;
-			}
-		}
-	}
-	
+		
 	al_trace("SFX... \n");
 	zcmusic_exit();
 	zcmixer_exit(zcmixer);
diff --git a/src/zc/zelda.h b/src/zc/zelda.h
index ee04fb5cb5..84cac38023 100644
--- a/src/zc/zelda.h
+++ b/src/zc/zelda.h
@@ -345,7 +345,6 @@ extern word     door_combo_set_count;
 extern word     introclk, intropos, dmapmsgclk, linkedmsgclk;
 extern int16_t    lensclk;
 extern int32_t     lensid;
-extern int32_t    Bpos;
 extern byte screengrid[22];
 extern byte screengrid_layer[2][22];
 extern byte ffcgrid[MAXFFCS/8];
@@ -490,9 +489,7 @@ extern void throttleFPS();
 extern zquestheader QHeader;
 extern byte                midi_flags[MIDIFLAGS_SIZE];
 extern byte                music_flags[MUSICFLAGS_SIZE];
-extern word                map_count;
 extern int32_t				   msg_strings_size;
-extern std::vector<mapscr> TheMaps;
 extern zcmap               *ZCMaps;
 extern byte                *quest_file;
 
diff --git a/src/zc_list_data.cpp b/src/zc_list_data.cpp
index ecde038e87..68eb83e7e0 100644
--- a/src/zc_list_data.cpp
+++ b/src/zc_list_data.cpp
@@ -4,6 +4,7 @@
 #include "qst.h"
 #include "zinfo.h"
 #include "base/misctypes.h"
+#include <fmt/format.h>
 
 extern zcmodule moduledata;
 extern char *weapon_string[];
@@ -81,43 +82,33 @@ GUI::ListData GUI::ZCListData::fonts(bool ss_fonts, bool numbered, bool sorted)
 		for(auto q = 0; ssfont2_str[q][0]; ++q)
 		{
 			char const* fontname = ssfont2_str[q];
+			std::string name;
 			if(numbered)
-			{
-				char* name = new char[strlen(fontname) + 7];
-				sprintf(name, "%s (%03d)", fontname, q);
-				fontname = name;
-			}
-			std::string sname(fontname);
+				name = fmt::format("{} ({:03})", fontname, q);
+			else name = fontname;
 			
 			if(sorted)
 			{
-				ids[sname] = q;
-				names.insert(sname);
+				ids[name] = q;
+				names.insert(name);
 			}
-			else strings.push_back(sname);
-			if(numbered)
-				delete[] fontname;
+			else strings.push_back(name);
 		}
 	}
 	else for(auto q = 0; q < font_max; ++q)
 	{
 		char const* fontname = msgfont_str[q].c_str();
+		std::string name;
 		if(numbered)
-		{
-			char* name = new char[strlen(fontname) + 7];
-			sprintf(name, "%s (%03d)", fontname, q);
-			fontname = name;
-		}
-		std::string sname(fontname);
+			name = fmt::format("{} ({:03})", fontname, q);
+		else name = fontname;
 		
 		if(sorted)
 		{
-			ids[sname] = q;
-			names.insert(sname);
+			ids[name] = q;
+			names.insert(name);
 		}
-		else strings.push_back(sname);
-		if(numbered)
-			delete[] fontname;
+		else strings.push_back(name);
 	}
 	if(!sorted)
 		return GUI::ListData(strings);
@@ -239,18 +230,13 @@ GUI::ListData GUI::ZCListData::enemies(bool numbered, bool defaultFilter)
 				continue; //Guys
 		}
 		char const* npcname = guy_string[q];
+		std::string name;
 		if(numbered)
-		{
-			char* name = new char[strlen(npcname) + 7];
-			sprintf(name, "%s (%03d)", npcname, q);
-			npcname = name;
-		}
-		std::string sname(npcname);
+			name = fmt::format("{} ({:03})", npcname, q);
+		else name = npcname;
 		
-		ids[sname] = q;
-		names.insert(sname);
-		if(numbered)
-			delete[] npcname;
+		ids[name] = q;
+		names.insert(name);
 	}
 	
 	GUI::ListData ls;
@@ -270,18 +256,13 @@ GUI::ListData GUI::ZCListData::items(bool numbered, bool none)
 	for(int32_t q=0; q < MAXITEMS; ++q)
 	{
 		char const* itname = item_string[q];
+		std::string name;
 		if(numbered)
-		{
-			char* name = new char[strlen(itname) + 7];
-			sprintf(name, "%s (%03d)", itname, q);
-			itname = name;
-		}
-		std::string sname(itname);
+			name = fmt::format("{} ({:03})", itname, q);
+		else name = itname;
 		
-		ids[sname] = q;
-		names.insert(sname);
-		if(numbered)
-			delete[] itname;
+		ids[name] = q;
+		names.insert(name);
 	}
 	
 	GUI::ListData ls;
@@ -302,18 +283,13 @@ GUI::ListData GUI::ZCListData::dropsets(bool numbered, bool none)
 	for(int32_t q=0; q < MAXITEMDROPSETS; ++q)
 	{
 		char const* dropname = item_drop_sets[q].name;
+		std::string name;
 		if(numbered)
-		{
-			char* name = new char[strlen(dropname) + 7];
-			sprintf(name, "%s (%03d)", dropname, q);
-			dropname = name;
-		}
-		std::string sname(dropname);
+			name = fmt::format("{} ({:03})", dropname, q);
+		else name = dropname;
 		
-		ids[sname] = q;
-		names.insert(sname);
-		if(numbered)
-			delete[] dropname;
+		ids[name] = q;
+		names.insert(name);
 	}
 	
 	GUI::ListData ls;
@@ -338,27 +314,23 @@ GUI::ListData GUI::ZCListData::itemclass(bool numbered, bool zero_none)
 		char const* itname = ZI.getItemClassName(i);
         if(i < itype_last || itname[0])
 		{
-            char* name = new char[strlen(itname) + 7];
-            if(numbered)
-				sprintf(name, "%s (%03d)", itname, i);
-            else strcpy(name, itname);
-			std::string sname(name);
+			std::string name;
+			if(numbered)
+				name = fmt::format("{} ({:03})", itname, i);
+			else name = itname;
 			
-			fams[sname] = i;
-			famnames.insert(sname);
-			delete[] name;
+			fams[name] = i;
+			famnames.insert(name);
 		}
 		else 
 		{
-			char *name = new char[12];
+			std::string name;
 			if(numbered)
-				sprintf(name, "zz%03d (%03d)", i, i);
-			else sprintf(name, "zz%03d", i);
-			std::string sname(name);
+				name = fmt::format("zz{:03} ({:03})", i, i);
+			else name = fmt::format("zz{:03}",i);
 			
-			fams[sname] = i;
-			famnames.insert(sname);
-			delete[] name;
+			fams[name] = i;
+			famnames.insert(name);
 		}
 	}
 	
@@ -386,27 +358,23 @@ GUI::ListData GUI::ZCListData::combotype(bool numbered, bool skipNone)
 		char const* module_str = ZI.getComboTypeName(i);
 		if(module_str[0])
 		{
-			char* name = new char[strlen(module_str) + 7];
+			std::string name;
 			if(numbered)
-				sprintf(name, "%s (%03d)", module_str, i);
-			else strcpy(name, module_str);
-			std::string sname(name);
+				name = fmt::format("{} ({:03})", module_str, i);
+			else name = module_str;
 			
-			types[sname] = i;
-			typenames.insert(sname);
-			delete[] name;
+			types[name] = i;
+			typenames.insert(name);
 		}
 		else 
 		{
-			char *name = new char[12];
+			std::string name;
 			if(numbered)
-				sprintf(name, "zz%03d (%03d)", i, i);
-			else sprintf(name, "zz%03d", i);
-			std::string sname(name);
+				name = fmt::format("zz{:03} ({:03})", i, i);
+			else name = fmt::format("zz{:03}",i);
 			
-			types[sname] = i;
-			typenames.insert(sname);
-			delete[] name;
+			types[name] = i;
+			typenames.insert(name);
 		}
 	}
 
@@ -429,23 +397,18 @@ GUI::ListData GUI::ZCListData::mapflag(int32_t numericalFlags, bool numbered, bo
 		if(!ZI.isUsableMapFlag(q))
 			continue; //Hidden
 		char const* module_str = ZI.getMapFlagName(q);
-		char* name = new char[strlen(module_str) + 7];
+		std::string name;
 		if(numbered)
-			sprintf(name, "%s (%03d)", module_str, q);
-		else strcpy(name, module_str);
+			name = fmt::format("{} ({:03})", module_str, q);
+		else name = module_str;
 		
-		std::string sname(name);
 		if (numericalFlags)
-		{
-			ls.add(sname, q);
-		}
+			ls.add(name, q);
 		else
 		{
-			vals[sname] = q;
-			names.insert(sname);
+			vals[name] = q;
+			names.insert(name);
 		}
-		
-		delete[] name;
 	}
 	if (!numericalFlags)
 	{
@@ -466,12 +429,7 @@ GUI::ListData GUI::ZCListData::dmaps(bool numbered)
 	{
 		char const* dm_str = DMaps[q].name;
 		if(numbered)
-		{
-			char* name = new char[strlen(dm_str) + 7];
-			sprintf(name, "%3d-%s", q, dm_str);
-			ls.add(name, q);
-			delete[] name;
-		}
+			ls.add(fmt::format("{:3}-{}",q,dm_str), q);
 		else ls.add(dm_str, q);
 	}
 	
@@ -490,18 +448,15 @@ GUI::ListData GUI::ZCListData::counters(bool numbered, bool skipNone)
 		if(!ZI.isUsableCtr(q))
 			continue; //Hidden
 		char const* module_str = ZI.getCtrName(q);
-		char* name = new char[strlen(module_str) + 6];
+		std::string sname;
 		if(numbered)
-			sprintf(name, "%s (%02d)", module_str, q);
-		else strcpy(name, module_str);
+			sname = fmt::format("{} ({:02})", module_str, q);
+		else sname = module_str;
 		
-		std::string sname(name);
 		
 		// vals[sname] = q;
 		// names.insert(sname);
 		ls.add(sname, q);
-		
-		delete[] name;
 	}
 	
 	// for(auto it = names.begin(); it != names.end(); ++it)
@@ -519,15 +474,13 @@ GUI::ListData GUI::ZCListData::miscsprites(bool skipNone, bool inclNegSpecialVal
 	
 	for(int32_t i=0; i<MAXWPNS; ++i)
 	{
-		char buf[512];
-		char* ptr = buf;
+		std::string name;
 		if(numbered)
-			sprintf(buf, "%s (%03d)", weapon_string[i], i);
-		else ptr = weapon_string[i];
-		std::string sname(ptr);
+			name = fmt::format("{} ({:03})", weapon_string[i], i);
+		else name = weapon_string[i];
 		
-		ids[sname] = i;
-		sprnames.insert(sname);
+		ids[name] = i;
+		sprnames.insert(name);
 	}
 	
 	GUI::ListData ls;
@@ -565,12 +518,7 @@ GUI::ListData GUI::ZCListData::bottletype()
 		if(QMisc.bottle_types[q].name[0])
 			ls.add(QMisc.bottle_types[q].name,q+1);
 		else
-		{
-			char buf[8] = { 0 };
-			sprintf(buf, "%2d", q+1);
-			
-			ls.add(buf, q+1);
-		}
+			ls.add(fmt::format("{:2}", q+1), q+1);
 	}
 	
 	return ls;
@@ -609,16 +557,9 @@ GUI::ListData GUI::ZCListData::weaptypes(bool numbered)
 		if(!ZI.isUsableWeap(q))
 			continue; //Hidden
 		char const* module_str = ZI.getWeapName(q);
-		char* name = new char[strlen(module_str) + 8];
 		if(numbered)
-			sprintf(name, "%s (%03d)", module_str, q);
-		else strcpy(name, module_str);
-		
-		std::string sname(name);
-		
-		ls.add(sname, q);
-		
-		delete[] name;
+			ls.add(fmt::format("{} ({:03})", module_str, q), q);
+		else ls.add(module_str, q);
 	}
 	
 	return ls;
@@ -633,12 +574,9 @@ GUI::ListData GUI::ZCListData::sfxnames(bool numbered)
 	for(int32_t i=1; i<WAV_COUNT; ++i)
 	{
 		char const* sfx_name = sfx_string[i];
-		char* name = new char[strlen(sfx_name) + 7];
 		if(numbered)
-			sprintf(name, "%s (%03d)", sfx_name, i);
-		else strcpy(name, sfx_name);
-		ls.add(name, i);
-		delete[] name;
+			ls.add(fmt::format("{} ({:03})", sfx_name, i), i);
+		else ls.add(sfx_name, i);
 	}
 	
 	return ls;
@@ -652,12 +590,10 @@ GUI::ListData GUI::ZCListData::midinames(bool numbered)
 	for(int32_t i=0; i<MAXCUSTOMTUNES; ++i)
 	{
 		char const* midi_name = customtunes[i].title;
-		char* name = new char[strlen(midi_name) + 7];
+		std::string name;
 		if(numbered)
-			sprintf(name, "%s (%03d)", midi_name, i+1);
-		else strcpy(name, midi_name);
-		ls.add(name, i+1);
-		delete[] name;
+			ls.add(fmt::format("{} ({:03})", midi_name, i+1), i+1);
+		else ls.add(midi_name, i+1);
 	}
 	
 	return ls;
diff --git a/src/zq/gui/misc_color_sel.cpp b/src/zq/gui/misc_color_sel.cpp
index 89c3576703..e1f4793c1b 100644
--- a/src/zq/gui/misc_color_sel.cpp
+++ b/src/zq/gui/misc_color_sel.cpp
@@ -6,10 +6,6 @@
 #include <utility>
 #include "subscr.h"
 
-//zq_subscr.cpp
-int32_t d_cs_color_proc(int32_t msg,DIALOG *d,int32_t);
-int32_t d_sys_color_proc(int32_t msg,DIALOG *d,int32_t);
-
 namespace GUI
 {
 static bool isCSet(int32_t val)
diff --git a/src/zq/zq_class.cpp b/src/zq/zq_class.cpp
index 54a1492317..fccad3cd7f 100644
--- a/src/zq/zq_class.cpp
+++ b/src/zq/zq_class.cpp
@@ -6421,10 +6421,10 @@ bool save_zgp(const char *path)
     return true;
 }
 
-bool save_subscreen(const char *path, bool *cancel)
+bool save_subscreen(const char *path, bool *cancel) //!TODO SUBSCR update to use new format
 {
 //  jwin_alert("Error","This feature not yet implemented.",NULL,NULL,"O&K",NULL,'k',0,get_zc_font(font_lfont));
-//  return false;
+	return false;/*
     reset_combo_animations();
     reset_combo_animations2();
     *cancel = false;
@@ -6490,18 +6490,19 @@ bool save_subscreen(const char *path, bool *cancel)
     }
     
     //subscreens
-    if(write_one_subscreen(f,&header,sslist_dlg[2].d1)!=0)
+    //if(write_one_subscreen(f,&header,sslist_dlg[2].d1)!=0)
     {
         pack_fclose(f);
         return false;
     }
     
     pack_fclose(f);
-    return true;
+    return true;*/
 }
 
-bool load_subscreen(const char *path)
+bool load_subscreen(const char *path) //!TODO SUBSCR update to handle new format
 {
+	return false;/*
     int32_t ret;
     sslist_dlg[0].dp2=get_zc_font(font_lfont);
     char *oldtitlestr=(char*)sslist_dlg[0].dp;
@@ -6566,14 +6567,14 @@ bool load_subscreen(const char *path)
     }
     
     //subscreens
-    if(read_one_subscreen(f,&header,sslist_dlg[2].d1,section_version,section_cversion)!=0)
+    //if(read_one_old_subscreen(f,&header,sslist_dlg[2].d1,section_version,section_cversion)!=0)
     {
         pack_fclose(f);
         return false;
     }
     
     pack_fclose(f);
-    return true;
+    return true;*/
 }
 
 bool setMapCount2(int32_t c)
@@ -12229,268 +12230,67 @@ int32_t writeherosprites(PACKFILE *f, zquestheader *Header)
 
 int32_t writesubscreens(PACKFILE *f, zquestheader *Header)
 {
-    dword section_id=ID_SUBSCREEN;
-    dword section_version=V_SUBSCREEN;
-    dword section_cversion=CV_SUBSCREEN;
-    dword section_size=0;
-    
-    //section id
-    if(!p_mputl(section_id,f))
-    {
-        new_return(1);
-    }
-    
-    //section version info
-    if(!p_iputw(section_version,f))
-    {
-        new_return(2);
-    }
-    
-    if(!p_iputw(section_cversion,f))
-    {
-        new_return(3);
-    }
-    
-    for(int32_t writecycle=0; writecycle<2; ++writecycle)
-    {
-        fake_pack_writing=(writecycle==0);
-        
-        //section size
-        if(!p_iputl(section_size,f))
-        {
-            new_return(4);
-        }
-        
-        writesize=0;
-        
-        for(int32_t i=0; i<MAXCUSTOMSUBSCREENS; i++)
-        {
-            int32_t ret = write_one_subscreen(f, Header, i);
-            fake_pack_writing=(writecycle==0);
-            
-            if(ret!=0)
-            {
-                new_return(ret);
-            }
-        }
-        
-        if(writecycle==0)
-        {
-            section_size=writesize;
-        }
-    }
-    
-    if(writesize!=int32_t(section_size) && save_warn)
-    {
-        char ebuf[80];
-        sprintf(ebuf, "%d != %d", writesize, int32_t(section_size));
-        jwin_alert("Error:  writesubscreens()","writesize != section_size",ebuf,NULL,"O&K",NULL,'k',0,get_zc_font(font_lfont));
-    }
-    
-    new_return(0);
-}
-
-int32_t write_one_subscreen(PACKFILE *f, zquestheader *Header, int32_t i)
-{
-    //these are here to bypass compiler warnings about unused arguments
-    Header=Header;
-    
-    int32_t numsub = 0;
-    
-    if(!pfwrite(custom_subscreen[i].name, 64,f))
-    {
-        new_return(28);
-    }
-    
-    if(!p_putc(custom_subscreen[i].ss_type,f))
-    {
-        new_return(29);
-    }
-    
-    for(int32_t k=0; (k<MAXSUBSCREENITEMS&&(custom_subscreen[i].objects[k].type != ssoNULL)); k++)
-    {
-        numsub++;
-    }
-    
-    if(!p_iputw(numsub,f))
-    {
-        new_return(4);
-    }
-    
-    for(int32_t j=0; (j<MAXSUBSCREENITEMS&&j<numsub); j++)
-    {
-        if(!p_putc(custom_subscreen[i].objects[j].type, f))
-        {
-            new_return(5);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].pos, f))
-        {
-            new_return(6);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].x, f))
-        {
-            new_return(7);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].y, f))
-        {
-            new_return(8);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].w, f))
-        {
-            new_return(9);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].h, f))
-        {
-            new_return(10);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].colortype1, f))
-        {
-            new_return(11);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].color1, f))
-        {
-            new_return(12);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].colortype2, f))
-        {
-            new_return(13);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].color2, f))
-        {
-            new_return(14);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].colortype3, f))
-        {
-            new_return(15);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].color3, f))
-        {
-            new_return(16);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d1, f))
-        {
-            new_return(17);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d2, f))
-        {
-            new_return(18);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d3, f))
-        {
-            new_return(19);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d4, f))
-        {
-            new_return(20);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d5, f))
-        {
-            new_return(21);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d6, f))
-        {
-            new_return(22);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d7, f))
-        {
-            new_return(23);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d8, f))
-        {
-            new_return(24);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d9, f))
-        {
-            new_return(25);
-        }
-        
-        if(!p_iputl(custom_subscreen[i].objects[j].d10, f))
-        {
-            new_return(26);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].speed, f))
-        {
-            new_return(27);
-        }
-        
-        if(!p_putc(custom_subscreen[i].objects[j].delay, f))
-        {
-            new_return(28);
-        }
-        
-        if(!p_iputw(custom_subscreen[i].objects[j].frame, f))
-        {
-            new_return(29);
-        }
-        
-        switch(custom_subscreen[i].objects[j].type)
-        {
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoCURRENTITEMTEXT:
-        case ssoCURRENTITEMCLASSTEXT:
-            if(custom_subscreen[i].objects[j].dp1 != NULL)
-            {
-                if(strlen((char*)custom_subscreen[i].objects[j].dp1))
-                {
-                    if(!p_iputw((int32_t)strlen((char*)custom_subscreen[i].objects[j].dp1), f))
-                    {
-                        new_return(27);
-                    }
-                    
-                    if(!pfwrite(custom_subscreen[i].objects[j].dp1, (int32_t)strlen((char*)custom_subscreen[i].objects[j].dp1)+1,f))
-                    {
-                        new_return(28);
-                    }
-                }
-                else
-                {
-                    if(!p_iputw(0, f))
-                    {
-                        new_return(27);
-                    }
-                }
-            }
-            else
-            {
-                if(!p_iputw(0, f))
-                {
-                    new_return(27);
-                }
-            }
-            
-            break;
-            
-        default:
-            if(!p_putc(0, f))
-            {
-                new_return(27);
-            }
-        }
-    }
-    
-    new_return(0);
+	dword section_id=ID_SUBSCREEN;
+	dword section_version=V_SUBSCREEN;
+	dword section_cversion=CV_SUBSCREEN;
+	dword section_size=0;
+	
+	//section id
+	if(!p_mputl(section_id,f))
+	{
+		new_return(1);
+	}
+	
+	//section version info
+	if(!p_iputw(section_version,f))
+	{
+		new_return(2);
+	}
+	
+	if(!p_iputw(section_cversion,f))
+	{
+		new_return(3);
+	}
+	
+	for(int32_t writecycle=0; writecycle<2; ++writecycle)
+	{
+		fake_pack_writing=(writecycle==0);
+		
+		//section size
+		if(!p_iputl(section_size,f))
+		{
+			new_return(4);
+		}
+		
+		writesize=0;
+		
+		byte sz = new_subscreen.size();
+		if(!p_putc(sz,f))
+			new_return(5);
+		
+		for(int32_t i=0; i<sz; i++)
+		{
+			int32_t ret = new_subscreen[i].write(f);
+			fake_pack_writing=(writecycle==0);
+			
+			if(ret!=0)
+				new_return(ret);
+		}
+		
+		if(writecycle==0)
+		{
+			section_size=writesize;
+		}
+	}
+	
+	if(writesize!=int32_t(section_size) && save_warn)
+	{
+		char ebuf[80];
+		sprintf(ebuf, "%d != %d", writesize, int32_t(section_size));
+		jwin_alert("Error:  writesubscreens()","writesize != section_size",ebuf,NULL,"O&K",NULL,'k',0,get_zc_font(font_lfont));
+	}
+	
+	new_return(0);
 }
 
 extern script_data *ffscripts[NUMSCRIPTFFC];
diff --git a/src/zq/zq_custom.cpp b/src/zq/zq_custom.cpp
index a36eee2b24..f8d62236fa 100644
--- a/src/zq/zq_custom.cpp
+++ b/src/zq/zq_custom.cpp
@@ -39,22 +39,11 @@ extern FFScript FFCore;
 
 extern int32_t ex;
 extern void reset_itembuf(itemdata *item, int32_t id);
-extern const char *item_class_list(int32_t index, int32_t *list_size);
 extern const char *sfxlist(int32_t index, int32_t *list_size);
 // zq_subscr.cpp
-extern int32_t d_qtile_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t d_ctl_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t d_csl_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t d_csl2_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t d_tileblock_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t d_stilelist_proc(int32_t msg,DIALOG *d,int32_t c);
 extern int32_t sstype_drop_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t jwin_fontdrop_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t jwin_tflpcheck_proc(int32_t msg,DIALOG *d,int32_t c);
-extern int32_t jwin_lscheck_proc(int32_t msg,DIALOG *d,int32_t c);
 
 extern int32_t biw_cnt;
-extern int32_t biic_cnt;
 
 extern ZModule zcm;
 extern zcmodule moduledata;
@@ -159,7 +148,7 @@ void large_dialog(DIALOG *d, float RESIZE_AMT)
 				d[i].w *= 2;
 				d[i].w -= 4;
 			}
-			else if(d[i].proc == d_wflag_proc || d[i].proc==d_bitmap_proc || d[i].proc == d_maptile_proc || d[i].proc==d_qtile_proc ||  d[i].proc==d_tileblock_proc)
+			else if(d[i].proc == d_wflag_proc || d[i].proc==d_bitmap_proc || d[i].proc == d_maptile_proc)
 			{
 				d[i].w *= 2;
 			}
@@ -175,13 +164,13 @@ void large_dialog(DIALOG *d, float RESIZE_AMT)
 			if((d[i].proc == d_maptile_proc && d[i].dp2!=(void*)1))
 			{
 			}
-			else if(d[i].proc == jwin_edit_proc || d[i].proc == jwin_check_proc || d[i].proc == jwin_checkfont_proc || d[i].proc == jwin_tflpcheck_proc || d[i].proc == jwin_lscheck_proc)
+			else if(d[i].proc == jwin_edit_proc || d[i].proc == jwin_check_proc || d[i].proc == jwin_checkfont_proc)
 			{
 				d[i].h = int32_t((double)d[i].h*1.5);
 			}
 			else if(d[i].proc == jwin_droplist_proc || d[i].proc == d_ndroplist_proc || d[i].proc == d_idroplist_proc || d[i].proc == d_nidroplist_proc || d[i].proc == d_dropdmaplist_proc
-					|| d[i].proc == jwin_as_droplist_proc  || d[i].proc == d_ffcombolist_proc || d[i].proc == sstype_drop_proc || d[i].proc == d_ctl_proc
-					|| d[i].proc == jwin_fontdrop_proc || d[i].proc == d_csl_proc || d[i].proc == d_csl2_proc || d[i].proc == d_stilelist_proc || d[i].proc == d_comboalist_proc)
+					|| d[i].proc == jwin_as_droplist_proc  || d[i].proc == d_ffcombolist_proc || d[i].proc == sstype_drop_proc
+					|| d[i].proc == d_comboalist_proc)
 			{
 				d[i].y += int32_t((double)d[i].h*0.25);
 				d[i].h = int32_t((double)d[i].h*1.25);
@@ -191,7 +180,7 @@ void large_dialog(DIALOG *d, float RESIZE_AMT)
 				d[i].h *= 2;
 				d[i].h -= 4;
 			}
-			else if(d[i].proc == d_wflag_proc || d[i].proc==d_bitmap_proc || d[i].proc == d_maptile_proc || d[i].proc==d_qtile_proc || d[i].proc==d_tileblock_proc)
+			else if(d[i].proc == d_wflag_proc || d[i].proc==d_bitmap_proc || d[i].proc == d_maptile_proc)
 			{
 				d[i].h *= 2;
 			}
@@ -225,8 +214,8 @@ void large_dialog(DIALOG *d, float RESIZE_AMT)
 		// Bigger font
 		bool bigfontproc = (d[i].proc != jwin_droplist_proc && d[i].proc != jwin_abclist_proc && d[i].proc != d_wlist_proc && d[i].proc != jwin_list_proc && d[i].proc != d_dmaplist_proc
 							&& d[i].proc != d_dropdmaplist_proc && d[i].proc != d_warplist_proc && d[i].proc != d_warplist_proc && d[i].proc != d_wclist_proc && d[i].proc != d_ndroplist_proc
-							&& d[i].proc != d_idroplist_proc && d[i].proc != d_nidroplist_proc && d[i].proc != jwin_as_droplist_proc && d[i].proc != d_ffcombolist_proc && d[i].proc != d_enelist_proc && d[i].proc != sstype_drop_proc && d[i].proc !=  d_ctl_proc
-							&& d[i].proc != jwin_fontdrop_proc && d[i].proc != d_csl_proc && d[i].proc != d_csl2_proc && d[i].proc != d_stilelist_proc && d[i].proc != d_comboalist_proc);
+							&& d[i].proc != d_idroplist_proc && d[i].proc != d_nidroplist_proc && d[i].proc != jwin_as_droplist_proc && d[i].proc != d_ffcombolist_proc && d[i].proc != d_enelist_proc && d[i].proc != sstype_drop_proc
+							&& d[i].proc != d_comboalist_proc);
 							
 		if(bigfontproc && !d[i].dp2)
 		{
diff --git a/src/zq/zq_custom.h b/src/zq/zq_custom.h
index 6981b03919..8321eb6bab 100644
--- a/src/zq/zq_custom.h
+++ b/src/zq/zq_custom.h
@@ -18,7 +18,6 @@ void large_dialog(DIALOG *d, float RESIZE_AMT);
 int32_t d_cstile_proc(int32_t msg,DIALOG *d,int32_t c);
 int32_t jwin_as_droplist_proc(int32_t msg,DIALOG *d,int32_t c);
 void build_bief_list();
-void build_biic_list();
 void build_biea_list();
 void build_biew_list();
 
diff --git a/src/zq/zq_doors.cpp b/src/zq/zq_doors.cpp
index 9e8fdf7e93..d438284ec7 100644
--- a/src/zq/zq_doors.cpp
+++ b/src/zq/zq_doors.cpp
@@ -25,10 +25,7 @@
 #include "zq/zquest.h"
 
 extern void restore_mouse();
-extern std::vector<mapscr> TheMaps;
-extern std::vector<word>   map_autolayers;
 extern zquestheader header;
-extern word map_count;
 
 extern int32_t onHelp();
 extern int32_t jwin_pal[jcMAX];
diff --git a/src/zq/zq_init.h b/src/zq/zq_init.h
index 2334dd5cc8..4c84e5c077 100644
--- a/src/zq/zq_init.h
+++ b/src/zq/zq_init.h
@@ -13,6 +13,5 @@
 
 int32_t onInit();
 void center_zq_init_dialog();
-const char *familylist(int32_t index, int32_t *list_size);
 #endif
  
diff --git a/src/zq/zq_strings.cpp b/src/zq/zq_strings.cpp
index baaf3d74f1..106d7e8d61 100644
--- a/src/zq/zq_strings.cpp
+++ b/src/zq/zq_strings.cpp
@@ -97,8 +97,6 @@ DIALOG strlist_dlg[] =
 	{ NULL,                  0,      0,      0,      0,        0,     0,     0,      0,       0,             0,       NULL,  NULL,  NULL }
 };
 
-extern ListData shadowstyle_list;
-
 DIALOG editmsg_help_dlg[] =
 {
 	/* (dialog proc)     (x)   (y)   (w)   (h)   (fg)     (bg)    (key)    (flags)     (d1)      (d2)      (dp) */
diff --git a/src/zq/zq_subscr.cpp b/src/zq/zq_subscr.cpp
index 4ab71416d2..6e1a899dec 100644
--- a/src/zq/zq_subscr.cpp
+++ b/src/zq/zq_subscr.cpp
@@ -38,2373 +38,729 @@ extern void large_dialog(DIALOG *d, float RESIZE_AMT);
 
 int32_t curr_subscreen_object;
 char *str_oname;
-subscreen_group *css;
+ZCSubscreen subscr_edit;
 bool sso_selection[MAXSUBSCREENITEMS];
-static int32_t ss_propCopySrc=-1;
+SubscrWidget* propCopyWidg = nullptr;
 
 gamedata *game;
 
-extern int32_t bii_cnt;
-
 void delete_subscreen(int32_t subscreenidx);
 
-
-const char *colortype_str[14] =
+SubscrPage& subscr_edit_page()
 {
-    "Misc. Color", "Sys. Color", "CSet 0", "CSet 1", "CSet 2", "CSet 3", "CSet 4", "CSet 5", "CSet 6", "CSet 7", "CSet 8", "CSet 9", "CSet 10", "CSet 11"
-};
+	if(subscr_edit.pages.empty())
+		subscr_edit.pages.emplace_back();
+    if(subscr_edit.pages.size() >= subscr_edit.curpage)
+		subscr_edit.curpage = 0;
+	return subscr_edit.pages[subscr_edit.curpage];
+}
+SubscrWidget* subscr_edit_widg()
+{
+	SubscrPage& p = subscr_edit_page();
+	if(p.contents.empty() || curr_subscreen_object < 0)
+	{
+		curr_subscreen_object=-1;
+		return nullptr;
+	}
+	if(curr_subscreen_object >= p.contents.size())
+		curr_subscreen_object = 0;
+	
+	return p.contents[curr_subscreen_object];
+}
+
+static ListData item_list(itemlist_num, &font);
 
-const char *colortypelist(int32_t index, int32_t *list_size)
+int32_t sso_properties(SubscrWidget* widg, int32_t obj_ind)
 {
-    if(index<0)
-    {
-        *list_size = 14;
-        return NULL;
-    }
-    
-    return colortype_str[index];
+    return call_subscrprop_dialog(widg,obj_ind) ? 0 : -1;
 }
 
-int32_t d_cs_color_proc(int32_t msg,DIALOG *d,int32_t)
+int32_t onBringToFront();
+int32_t onBringForward();
+int32_t onSendBackward();
+int32_t onSendToBack();
+int32_t onReverseArrangement();
+int32_t onAlignLeft();
+int32_t onAlignCenter();
+int32_t onAlignRight();
+int32_t onAlignTop();
+int32_t onAlignMiddle();
+int32_t onAlignBottom();
+int32_t onDistributeLeft();
+int32_t onDistributeCenter();
+int32_t onDistributeRight();
+int32_t onDistributeTop();
+int32_t onDistributeMiddle();
+int32_t onDistributeBottom();
+int32_t onGridSnapLeft();
+int32_t onGridSnapCenter();
+int32_t onGridSnapRight();
+int32_t onGridSnapTop();
+int32_t onGridSnapMiddle();
+int32_t onGridSnapBottom();
+void copySSOProperties(SubscrWidget const* src, SubscrWidget* dest);
+
+int32_t onSubscreenObjectProperties()
 {
-    int32_t w=(d->w-4)/16;
-    
-    switch(msg)
+	SubscrPage& pg = subscr_edit_page();
+	SubscrWidget* widg = subscr_edit_widg();
+    if(widg)
     {
-    case MSG_DRAW:
-        //rectfill(screen, d->x+2, d->y+2, d->x+d->w-3, d->y+d->h-3, jwin_pal[jcBOX]);
-        //top blank part
-        rectfill(screen, d->x, d->y, d->x+(w*16)+3, d->y+1, jwin_pal[jcBOX]);
-        jwin_draw_frame(screen,d->x,d->y+2,w*16+4, d->h-4, FR_DEEP);
-        
-        for(int32_t i=0; i<16; ++i)
+        if(sso_properties(widg,pg.cursor_pos)!=-1)
         {
-            rectfill(screen, d->x+2+(w*i), d->y+4, d->x+2+(w*(i+1))-1, d->y+d->h-5, ((d-2)->d1-2)*16+i);
+            for(int32_t i=0; i<pg.contents.size(); i++)
+            {
+                if(!sso_selection[i])
+                    continue;
+                
+                copySSOProperties(widg, pg.contents[i]);
+            }
         }
-        
-        // right end
-        rectfill(screen, d->x+(w*16)+4, d->y, d->x+d->w-1, d->y+d->h-1, jwin_pal[jcBOX]);
-        // bottom part
-        rectfill(screen, d->x, d->y+d->h-2, d->x+(w*16)+3, d->y+d->h-1, jwin_pal[jcBOX]);
-        
-        //indicator lines
-        hline(screen, d->x+2+(w*d->d1), d->y, d->x+2+(w*(d->d1+1))-1, jwin_pal[jcBOXFG]);
-        hline(screen, d->x+2+(w*d->d1), d->y+d->h-1, d->x+2+(w*(d->d1+1))-1, jwin_pal[jcBOXFG]);
-        
-        break;
-        
-    case MSG_CLICK:
-        d->d1=vbound((gui_mouse_x()-d->x-2)/w,0,15);
-        d->flags|=D_DIRTY;
-        break;
     }
     
     return D_O_K;
 }
 
-int32_t d_sys_color_proc(int32_t msg,DIALOG *d,int32_t)
+int32_t onNewSubscreenObject();
+
+int32_t onDeleteSubscreenObject()
 {
-    int32_t w=(d->w-4)/17;
+	SubscrPage& pg = subscr_edit_page();
+    size_t objs=pg.contents.size();
     
-    switch(msg)
+    if(objs==0)
+        return D_O_K;
+    
+	//erase the one object
+	auto cnt = curr_subscreen_object;
+	for(auto it = pg.contents.begin(); it != pg.contents.end();)
+	{
+		if(cnt--) ++it;
+		else
+		{
+			it = pg.contents.erase(it);
+			break;
+		}
+	}
+	
+	//...shift the selection array
+    for(int32_t i=curr_subscreen_object; i<objs-1; ++i)
     {
-    case MSG_DRAW:
-        //rectfill(screen, d->x+2, d->y+2, d->x+d->w-3, d->y+d->h-3, jwin_pal[jcBOX]);
-        //top blank part
-        rectfill(screen, d->x, d->y, d->x+(w*17)+3, d->y+1, jwin_pal[jcBOX]);
-        jwin_draw_frame(screen,d->x,d->y+2,w*17+4, d->h-4, FR_DEEP);
-        
-        for(int32_t i=0; i<17; ++i)
-        {
-            rectfill(screen, d->x+2+(w*i), d->y+4, d->x+2+(w*(i+1))-1, d->y+d->h-5, vc(zc_max(0,i-1)));
-        }
-        
-        line(screen, d->x+2, d->y+4, d->x+2+w-1, d->y+d->h-5, vc(15));
-        line(screen, d->x+2, d->y+d->h-5, d->x+2+w-1, d->y+4, vc(15));
-        // right end
-        rectfill(screen, d->x+(w*17)+4, d->y, d->x+d->w-1, d->y+d->h-1, jwin_pal[jcBOX]);
-        // bottom part
-        rectfill(screen, d->x, d->y+d->h-2, d->x+(w*17)+3, d->y+d->h-1, jwin_pal[jcBOX]);
-        
-        //indicator lines
-        hline(screen, d->x+2+(w*(d->d1+1)), d->y, d->x+2+(w*(d->d1+2))-1, jwin_pal[jcBOXFG]);
-        hline(screen, d->x+2+(w*(d->d1+1)), d->y+d->h-1, d->x+2+(w*(d->d1+2))-1, jwin_pal[jcBOXFG]);
-        
-        break;
-        
-    case MSG_CLICK:
-        d->d1=vbound((gui_mouse_x()-d->x-2)/w,0,16)-1;
-        d->flags|=D_DIRTY;
-        break;
+        sso_selection[i]=sso_selection[i+1];
     }
     
+    sso_selection[objs-1]=false;
+    
+    if(curr_subscreen_object==objs-1)
+        --curr_subscreen_object;
+    
+    update_sso_name();
+    update_up_dn_btns();
+    
     return D_O_K;
 }
 
-void update_ctl_proc(DIALOG *d, int32_t ct)
+int32_t onAddToSelection()
 {
-    switch(ct)
+    if(curr_subscreen_object >= 0)
     {
-    case 0:
-        d->proc=jwin_droplist_proc;
-        break;
-        
-    case 1:
-        d->proc=d_sys_color_proc;
-        break;
-        
-    default:
-        d->proc=d_cs_color_proc;
-        break;
+        sso_selection[curr_subscreen_object]=true;
     }
     
-    d->flags|=D_DIRTY;
+    return D_O_K;
 }
 
-int32_t d_ctl_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t onRemoveFromSelection()
 {
-    int32_t old_d1=d->d1;
-    int32_t ret=jwin_droplist_proc(msg, d, c);
-    
-    if(d->d1!=old_d1)
+    if(curr_subscreen_object >= 0)
     {
-        update_ctl_proc(d+2, d->d1);
+        sso_selection[curr_subscreen_object]=false;
     }
     
-    return ret;
+    return D_O_K;
 }
 
-int32_t d_csl2_proc(int32_t msg,DIALOG *d,int32_t c);
-
-void update_csl_proc(DIALOG *d, int32_t cs)
+int32_t onInvertSelection()
 {
-    switch(cs)
+    for(int32_t i=0; i<subscr_edit_page().contents.size(); ++i)
     {
-    case 0:
-        d->proc=jwin_text_proc;
-        d->fg=jwin_pal[jcBOXFG];
-        d->bg=jwin_pal[jcBOX];
-        (d+1)->proc=d_csl2_proc;
-        (d+1)->fg=0;
-        (d+1)->bg=0;
-        //(d+59)->fg=subscreen_cset((d-1)->d1?(d-1)->d1-1:ssctMISC, (d+1)->d1);
-        break;
-        
-    default:
-        d->proc=d_box_proc;
-        d->fg=jwin_pal[jcBOX];
-        d->bg=jwin_pal[jcBOX];
-        (d+1)->proc=d_box_proc;
-        (d+1)->fg=jwin_pal[jcBOX];
-        (d+1)->bg=jwin_pal[jcBOX];
-        break;
+        sso_selection[i]=!sso_selection[i];
     }
     
-    d->flags|=D_DIRTY;
-    (d+1)->flags|=D_DIRTY;
+    return D_O_K;
 }
 
-int32_t d_csl_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t onClearSelection()
 {
-    int32_t old_d1=d->d1;
-    int32_t ret=jwin_droplist_proc(msg, d, c);
-    
-    if(d->d1!=old_d1)
+    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
     {
-        update_csl_proc(d+1, d->d1);
-        (d+60)->fg=subscreen_cset(d->d1?d->d1-1:ssctMISC, (d+2)->d1);
+        sso_selection[i]=false;
     }
     
-    return ret;
+    return D_O_K;
 }
 
-int32_t d_csl2_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t onDuplicateSubscreenObject()
 {
-    int32_t old_d1=d->d1;
-    int32_t ret=jwin_droplist_proc(msg, d, c);
+	SubscrPage& pg = subscr_edit_page();
+    size_t objs = pg.contents.size();
     
-    if(d->d1!=old_d1)
-    {
-        (d+58)->fg=subscreen_cset((d-2)->d1?(d-2)->d1-1:ssctMISC, d->d1);
-    }
+    if(objs==0)
+        return D_O_K;
     
-    return ret;
-}
-
-int32_t jwin_fontdrop_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    int32_t old_d1=d->d1;
-    int32_t ret=jwin_droplist_proc(msg, d, c);
+    int32_t counter=0;
     
-    if(d->d1!=old_d1)
+    for(int32_t i=0; i<objs; ++i)
     {
-        (d+3)->dp2=ss_font(d->d1);
-        (d+3)->flags|=D_DIRTY;
-        
-        if((d+3)->proc!=d_dummy_proc)
+        if(sso_selection[i] || i==curr_subscreen_object)
         {
-            rectfill(screen, (d+3)->x, (d+3)->y, (d+3)->x+(d+3)->w-1, (d+3)->y+(d+3)->h-1, jwin_pal[jcBOX]);
-        }
-        
-        (d+3)->h=text_height(ss_font(d->d1))+8;
-        (d+49)->dp2=ss_font(d->d1);
-        (d+49)->flags|=D_DIRTY;
-        
-        if((d+49)->proc!=d_dummy_proc)
-        {
-            rectfill(screen, (d+49)->x, (d+49)->y, (d+49)->x+(d+49)->w-1, (d+49)->y+(d+49)->h-1, jwin_pal[jcBOX]);
+			SubscrWidget* widg = pg.contents[i]->clone();
+			if(!widg) continue;
+			
+            widg->x+=zc_max(zinit.ss_grid_x,8);
+            widg->y+=zc_max(zinit.ss_grid_y,8);
         }
-        
-        (d+49)->h=text_height(ss_font(d->d1))+8;
     }
     
-    return ret;
+    update_sso_name();
+    update_up_dn_btns();
+    
+    return D_O_K;
 }
 
-const char *misccolor_str[ssctMAX] =
-{
-    "Text", "Caption", "Overworld BG", "Dungeon BG", "Dungeon FG", "Cave FG", "BS Dark", "BS Goal", "Compass (Lt)", "Compass (Dk)",
-    "SS BG", "SS Shadow", "Tri. Frame", "Big Map BG", "Big Map FG", "Player's Pos", "Message Text"
-};
+static int32_t onToggleInvis();
+static int32_t onEditGrid();
+static int32_t onSelectionOptions();
+static int32_t onShowHideGrid();
 
-const char *misccolorlist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = ssctMAX;
-        return NULL;
-    }
-    
-    return misccolor_str[index];
-}
 
-const char *csettype_str[13] =
+static MENU subscreen_rc_menu[] =
 {
-    "Misc. CSet", "CSet 0", "CSet 1", "CSet 2", "CSet 3", "CSet 4", "CSet 5", "CSet 6", "CSet 7", "CSet 8", "CSet 9", "CSet 10", "CSet 11"
+    { (char *)"Properties ",       NULL,  NULL, 0, NULL },
+    { (char *)"Copy Properties ",  NULL,  NULL, 0, NULL },
+    { (char *)"Paste Properties ", NULL,  NULL, 0, NULL },
+    { NULL,                        NULL,  NULL, 0, NULL }
 };
 
-const char *csettypelist(int32_t index, int32_t *list_size)
+
+int32_t d_subscreen_proc(int32_t msg,DIALOG *d,int32_t)
 {
-    if(index<0)
-    {
-        *list_size = 13;
-        return NULL;
-    }
-    
-    return csettype_str[index];
+	switch(msg)
+	{
+	case MSG_CLICK:
+	{
+		SubscrPage& pg = subscr_edit_page();
+		for(int32_t i=pg.contents.size()-1; i>=0; --i)
+		{
+			SubscrWidget* widg = pg.contents[i];
+			int32_t x=(widg->getX()+widg->getXOffs())*2;
+			int32_t y=widg->getY()*2;
+			int32_t w=widg->getW()*2;
+			int32_t h=widg->getH()*2;
+			
+			if(isinRect(gui_mouse_x(),gui_mouse_y(),d->x+x, d->y+y, d->x+x+w-1, d->y+y+h-1))
+			{
+				if(key[KEY_LSHIFT]||key[KEY_RSHIFT])
+				{
+					if(sso_selection[i]==true)
+					{
+						sso_selection[i]=false;
+					}
+					else
+					{
+						sso_selection[curr_subscreen_object]=true;
+						curr_subscreen_object=i;
+						update_sso_name();
+						update_up_dn_btns();
+					}
+				}
+				else
+				{
+					onClearSelection();
+					curr_subscreen_object=i;
+					update_sso_name();
+					update_up_dn_btns();
+				}
+				
+				break;
+			}
+		}
+		
+		if(gui_mouse_b()&2) //right mouse button
+		{
+			object_message(d,MSG_DRAW,0);
+			
+			// Disable "Paste Properties" if the copy source is invalid
+			if(!propCopyWidg || propCopyWidg->getType()==ssoNULL)
+				subscreen_rc_menu[2].flags|=D_DISABLED;
+			else
+				subscreen_rc_menu[2].flags&=~D_DISABLED;
+			
+			int32_t m = popup_menu(subscreen_rc_menu,gui_mouse_x(),gui_mouse_y());
+			
+			switch(m)
+			{
+			case 0: // Properties
+				onSubscreenObjectProperties();
+				break;
+			case 1: // Copy Properties
+			{
+				SubscrWidget* w = subscr_edit_widg();
+				if(w)
+					propCopyWidg = w->clone();
+				else
+				{
+					delete propCopyWidg;
+					propCopyWidg = nullptr;
+				}
+				break;
+			}
+			case 2: // Paste Properties
+				if(propCopyWidg) // Hopefully unnecessary)
+				{
+					SubscrPage& pg = subscr_edit_page();
+					for(int32_t i=0; i<pg.contents.size(); i++)
+					{
+						if(i == curr_subscreen_object || sso_selection[i])
+							copySSOProperties(propCopyWidg, pg.contents[i]);
+					}
+				}
+				break;
+			}
+		}
+		
+		return D_O_K;
+	}
+	break;
+	
+	case MSG_VSYNC:
+		d->flags|=D_DIRTY;
+		break;
+		
+	case MSG_DRAW:
+	{
+		Sitems.animate();
+		BITMAP *buf = create_bitmap_ex(8,d->w,d->h);//In Large Mode, this is actually 2x as large as needed, but whatever.
+		
+		if(buf)
+		{
+			clear_bitmap(buf);
+			ZCSubscreen* subs = (ZCSubscreen*)(d->dp);
+			show_custom_subscreen(buf, subs, 0, 0, true, sspUP | sspDOWN | sspSCROLLING);
+			
+			SubscrPage& pg = subs->cur_page();
+			for(int32_t i=0; i<pg.contents.size(); ++i)
+			{
+				if(sso_selection[i] || i == curr_subscreen_object)
+				{
+					auto c = i != curr_subscreen_object
+						? vc(zinit.ss_bbox_2_color)
+						: vc(zinit.ss_bbox_1_color);
+					sso_bounding_box(buf, pg.contents[i], c);
+				}
+			}
+			
+			if(zinit.ss_flags&ssflagSHOWGRID)
+			{
+				for(int32_t x=zinit.ss_grid_xofs; x<d->w; x+=zinit.ss_grid_x)
+				{
+					for(int32_t y=zinit.ss_grid_yofs; y<d->h; y+=zinit.ss_grid_y)
+					{
+						buf->line[y][x]=vc(zinit.ss_grid_color);
+					}
+				}
+			}
+			
+			stretch_blit(buf,screen,0,0,d->w/2,d->h/2,d->x,d->y,d->w,d->h);
+			
+			destroy_bitmap(buf);
+		}
+	}
+	break;
+	
+	case MSG_WANTFOCUS:
+		return D_WANTFOCUS;
+		break;
+	}
+	
+	return D_O_K;
 }
 
-const char *misccset_str[sscsMAX] =
-{
-    "Triforce", "Tri. Frame", "Overworld Map", "Dungeon Map", "Blue Frame", "HC Piece", "SS Vine"
-};
+int32_t onSSUp();
+int32_t onSSDown();
+int32_t onSSLeft();
+int32_t onSSRight();
+int32_t onSSPgDn();
+int32_t onSSPgUp();
 
-const char *misccsetlist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = sscsMAX;
-        return NULL;
-    }
-    
-    return misccset_str[index];
-}
+int32_t d_ssup_btn_proc(int32_t msg,DIALOG *d,int32_t c);
+int32_t d_ssdn_btn_proc(int32_t msg,DIALOG *d,int32_t c);
+int32_t d_sslt_btn_proc(int32_t msg,DIALOG *d,int32_t c);
+int32_t d_ssrt_btn_proc(int32_t msg,DIALOG *d,int32_t c);
 
-const char *spectile_str[ssmstMAX+1] =
+int32_t onSSUp()
 {
-    "None", "SS Vine", "Magic Meter"
-};
+	int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?-zinit.ss_grid_y:-1;
+	
+	SubscrPage& pg = subscr_edit_page();
+	for(int32_t i=0; i<pg.contents.size(); ++i)
+	{
+		if(sso_selection[i] || i==curr_subscreen_object)
+		{
+			if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
+			{
+				pg.contents[i]->h+=delta;
+			}
+			else
+			{
+				pg.contents[i]->y+=delta;
+			}
+		}
+	}
+	
+	return D_O_K;
+}
 
-const char *spectilelist(int32_t index, int32_t *list_size)
+int32_t onSSDown()
 {
-    if(index<0)
-    {
-        *list_size = ssmstMAX+1;
-        return NULL;
-    }
-    
-    return spectile_str[index];
+	int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?zinit.ss_grid_y:1;
+	
+	SubscrPage& pg = subscr_edit_page();
+	for(int32_t i=0; i<pg.contents.size(); ++i)
+	{
+		if(sso_selection[i] || i==curr_subscreen_object)
+		{
+			if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
+			{
+				pg.contents[i]->h+=delta;
+			}
+			else
+			{
+				pg.contents[i]->y+=delta;
+			}
+		}
+	}
+	
+	return D_O_K;
 }
 
-const char *ssfont_str[ssfMAX] =
+int32_t onSSLeft()
 {
-	"Zelda NES", "SS 1", "SS 2", "SS 3", "SS 4", "BS Time", "Small", "Small Prop.", "LttP Small", "Link's Awakening", "Link to the Past",
-	"Goron", "Zoran", "Hylian 1", "Hylian 2", "Hylian 3", "Hylian 4", "Proportional", "Oracle", "Oracle Proportional", "Phantom", "Phantom Proportional",
-	"Atari 800", "Acorn", "ADOS", "Allegro", "Apple II", "Apple II 80 Column", "Apple IIgs", "Aquarius",
-	"Atari 400", "C64", "C64 HiRes", "IBM CGA", "COCO Mode I", "COCO Mode II", "Coupe", "Amstrad CPC",
-	"Fantasy Letters", "FDS Katakana", "FDSesque", "FDS Roman", "FF", "Elder Futhark", "Gaia", "Hira",
-	"JP Unsorted", "Kong", "Mana", "Mario", "Mot CPU", "MSX Mode 0", "MSX Mode 1", "PET", "Homebrew",
-	"Mr. Saturn", "Sci-Fi", "Sherwood", "Sinclair QL", "Spectrum", "Spectrum Large", "TI99", "TRS",
-	"Zelda 2", "ZX", "Lisa"
-};
+	int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?-zinit.ss_grid_x:-1;
+	
+	SubscrPage& pg = subscr_edit_page();
+	for(int32_t i=0; i<pg.contents.size(); ++i)
+	{
+		if(sso_selection[i] || i==curr_subscreen_object)
+		{
+			if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
+			{
+				pg.contents[i]->w+=delta;
+			}
+			else
+			{
+				pg.contents[i]->x+=delta;
+			}
+		}
+	}
+	
+	return D_O_K;
+}
 
-const char *ssfontlist(int32_t index, int32_t *list_size)
+int32_t onSSRight()
 {
-    if(index<0)
-    {
-        *list_size = ssfMAX;
-        return NULL;
-    }
-    
-    return ssfont_str[index];
+	int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?zinit.ss_grid_x:1;
+	
+	SubscrPage& pg = subscr_edit_page();
+	for(int32_t i=0; i<pg.contents.size(); ++i)
+	{
+		if(sso_selection[i] || i==curr_subscreen_object)
+		{
+			if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
+			{
+				pg.contents[i]->w+=delta;
+			}
+			else
+			{
+				pg.contents[i]->x+=delta;
+			}
+		}
+	}
+	
+	return D_O_K;
 }
 
-extern const char *shadowstyle_str[sstsMAX];
-
-const char *shadowstylelist(int32_t index, int32_t *list_size)
+int32_t d_ssup_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    if(index<0)
-    {
-        *list_size = sstsMAX;
-        return NULL;
-    }
-    
-    return shadowstyle_str[index];
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			onSSUp();
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-const char *alignment_str[3] =
-{
-    "Left", "Center", "Right"
-};
-
-const char *alignmentlist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = 3;
-        return NULL;
-    }
-    
-    return alignment_str[index];
-}
-
-const char *wrapping_str[2] =
-{
-    "Character", "Word"
-};
-
-const char *wrappinglist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = 2;
-        return NULL;
-    }
-    
-    return wrapping_str[index];
-}
-
-const char *rows_str[2] =
-{
-    "Two", "Three"
-};
-
-const char *rowslist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = 2;
-        return NULL;
-    }
-    
-    return rows_str[index];
-}
-
-const char *button_str[4] =
-{
-    "A", "B", "X", "Y"
-};
-
-const char *buttonlist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = 4;
-        return NULL;
-    }
-    
-    return button_str[index];
-}
-
-extern const char *icounter_str2[sscMAX];
-
-const char *icounterlist(int32_t index, int32_t *list_size)
-{
-    if(index<0)
-    {
-        *list_size = sscMAX;
-        return NULL;
-    }
-    
-    return icounter_str2[index];
-}
-
-
-int32_t d_stilelist_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    int32_t old_d1=d->d1;
-    int32_t ret=jwin_droplist_proc(msg, d, c);
-    
-    if(d->d1!=old_d1)
-    {
-        (d-14)->h=32;
-        (d-15)->h=(d-14)->h+4;
-        
-        switch(d->d1-1)
-        {
-        case ssmstSSVINETILE:
-            (d-15)->w=52;
-            (d-14)->w=48;
-            (d-14)->d1=wpnsbuf[iwSubscreenVine].tile;
-            break;
-            
-        case ssmstMAGICMETER:
-            (d-15)->w=148;
-            (d-14)->w=144;
-            (d-14)->d1=wpnsbuf[iwMMeter].tile;
-            break;
-            
-        case -1:
-        default:
-            (d-15)->w=20;
-            (d-14)->w=16;
-            break;
-        }
-        
-        (d-14)->w*=2;
-        (d-15)->w=(d-14)->w+4;
-        (d-14)->bg=vbound((d-14)->bg,0,((d-14)->w-1)>>2);
-        (d-17)->flags|=D_DIRTY;
-        (d-15)->flags|=D_DIRTY;
-        (d-14)->flags|=D_DIRTY;
-        (d-1)->flags|=D_DIRTY;
-        d->flags|=D_DIRTY;
-    }
-    
-    return ret;
-}
-
-
-
-static int32_t ssop_location_list[] =
-{
-    // dialog control number
-    5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,212,213, -1
-};
-
-static int32_t ssop_color_list[] =
-{
-    // dialog control number
-    35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, -1
-};
-
-static int32_t ssop_attributes_list[] =
-{
-    // dialog control number
-    95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, -1
-};
-
-static TABPANEL sso_properties_tabs[] =
-{
-    // (text)
-    { (char *)"Location",    D_SELECTED,  ssop_location_list,   0, NULL },
-    { (char *)"Color",       0,           ssop_color_list,      0, NULL },
-    { (char *)"Attributes",  0,           ssop_attributes_list, 0, NULL },
-    { NULL,                  0,           NULL,                 0, NULL }
-};
-
-int32_t jwin_tflpcheck_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    bool selected=(d->flags&D_SELECTED)!=0;
-    int32_t ret = jwin_checkfont_proc(msg,d,c);
-    bool new_selected=(d->flags&D_SELECTED)!=0;
-    
-    if(new_selected!=selected)
-    {
-        (d-3)->w=(new_selected?32:16)*2;
-        (d-3)->h=(new_selected?48:16)*2;
-        (d-4)->w=(d-3)->w+4;
-        (d-4)->h=(d-3)->h+4;
-//    (d-5)->x=((d-4)->x)+(((d-4)->w)/2);
-        (d-6)->w=(new_selected?112:96)*2;
-        (d-6)->h=(new_selected?112:48)*2;
-        (d-7)->w=(d-6)->w+4;
-        (d-7)->h=(d-6)->h+4;
-//    (d-8)->x=((d-7)->x)+(((d-7)->w)/2);
-        (d-3)->flags|=D_DIRTY;
-        (d-4)->flags|=D_DIRTY;
-        (d-5)->flags|=D_DIRTY;
-        (d-6)->flags|=D_DIRTY;
-        (d-7)->flags|=D_DIRTY;
-        (d-8)->flags|=D_DIRTY;
-        (d-9)->flags|=D_DIRTY;
-    }
-    
-    return ret;
-}
-
-int32_t jwin_lscheck_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    bool selected=(d->flags&D_SELECTED)!=0;
-    int32_t ret = jwin_checkfont_proc(msg,d,c);
-    bool new_selected=(d->flags&D_SELECTED)!=0;
-    
-    if(new_selected!=selected || msg==MSG_START)
-    {
-        (d-6)->w=(new_selected?32:16)*2;
-        (d-6)->h=(new_selected?48:16)*2;
-        (d-7)->w=(d-6)->w+4;
-        (d-7)->h=(d-6)->h+4;
-        (d-6)->flags|=D_DIRTY;
-        (d-7)->flags|=D_DIRTY;
-        (d-8)->flags|=D_DIRTY;
-        (d-9)->flags|=D_DIRTY;
-    }
-    
-    return ret;
-}
-
-int32_t d_qtile_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t d_ssdn_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    switch(msg)
-    {
-    case MSG_DRAW:
-    {
-        int32_t dw = d->w / 2;
-        int32_t dh = d->h / 2;
-        
-        BITMAP *buf = create_bitmap_ex(8,dw,dh);
-        
-        if(buf)
-        {
-            clear_bitmap(buf);
-            
-            for(int32_t y=0; y<dh; y+=16)
-            {
-                for(int32_t x=0; x<dw; x+=16)
-                {
-                    puttile16(buf,d->d1+(y>>4)*20+(x>>4),x,y,d->fg,d->d2);
-                }
-            }
-            
-            int32_t t=d->bg>>2;
-            int32_t t2=d->bg-(t<<2);
-            rect(buf,
-                 (t<<4)+((t2&1)<<3) ,
-                 ((t2&2)<<2),
-                 (t<<4)+((t2&1)<<3)+7,
-                 ((t2&2)<<2)+7, jwin_pal[jcTITLER]);
-            stretch_blit(buf,screen,0,0,dw,dh,d->x-1,d->y-1,dw*2,dh*2);
-            destroy_bitmap(buf);
-        }
-        
-        //textprintf_ex(screen, get_zc_font(font_pfont), d->x,d->y, vc(15), -1, "%d", d->bg);
-        return D_O_K;
-    }
-    break;
-    
-    case MSG_CLICK:
-    {
-        int32_t old_fg=d->fg;
-        
-        if(gui_mouse_b()&2)  //right mouse button
-        {
-            int32_t old_bg = d->bg;
-            int32_t mx = vbound(gui_mouse_x()-d->x,0,d->w-1) / 2;
-            int32_t my = vbound(gui_mouse_y()-d->y,0,d->h-1) / 2;
-            
-            int32_t t=mx>>4;
-            d->bg=(t<<2)+((my>>3)<<1)+((mx-(t<<4))>>3);
-            
-            if(d->bg!=old_bg)
-            {
-                d->flags|=D_DIRTY;
-            }
-            
-            return D_O_K;
-        }
-        
-        int32_t ret=d_maptile_proc(msg, d, c);
-        
-        if(d->fg!=old_fg)
-        {
-            (d-60)->d1=d->fg+1;
-            (d-60)->d2=(d-60)->d1;
-            update_csl_proc(d-59, d->fg+1);
-        }
-        
-        d->flags|=D_DIRTY;
-        return ret;
-    }
-    break;
-    }
-    
-    return d_maptile_proc(msg, d, c);
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			onSSDown();
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-int32_t d_spectile_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t d_sslt_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    int32_t d1=d->d1;
-    int32_t ret=d_qtile_proc(msg,d,c);
-    
-    if(d1!=d->d1)
-    {
-        (d+14)->d1=0;
-        (d+14)->d2=0;
-        (d+14)->flags|=D_DIRTY;
-        d->w=32;
-        (d-1)->w=d->w+4;
-        d->flags|=D_DIRTY;
-        (d-1)->flags|=D_DIRTY;
-        (d-3)->flags|=D_DIRTY;
-    }
-    
-    return ret;
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			onSSLeft();
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-int32_t d_tileblock_proc(int32_t msg,DIALOG *d,int32_t c)
+int32_t d_ssrt_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    int32_t old_fg=d->fg;
-    int32_t ret=d_maptile_proc(msg, d, c);
-    
-    switch(msg)
-    {
-    case MSG_CLICK:
-        if(d->fg!=old_fg)
-        {
-            (d-60)->d1=d->fg+1;
-            (d-60)->d2=(d-60)->d1;
-            update_csl_proc(d-59, d->fg+1);
-        }
-        
-        d->flags|=D_DIRTY;
-        break;
-    }
-    
-    return ret;
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			onSSRight();
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-void extract_colortype(DIALOG *d, subscreen_object *tempsso, int32_t ct)
+int32_t d_ssup_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    switch(ct)
-    {
-    case 3:
-        switch(tempsso->colortype3)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        case ssctSYSTEM:
-            d->d1=1;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype3+2;
-            break;
-        }
-        
-        break;
-        
-    case 2:
-        switch(tempsso->colortype2)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        case ssctSYSTEM:
-            d->d1=1;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype2+2;
-            break;
-        }
-        
-        break;
-        
-    case 1:
-    default:
-        switch(tempsso->colortype1)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        case ssctSYSTEM:
-            d->d1=1;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype1+2;
-            break;
-        }
-        
-        break;
-    }
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			SubscrPage& pg = subscr_edit_page();
+			for(int32_t i=0; i<pg.contents.size(); ++i)
+			{
+				if(sso_selection[i] || i==curr_subscreen_object)
+				{
+					--pg.contents[i]->h;
+				}
+			}
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-void insert_colortype(DIALOG *d, subscreen_object *tempsso, int32_t ct)
+int32_t d_ssdn_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    switch(ct)
-    {
-    case 3:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype3=ssctMISC;
-            break;
-            
-        case 1:
-            tempsso->colortype3=ssctSYSTEM;
-            break;
-            
-        default:
-            tempsso->colortype3=d->d1-2;
-            break;
-        }
-        
-        break;
-        
-    case 2:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype2=ssctMISC;
-            break;
-            
-        case 1:
-            tempsso->colortype2=ssctSYSTEM;
-            break;
-            
-        default:
-            tempsso->colortype2=d->d1-2;
-            break;
-        }
-        
-        break;
-        
-    case 1:
-    default:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype1=ssctMISC;
-            break;
-            
-        case 1:
-            tempsso->colortype1=ssctSYSTEM;
-            break;
-            
-        default:
-            tempsso->colortype1=d->d1-2;
-            break;
-        }
-        
-        break;
-    }
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			SubscrPage& pg = subscr_edit_page();
+			for(int32_t i=0; i<pg.contents.size(); ++i)
+			{
+				if(sso_selection[i] || i==curr_subscreen_object)
+				{
+					++pg.contents[i]->h;
+				}
+			}
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-void extract_cset(DIALOG *d, subscreen_object *tempsso, int32_t ct)
+int32_t d_sslt_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    switch(ct)
-    {
-    case 3:
-        switch(tempsso->colortype3)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype3+1;
-            break;
-        }
-        
-        break;
-        
-    case 2:
-        switch(tempsso->colortype2)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype2+1;
-            break;
-        }
-        
-        break;
-        
-    case 1:
-    default:
-        switch(tempsso->colortype1)
-        {
-        case ssctMISC:
-            d->d1=0;
-            break;
-            
-        default:
-            d->d1=tempsso->colortype1+1;
-            break;
-        }
-        
-        break;
-    }
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			SubscrPage& pg = subscr_edit_page();
+			for(int32_t i=0; i<pg.contents.size(); ++i)
+			{
+				if(sso_selection[i] || i==curr_subscreen_object)
+				{
+					--pg.contents[i]->w;
+				}
+			}
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
 }
 
-void insert_cset(DIALOG *d, subscreen_object *tempsso, int32_t ct)
+int32_t d_ssrt_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    switch(ct)
-    {
-    case 3:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype3=ssctMISC;
-            break;
-            
-        default:
-            tempsso->colortype3=d->d1-1;
-            break;
-        }
-        
-        break;
-        
-    case 2:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype2=ssctMISC;
-            break;
-            
-        default:
-            tempsso->colortype2=d->d1-1;
-            break;
-        }
-        
-        break;
-        
-    case 1:
-    default:
-        switch(d->d1)
-        {
-        case 0:
-            tempsso->colortype1=ssctMISC;
-            break;
-            
-        default:
-            tempsso->colortype1=d->d1-1;
-            break;
-        }
-        
-        break;
-    }
-}
-
-static DIALOG sso_raw_data_dlg[] =
-{
-    // (dialog proc)     (x)   (y)   (w)   (h)   (fg)     (bg)    (key)    (flags)     (d1)           (d2)     (dp)
-    { jwin_win_proc,     60-12,   40,   200+24,  148,  vc(14),  vc(1),  0,       D_EXIT,          0,             0, (void *) "Raw Data", NULL, NULL },
-    { d_timer_proc,         0,    0,     0,    0,    0,       0,       0,       0,          0,          0,         NULL, NULL, NULL },
-    { jwin_textbox_proc,       72-12,   60+4,   176+24+1,  92+4,   jwin_pal[jcTEXTFG],  jwin_pal[jcTEXTBG],  0,       D_EXIT,     0,             0,      NULL, NULL, NULL },
-    { jwin_button_proc,     130,   163,  61,   21,   vc(14),  vc(1),  13,      D_EXIT,     0,             0, (void *) "OK", NULL, NULL },
-    { NULL,                 0,    0,    0,    0,   0,       0,       0,       0,          0,             0,       NULL,                           NULL,  NULL }
-};
-
-static ListData rows_list(rowslist, &font);
-static ListData itemclass_list(item_class_list, &font);
-
-int32_t sso_raw_data(subscreen_object *tempsso)
-{
-    char raw_text[65535];
-    char title[80];
-    sprintf(title, "Raw Data for Object #%d", curr_subscreen_object);
-    sprintf(raw_text, "Type:  %d\nPosition:  %d\nX:  %d\nY:  %d\nW:  %d\nH:  %d\nColor Type 1:  %d\nColor 1:  %d\nColor Type 2:  %d\nColor 2:  %d\nColor Type 3:  %d\nColor 3:  %d\nD1:  %d\nD2:  %d\nD3:  %d\nD4:  %d\nD5:  %d\nD6:  %d\nD7:  %d\nD8:  %d\nD9:  %d\nD10:  %d\nFrames:  %d\nSpeed:  %d\nDelay:  %d\nFrame:  %d\nDp1:  %s",
-            tempsso->type, tempsso->pos, tempsso->x, tempsso->y, tempsso->w, tempsso->h, tempsso->colortype1, tempsso->color1, tempsso->colortype2, tempsso->color2, tempsso->colortype3, tempsso->color3, tempsso->d1, tempsso->d2, tempsso->d3, tempsso->d4, tempsso->d5, tempsso->d6, tempsso->d7, tempsso->d8, tempsso->d9, tempsso->d10, tempsso->frames, tempsso->speed, tempsso->delay, tempsso->frame, tempsso->dp1!=NULL?(char *)tempsso->dp1:"NULL");
-    sso_raw_data_dlg[0].dp2=get_zc_font(font_lfont);
-    sso_raw_data_dlg[2].dp=raw_text;
-    sso_raw_data_dlg[2].d2=0;
-    
-    large_dialog(sso_raw_data_dlg);
-        
-    zc_popup_dialog(sso_raw_data_dlg,2);
-    return D_O_K;
-}
-
-static ListData wrapping_list(wrappinglist, &font);
-static ListData alignment_list(alignmentlist, &font);
-ListData shadowstyle_list(shadowstylelist, &font);
-static ListData misccolor_list(misccolorlist, &font);
-static ListData spectile_list(spectilelist, &font);
-static ListData ssfont_list(ssfontlist, &font);
-static ListData colortype_list(colortypelist, &font);
-static ListData item_list(itemlist_num, &font);
-
-int32_t sso_properties(subscreen_object *tempsso)
-{
-    return call_subscrprop_dialog(tempsso, curr_subscreen_object) ? 0 : -1;
-}
-
-int32_t onBringToFront();
-int32_t onBringForward();
-int32_t onSendBackward();
-int32_t onSendToBack();
-int32_t onReverseArrangement();
-int32_t onAlignLeft();
-int32_t onAlignCenter();
-int32_t onAlignRight();
-int32_t onAlignTop();
-int32_t onAlignMiddle();
-int32_t onAlignBottom();
-int32_t onDistributeLeft();
-int32_t onDistributeCenter();
-int32_t onDistributeRight();
-int32_t onDistributeTop();
-int32_t onDistributeMiddle();
-int32_t onDistributeBottom();
-int32_t onGridSnapLeft();
-int32_t onGridSnapCenter();
-int32_t onGridSnapRight();
-int32_t onGridSnapTop();
-int32_t onGridSnapMiddle();
-int32_t onGridSnapBottom();
-void copySSOProperties(subscreen_object& src, subscreen_object& dest);
-
-int32_t onSubscreenObjectProperties()
-{
-    if(curr_subscreen_object >= 0)
-    {
-        if(sso_properties(&(css->objects[curr_subscreen_object]))!=-1)
-        {
-            for(int32_t i=0; i<MAXSUBSCREENITEMS; i++)
-            {
-                if(!sso_selection[i])
-                    continue;
-                
-                copySSOProperties(css->objects[curr_subscreen_object], css->objects[i]);
-            }
-        }
-    }
-    
-    return D_O_K;
-}
-
-int32_t onSubscreenObjectRawProperties()
-{
-    if(curr_subscreen_object >= 0)
-    {
-        sso_raw_data(&(css->objects[curr_subscreen_object]));
-    }
-    
-    return D_O_K;
-}
-
-int32_t onNewSubscreenObject();
-
-int32_t onDeleteSubscreenObject()
-{
-    int32_t objs=ss_objects(css);
-    
-    if(objs==0)
-    {
-        return D_O_K;
-    }
-    
-    for(int32_t i=curr_subscreen_object; i<objs-1; ++i)
-    {
-        css->objects[i]=css->objects[i+1];
-        sso_selection[i]=sso_selection[i+1];
-    }
-    
-    if(css->objects[objs-1].dp1!=NULL)
-    {
-        //No, don't do this.  css->objects[objs-2] is pointing at this.  Leave it be.
-        //delete [] (char *)css->objects[objs-1].dp1;
-        css->objects[objs-1].dp1=NULL;
-    }
-    
-    css->objects[objs-1].type=ssoNULL;
-    sso_selection[objs-1]=false;
-    
-    if(ss_propCopySrc==curr_subscreen_object)
-        ss_propCopySrc=-1;
-    else if(ss_propCopySrc>curr_subscreen_object)
-        ss_propCopySrc--;
-    
-    if(curr_subscreen_object==objs-1)
-    {
-        --curr_subscreen_object;
-    }
-    
-    update_sso_name();
-    update_up_dn_btns();
-    
-    return D_O_K;
-}
-
-int32_t onAddToSelection()
-{
-    if(curr_subscreen_object >= 0)
-    {
-        sso_selection[curr_subscreen_object]=true;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onRemoveFromSelection()
-{
-    if(curr_subscreen_object >= 0)
-    {
-        sso_selection[curr_subscreen_object]=false;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onInvertSelection()
-{
-    for(int32_t i=0; i<ss_objects(css); ++i)
-    {
-        sso_selection[i]=!sso_selection[i];
-    }
-    
-    return D_O_K;
-}
-
-int32_t onClearSelection()
-{
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        sso_selection[i]=false;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onDuplicateSubscreenObject()
-{
-    int32_t objs=ss_objects(css);
-    
-    if(objs==0)
-    {
-        return D_O_K;
-    }
-    
-    int32_t counter=0;
-    
-    for(int32_t i=0; i<objs; ++i)
-    {
-        int32_t c=objs+counter;
-        
-        if(sso_selection[i]||i==curr_subscreen_object)
-        {
-            if(css->objects[c].dp1!=NULL)
-            {
-                delete [](char *)css->objects[c].dp1;
-            }
-            
-            css->objects[c]=css->objects[i];
-            
-            if(css->objects[c].dp1!=NULL)
-            {
-                //No, don't do this.  css->objects[i] is pointing at this.  Leave it be.
-                //delete [] (char *)css->objects[c].dp1;
-                css->objects[c].dp1=NULL;
-            }
-            
-            if(css->objects[i].dp1!=NULL)
-            {
-                //css->objects[c].dp1=malloc(strlen((char *)css->objects[i].dp1)+1);
-                css->objects[c].dp1= new char[strlen((char *)css->objects[i].dp1)+1];
-                strcpy((char *)css->objects[c].dp1,(char *)css->objects[i].dp1);
-            }
-            else
-            {
-                //css->objects[c].dp1=malloc(2);
-                css->objects[c].dp1 = new char[2];
-                ((char *)css->objects[c].dp1)[0]=0;
-            }
-            
-            css->objects[c].x+=zc_max(zinit.ss_grid_x>>1,4);
-            css->objects[c].y+=zc_max(zinit.ss_grid_y>>1,4);
-            ++counter;
-        }
-    }
-    
-    update_sso_name();
-    update_up_dn_btns();
-    
-    return D_O_K;
-}
-
-static int32_t onToggleInvis();
-static int32_t onEditGrid();
-static int32_t onSelectionOptions();
-static int32_t onShowHideGrid();
-
-
-static MENU subscreen_rc_menu[] =
-{
-    { (char *)"Properties ",       NULL,  NULL, 0, NULL },
-    { (char *)"Inspect ",          NULL,  NULL, 0, NULL },
-    { (char *)"Copy Properties ",  NULL,  NULL, 0, NULL },
-    { (char *)"Paste Properties ", NULL,  NULL, 0, NULL },
-    { NULL,                        NULL,  NULL, 0, NULL }
-};
-
-
-int32_t d_subscreen_proc(int32_t msg,DIALOG *d,int32_t)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        for(int32_t i=ss_objects(css)-1; i>=0; --i)
-        {
-            int32_t x=sso_x(&css->objects[i])*2;
-            int32_t y=sso_y(&css->objects[i])*2;
-            int32_t w=sso_w(&css->objects[i])*2;
-            int32_t h=sso_h(&css->objects[i])*2;
-            
-            switch(get_alignment(&css->objects[i]))
-            {
-            case sstaCENTER:
-                x-=(w/2);
-                break;
-                
-            case sstaRIGHT:
-                x-=w;
-                break;
-                
-            case sstaLEFT:
-            default:
-                break;
-            }
-            
-            if(isinRect(gui_mouse_x(),gui_mouse_y(),d->x+x, d->y+y, d->x+x+w-1, d->y+y+h-1))
-            {
-                if(key[KEY_LSHIFT]||key[KEY_RSHIFT])
-                {
-                    if(sso_selection[i]==true)
-                    {
-                        sso_selection[i]=false;
-                    }
-                    else
-                    {
-                        sso_selection[curr_subscreen_object]=true;
-                        curr_subscreen_object=i;
-                        update_sso_name();
-                        update_up_dn_btns();
-                    }
-                }
-                else
-                {
-                    onClearSelection();
-                    curr_subscreen_object=i;
-                    update_sso_name();
-                    update_up_dn_btns();
-                }
-                
-                break;
-            }
-        }
-        
-        if(gui_mouse_b()&2) //right mouse button
-        {
-            object_message(d,MSG_DRAW,0);
-            
-            // Disable "Paste Properties" if the copy source is invalid
-            if(ss_propCopySrc<0 || css->objects[ss_propCopySrc].type==ssoNULL)
-                subscreen_rc_menu[3].flags|=D_DISABLED;
-            else
-                subscreen_rc_menu[3].flags&=~D_DISABLED;
-            
-            int32_t m = popup_menu(subscreen_rc_menu,gui_mouse_x(),gui_mouse_y());
-            
-            switch(m)
-            {
-            case 0: // Properties
-                onSubscreenObjectProperties();
-                break;
-                
-            case 1: // Inspect
-                onSubscreenObjectRawProperties();
-                break;
-            
-            case 2: // Copy Properties
-                ss_propCopySrc=curr_subscreen_object;
-                break;
-                
-            case 3: // Paste Properties
-                if(ss_propCopySrc>=0) // Hopefully unnecessary)
-                {
-                    copySSOProperties(css->objects[ss_propCopySrc], css->objects[curr_subscreen_object]);
-                    for(int32_t i=0; i<MAXSUBSCREENITEMS; i++)
-                    {
-                        if(!sso_selection[i])
-                            continue;
-                        
-                        copySSOProperties(css->objects[ss_propCopySrc], css->objects[i]);
-                    }
-                }
-                break;
-            }
-        }
-        
-        return D_O_K;
-    }
-    break;
-    
-    case MSG_VSYNC:
-        d->flags|=D_DIRTY;
-        break;
-        
-    case MSG_DRAW:
-    {
-        Sitems.animate();
-        BITMAP *buf = create_bitmap_ex(8,d->w,d->h);//In Large Mode, this is actually 2x as large as needed, but whatever.
-        
-        if(buf)
-        {
-            clear_bitmap(buf);
-            show_custom_subscreen(buf, (subscreen_group *)(d->dp), 0, 0, true, sspUP | sspDOWN | sspSCROLLING);
-            
-            for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-            {
-                if(sso_selection[i])
-                {
-                    sso_bounding_box(buf, css, i, vc(zinit.ss_bbox_2_color));
-                }
-            }
-            
-            sso_bounding_box(buf, css, curr_subscreen_object, vc(zinit.ss_bbox_1_color));
-            
-            if(zinit.ss_flags&ssflagSHOWGRID)
-            {
-                for(int32_t x=zinit.ss_grid_xofs; x<d->w; x+=zinit.ss_grid_x)
-                {
-                    for(int32_t y=zinit.ss_grid_yofs; y<d->h; y+=zinit.ss_grid_y)
-                    {
-                        buf->line[y][x]=vc(zinit.ss_grid_color);
-                    }
-                }
-            }
-            
-            stretch_blit(buf,screen,0,0,d->w/2,d->h/2,d->x,d->y,d->w,d->h);
-            
-            destroy_bitmap(buf);
-        }
-    }
-    break;
-    
-    case MSG_WANTFOCUS:
-        return D_WANTFOCUS;
-        break;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onSSUp();
-int32_t onSSDown();
-int32_t onSSLeft();
-int32_t onSSRight();
-int32_t onSSPgDn();
-int32_t onSSPgUp();
-
-int32_t d_ssup_btn_proc(int32_t msg,DIALOG *d,int32_t c);
-int32_t d_ssdn_btn_proc(int32_t msg,DIALOG *d,int32_t c);
-int32_t d_sslt_btn_proc(int32_t msg,DIALOG *d,int32_t c);
-int32_t d_ssrt_btn_proc(int32_t msg,DIALOG *d,int32_t c);
-
-int32_t onSSUp()
-{
-    int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?-zinit.ss_grid_y:-1;
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(sso_selection[i]&&i!=curr_subscreen_object)
-        {
-            if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-            {
-                css->objects[i].h+=delta;
-            }
-            else
-            {
-                css->objects[i].y+=delta;
-            }
-        }
-    }
-    
-    if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-    {
-        css->objects[curr_subscreen_object].h+=delta;
-    }
-    else
-    {
-        css->objects[curr_subscreen_object].y+=delta;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onSSDown()
-{
-    int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?zinit.ss_grid_y:1;
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(sso_selection[i]&&i!=curr_subscreen_object)
-        {
-            if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-            {
-                css->objects[i].h+=delta;
-            }
-            else
-            {
-                css->objects[i].y+=delta;
-            }
-        }
-    }
-    
-    if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-    {
-        css->objects[curr_subscreen_object].h+=delta;
-    }
-    else
-    {
-        css->objects[curr_subscreen_object].y+=delta;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onSSLeft()
-{
-    int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?-zinit.ss_grid_x:-1;
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(sso_selection[i]&&i!=curr_subscreen_object)
-        {
-            if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-            {
-                css->objects[i].w+=delta;
-            }
-            else
-            {
-                css->objects[i].x+=delta;
-            }
-        }
-    }
-    
-    if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-    {
-        css->objects[curr_subscreen_object].w+=delta;
-    }
-    else
-    {
-        css->objects[curr_subscreen_object].x+=delta;
-    }
-    
-    return D_O_K;
-}
-
-int32_t onSSRight()
-{
-    int32_t delta=(key[KEY_LSHIFT]||key[KEY_RSHIFT])?zinit.ss_grid_x:1;
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(sso_selection[i]&&i!=curr_subscreen_object)
-        {
-            if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-            {
-                css->objects[i].w+=delta;
-            }
-            else
-            {
-                css->objects[i].x+=delta;
-            }
-        }
-    }
-    
-    if(key[KEY_ZC_LCONTROL] || key[KEY_ZC_RCONTROL])
-    {
-        css->objects[curr_subscreen_object].w+=delta;
-    }
-    else
-    {
-        css->objects[curr_subscreen_object].x+=delta;
-    }
-    
-    return D_O_K;
-}
-
-int32_t d_ssup_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        onSSUp();
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssdn_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        onSSDown();
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_sslt_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        onSSLeft();
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssrt_btn2_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        onSSRight();
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssup_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        
-        for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-        {
-            if(sso_selection[i]&&i!=curr_subscreen_object)
-            {
-                --css->objects[i].h;
-            }
-        }
-        
-        --css->objects[curr_subscreen_object].h;
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssdn_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        
-        for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-        {
-            if(sso_selection[i]&&i!=curr_subscreen_object)
-            {
-                ++css->objects[i].h;
-            }
-        }
-        
-        ++css->objects[curr_subscreen_object].h;
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_sslt_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        
-        for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-        {
-            if(sso_selection[i]&&i!=curr_subscreen_object)
-            {
-                --css->objects[i].w;
-            }
-        }
-        
-        --css->objects[curr_subscreen_object].w;
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssrt_btn3_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        
-        for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-        {
-            if(sso_selection[i]&&i!=curr_subscreen_object)
-            {
-                ++css->objects[i].w;
-            }
-        }
-        
-        ++css->objects[curr_subscreen_object].w;
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t Bweapon(int32_t pos)
-{
-    int32_t p=-1;
-    
-    for(int32_t i=0; css->objects[i].type!=ssoNULL; ++i)
-    {
-        if(css->objects[i].type==ssoCURRENTITEM && css->objects[i].d3==pos)
-        {
-            p=i;
-            break;
-        }
-    }
-    
-    if(p==-1)
-    {
-        return 0;
-    }
-    
-    int32_t family = 0;
-    bool bow = false;
-    
-    switch(css->objects[p].d1)
-    {
-    case itype_arrow:
-    case itype_bowandarrow:
-        if(current_item(itype_bow) && current_item(itype_arrow))
-        {
-            bow=(css->objects[p].d1==itype_bowandarrow);
-            family=itype_arrow;
-        }
-        
-        break;
-        
-    case itype_letterpotion:
-        if(current_item(itype_potion))
-            family=itype_potion;
-        else if(current_item(itype_letter))
-            family=itype_letter;
-        
-        break;
-        
-    case itype_sword:
-    {
-        if(!get_qr(qr_SELECTAWPN))
-            break;
-            
-        family=itype_sword;
-    }
-    break;
-    
-    default:
-        family=css->objects[p].d1;
-    }
-    
-    for(int32_t i=0; i<MAXITEMS; i++)
-    {
-        if(itemsbuf[i].family==family) return i+(bow ? 0xF000 : 0);
-    }
-    
-    return 0;
-}
-
-void selectBwpn(int32_t xstep, int32_t ystep)
-{
-    if((xstep==0)&&(ystep==0))
-    {
-        Bwpn=Bweapon(Bpos);
-        update_subscr_items();
-        
-        if(Bwpn)
-        {
-            return;
-        }
-        
-        xstep=1;
-    }
-    
-    if((xstep==8)&&(ystep==8))
-    {
-        Bwpn=Bweapon(Bpos);
-        update_subscr_items();
-        
-        if(Bwpn)
-        {
-            return;
-        }
-        
-        xstep=-1;
-    }
-    
-    int32_t pos = Bpos;
-    int32_t tries=0;
-    
-    do
-    {
-        int32_t p=-1;
-        
-        for(int32_t i=0; css->objects[i].type!=ssoNULL; ++i)
-        {
-            if(css->objects[i].type==ssoCURRENTITEM)
-            {
-                if(css->objects[i].d3==Bpos)
-                {
-                    p=i;
-                    break;
-                }
-            }
-        }
-        
-        if(p!=-1)
-        {
-            if(xstep!=0)
-            {
-                Bpos=xstep<0?css->objects[p].d6:css->objects[p].d7;
-            }
-            else
-            {
-                Bpos=ystep<0?css->objects[p].d4:css->objects[p].d5;
-            }
-        }
-        
-        Bwpn = Bweapon(Bpos);
-        update_subscr_items();
-        
-        if(Bwpn)
-        {
-            return;
-        }
-    }
-    while(Bpos!=pos && ++tries<0x100);
-    
-    if(!Bwpn)
-        Bpos=0;
-}
-
-
-int32_t d_ssup_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        selectBwpn(0, -1);
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssdn_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        selectBwpn(0, 1);
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_sslt_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        selectBwpn(-1, 0);
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-int32_t d_ssrt_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
-{
-    switch(msg)
-    {
-    case MSG_CLICK:
-    {
-        jwin_button_proc(msg, d, c);
-        selectBwpn(1, 0);
-        return D_O_K;
-    }
-    break;
-    }
-    
-    return jwin_button_proc(msg, d, c);
-}
-
-const char *sso_type[ssoMAX]=
-{
-    "ssoNULL", "ssoNONE", "sso2X2FRAME", "ssoTEXT", "ssoLINE", "ssoRECT", "ssoBSTIME", "ssoTIME", "ssoSSTIME", "ssoMAGICMETER", "ssoLIFEMETER", "ssoBUTTONITEM", "ssoICON", "ssoCOUNTER",
-    "ssoCOUNTERS", "ssoMINIMAPTITLE", "ssoMINIMAP", "ssoLARGEMAP", "ssoCLEAR", "ssoCURRENTITEM", "ssoITEM", "ssoTRIFRAME", "ssoTRIFORCE", "ssoTILEBLOCK", "ssoMINITILE", "ssoSELECTOR1", "ssoSELECTOR2",
-    "ssoMAGICGAUGE", "ssoLIFEGAUGE", "ssoTEXTBOX", "ssoCURRENTITEMTILE", "ssoSELECTEDITEMTILE", "ssoCURRENTITEMTEXT", "ssoCURRENTITEMNAME", "ssoSELECTEDITEMNAME", "ssoCURRENTITEMCLASSTEXT",
-    "ssoCURRENTITEMCLASSNAME", "ssoSELECTEDITEMCLASSNAME"
-};
-
-const char *sso_textstyle[sstsMAX]=
-{
-    "sstsNORMAL", "sstsSHADOW", "sstsSHADOWU", "sstsOUTLINE8", "sstsOUTLINEPLUS", "sstsOUTLINEX", "sstsSHADOWED", "sstsSHADOWEDU", "sstsOUTLINED8", "sstsOUTLINEDPLUS", "sstsOUTLINEDX"
-};
-
-const char *sso_fontname[ssfMAX]=
-{
-    "ssfZELDA", "ssfSS1", "ssfSS2", "ssfSS3", "ssfSS4", "ssfZTIME", "ssfSMALL", "ssfSMALLPROP", "ssfZ3SMALL", "ssfGBLA", "ssfZ3",
-    "ssfGORON", "ssfZORAN", "ssfHYLIAN1", "ssfHYLIAN2", "ssfHYLIAN3", "ssfHYLIAN4", "ssfPROP", "ssfGBORACLE", "ssfGBORACLEP",
-    "ssfDSPHANTOM", "ssfDSPHANTOMP",
-	
-	"ssfAT800", "ssfACORN", "ssfALLEG", "ssfAPL2", "ssfAPL280", "ssfAPL2GS", "ssfAQUA", "ssfAT400", "ssfC64", "ssfC64HR",
-	"ssfCGA", "ssfCOCO", "ssfCOCO2", "ssfCOUPE", "ssfCPC", "ssfFANTASY", "ssfFDSKANA", "ssfFDSLIKE", "ssfFDSROM", "ssfFF",
-	"ssfFUTHARK", "ssfGAIA", "ssfHIRA", "ssfJP", "ssfKONG", "ssfMANA", "ssfML", "ssfMOT", "ssfMSX0", "ssfMSX1", "ssfPET",
-	"ssfPSTART", "ssfSATURN", "ssfSCIFI", "ssfSHERW", "ssfSINQL", "ssfSPEC", "ssfSPECLG", "ssfTI99", "ssfTRS", "ssfZ2", "ssfZX", "ssfLISA"
-	
-};
-
-const char *sso_colortype[2]=
-{
-    "ssctSYSTEM", "ssctMISC"
-};
-
-const char *sso_specialcolor[ssctMAX]=
-{
-    "ssctTEXT", "ssctCAPTION", "ssctOVERWBG", "ssctDNGNBG", "ssctDNGNFG", "ssctCAVEFG", "ssctBSDK", "ssctBSGOAL", "ssctCOMPASSLT", "ssctCOMPASSDK", "ssctSUBSCRBG", "ssctSUBSCRSHADOW",
-    "ssctTRIFRAMECOLOR", "ssctBMAPBG", "ssctBMAPFG", "ssctHERODOT", "ssctMSGTEXT"
-};
-
-const char *sso_specialcset[sscsMAX]=
-{
-    "sscsTRIFORCECSET", "sscsTRIFRAMECSET", "sscsOVERWORLDMAPCSET", "sscsDUNGEONMAPCSET", "sscsBLUEFRAMECSET", "sscsHCPIECESCSET", "sscsSSVINECSET"
-};
-
-const char *sso_specialtile[ssmstMAX]=
-{
-    "ssmstSSVINETILE", "ssmstMAGICMETER"
-};
-
-const char *sso_counterobject[sscMAX]=
-{
-    "sscRUPEES", "sscBOMBS", "sscSBOMBS", "sscARROWS", "sscGENKEYMAGIC", "sscGENKEYNOMAGIC", "sscLEVKEYMAGIC",
-    "sscLEVKEYNOMAGIC", "sscANYKEYMAGIC", "sscANYKEYNOMAGIC", "sscSCRIPT1", "sscSCRIPT2", "sscSCRIPT3", "sscSCRIPT4",
-    "sscSCRIPT5", "sscSCRIPT6", "sscSCRIPT7", "sscSCRIPT8", "sscSCRIPT9", "sscSCRIPT10"
-};
-
-const char *sso_alignment[3]=
-{
-    "sstaLEFT", "sstaCENTER", "sstaRIGHT"
-};
-
-
-bool save_subscreen_code(char *path)
-{
-    PACKFILE *f = pack_fopen_password(path,F_WRITE,"");
-    
-    if(!f)
-    {
-        return false;
-    }
-    
-    int32_t ssobjs=ss_objects(css);
-    char buf[512];
-    memset(buf,0,512);
-    sprintf(buf, "subscreen_object exported_subscreen[%d]=\n", ssobjs);
-    pack_fputs(buf, f);
-    
-    if(pack_ferror(f))
-    {
-        pack_fclose(f);
-        return false;
-    }
-    
-    pack_fputs("{\n", f);
-    
-    if(pack_ferror(f))
-    {
-        pack_fclose(f);
-        return false;
-    }
-    
-    for(int32_t i=0; i<ssobjs; ++i)
-    {
-//    pack_fputs("{\n", f);
-        sprintf(buf, "  { %s, %d, %d, %d, %d, %d, ",
-                sso_type[css->objects[i].type], css->objects[i].pos, css->objects[i].x, css->objects[i].y, css->objects[i].w, css->objects[i].h);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        if(css->objects[i].colortype1>=ssctSYSTEM)
-        {
-            sprintf(buf, "%s, ", sso_colortype[css->objects[i].colortype1==ssctSYSTEM?0:1]);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-            
-            if(css->objects[i].colortype1==ssctMISC)
-            {
-                int32_t t=css->objects[i].type;
-                
-                if(t==sso2X2FRAME||t==ssoCURRENTITEMTILE||t==ssoICON||t==ssoMINITILE||t==ssoSELECTEDITEMTILE||t==ssoSELECTOR1||t==ssoSELECTOR2||t==ssoTRIFORCE||t==ssoTILEBLOCK)
-                {
-                    sprintf(buf, "%s, ", sso_specialcset[css->objects[i].color1]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-                else
-                {
-                    sprintf(buf, "%s, ", sso_specialcolor[css->objects[i].color1]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-            }
-            else
-            {
-                sprintf(buf, "%d, ", css->objects[i].color1);
-                pack_fputs(buf, f);
-                
-                if(pack_ferror(f))
-                {
-                    pack_fclose(f);
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            sprintf(buf, "%d, %d, ", css->objects[i].colortype1, css->objects[i].color1);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-        }
-        
-        if(css->objects[i].colortype2>=ssctSYSTEM)
-        {
-            sprintf(buf, "%s, ", sso_colortype[css->objects[i].colortype2==ssctSYSTEM?0:1]);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-            
-            if(css->objects[i].colortype2==ssctMISC)
-            {
-                int32_t t=css->objects[i].type;
-                
-                if(t==sso2X2FRAME||t==ssoCURRENTITEMTILE||t==ssoICON||t==ssoMINITILE||t==ssoSELECTEDITEMTILE||t==ssoSELECTOR1||t==ssoSELECTOR2||t==ssoTRIFORCE||t==ssoTILEBLOCK)
-                {
-                    sprintf(buf, "%s, ", sso_specialcset[css->objects[i].color2]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-                else
-                {
-                    sprintf(buf, "%s, ", sso_specialcolor[css->objects[i].color2]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-            }
-            else
-            {
-                sprintf(buf, "%d, ", css->objects[i].color2);
-                pack_fputs(buf, f);
-                
-                if(pack_ferror(f))
-                {
-                    pack_fclose(f);
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            sprintf(buf, "%d, %d, ", css->objects[i].colortype2, css->objects[i].color2);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-        }
-        
-        if(css->objects[i].colortype3>=ssctSYSTEM)
-        {
-            sprintf(buf, "%s, ", sso_colortype[css->objects[i].colortype3==ssctSYSTEM?0:1]);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-            
-            if(css->objects[i].colortype3==ssctMISC)
-            {
-                int32_t t=css->objects[i].type;
-                
-                if(t==sso2X2FRAME||t==ssoCURRENTITEMTILE||t==ssoICON||t==ssoMINITILE||t==ssoSELECTEDITEMTILE||t==ssoSELECTOR1||t==ssoSELECTOR2||t==ssoTRIFORCE||t==ssoTILEBLOCK)
-                {
-                    sprintf(buf, "%s, ", sso_specialcset[css->objects[i].color3]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-                else
-                {
-                    sprintf(buf, "%s, ", sso_specialcolor[css->objects[i].color3]);
-                    pack_fputs(buf, f);
-                    
-                    if(pack_ferror(f))
-                    {
-                        pack_fclose(f);
-                        return false;
-                    }
-                }
-            }
-            else
-            {
-                sprintf(buf, "%d, ", css->objects[i].color3);
-                pack_fputs(buf, f);
-                
-                if(pack_ferror(f))
-                {
-                    pack_fclose(f);
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            sprintf(buf, "%d, %d, ", css->objects[i].colortype3, css->objects[i].color3);
-            pack_fputs(buf, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-        }
-        
-        switch(css->objects[i].type)
-        {
-        case ssoCURRENTITEM:
-            sprintf(buf, "%s, ", itype_names[css->objects[i].d1]);
-            break;
-            
-        case ssoCOUNTER:
-        case ssoCOUNTERS:
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoMINIMAPTITLE:
-        case ssoSELECTEDITEMNAME:
-        case ssoTIME:
-        case ssoSSTIME:
-        case ssoBSTIME:
-            sprintf(buf, "%s, ", sso_fontname[css->objects[i].d1]);
-            break;
-            
-        default:
-            sprintf(buf, "%d, ", css->objects[i].d1);
-            break;
-        }
-        
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        switch(css->objects[i].type)
-        {
-        case ssoCOUNTER:
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoMINIMAPTITLE:
-        case ssoSELECTEDITEMNAME:
-        case ssoTIME:
-        case ssoSSTIME:
-        case ssoBSTIME:
-            sprintf(buf, "%s, ", sso_alignment[css->objects[i].d2]);
-            break;
-            
-        case ssoMINITILE:
-            if(css->objects[i].d1==-1)
-            {
-                sprintf(buf, "%s, ", sso_specialtile[css->objects[i].d2]);
-            }
-            else
-            {
-                sprintf(buf, "%d, ", css->objects[i].d2);
-            }
-            
-            break;
-            
-        default:
-            sprintf(buf, "%d, ", css->objects[i].d2);
-            break;
-        }
-        
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        switch(css->objects[i].type)
-        {
-        case ssoCOUNTER:
-        case ssoCOUNTERS:
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoMINIMAPTITLE:
-        case ssoSELECTEDITEMNAME:
-        case ssoTIME:
-        case ssoSSTIME:
-        case ssoBSTIME:
-            sprintf(buf, "%s, ", (char *)sso_textstyle[css->objects[i].d3]);
-            break;
-            
-        default:
-            sprintf(buf, "%d, ", css->objects[i].d3);
-            break;
-        }
-        
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].d4);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        switch(css->objects[i].type)
-        {
-        case ssoCOUNTER:
-        case ssoCOUNTERS:
-            sprintf(buf, "\'%c\', ", css->objects[i].d5);
-            break;
-            
-        default:
-            sprintf(buf, "%d, ", css->objects[i].d5);
-            break;
-        }
-        
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].d6);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        switch(css->objects[i].type)
-        {
-        case ssoCOUNTER:
-            sprintf(buf, "%s, ", sso_counterobject[css->objects[i].d7]);
-            break;
-            
-        default:
-            sprintf(buf, "%d, ", css->objects[i].d7);
-            break;
-        }
-        
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].d8);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].d9);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].d10);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].frames);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].speed);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].delay);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        sprintf(buf, "%d, ", css->objects[i].frame);
-        pack_fputs(buf, f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-        
-        
-        if(!css->objects[i].dp1)
-        {
-            pack_fputs("NULL", f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-        }
-        else
-        {
-            pack_fputs("(void *)\"", f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-            
-            pack_fputs((char *)css->objects[i].dp1, f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-            
-            pack_fputs("\"", f);
-            
-            if(pack_ferror(f))
-            {
-                pack_fclose(f);
-                return false;
-            }
-        }
-        
-        pack_fputs(" },\n", f);
-        
-        if(pack_ferror(f))
-        {
-            pack_fclose(f);
-            return false;
-        }
-    }
-    
-    pack_fputs("  { ssoNULL }\n", f);
-    
-    if(pack_ferror(f))
+	switch(msg)
+	{
+		case MSG_CLICK:
+		{
+			jwin_button_proc(msg, d, c);
+			SubscrPage& pg = subscr_edit_page();
+			for(int32_t i=0; i<pg.contents.size(); ++i)
+			{
+				if(sso_selection[i] || i==curr_subscreen_object)
+				{
+					++pg.contents[i]->w;
+				}
+			}
+			return D_O_K;
+		}
+		break;
+	}
+	
+	return jwin_button_proc(msg, d, c);
+}
+
+int32_t d_ssup_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
+{
+    switch(msg)
+    {
+    case MSG_CLICK:
     {
-        pack_fclose(f);
-        return false;
+        jwin_button_proc(msg, d, c);
+        subscr_edit.cur_page().move_cursor(SEL_UP);
+        return D_O_K;
+    }
+    break;
     }
     
-    pack_fputs("};\n", f);
-    
-    if(pack_ferror(f))
+    return jwin_button_proc(msg, d, c);
+}
+
+int32_t d_ssdn_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
+{
+    switch(msg)
+    {
+    case MSG_CLICK:
     {
-        pack_fclose(f);
-        return false;
+        jwin_button_proc(msg, d, c);
+        subscr_edit.cur_page().move_cursor(SEL_DOWN);
+        return D_O_K;
+    }
+    break;
     }
     
-    pack_fclose(f);
-    return true;
+    return jwin_button_proc(msg, d, c);
 }
 
-
-
-int32_t onExport_Subscreen_Code()
+int32_t d_sslt_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
 {
-    if(!getname("Export Subscreen Code (.zss)","zss",NULL,datapath,false))
+    switch(msg)
+    {
+    case MSG_CLICK:
+    {
+        jwin_button_proc(msg, d, c);
+        subscr_edit.cur_page().move_cursor(SEL_LEFT);
         return D_O_K;
-        
-    char buf[256+20],buf2[256+20],name[256];
-    extract_name(temppath,name,FILENAME8_3);
+    }
+    break;
+    }
     
-    if(save_subscreen_code(temppath))
+    return jwin_button_proc(msg, d, c);
+}
+
+int32_t d_ssrt_btn4_proc(int32_t msg,DIALOG *d,int32_t c)
+{
+    switch(msg)
     {
-        sprintf(buf,"ZQuest");
-        sprintf(buf2,"Saved %s",name);
-    }
-    else
+    case MSG_CLICK:
     {
-        sprintf(buf,"Error");
-        sprintf(buf2,"Error saving %s",name);
+        jwin_button_proc(msg, d, c);
+        subscr_edit.cur_page().move_cursor(SEL_RIGHT);
+        return D_O_K;
+    }
+    break;
     }
     
-    jwin_alert(buf,buf2,NULL,NULL,"O&K",NULL,'k',0,get_zc_font(font_lfont));
-    return D_O_K;
+    return jwin_button_proc(msg, d, c);
 }
 
+const char *sso_textstyle[sstsMAX]=
+{
+    "sstsNORMAL", "sstsSHADOW", "sstsSHADOWU", "sstsOUTLINE8", "sstsOUTLINEPLUS", "sstsOUTLINEX", "sstsSHADOWED", "sstsSHADOWEDU", "sstsOUTLINED8", "sstsOUTLINEDPLUS", "sstsOUTLINEDX"
+};
+
+const char *sso_fontname[ssfMAX]=
+{
+    "ssfZELDA", "ssfSS1", "ssfSS2", "ssfSS3", "ssfSS4", "ssfZTIME", "ssfSMALL", "ssfSMALLPROP", "ssfZ3SMALL", "ssfGBLA", "ssfZ3",
+    "ssfGORON", "ssfZORAN", "ssfHYLIAN1", "ssfHYLIAN2", "ssfHYLIAN3", "ssfHYLIAN4", "ssfPROP", "ssfGBORACLE", "ssfGBORACLEP",
+    "ssfDSPHANTOM", "ssfDSPHANTOMP",
+	
+	"ssfAT800", "ssfACORN", "ssfALLEG", "ssfAPL2", "ssfAPL280", "ssfAPL2GS", "ssfAQUA", "ssfAT400", "ssfC64", "ssfC64HR",
+	"ssfCGA", "ssfCOCO", "ssfCOCO2", "ssfCOUPE", "ssfCPC", "ssfFANTASY", "ssfFDSKANA", "ssfFDSLIKE", "ssfFDSROM", "ssfFF",
+	"ssfFUTHARK", "ssfGAIA", "ssfHIRA", "ssfJP", "ssfKONG", "ssfMANA", "ssfML", "ssfMOT", "ssfMSX0", "ssfMSX1", "ssfPET",
+	"ssfPSTART", "ssfSATURN", "ssfSCIFI", "ssfSHERW", "ssfSINQL", "ssfSPEC", "ssfSPECLG", "ssfTI99", "ssfTRS", "ssfZ2", "ssfZX", "ssfLISA"
+	
+};
+
+const char *sso_colortype[2]=
+{
+    "ssctSYSTEM", "ssctMISC"
+};
+
+const char *sso_specialcolor[ssctMAX]=
+{
+    "ssctTEXT", "ssctCAPTION", "ssctOVERWBG", "ssctDNGNBG", "ssctDNGNFG", "ssctCAVEFG", "ssctBSDK", "ssctBSGOAL", "ssctCOMPASSLT", "ssctCOMPASSDK", "ssctSUBSCRBG", "ssctSUBSCRSHADOW",
+    "ssctTRIFRAMECOLOR", "ssctBMAPBG", "ssctBMAPFG", "ssctHERODOT", "ssctMSGTEXT"
+};
+
+const char *sso_specialcset[sscsMAX]=
+{
+    "sscsTRIFORCECSET", "sscsTRIFRAMECSET", "sscsOVERWORLDMAPCSET", "sscsDUNGEONMAPCSET", "sscsBLUEFRAMECSET", "sscsHCPIECESCSET", "sscsSSVINECSET"
+};
+
+const char *sso_specialtile[ssmstMAX]=
+{
+    "ssmstSSVINETILE", "ssmstMAGICMETER"
+};
+
+const char *sso_counterobject[sscMAX]=
+{
+    "sscRUPEES", "sscBOMBS", "sscSBOMBS", "sscARROWS", "sscGENKEYMAGIC", "sscGENKEYNOMAGIC", "sscLEVKEYMAGIC",
+    "sscLEVKEYNOMAGIC", "sscANYKEYMAGIC", "sscANYKEYNOMAGIC", "sscSCRIPT1", "sscSCRIPT2", "sscSCRIPT3", "sscSCRIPT4",
+    "sscSCRIPT5", "sscSCRIPT6", "sscSCRIPT7", "sscSCRIPT8", "sscSCRIPT9", "sscSCRIPT10"
+};
+
+const char *sso_alignment[3]=
+{
+    "sstaLEFT", "sstaCENTER", "sstaRIGHT"
+};
+
 int32_t onActivePassive();
 
 static MENU ss_arrange_menu[] =
@@ -2471,8 +827,6 @@ static MENU ss_edit_menu[] =
     { (char *)"Switch Active/Passive",              onActivePassive,                      NULL, 0, NULL },
     { (char *)"",                    NULL,                                 NULL, 0, NULL },
     { (char *)"&Take Snapshot\tZ",   onSnapshot,                           NULL, 0, NULL },
-    { (char *)"",                    NULL,                                 NULL, 0, NULL },
-    { (char *)"E&xport as Code\tX",  onExport_Subscreen_Code,              NULL, 0, NULL },
     { NULL,                          NULL,                                 NULL, 0, NULL }
 };
 
@@ -2554,7 +908,6 @@ static DIALOG subscreen_dlg[] =
     { d_keyboard_proc,      0,     0,     0,       0,    0,                 0,                'd',     0,          0,             0, (void *) onDuplicateSubscreenObject, NULL, NULL },
     { d_keyboard_proc,      0,     0,     0,       0,    0,                 0,                'e',     0,          0,             0, (void *) onSubscreenObjectProperties, NULL, NULL },
     { d_keyboard_proc,      0,     0,     0,       0,    0,                 0,                'z',     0,          0,             0, (void *) onSnapshot, NULL, NULL },
-    { d_keyboard_proc,      0,     0,     0,       0,    0,                 0,                'x',     0,          0,             0, (void *) onExport_Subscreen_Code, NULL, NULL },
     { d_vsync_proc,         0,     0,     0,       0,    0,                 0,                0,       0,          0,             0,       NULL, NULL, NULL },
     { d_timer_proc,         0,    0,     0,    0,    0,       0,       0,       0,          0,          0,         NULL, NULL, NULL },
     { NULL,                 0,    0,    0,    0,   0,       0,       0,       0,          0,             0,       NULL,                           NULL,  NULL }
@@ -2562,16 +915,16 @@ static DIALOG subscreen_dlg[] =
 
 int32_t onActivePassive()
 {
-    if(css->ss_type == sstACTIVE)
+    if(subscr_edit.sub_type == sstPASSIVE)
     {
-        css->ss_type = sstPASSIVE;
-        subscreen_dlg[3].h=116;
+        subscr_edit.sub_type = sstACTIVE;
+        subscreen_dlg[3].h=172*2-4;
         subscreen_dlg[4].h=subscreen_dlg[3].h-4;
     }
-    else if(css->ss_type == sstPASSIVE)
+	else
     {
-        css->ss_type = sstACTIVE;
-        subscreen_dlg[3].h=172*2-4;
+        subscr_edit.sub_type = sstPASSIVE;
+        subscreen_dlg[3].h=116;
         subscreen_dlg[4].h=subscreen_dlg[3].h-4;
     }
     
@@ -2641,7 +994,7 @@ const char *sso_str[ssoMAX]=
 {
     "NULL", "(None)", "2x2 Frame", "Text", "Line", "Rectangle", "BS-Zelda Time", "Game Time", "Game Time (Quest Rule)", "Magic Meter", "Life Meter",
     "Button Item", "-Icon (Not Implemented)", "Counter", "Counter Block", "Minimap Title", "Minimap", "Large Map", "Background Color", "Current Item", "-Item (Not Implemented)",
-    "Triforce Frame", "Triforce Piece", "Tile Block", "Minitile", "Selector 1", "Selector 2", "Magic Gauge Piece", "Life Gauge Piece", "Text Box", "-Current Item -> Tile (Not Implemented)",
+    "Triangle Frame", "McGuffin Piece", "Tile Block", "Minitile", "Selector 1", "Selector 2", "Magic Gauge Piece", "Life Gauge Piece", "Text Box", "-Current Item -> Tile (Not Implemented)",
     "-Selected Item -> Tile (Not Implemented)", "-Current Item -> Text (Not Implemented)", "-Current Item Name (Not Implemented)", "Selected Item Name",
     "-Current Item Class -> Text (Not Implemented)", "-Current Item Class Name (Not Implemented)", "-Selected Item Class Name (Not Implemented)"
 };
@@ -2663,11 +1016,6 @@ char *sso_name(int32_t type)
     return tempname;
 }
 
-char *sso_name(subscreen_object *tempss, int32_t id)
-{
-    return sso_name(tempss[id].type);
-}
-
 sso_struct bisso[ssoMAX];
 int32_t bisso_cnt=-1;
 
@@ -2724,54 +1072,25 @@ static DIALOG ssolist_dlg[] =
 
 void doNewSubscreenObject(int32_t type)
 {
-    subscreen_object tempsso;
-	memset(&tempsso,0,sizeof(subscreen_object));
-	//tempsso.dp1=(char *)malloc(2);
-	tempsso.dp1 = new char[2];
-	((char *)tempsso.dp1)[0]=0;
-	tempsso.type=type;
-	tempsso.pos = sspUP | sspDOWN | sspSCROLLING;
-	tempsso.w=1;
-	tempsso.h=1;
+	SubscrWidget* widg = SubscrWidget::newType(type);
+	widg->posflags = sspUP | sspDOWN | sspSCROLLING;
+	widg->w=1;
+	widg->h=1;
 	
-	switch(tempsso.type)
-	{
-		case ssoCURRENTITEM:
-			tempsso.d2 = SSCURRITEM_VISIBLE;
-			break;
-		case ssoMAGICGAUGE:
-			tempsso.d9 = -1; // 'Always show' by default
-			break;
-		case ssoCOUNTER:
-			tempsso.d10 = -1; //(None) inf item
-            tempsso.colortype1 = ssctMISC; //Default text color
-			break;
-		
-		case ssoBSTIME: case ssoCOUNTERS: case ssoSSTIME:
-        case ssoTIME: case ssoMINIMAPTITLE: case ssoSELECTEDITEMNAME:
-        case ssoTEXT: case ssoTEXTBOX:
-			tempsso.colortype1 = ssctMISC; //Default text color
-			break;
-	}
-		
 	int32_t temp_cso=curr_subscreen_object;
-	curr_subscreen_object=ss_objects(css);
+	curr_subscreen_object=subscr_edit_page().contents.size();
 	
-	if(sso_properties(&tempsso)!=-1)
+	SubscrPage& pg = subscr_edit_page();
+	if(sso_properties(widg,pg.contents.size())!=-1)
 	{
-		if(css->objects[curr_subscreen_object].dp1!=NULL)
-		{
-			delete [](char *)css->objects[curr_subscreen_object].dp1;
-			css->objects[curr_subscreen_object].dp1=NULL;
-		}
-		
-		css->objects[curr_subscreen_object]=tempsso;
+		pg.contents.push_back(widg);
 		update_sso_name();
 		update_up_dn_btns();
 	}
 	else
 	{
 		curr_subscreen_object=temp_cso;
+		delete widg;
 	}
 }
 
@@ -2801,7 +1120,7 @@ std::string getssname(int32_t type)
 		case ssoCURRENTITEM: return "ssoCURRENTITEM";
 		case ssoITEM: return "ssoITEM";
 		case ssoTRIFRAME: return "ssoTRIFRAME";
-		case ssoTRIFORCE: return "ssoTRIFORCE";
+		case ssoMCGUFFIN: return "ssoMCGUFFIN";
 		case ssoTILEBLOCK: return "ssoTILEBLOCK";
 		case ssoMINITILE: return "ssoMINITILE";
 		case ssoSELECTOR1: return "ssoSELECTOR1";
@@ -2841,166 +1160,127 @@ int32_t onNewSubscreenObject()
 }
 
 
-void align_objects(subscreen_group *tempss, bool *selection, int32_t align_type)
+void align_objects(bool *selection, int32_t align_type)
 {
-    int32_t l=sso_x(&tempss->objects[curr_subscreen_object]);
-    int32_t t=sso_y(&tempss->objects[curr_subscreen_object]);
-    int32_t w=sso_w(&tempss->objects[curr_subscreen_object]);
-    int32_t h=sso_h(&tempss->objects[curr_subscreen_object]);
-    
-    switch(get_alignment(&tempss->objects[curr_subscreen_object]))
-    {
-    case sstaCENTER:
-        l-=(w/2);
-        break;
-        
-    case sstaRIGHT:
-        l-=w;
-        break;
-        
-    case sstaLEFT:
-    default:
-        break;
-    }
-    
-    int32_t r=l+w-1;
-    int32_t b=t+h-1;
-    int32_t c=l+w/2;
-    int32_t m=t+h/2;
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(selection[i]&&i!=curr_subscreen_object)
-        {
-            int32_t tl=sso_x(&tempss->objects[i]);
-            int32_t tt=sso_y(&tempss->objects[i]);
-            int32_t tw=sso_w(&tempss->objects[i]);
-            int32_t th=sso_h(&tempss->objects[i]);
-            
-            switch(get_alignment(&tempss->objects[i]))
-            {
-            case sstaCENTER:
-                tl-=(tw/2);
-                break;
-                
-            case sstaRIGHT:
-                tl-=tw;
-                break;
-                
-            case sstaLEFT:
-            default:
-                break;
-            }
-            
-            int32_t tr=tl+tw-1;
-            int32_t tb=tt+th-1;
-            int32_t tc=tl+tw/2;
-            int32_t tm=tt+th/2;
-            
-            switch(align_type)
-            {
-            case ssoaBOTTOM:
-                tempss->objects[i].y+=b-tb;
-                break;
-                
-            case ssoaMIDDLE:
-                tempss->objects[i].y+=m-tm;
-                break;
-                
-            case ssoaTOP:
-                tempss->objects[i].y+=t-tt;
-                break;
-                
-            case ssoaRIGHT:
-                tempss->objects[i].x+=r-tr;
-                break;
-                
-            case ssoaCENTER:
-                tempss->objects[i].x+=c-tc;
-                break;
-                
-            case ssoaLEFT:
-            default:
-                tempss->objects[i].x+=l-tl;
-                break;
-            }
-        }
-    }
+	auto& pg = subscr_edit_page();
+	auto* curwidg = subscr_edit_widg();
+	if(!curwidg) return;
+	int32_t l=curwidg->getX()+curwidg->getXOffs();
+	int32_t t=curwidg->getY();
+	int32_t w=curwidg->getW();
+	int32_t h=curwidg->getH();
+	
+	int32_t r=l+w-1;
+	int32_t b=t+h-1;
+	int32_t c=l+w/2;
+	int32_t m=t+h/2;
+	
+	for(int32_t i=0; i<pg.contents.size(); ++i)
+	{
+		if(selection[i]&&i!=curr_subscreen_object)
+		{
+			SubscrWidget& widg = *pg.contents[i];
+			int32_t tl=widg.getX()+widg.getXOffs();
+			int32_t tt=widg.getY();
+			int32_t tw=widg.getW();
+			int32_t th=widg.getH();
+			
+			int32_t tr=tl+tw-1;
+			int32_t tb=tt+th-1;
+			int32_t tc=tl+tw/2;
+			int32_t tm=tt+th/2;
+			
+			switch(align_type)
+			{
+			case ssoaBOTTOM:
+				widg.y+=b-tb;
+				break;
+				
+			case ssoaMIDDLE:
+				widg.y+=m-tm;
+				break;
+				
+			case ssoaTOP:
+				widg.y+=t-tt;
+				break;
+				
+			case ssoaRIGHT:
+				widg.x+=r-tr;
+				break;
+				
+			case ssoaCENTER:
+				widg.x+=c-tc;
+				break;
+				
+			case ssoaLEFT:
+			default:
+				widg.x+=l-tl;
+				break;
+			}
+		}
+	}
 }
 
-void grid_snap_objects(subscreen_group *tempss, bool *selection, int32_t snap_type)
+void grid_snap_objects(bool *selection, int32_t snap_type)
 {
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(selection[i]||i==curr_subscreen_object)
-        {
-            int32_t tl=sso_x(&tempss->objects[i]);
-            int32_t tt=sso_y(&tempss->objects[i]);
-            int32_t tw=sso_w(&tempss->objects[i]);
-            int32_t th=sso_h(&tempss->objects[i]);
-            
-            switch(get_alignment(&tempss->objects[i]))
-            {
-            case sstaCENTER:
-                tl-=(tw/2);
-                break;
-                
-            case sstaRIGHT:
-                tl-=tw;
-                break;
-                
-            case sstaLEFT:
-            default:
-                break;
-            }
-            
-            int32_t tr=tl+tw-1;
-            int32_t tb=tt+th-1;
-            int32_t tc=tl+tw/2;
-            int32_t tm=tt+th/2;
-            int32_t l1=(tl-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
-            int32_t l2=l1+zinit.ss_grid_x;
-            int32_t c1=(tc-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
-            int32_t c2=c1+zinit.ss_grid_x;
-            int32_t r1=(tr-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
-            int32_t r2=r1+zinit.ss_grid_x;
-            
-            int32_t t1=(tt-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
-            int32_t t2=t1+zinit.ss_grid_y;
-            int32_t m1=(tm-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
-            int32_t m2=m1+zinit.ss_grid_y;
-            int32_t b1=(tb-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
-            int32_t b2=b1+zinit.ss_grid_y;
-            
-            switch(snap_type)
-            {
-            case ssosBOTTOM:
-                tempss->objects[i].y+=(abs(b1-tb)>abs(b2-tb))?(b2-tb):(b1-tb);
-                break;
-                
-            case ssosMIDDLE:
-                tempss->objects[i].y+=(abs(m1-tm)>abs(m2-tm))?(m2-tm):(m1-tm);
-                break;
-                
-            case ssosTOP:
-                tempss->objects[i].y+=(abs(t1-tt)>abs(t2-tt))?(t2-tt):(t1-tt);
-                break;
-                
-            case ssosRIGHT:
-                tempss->objects[i].x+=(abs(r1-tr)>abs(r2-tr))?(r2-tr):(r1-tr);
-                break;
-                
-            case ssosCENTER:
-                tempss->objects[i].x+=(abs(c1-tc)>abs(c2-tc))?(c2-tc):(c1-tc);
-                break;
-                
-            case ssosLEFT:
-            default:
-                tempss->objects[i].x+=(abs(l1-tl)>abs(l2-tl))?(l2-tl):(l1-tl);
-                break;
-            }
-        }
-    }
+	auto& pg = subscr_edit_page();
+	for(int32_t i=0; i < pg.contents.size(); ++i)
+	{
+		if(selection[i]||i==curr_subscreen_object)
+		{
+			SubscrWidget& widg = *pg.contents[i];
+			int32_t tl=widg.getX()+widg.getXOffs();
+			int32_t tt=widg.getY();
+			int32_t tw=widg.getW();
+			int32_t th=widg.getH();
+			
+			int32_t tr=tl+tw-1;
+			int32_t tb=tt+th-1;
+			int32_t tc=tl+tw/2;
+			int32_t tm=tt+th/2;
+			int32_t l1=(tl-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
+			int32_t l2=l1+zinit.ss_grid_x;
+			int32_t c1=(tc-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
+			int32_t c2=c1+zinit.ss_grid_x;
+			int32_t r1=(tr-zinit.ss_grid_xofs)/zinit.ss_grid_x*zinit.ss_grid_x+zinit.ss_grid_xofs;
+			int32_t r2=r1+zinit.ss_grid_x;
+			
+			int32_t t1=(tt-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
+			int32_t t2=t1+zinit.ss_grid_y;
+			int32_t m1=(tm-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
+			int32_t m2=m1+zinit.ss_grid_y;
+			int32_t b1=(tb-zinit.ss_grid_yofs)/zinit.ss_grid_y*zinit.ss_grid_y+zinit.ss_grid_yofs;
+			int32_t b2=b1+zinit.ss_grid_y;
+			
+			switch(snap_type)
+			{
+			case ssosBOTTOM:
+				widg.y+=(abs(b1-tb)>abs(b2-tb))?(b2-tb):(b1-tb);
+				break;
+				
+			case ssosMIDDLE:
+				widg.y+=(abs(m1-tm)>abs(m2-tm))?(m2-tm):(m1-tm);
+				break;
+				
+			case ssosTOP:
+				widg.y+=(abs(t1-tt)>abs(t2-tt))?(t2-tt):(t1-tt);
+				break;
+				
+			case ssosRIGHT:
+				widg.x+=(abs(r1-tr)>abs(r2-tr))?(r2-tr):(r1-tr);
+				break;
+				
+			case ssosCENTER:
+				widg.x+=(abs(c1-tc)>abs(c2-tc))?(c2-tc):(c1-tc);
+				break;
+				
+			case ssosLEFT:
+			default:
+				widg.x+=(abs(l1-tl)>abs(l2-tl))?(l2-tl):(l1-tl);
+				break;
+			}
+		}
+	}
 }
 
 typedef struct dist_obj
@@ -3016,168 +1296,154 @@ typedef struct dist_obj
     int32_t m;
 } dist_obj;
 
-void distribute_objects(subscreen_group *tempss, bool *selection, int32_t distribute_type)
+void distribute_objects(bool *, int32_t distribute_type)
 {
-    //these are here to bypass compiler warnings about unused arguments
-    selection=selection;
-    
-    int32_t count=0;
-    dist_obj temp_do[MAXSUBSCREENITEMS];
-    
-    for(int32_t i=0; i<MAXSUBSCREENITEMS; ++i)
-    {
-        if(sso_selection[i]==true||i==curr_subscreen_object)
-        {
-            temp_do[count].index=i;
-            temp_do[count].l=sso_x(&tempss->objects[i]);
-            temp_do[count].t=sso_y(&tempss->objects[i]);
-            temp_do[count].w=sso_w(&tempss->objects[i]);
-            temp_do[count].h=sso_h(&tempss->objects[i]);
-            
-            switch(get_alignment(&tempss->objects[i]))
-            {
-            case sstaCENTER:
-                temp_do[count].l-=(temp_do[count].w/2);
-                break;
-                
-            case sstaRIGHT:
-                temp_do[count].l-=temp_do[count].w;
-                break;
-                
-            case sstaLEFT:
-            default:
-                break;
-            }
-            
-            temp_do[count].r=temp_do[count].l+temp_do[count].w-1;
-            temp_do[count].b=temp_do[count].t+temp_do[count].h-1;
-            temp_do[count].c=temp_do[count].l+temp_do[count].w/2;
-            temp_do[count].m=temp_do[count].t+temp_do[count].h/2;
-            ++count;
-        }
-    }
-    
-    if(count<3)
-    {
-        return;
-    }
-    
-    //sort all objects in order of position, then index (yeah, bubble sort; sue me)
-    dist_obj tempdo2;
-    
-    for(int32_t j=0; j<count-1; j++)
-    {
-        for(int32_t k=0; k<count-1-j; k++)
-        {
-            switch(distribute_type)
-            {
-            case ssodBOTTOM:
-                if(temp_do[k+1].b<temp_do[k].b||((temp_do[k+1].b==temp_do[k].b)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-                
-            case ssodMIDDLE:
-                if(temp_do[k+1].m<temp_do[k].m||((temp_do[k+1].m==temp_do[k].m)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-                
-            case ssodTOP:
-                if(temp_do[k+1].t<temp_do[k].t||((temp_do[k+1].t==temp_do[k].t)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-                
-            case ssodRIGHT:
-                if(temp_do[k+1].r<temp_do[k].r||((temp_do[k+1].r==temp_do[k].r)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-                
-            case ssodCENTER:
-                if(temp_do[k+1].c<temp_do[k].c||((temp_do[k+1].c==temp_do[k].c)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-                
-            case ssodLEFT:
-            default:
-                if(temp_do[k+1].l<temp_do[k].l||((temp_do[k+1].l==temp_do[k].l)&&(temp_do[k+1].index<temp_do[k].index)))
-                {
-                    tempdo2=temp_do[k];
-                    temp_do[k]=temp_do[k+1];
-                    temp_do[k+1]=tempdo2;
-                }
-                
-                break;
-            }
-        }
-    }
-    
-    int32_t ld=temp_do[count-1].l-temp_do[0].l;
-    int32_t td=temp_do[count-1].t-temp_do[0].t;
-    int32_t rd=temp_do[count-1].r-temp_do[0].r;
-    int32_t bd=temp_do[count-1].b-temp_do[0].b;
-    int32_t cd=temp_do[count-1].c-temp_do[0].c;
-    int32_t md=temp_do[count-1].m-temp_do[0].m;
-    
-    for(int32_t i=1; i<count-1; ++i)
-    {
-        switch(distribute_type)
-        {
-        case ssodBOTTOM:
-            tempss->objects[temp_do[i].index].y+=bd*i/(count-1)-temp_do[i].b+temp_do[0].b;
-            break;
-            
-        case ssodMIDDLE:
-            tempss->objects[temp_do[i].index].y+=md*i/(count-1)-temp_do[i].m+temp_do[0].m;
-            break;
-            
-        case ssodTOP:
-            tempss->objects[temp_do[i].index].y+=td*i/(count-1)-temp_do[i].t+temp_do[0].t;
-            break;
-            
-        case ssodRIGHT:
-            tempss->objects[temp_do[i].index].x+=rd*i/(count-1)-temp_do[i].r+temp_do[0].r;
-            break;
-            
-        case ssodCENTER:
-            tempss->objects[temp_do[i].index].x+=cd*i/(count-1)-temp_do[i].c+temp_do[0].c;
-            break;
-            
-        case ssodLEFT:
-        default:
-            tempss->objects[temp_do[i].index].x+=ld*i/(count-1)-temp_do[i].l+temp_do[0].l;
-            break;
-        }
-    }
-    
+	int32_t count=0;
+	dist_obj temp_do[MAXSUBSCREENITEMS];
+	
+	auto& pg = subscr_edit_page();
+	for(int32_t i=0; i < pg.contents.size(); ++i)
+	{
+		if(sso_selection[i]==true||i==curr_subscreen_object)
+		{
+			SubscrWidget& widg = *pg.contents[i];
+			temp_do[count].index=i;
+			temp_do[count].l=widg.getX()+widg.getXOffs();
+			temp_do[count].t=widg.getY();
+			temp_do[count].w=widg.getW();
+			temp_do[count].h=widg.getH();
+			
+			temp_do[count].r=temp_do[count].l+temp_do[count].w-1;
+			temp_do[count].b=temp_do[count].t+temp_do[count].h-1;
+			temp_do[count].c=temp_do[count].l+temp_do[count].w/2;
+			temp_do[count].m=temp_do[count].t+temp_do[count].h/2;
+			++count;
+		}
+	}
+	
+	if(count<3)
+	{
+		return;
+	}
+	
+	//sort all objects in order of position, then index (yeah, bubble sort; sue me)
+	dist_obj tempdo2;
+	
+	for(int32_t j=0; j<count-1; j++)
+	{
+		for(int32_t k=0; k<count-1-j; k++)
+		{
+			switch(distribute_type)
+			{
+			case ssodBOTTOM:
+				if(temp_do[k+1].b<temp_do[k].b||((temp_do[k+1].b==temp_do[k].b)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+				
+			case ssodMIDDLE:
+				if(temp_do[k+1].m<temp_do[k].m||((temp_do[k+1].m==temp_do[k].m)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+				
+			case ssodTOP:
+				if(temp_do[k+1].t<temp_do[k].t||((temp_do[k+1].t==temp_do[k].t)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+				
+			case ssodRIGHT:
+				if(temp_do[k+1].r<temp_do[k].r||((temp_do[k+1].r==temp_do[k].r)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+				
+			case ssodCENTER:
+				if(temp_do[k+1].c<temp_do[k].c||((temp_do[k+1].c==temp_do[k].c)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+				
+			case ssodLEFT:
+			default:
+				if(temp_do[k+1].l<temp_do[k].l||((temp_do[k+1].l==temp_do[k].l)&&(temp_do[k+1].index<temp_do[k].index)))
+				{
+					tempdo2=temp_do[k];
+					temp_do[k]=temp_do[k+1];
+					temp_do[k+1]=tempdo2;
+				}
+				
+				break;
+			}
+		}
+	}
+	
+	int32_t ld=temp_do[count-1].l-temp_do[0].l;
+	int32_t td=temp_do[count-1].t-temp_do[0].t;
+	int32_t rd=temp_do[count-1].r-temp_do[0].r;
+	int32_t bd=temp_do[count-1].b-temp_do[0].b;
+	int32_t cd=temp_do[count-1].c-temp_do[0].c;
+	int32_t md=temp_do[count-1].m-temp_do[0].m;
+	
+	for(int32_t i=1; i<count-1; ++i)
+	{
+		if(unsigned(temp_do[i].index) >= pg.contents.size())
+			continue;
+		SubscrWidget& widg = *pg.contents[temp_do[i].index];
+		switch(distribute_type)
+		{
+		case ssodBOTTOM:
+			widg.y+=bd*i/(count-1)-temp_do[i].b+temp_do[0].b;
+			break;
+			
+		case ssodMIDDLE:
+			widg.y+=md*i/(count-1)-temp_do[i].m+temp_do[0].m;
+			break;
+			
+		case ssodTOP:
+			widg.y+=td*i/(count-1)-temp_do[i].t+temp_do[0].t;
+			break;
+			
+		case ssodRIGHT:
+			widg.x+=rd*i/(count-1)-temp_do[i].r+temp_do[0].r;
+			break;
+			
+		case ssodCENTER:
+			widg.x+=cd*i/(count-1)-temp_do[i].c+temp_do[0].c;
+			break;
+			
+		case ssodLEFT:
+		default:
+			widg.x+=ld*i/(count-1)-temp_do[i].l+temp_do[0].l;
+			break;
+		}
+	}
 }
 
 int32_t onBringToFront()
 {
-    while(curr_subscreen_object<ss_objects(css)-1)
+    while(curr_subscreen_object<subscr_edit_page().contents.size()-1)
     {
         onBringForward();
     }
@@ -3197,15 +1463,16 @@ int32_t onSendToBack()
 
 int32_t onReverseArrangement()
 {
+	auto& pg = subscr_edit_page();
     int32_t i=0;
-    int32_t j=MAXSUBSCREENITEMS-1;
+    int32_t j=pg.contents.size()-1;
     subscreen_object tempsso;
     
     sso_selection[curr_subscreen_object]=true;
     
     while(true)
     {
-        while(i<MAXSUBSCREENITEMS && !sso_selection[i])
+        while(i<pg.contents.size() && !sso_selection[i])
             i++;
             
         while(j>=0 && !sso_selection[j])
@@ -3221,10 +1488,8 @@ int32_t onReverseArrangement()
             curr_subscreen_object=j;
         else if(curr_subscreen_object==j)
             curr_subscreen_object=i;
-            
-        tempsso=css->objects[i];
-        css->objects[i]=css->objects[j];
-        css->objects[j]=tempsso;
+		
+		zc_swap(pg.contents[i],pg.contents[j]);
         
         i++;
         j--;
@@ -3233,109 +1498,109 @@ int32_t onReverseArrangement()
 
 int32_t onAlignLeft()
 {
-    align_objects(css, sso_selection, ssoaLEFT);
+    align_objects(sso_selection, ssoaLEFT);
     return D_O_K;
 }
 
 int32_t onAlignCenter()
 {
-    align_objects(css, sso_selection, ssoaCENTER);
+    align_objects(sso_selection, ssoaCENTER);
     return D_O_K;
 }
 
 int32_t onAlignRight()
 {
-    align_objects(css, sso_selection, ssoaRIGHT);
+    align_objects(sso_selection, ssoaRIGHT);
     return D_O_K;
 }
 
 int32_t onAlignTop()
 {
-    align_objects(css, sso_selection, ssoaTOP);
+    align_objects(sso_selection, ssoaTOP);
     return D_O_K;
 }
 
 int32_t onAlignMiddle()
 {
-    align_objects(css, sso_selection, ssoaMIDDLE);
+    align_objects(sso_selection, ssoaMIDDLE);
     return D_O_K;
 }
 
 int32_t onAlignBottom()
 {
-    align_objects(css, sso_selection, ssoaBOTTOM);
+    align_objects(sso_selection, ssoaBOTTOM);
     return D_O_K;
 }
 
 int32_t onDistributeLeft()
 {
-    distribute_objects(css, sso_selection, ssodLEFT);
+    distribute_objects(sso_selection, ssodLEFT);
     return D_O_K;
 }
 
 int32_t onDistributeCenter()
 {
-    distribute_objects(css, sso_selection, ssodCENTER);
+    distribute_objects(sso_selection, ssodCENTER);
     return D_O_K;
 }
 
 int32_t onDistributeRight()
 {
-    distribute_objects(css, sso_selection, ssodRIGHT);
+    distribute_objects(sso_selection, ssodRIGHT);
     return D_O_K;
 }
 
 int32_t onDistributeTop()
 {
-    distribute_objects(css, sso_selection, ssodTOP);
+    distribute_objects(sso_selection, ssodTOP);
     return D_O_K;
 }
 
 int32_t onDistributeMiddle()
 {
-    distribute_objects(css, sso_selection, ssodMIDDLE);
+    distribute_objects(sso_selection, ssodMIDDLE);
     return D_O_K;
 }
 
 int32_t onDistributeBottom()
 {
-    distribute_objects(css, sso_selection, ssodBOTTOM);
+    distribute_objects(sso_selection, ssodBOTTOM);
     return D_O_K;
 }
 
 int32_t onGridSnapLeft()
 {
-    grid_snap_objects(css, sso_selection, ssosLEFT);
+    grid_snap_objects(sso_selection, ssosLEFT);
     return D_O_K;
 }
 
 int32_t onGridSnapCenter()
 {
-    grid_snap_objects(css, sso_selection, ssosCENTER);
+    grid_snap_objects(sso_selection, ssosCENTER);
     return D_O_K;
 }
 
 int32_t onGridSnapRight()
 {
-    grid_snap_objects(css, sso_selection, ssosRIGHT);
+    grid_snap_objects(sso_selection, ssosRIGHT);
     return D_O_K;
 }
 
 int32_t onGridSnapTop()
 {
-    grid_snap_objects(css, sso_selection, ssosTOP);
+    grid_snap_objects(sso_selection, ssosTOP);
     return D_O_K;
 }
 
 int32_t onGridSnapMiddle()
 {
-    grid_snap_objects(css, sso_selection, ssosMIDDLE);
+    grid_snap_objects(sso_selection, ssosMIDDLE);
     return D_O_K;
 }
 
 int32_t onGridSnapBottom()
 {
-    grid_snap_objects(css, sso_selection, ssosBOTTOM);
+    grid_snap_objects(sso_selection, ssosBOTTOM);
     return D_O_K;
 }
 
@@ -3421,7 +1686,7 @@ void update_up_dn_btns()
         subscreen_dlg[10].flags&=~D_DISABLED;
     }
     
-    if(curr_subscreen_object>=ss_objects(css)-1)
+    if(curr_subscreen_object>=subscr_edit_page().contents.size()-1)
     {
         subscreen_dlg[9].flags|=D_DISABLED;
     }
@@ -3446,26 +1711,17 @@ int32_t onSSCtrlPgDn()
 
 int32_t onSendBackward()
 {
-    subscreen_object tempsso;
-    bool tempsel;
-    
-    if(curr_subscreen_object>0)
-    {
-        tempsso=css->objects[curr_subscreen_object];
-        tempsel=sso_selection[curr_subscreen_object];
-        
-        css->objects[curr_subscreen_object]=css->objects[curr_subscreen_object-1];
-        sso_selection[curr_subscreen_object]=sso_selection[curr_subscreen_object-1];
-        
-        css->objects[curr_subscreen_object-1]=tempsso;
-        sso_selection[curr_subscreen_object-1]=tempsel;
-        
-        --curr_subscreen_object;
-        update_sso_name();
-    }
-    
-    update_up_dn_btns();
-    return D_O_K;
+	auto& contents = subscr_edit_page().contents;
+	if(curr_subscreen_object >= 0 && curr_subscreen_object<subscr_edit_page().contents.size()-1)
+	{
+		zc_swap(contents[curr_subscreen_object],contents[curr_subscreen_object-1]);
+		zc_swap(sso_selection[curr_subscreen_object],sso_selection[curr_subscreen_object-1]);
+		++curr_subscreen_object;
+		update_sso_name();
+	}
+	
+	update_up_dn_btns();
+	return D_O_K;
 }
 
 int32_t onSSPgDn()
@@ -3480,7 +1736,7 @@ int32_t onSSPgDn()
         
         if(curr_subscreen_object<0)
         {
-            curr_subscreen_object=ss_objects(css)-1;
+            curr_subscreen_object=subscr_edit_page().contents.size()-1;
         }
         
         update_sso_name();
@@ -3493,26 +1749,17 @@ int32_t onSSPgDn()
 // Send forward
 int32_t onBringForward()
 {
-    subscreen_object tempsso;
-    bool tempsel;
-    
-    if(curr_subscreen_object<ss_objects(css)-1)
-    {
-        tempsso=css->objects[curr_subscreen_object];
-        tempsel=sso_selection[curr_subscreen_object];
-        
-        css->objects[curr_subscreen_object]=css->objects[curr_subscreen_object+1];
-        sso_selection[curr_subscreen_object]=sso_selection[curr_subscreen_object+1];
-        
-        css->objects[curr_subscreen_object+1]=tempsso;
-        sso_selection[curr_subscreen_object+1]=tempsel;
-        
-        ++curr_subscreen_object;
-        update_sso_name();
-    }
-    
-    update_up_dn_btns();
-    return D_O_K;
+	auto& contents = subscr_edit_page().contents;
+	if(curr_subscreen_object<subscr_edit_page().contents.size()-1)
+	{
+		zc_swap(contents[curr_subscreen_object],contents[curr_subscreen_object+1]);
+		zc_swap(sso_selection[curr_subscreen_object],sso_selection[curr_subscreen_object+1]);
+		++curr_subscreen_object;
+		update_sso_name();
+	}
+	
+	update_up_dn_btns();
+	return D_O_K;
 }
 
 
@@ -3524,11 +1771,11 @@ int32_t onSSPgUp()
     }
     else
     {
-        if(ss_objects(css)>0)
+        if(!subscr_edit_page().contents.empty())
         {
             ++curr_subscreen_object;
             
-            if(curr_subscreen_object>=ss_objects(css))
+            if(curr_subscreen_object>=subscr_edit_page().contents.size())
             {
                 curr_subscreen_object=0;
             }
@@ -3605,93 +1852,68 @@ int32_t d_ssrt_btn_proc(int32_t msg,DIALOG *d,int32_t c)
 
 
 
-void edit_subscreen()
+bool edit_subscreen()
 {
-    game = new gamedata();
-    game->set_time(0);
-    resetItems(game,&zinit,true);
-    
-    //so that these will show up on the subscreen -DD
-    if(game->get_bombs() == 0)
-        game->set_bombs(1);
-        
-    if(game->get_sbombs() == 0)
-        game->set_sbombs(1);
-        
-    if(game->get_arrows() == 0)
-        game->set_arrows(1);
-        
-    subscreen_dlg[0].dp2=get_zc_font(font_lfont);
-    load_Sitems();
-    curr_subscreen_object=0;
-    ss_propCopySrc=-1;
-    subscreen_group tempss;
-    memset(&tempss, 0, sizeof(subscreen_group));
-    int32_t i;
-    
-    for(i=0; i<MAXSUBSCREENITEMS; i++)
-    {
-        memcpy(&tempss.objects[i],&css->objects[i],sizeof(subscreen_object));
-        
-        switch(css->objects[i].type)
-        {
-        case ssoTEXT:
-        case ssoTEXTBOX:
-        case ssoCURRENTITEMTEXT:
-        case ssoCURRENTITEMCLASSTEXT:
-            tempss.objects[i].dp1 = NULL;
-            tempss.objects[i].dp1 = new char[strlen((char*)css->objects[i].dp1)+1];
-            strcpy((char*)tempss.objects[i].dp1,(char*)css->objects[i].dp1);
-            break;
-            
-        default:
-            break;
-        }
-    }
-    
-    tempss.ss_type=css->ss_type;
-    strcpy(tempss.name, css->name);
-    
-    if(ss_objects(css)==0)
-    {
-        curr_subscreen_object=-1;
-    }
-    
-    onClearSelection();
-    ss_view_menu[0].flags=zinit.ss_flags&ssflagSHOWINVIS?D_SELECTED:0;
-    ss_view_menu[2].flags=zinit.ss_flags&ssflagSHOWGRID?D_SELECTED:0;
-    
-    if(css->objects[0].type==ssoNULL)
-    {
-        css->objects[0].type=ssoNONE;
-    }
-    
-    subscreen_dlg[4].dp=(void *)css;
-    subscreen_dlg[5].fg=jwin_pal[jcBOX];
-    subscreen_dlg[5].bg=jwin_pal[jcBOX];
-    str_oname=(char *)malloc(255);
-    subscreen_dlg[6].dp=(void *)str_oname;
-    subscreen_dlg[8].dp=(void *)(css->name);
-    update_sso_name();
-    subscreen_dlg[10].flags|=D_DISABLED;
-    
-    if(css->ss_type==sstPASSIVE)
-    {
-        subscreen_dlg[21].flags|=D_DISABLED;
-        subscreen_dlg[22].flags|=D_DISABLED;
-        subscreen_dlg[23].flags|=D_DISABLED;
-        subscreen_dlg[24].flags|=D_DISABLED;
-    }
-    else
-    {
-        subscreen_dlg[21].flags&=~D_DISABLED;
-        subscreen_dlg[22].flags&=~D_DISABLED;
-        subscreen_dlg[23].flags&=~D_DISABLED;
-        subscreen_dlg[24].flags&=~D_DISABLED;
-    }
-    
-    selectBwpn(0, 0);
-    
+	game = new gamedata();
+	game->set_time(0);
+	resetItems(game,&zinit,true);
+	
+	//so that these will show up on the subscreen -DD
+	if(game->get_bombs() == 0)
+		game->set_bombs(1);
+		
+	if(game->get_sbombs() == 0)
+		game->set_sbombs(1);
+		
+	if(game->get_arrows() == 0)
+		game->set_arrows(1);
+		
+	subscreen_dlg[0].dp2=get_zc_font(font_lfont);
+	load_Sitems();
+	curr_subscreen_object=0;
+	int32_t i;
+	
+	if(subscr_edit.pages.empty())
+		subscr_edit.pages.emplace_back();
+	if(subscr_edit.pages.size() >= subscr_edit.curpage)
+		subscr_edit.curpage = 0;
+	if(subscr_edit.pages[subscr_edit.curpage].contents.empty())
+	{
+		curr_subscreen_object=-1;
+	}
+	
+	onClearSelection();
+	ss_view_menu[0].flags=zinit.ss_flags&ssflagSHOWINVIS?D_SELECTED:0;
+	ss_view_menu[2].flags=zinit.ss_flags&ssflagSHOWGRID?D_SELECTED:0;
+		
+	subscreen_dlg[4].dp=(void *)&subscr_edit;
+	subscreen_dlg[5].fg=jwin_pal[jcBOX];
+	subscreen_dlg[5].bg=jwin_pal[jcBOX];
+	str_oname=(char *)malloc(255);
+	char namebuf[64] = {0};
+	strncpy(namebuf,subscr_edit.name.c_str(),63);
+	subscreen_dlg[6].dp=(void *)str_oname;
+	subscreen_dlg[8].dp=(void *)namebuf;
+	update_sso_name();
+	subscreen_dlg[10].flags|=D_DISABLED;
+	
+	if(subscr_edit.sub_type==sstPASSIVE)
+	{
+		subscreen_dlg[21].flags|=D_DISABLED;
+		subscreen_dlg[22].flags|=D_DISABLED;
+		subscreen_dlg[23].flags|=D_DISABLED;
+		subscreen_dlg[24].flags|=D_DISABLED;
+	}
+	else
+	{
+		subscreen_dlg[21].flags&=~D_DISABLED;
+		subscreen_dlg[22].flags&=~D_DISABLED;
+		subscreen_dlg[23].flags&=~D_DISABLED;
+		subscreen_dlg[24].flags&=~D_DISABLED;
+	}
+	
+	subscr_edit.cur_page().move_cursor(SEL_VERIFY_RIGHT);
+	
 	bool enlarge = subscreen_dlg[0].d1==0;
 	
 	if(enlarge)
@@ -3701,53 +1923,26 @@ void edit_subscreen()
 		subscreen_dlg[3].y-=31;
 		subscreen_dlg[3].x+=1;
 		
-		if(css->ss_type == sstPASSIVE)
+		if(subscr_edit.sub_type == sstPASSIVE)
 			subscreen_dlg[3].h=60*2-4;
-		else if(css->ss_type == sstACTIVE)
+		else if(subscr_edit.sub_type == sstACTIVE)
 			subscreen_dlg[3].h=172*2-4;
 			
 		subscreen_dlg[4].h=subscreen_dlg[3].h-4;
 	}
 	
-    int32_t ret = zc_popup_dialog(subscreen_dlg,2);
-    
-    if(ret==1)
-    {
-        saved=false;
-        zinit.subscreen=ssdtMAX;
-    }
-    else
-    {
-        reset_subscreen(css);
-        int32_t j;
-        
-        for(j=0; j<MAXSUBSCREENITEMS; j++)
-        {
-            memcpy(&css->objects[j],&tempss.objects[j],sizeof(subscreen_object));
-            
-            switch(tempss.objects[j].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                css->objects[j].dp1 = NULL;
-                css->objects[j].dp1 = new char[strlen((char*)tempss.objects[j].dp1)+1];
-                strcpy((char*)css->objects[j].dp1,(char*)tempss.objects[j].dp1);
-                break;
-                
-            default:
-                break;
-            }
-        }
-        
-        css->ss_type=tempss.ss_type;
-        strcpy(css->name, tempss.name);
-        reset_subscreen(&tempss);
-    }
-    
-    delete game;
-    game=NULL;
+	int32_t ret = zc_popup_dialog(subscreen_dlg,2);
+	
+	if(ret==1)
+	{
+		subscr_edit.name = namebuf;
+		saved=false;
+		zinit.subscreen=ssdtMAX;
+	}
+	
+	delete game;
+	game=NULL;
+	return ret == 1;
 }
 
 const char *allsubscrtype_str[30] =
@@ -3874,91 +2069,55 @@ const char *subscreenlist(int32_t index, int32_t *list_size)
 {
     if(index<0)
     {
-        int32_t j=0;
-        
-        while(custom_subscreen[j].objects[0].type!=ssoNULL)
-        {
-            ++j;
-        }
-        
-        *list_size = j+(show_new_ss?1:0);
-        sprintf(custom_subscreen[j].name, "<New>");
+        *list_size = new_subscreen.size()+(show_new_ss?1:0);
         return NULL;
     }
-    
-    return custom_subscreen[index].name;
+    if(show_new_ss && index == new_subscreen.size())
+		return "<New>";
+	if(unsigned(index) < new_subscreen.size())
+		return new_subscreen[index].name.c_str();
+	return "";
 }
 
-const char *subscreenlist_a(int32_t index, int32_t *list_size)
+const char *subscreenlist_either(int32_t index, int32_t *list_size, byte type)
 {
     if(index<0)
     {
         int32_t i=0, j=0;
         
-        while(custom_subscreen[j].objects[0].type!=ssoNULL)
-        {
-            if(custom_subscreen[j].ss_type==sstACTIVE)
-            {
-                ++i;
-            }
-            
-            ++j;
-        }
+		while(j < new_subscreen.size())
+		{
+			if(new_subscreen[j].sub_type==type)
+				++i;
+			
+			++j;
+		}
         
         *list_size = i;
         return NULL;
     }
     
-//  return custsubscrtype_str[index];
     int32_t i=-1, j=0;
     
-    while(custom_subscreen[j].objects[0].type!=ssoNULL&&i!=index)
-    {
-        if(custom_subscreen[j].ss_type==sstACTIVE)
-        {
-            ++i;
-        }
-        
-        ++j;
-    }
+	while(j < new_subscreen.size() && i!=index)
+	{
+		if(new_subscreen[j].sub_type==type)
+			++i;
+		
+		++j;
+	}
     
-    return custom_subscreen[j-1].name;
+    return new_subscreen[j-1].name.c_str();
+}
+
+const char *subscreenlist_a(int32_t index, int32_t *list_size)
+{
+    return subscreenlist_either(index,list_size,sstACTIVE);
 }
 
 const char *subscreenlist_b(int32_t index, int32_t *list_size)
 {
-    if(index<0)
-    {
-        int32_t i=0, j=0;
-        
-        while(custom_subscreen[j].objects[0].type!=ssoNULL)
-        {
-            if(custom_subscreen[j].ss_type==sstPASSIVE)
-            {
-                ++i;
-            }
-            
-            ++j;
-        }
-        
-        *list_size = i;
-        return NULL;
-    }
-    
-//  return custsubscrtype_str[index];
-    int32_t i=-1, j=0;
-    
-    while(custom_subscreen[j].name[0]&&i!=index)
-    {
-        if(custom_subscreen[j].ss_type==sstPASSIVE)
-        {
-            ++i;
-        }
-        
-        ++j;
-    }
-    
-    return custom_subscreen[j-1].name;
+    return subscreenlist_either(index,list_size,sstPASSIVE);
 }
 
 static ListData subscreen_list(subscreenlist, &font);
@@ -3987,39 +2146,37 @@ int32_t onEditSubscreens()
     {
         ret=zc_popup_dialog(sslist_dlg,2);
         
+		auto ind = sslist_dlg[2].d1;
         if(ret==4)
         {
             int32_t confirm = jwin_alert("Confirm Delete", "You are about to delete the selected subscreen!", "Are you sure?", NULL, "OK", "Cancel", KEY_ENTER, KEY_ESC, get_zc_font(font_lfont));
             
             if(confirm==1)
             {
-                delete_subscreen(sslist_dlg[2].d1);
+                delete_subscreen(ind);
                 saved=false;
             }
         }
         else if(ret==2 || ret ==3)
         {
-            if(custom_subscreen[sslist_dlg[2].d1].ss_type==sstACTIVE)
-            {
-                subscreen_dlg[3].h=340;
-                subscreen_dlg[4].h=subscreen_dlg[3].h-4;
-            }
-            else if(custom_subscreen[sslist_dlg[2].d1].ss_type==sstPASSIVE)
+			if(ind < new_subscreen.size())
+				subscr_edit = new_subscreen[ind];
+			else subscr_edit.clear();
+            if(subscr_edit.sub_type==sstPASSIVE)
             {
                 subscreen_dlg[3].h=116;
                 subscreen_dlg[4].h=subscreen_dlg[3].h-4;
-                //iu;hukl;kh;
             }
-            else
+			else
             {
-                subscreen_dlg[3].h=40;
+				subscr_edit.sub_type = sstACTIVE;
+                subscreen_dlg[3].h=340;
                 subscreen_dlg[4].h=subscreen_dlg[3].h-4;
             }
             
-            css = &custom_subscreen[sslist_dlg[2].d1];
             bool edit_it=true;
             
-            if(css->objects[0].type==ssoNULL)
+            if(subscr_edit.pages.empty())
             {
                 large_dialog(sstemplatelist_dlg);
                     
@@ -4041,43 +2198,20 @@ int32_t onEditSubscreens()
                             {
                                 tempsub = default_subscreen_passive[(sstemplatelist_dlg[5].d1-1)/2][(sstemplatelist_dlg[5].d1-1)&1];
                             }
-                            
-                            int32_t i;
-                            
-                            for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-                            {
-                                switch(tempsub[i].type)
-                                {
-                                case ssoTEXT:
-                                case ssoTEXTBOX:
-                                case ssoCURRENTITEMTEXT:
-                                case ssoCURRENTITEMCLASSTEXT:
-                                    if(css->objects[i].dp1 != NULL) delete [](char *)css->objects[i].dp1;
-                                    
-                                    memcpy(&css->objects[i],&tempsub[i],sizeof(subscreen_object));
-                                    css->objects[i].dp1 = NULL;
-                                    css->objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                                    strcpy((char*)css->objects[i].dp1,(char*)tempsub[i].dp1);
-                                    break;
-                                    
-                                default:
-                                    memcpy(&css->objects[i],&tempsub[i],sizeof(subscreen_object));
-                                    break;
-                                }
-                            }
+							subscr_edit.load_old(tempsub);
                         }
                         
                         if(sstemplatelist_dlg[4].d1==0)
                         {
-                            css->ss_type=sstACTIVE;
-                            strcpy(css->name, activesubscrtype_str[sstemplatelist_dlg[5].d1]);
+                            subscr_edit.sub_type=sstACTIVE;
+                            subscr_edit.name = activesubscrtype_str[sstemplatelist_dlg[5].d1];
                             subscreen_dlg[3].h=172*2;
                             subscreen_dlg[4].h=subscreen_dlg[3].h-4;
                         }
                         else
                         {
-                            css->ss_type=sstPASSIVE;
-                            strcpy(css->name, passivesubscrtype_str[sstemplatelist_dlg[5].d1]);
+                            subscr_edit.sub_type=sstPASSIVE;
+                            subscr_edit.name = passivesubscrtype_str[sstemplatelist_dlg[5].d1];
                             subscreen_dlg[3].h=120;
                             subscreen_dlg[4].h=subscreen_dlg[3].h-4;
                         }
@@ -4094,43 +2228,20 @@ int32_t onEditSubscreens()
                         {
                             tempsub = z3_passive_a;
                         }
-                        
-                        int32_t i;
-                        
-                        for(i=0; (i<MAXSUBSCREENITEMS&&tempsub[i].type!=ssoNULL); i++)
-                        {
-                            switch(tempsub[i].type)
-                            {
-                            case ssoTEXT:
-                            case ssoTEXTBOX:
-                            case ssoCURRENTITEMTEXT:
-                            case ssoCURRENTITEMCLASSTEXT:
-                                if(css->objects[i].dp1 != NULL) delete [](char *)css->objects[i].dp1;
-                                
-                                memcpy(&css->objects[i],&tempsub[i],sizeof(subscreen_object));
-                                css->objects[i].dp1 = NULL;
-                                css->objects[i].dp1 = new char[strlen((char*)tempsub[i].dp1)+1];
-                                strcpy((char*)css->objects[i].dp1,(char*)tempsub[i].dp1);
-                                break;
-                                
-                            default:
-                                memcpy(&css->objects[i],&tempsub[i],sizeof(subscreen_object));
-                                break;
-                            }
-                        }
+						subscr_edit.load_old(tempsub);
                         
                         if(sstemplatelist_dlg[4].d1==0)
                         {
-                            css->ss_type=sstACTIVE;
-                            strcpy(css->name, activesubscrtype_str[sstemplatelist_dlg[5].d1]);
+                            subscr_edit.sub_type=sstACTIVE;
+                            subscr_edit.name = activesubscrtype_str[sstemplatelist_dlg[5].d1];
                             subscreen_dlg[3].h=344;
                             subscreen_dlg[4].h=subscreen_dlg[3].h-4;
                             
                         }
                         else
                         {
-                            css->ss_type=sstPASSIVE;
-                            strcpy(css->name, passivesubscrtype_str[sstemplatelist_dlg[5].d1]);
+                            subscr_edit.sub_type=sstPASSIVE;
+                            subscr_edit.name = passivesubscrtype_str[sstemplatelist_dlg[5].d1];
                             subscreen_dlg[3].h=120;
                             subscreen_dlg[4].h=subscreen_dlg[3].h-4;
                         }
@@ -4141,11 +2252,15 @@ int32_t onEditSubscreens()
                     edit_it=false;
                 }
             }
+            if(subscr_edit.pages.empty())
+				subscr_edit.pages.emplace_back();
             
-            if(edit_it)
-            {
-                edit_subscreen();
-            }
+            if(edit_it && edit_subscreen())
+			{
+				if(ind < new_subscreen.size())
+					new_subscreen[ind] = subscr_edit;
+				else new_subscreen.push_back(subscr_edit);
+			}
         }
     }
     
@@ -4155,17 +2270,14 @@ int32_t onEditSubscreens()
 
 void update_sso_name()
 {
-    if(curr_subscreen_object<0)
-    {
-        sprintf(str_oname, "No object selected");
-    }
-    else
-    {
-        sprintf(str_oname, "%3d:  %s", curr_subscreen_object, sso_name(css->objects, curr_subscreen_object));
-    }
-    
-    subscreen_dlg[5].flags|=D_DIRTY;
-    subscreen_dlg[6].flags|=D_DIRTY;
+	SubscrWidget* w = subscr_edit_widg();
+	if(w)
+		sprintf(str_oname, "%3d:  %s", curr_subscreen_object, sso_name(w->getType()));
+	else
+		sprintf(str_oname, "No object selected");
+	
+	subscreen_dlg[5].flags|=D_DIRTY;
+	subscreen_dlg[6].flags|=D_DIRTY;
 }
 
 void center_zq_subscreen_dialogs()
@@ -4180,230 +2292,43 @@ void center_zq_subscreen_dialogs()
 
 void delete_subscreen(int32_t subscreenidx)
 {
-    if(custom_subscreen[subscreenidx].objects[0].type == ssoNULL)
-        return;
-        
-    //delete
-    reset_subscreen(&custom_subscreen[subscreenidx]);
-    
-    //and move all other subscreens up
-    for(int32_t i=subscreenidx+1; i<MAXCUSTOMSUBSCREENS; i++)
-    {
-        memcpy(&custom_subscreen[i-1], &custom_subscreen[i], sizeof(subscreen_group));
-    }
-    
-    //fix dmaps
-    int32_t dmap_count=count_dmaps();
-    
-    for(int32_t i=0; i<dmap_count; i++)
-    {
-        //decrement
-        if(DMaps[i].active_subscreen > subscreenidx)
-            DMaps[i].active_subscreen--;
-            
-        if(DMaps[i].passive_subscreen > subscreenidx)
-            DMaps[i].passive_subscreen--;
-    }
-}
-
-// These were defined in ffscript.h; no need for them here
-#undef DELAY
-#undef WIDTH
-#undef HEIGHT
-
-#define D1        0x00000001
-#define D2        0x00000002
-#define D3        0x00000004
-#define D4        0x00000008
-#define D5        0x00000010
-#define D6        0x00000020
-#define D7        0x00000040
-#define D8        0x00000080
-#define D9        0x00000100
-#define D10       0x00000200
-#define D1_TO_D10 0x000003FF
-#define COLOR1    0x00000400
-#define COLOR2    0x00000800
-#define COLOR3    0x00001000
-#define FRAMES    0x00002000
-#define FRAME     0x00004000
-#define SPEED     0x00008000
-#define DELAY     0x00010000
-#define WIDTH     0x00020000
-#define HEIGHT    0x00040000
-
-// This function does the actual copying. Name sucks, but whatever.
-// what controls which properties are copied. Type, x, y, and dp1
-// are never copied. The active up/down/scrolling flags from pos
-// are always copied, but the rest of it is not.
-void doCopySSOProperties(subscreen_object& src, subscreen_object& dest, int32_t what)
-{
-    dest.pos&=~(sspUP|sspDOWN|sspSCROLLING);
-    dest.pos|=src.pos&(sspUP|sspDOWN|sspSCROLLING);
-    
-    // Actually, I think pos is nothing but those three flags...
-    
-    if(what&WIDTH)
-        dest.w=src.w;
-    if(what&HEIGHT)
-        dest.h=src.h;
-    
-    if(what&D1)
-        dest.d1=src.d1;
-    if(what&D2)
-        dest.d2=src.d2;
-    if(what&D3)
-        dest.d3=src.d3;
-    if(what&D4)
-        dest.d4=src.d4;
-    if(what&D5)
-        dest.d5=src.d5;
-    if(what&D6)
-        dest.d6=src.d6;
-    if(what&D7)
-        dest.d7=src.d7;
-    if(what&D8)
-        dest.d8=src.d8;
-    if(what&D9)
-        dest.d9=src.d9;
-    if(what&D10)
-        dest.d10=src.d10;
-    
-    if(what&COLOR1)
-    {
-        dest.colortype1=src.colortype1;
-        dest.color1=src.color1;
-    }
-    if(what&COLOR2)
-    {
-        dest.colortype2=src.colortype2;
-        dest.color2=src.color2;
-    }
-    if(what&COLOR3)
-    {
-        dest.colortype3=src.colortype3;
-        dest.color3=src.color3;
-    }
-    
-    if(what&FRAMES)
-        dest.frames=src.frames;
-    if(what&FRAME)
-        dest.frame=src.frame;
-    if(what&SPEED)
-        dest.speed=src.speed;
-    if(what&DELAY)
-        dest.delay=src.delay;
+	if(subscreenidx >= new_subscreen.size())
+		return;
+	
+	int32_t i = 0;
+	int32_t active_ind = 0, passive_ind = 0;
+	for(auto it = new_subscreen.begin(); it != new_subscreen.end(); ++it)
+	{
+		if(i++ == subscreenidx)
+		{
+			if(it->sub_type == sstACTIVE) passive_ind = -1;
+			else active_ind = -1;
+			i = -1;
+			new_subscreen.erase(it);
+			break;
+		}
+		if(it->sub_type == sstACTIVE) ++active_ind;
+		else ++passive_ind;
+	}
+	if(i != -1) active_ind = passive_ind = -1; //no deletion
+	
+	//fix dmaps
+	int32_t dmap_count=count_dmaps();
+	
+	for(int32_t i=0; i<dmap_count; i++)
+	{
+		//decrement
+		if(active_ind > -1 && DMaps[i].active_subscreen > active_ind)
+			DMaps[i].active_subscreen--;
+			
+		if(passive_ind > -1 && DMaps[i].passive_subscreen > passive_ind)
+			DMaps[i].passive_subscreen--;
+	}
 }
 
-// Copies one object's properties to another. Selects properties depending on
-// the object type; some things are deliberately skipped, like which heart
-// container a life gauge piece corresponds to.
-void copySSOProperties(subscreen_object& src, subscreen_object& dest)
+void copySSOProperties(SubscrWidget const* src, SubscrWidget* dest)
 {
-    if(src.type!=dest.type || &src==&dest)
+    if(src->getType()!=dest->getType() || src==dest)
         return;
-    
-    switch(src.type)
-    {
-        case sso2X2FRAME:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|COLOR1);
-            break;
-            
-        case ssoTEXT:
-            doCopySSOProperties(src, dest, D1|D2|D3|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoLINE:
-            doCopySSOProperties(src, dest, D1|D2|COLOR1|WIDTH|HEIGHT);
-            break;
-            
-        case ssoRECT:
-            doCopySSOProperties(src, dest, D1|D2|COLOR1|COLOR2|WIDTH|HEIGHT);
-            break;
-            
-        case ssoBSTIME:
-        case ssoTIME:
-        case ssoSSTIME:
-            doCopySSOProperties(src, dest, D1|D2|D3|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoMAGICMETER: // Full meter
-            // No properties but pos
-            doCopySSOProperties(src, dest, 0);
-            break;
-            
-        case ssoLIFEMETER:
-            doCopySSOProperties(src, dest, D2|D3);
-            break;
-            
-        case ssoBUTTONITEM:
-            doCopySSOProperties(src, dest, D2);
-            break;
-            
-        case ssoCOUNTER: // Single counter
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|D6|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoCOUNTERS: // Counter block
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoMINIMAPTITLE:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoMINIMAP:
-            doCopySSOProperties(src, dest, D1|D2|D3|COLOR1|COLOR2|COLOR3);
-            break;
-            
-        case ssoLARGEMAP:
-            doCopySSOProperties(src, dest, D1|D2|D3|D10|COLOR1|COLOR2);
-            break;
-            
-        case ssoCLEAR:
-            doCopySSOProperties(src, dest, COLOR1);
-            break;
-            
-        case ssoCURRENTITEM:
-            // Flags only
-            doCopySSOProperties(src, dest, D2);
-            break;
-            
-        case ssoTRIFRAME:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|D6|D7|COLOR1|COLOR2);
-            break;
-            
-        case ssoTRIFORCE: // Single piece
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|COLOR1);
-            break;
-            
-        case ssoTILEBLOCK:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|COLOR1|WIDTH|HEIGHT);
-            break;
-            
-        case ssoMINITILE:
-            // Does this one work at all?
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|D6|COLOR1|WIDTH|HEIGHT);
-            break;
-            
-        case ssoSELECTOR1:
-        case ssoSELECTOR2:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|COLOR1);
-            break;
-            
-        case ssoMAGICGAUGE: // Single piece
-            // Skip magic container (d1)
-            doCopySSOProperties(src, dest, (D1_TO_D10&~D1)|COLOR1|COLOR2|WIDTH|HEIGHT);
-            break;
-            
-        case ssoLIFEGAUGE: // Single piece
-            // Skip heart container (d1)
-            doCopySSOProperties(src, dest, (D1_TO_D10&~D1)|COLOR1|COLOR2|WIDTH|HEIGHT);
-            break;
-            
-        case ssoTEXTBOX:
-        case ssoSELECTEDITEMNAME:
-            doCopySSOProperties(src, dest, D1|D2|D3|D4|D5|COLOR1|COLOR2|COLOR3|WIDTH|HEIGHT);
-            break;
-    }
+	dest->copy_prop(src);
 }
diff --git a/src/zq/zq_subscr.h b/src/zq/zq_subscr.h
index e5a81af433..ea416a0ae7 100644
--- a/src/zq/zq_subscr.h
+++ b/src/zq/zq_subscr.h
@@ -20,7 +20,7 @@ enum { ssodLEFT, ssodCENTER, ssodRIGHT, ssodTOP, ssodMIDDLE, ssodBOTTOM };
 //subscreen object snapping
 enum { ssosLEFT, ssosCENTER, ssosRIGHT, ssosTOP, ssosMIDDLE, ssosBOTTOM };
 
-void edit_subscreen();
+bool edit_subscreen();
 int32_t onEditSubscreens();
 
 char *sso_name(int32_t type);
diff --git a/src/zq/zq_tiles.cpp b/src/zq/zq_tiles.cpp
index 77d3e71c75..aa17b3016f 100644
--- a/src/zq/zq_tiles.cpp
+++ b/src/zq/zq_tiles.cpp
@@ -7892,17 +7892,6 @@ bool overlay_tiles_united(int32_t &tile,int32_t &tile2,int32_t &copy,int32_t &co
 			//Check subscreen objects
 			//Tried to have a go at this but I think it's a bit too complicated for me at the moment.
 			//Might come back to it another time and see what I can do ~Joe123
-			/*if(!done){
-				 for(int32_t u=0;u<MAXCUSTOMSUBSCREENS;u++){
-					 if(!custom_subscreen[u].ss_type) continue;
-					 for(int32_t v=0;v<MAXSUBSCREENITEMS;v++){
-						  if(custom_subscreen[u].objects[v].type != ssoTILEBLOCK) continue;
-						  subscreen_items[0].tile = custom_subscreen[u].objects[v].d1;
-						  subscreen_items[0].width = custom_subscreen[u].objects[v].w;
-						  subscreen_items[0].height = custom_subscreen[u].objects[v].h;
-					 }
-				 }
-			}*/
 			
 			//check map styles
 			if(!done)
@@ -9439,17 +9428,6 @@ bool overlay_tile_united_mass(int32_t &tile,int32_t &tile2,int32_t &copy,int32_t
 			//Check subscreen objects
 			//Tried to have a go at this but I think it's a bit too complicated for me at the moment.
 			//Might come back to it another time and see what I can do ~Joe123
-			/*if(!done){
-				 for(int32_t u=0;u<MAXCUSTOMSUBSCREENS;u++){
-					 if(!custom_subscreen[u].ss_type) continue;
-					 for(int32_t v=0;v<MAXSUBSCREENITEMS;v++){
-						  if(custom_subscreen[u].objects[v].type != ssoTILEBLOCK) continue;
-						  subscreen_items[0].tile = custom_subscreen[u].objects[v].d1;
-						  subscreen_items[0].width = custom_subscreen[u].objects[v].w;
-						  subscreen_items[0].height = custom_subscreen[u].objects[v].h;
-					 }
-				 }
-			}*/
 			
 			//check map styles
 			if(!done)
@@ -10816,17 +10794,6 @@ bool do_movetile_united(tile_move_data const& tmd)
 			//Check subscreen objects
 			//Tried to have a go at this but I think it's a bit too complicated for me at the moment.
 			//Might come back to it another time and see what I can do ~Joe123
-			/*if(!done){
-				 for(int32_t u=0;u<MAXCUSTOMSUBSCREENS;u++){
-					 if(!custom_subscreen[u].ss_type) continue;
-					 for(int32_t v=0;v<MAXSUBSCREENITEMS;v++){
-						  if(custom_subscreen[u].objects[v].type != ssoTILEBLOCK) continue;
-						  subscreen_items[0].tile = custom_subscreen[u].objects[v].d1;
-						  subscreen_items[0].width = custom_subscreen[u].objects[v].w;
-						  subscreen_items[0].height = custom_subscreen[u].objects[v].h;
-					 }
-				 }
-			}*/
 			
 			//check map styles
 			if(!done)
@@ -12493,17 +12460,6 @@ bool copy_tiles_united_floodfill(int32_t &tile,int32_t &tile2,int32_t &copy,int3
 			//Check subscreen objects
 			//Tried to have a go at this but I think it's a bit too complicated for me at the moment.
 			//Might come back to it another time and see what I can do ~Joe123
-			/*if(!done){
-				 for(int32_t u=0;u<MAXCUSTOMSUBSCREENS;u++){
-					 if(!custom_subscreen[u].ss_type) continue;
-					 for(int32_t v=0;v<MAXSUBSCREENITEMS;v++){
-						  if(custom_subscreen[u].objects[v].type != ssoTILEBLOCK) continue;
-						  subscreen_items[0].tile = custom_subscreen[u].objects[v].d1;
-						  subscreen_items[0].width = custom_subscreen[u].objects[v].w;
-						  subscreen_items[0].height = custom_subscreen[u].objects[v].h;
-					 }
-				 }
-			}*/
 			
 			//check map styles
 			if(!done)
diff --git a/src/zq/zquest.cpp b/src/zq/zquest.cpp
index de5adf581e..7989aadbb4 100644
--- a/src/zq/zquest.cpp
+++ b/src/zq/zquest.cpp
@@ -492,8 +492,6 @@ SAMPLE customsfxdata[WAV_COUNT];
 uint8_t customsfxflag[WAV_COUNT>>3];
 int32_t sfxdat=1;
 
-extern void deallocate_biic_list();
-
 zinitdata zinit;
 
 int32_t onImport_ComboAlias();
@@ -718,9 +716,6 @@ END_OF_FUNCTION(myvsync_callback)
 zquestheader header;
 byte                midi_flags[MIDIFLAGS_SIZE];
 byte                music_flags[MUSICFLAGS_SIZE];
-word                map_count;
-vector<mapscr>      TheMaps;
-vector<word>        map_autolayers;
 zcmap               *ZCMaps;
 byte                *quest_file;
 int32_t					msg_strings_size;
@@ -1135,7 +1130,6 @@ static MENU maps_menu[] =
 static MENU misc_menu[] =
 {
     { (char *)"S&ubscreens",                onEditSubscreens,          NULL,                     0,            NULL   },
-    { (char *)"&Master Subscreen Type",     onSubscreen,               NULL,                     0,            NULL   },
     { (char *)"&Shop Types",                onShopTypes,               NULL,                     0,            NULL   },
     { (char *)"&Bottle Types",              onBottleTypes,             NULL,                     0,            NULL   },
     { (char *)"Bottle S&hop Types",         onBottleShopTypes,         NULL,                     0,            NULL   },
@@ -19545,71 +19539,6 @@ int32_t onCheats()
 	return D_O_K;
 }
 
-const char *subscrtype_str[ssdtMAX+1] = { "Original","New Subscreen","Revision 2","BS Zelda Original","BS Zelda Modified","BS Zelda Enhanced","BS Zelda Complete","Zelda 3","Custom" };
-
-const char *subscrtypelist(int32_t index, int32_t *list_size)
-{
-    if(index>=0)
-    {
-        bound(index,0,ssdtMAX);
-        return subscrtype_str[index];
-    }
-    
-    *list_size=ssdtMAX+1;
-    return NULL;
-}
-
-static ListData subscreen_type_dlg_list(subscrtypelist, &font);
-
-static DIALOG subscreen_type_dlg[] =
-{
-    /* (dialog proc)     (x)   (y)   (w)   (h)   (fg)     (bg)    (key)    (flags)     (d1)           (d2)     (dp) */
-    { jwin_win_proc,     83,   32,   154,  70,  vc(14),  vc(1),  0,       D_EXIT,          0,             0, (void *) "Subscreen Type", NULL, NULL },
-    { jwin_button_proc,     89,  77,  61,   21,   vc(14),  vc(1),  27,      D_EXIT,     0,             0, (void *) "OK", NULL, NULL },
-    { jwin_button_proc,     170,  77,  61,   21,   vc(14),  vc(1),  27,      D_EXIT,     0,             0, (void *) "Cancel", NULL, NULL },
-    { jwin_droplist_proc,   107-8,  57,   106+15,  16,   jwin_pal[jcTEXTFG],  jwin_pal[jcTEXTBG],  0,       0,          1,             0, (void *) &subscreen_type_dlg_list, NULL, NULL },
-    { d_timer_proc,         0,    0,     0,    0,    0,       0,       0,       0,          0,          0,         NULL, NULL, NULL },
-    { NULL,                 0,    0,    0,    0,   0,       0,       0,       0,          0,             0,       NULL,                           NULL,  NULL }
-};
-
-int32_t onSubscreen()
-{
-    int32_t tempsubscreen=zinit.subscreen;
-    subscreen_type_dlg[0].dp2=get_zc_font(font_lfont);
-    subscreen_type_dlg[3].d1=zinit.subscreen;
-    
-    large_dialog(subscreen_type_dlg);
-        
-    int32_t ret = zc_popup_dialog(subscreen_type_dlg,2);
-    
-    if(ret==1)
-    {
-        if(subscreen_type_dlg[3].d1!=tempsubscreen)
-        {
-            zinit.subscreen=subscreen_type_dlg[3].d1;
-            
-            if(zinit.subscreen!=ssdtMAX)  //custom
-            {
-                if(tempsubscreen==ssdtMAX)
-                {
-                    if(jwin_alert("Reset Custom Subscreens","This will delete all of your custom subscreens!","Proceed?",NULL,"&OK","&Cancel",13,27,get_zc_font(font_lfont))==2)
-                    {
-                        zinit.subscreen=ssdtMAX;
-                        return D_O_K;
-                    }
-                }
-                
-                reset_subscreens();
-                setupsubscreens();
-            }
-            
-            saved=false;
-        }
-    }
-    
-    return D_O_K;
-}
-
 bool do_x_button(BITMAP *dest, int32_t x, int32_t y)
 {
     bool over=false;
@@ -24960,7 +24889,6 @@ int32_t load_zmod_module_file()
 	    al_trace("New Module Path is: %s \n", moduledata.module_name);
 	    zc_set_config("ZCMODULE","current_module",moduledata.module_name);
 	    zcm.init(true); //Load the module values.
-	    build_biic_list();
 	    build_bief_list();
 	    build_biea_list(); 
 	    build_biew_list();
@@ -26833,7 +26761,7 @@ static void do_copy_qst_command(const char* input_filename, const char* output_f
 	exit(ret);
 }
 
-int32_t Awpn=0, Bwpn=0, Bpos=0, Xwpn = 0, Ywpn = 0;
+int32_t Awpn=0, Bwpn=0, Xwpn = 0, Ywpn = 0;
 sprite_list  guys, items, Ewpns, Lwpns, Sitems, chainlinks, decorations, portals;
 int32_t exittimer = 10000, exittimer2 = 100;
 
@@ -27084,14 +27012,6 @@ int32_t main(int32_t argc,char **argv)
 	
 	Z_message("OK\n");
 	
-	for(int32_t i=0; i<4; i++)
-	{
-		for(int32_t j=0; j<MAXSUBSCREENITEMS; j++)
-		{
-			memset(&custom_subscreen[i].objects[j],0,sizeof(subscreen_object));
-		}
-	}
-	
 	int32_t helpsize = file_size_ex_password("docs/zquest.txt","");
 	
 	if(!helpsize)
@@ -28665,9 +28585,6 @@ void destroy_bitmaps_on_exit()
 
 void quit_game()
 {
-    deallocate_biic_list();
-    
-    
     set_last_timed_save(nullptr);
     save_config_file();
     zc_set_palette(black_palette);
@@ -28700,25 +28617,6 @@ void quit_game()
         }
     }
     
-    al_trace("Cleaning subscreens. \n");
-    
-    for(int32_t i=0; i<4; i++)
-    {
-        for(int32_t j=0; j<MAXSUBSCREENITEMS; j++)
-        {
-            switch(custom_subscreen[i].objects[j].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[i].objects[j].dp1 != NULL) delete[](char *)custom_subscreen[i].objects[j].dp1;
-                
-                break;
-            }
-        }
-    }
-    
     al_trace("Cleaning sfx. \n");
     
     for(int32_t i=0; i<WAV_COUNT; i++)
@@ -28848,9 +28746,6 @@ void quit_game()
 
 void quit_game2()
 {
-    deallocate_biic_list();
-    
-    
     set_last_timed_save(nullptr);
     save_config_file();
     zc_set_palette(black_palette);
@@ -28883,25 +28778,6 @@ void quit_game2()
         }
     }
     
-    al_trace("Cleaning subscreens. \n");
-    
-    for(int32_t i=0; i<4; i++)
-    {
-        for(int32_t j=0; j<MAXSUBSCREENITEMS; j++)
-        {
-            switch(custom_subscreen[i].objects[j].type)
-            {
-            case ssoTEXT:
-            case ssoTEXTBOX:
-            case ssoCURRENTITEMTEXT:
-            case ssoCURRENTITEMCLASSTEXT:
-                if(custom_subscreen[i].objects[j].dp1 != NULL) delete[](char *)custom_subscreen[i].objects[j].dp1;
-                
-                break;
-            }
-        }
-    }
-    
     al_trace("Cleaning sfx. \n");
     
     for(int32_t i=0; i<WAV_COUNT; i++)
@@ -29069,7 +28945,6 @@ void center_zquest_dialogs()
     jwin_center_dialog(sfx_edit_dlg);
     jwin_center_dialog(showpal_dlg);
     jwin_center_dialog(strlist_dlg);
-    jwin_center_dialog(subscreen_type_dlg);
     jwin_center_dialog(template_dlg);
     center_zq_tiles_dialog();
     jwin_center_dialog(tp_dlg);
@@ -29657,7 +29532,7 @@ command_pair commands[cmdMAX]=
     { " Map Count",                         0, NULL },
     { "Default Map Styles",                 0, (intF) onDefault_MapStyles },
     { "Map Styles",                         0, (intF) onMapStyles },
-    { "Master Subscreen Type",              0, (intF) onSubscreen },
+    { " Master Subscreen Type",             0, NULL },
     { " Message String",                    0, NULL },
     { "MIDIs",                              0, (intF) onMidis },
     { "Misc Colors",                        0, (intF) onMiscColors },
diff --git a/src/zq/zquest.h b/src/zq/zquest.h
index 8d1cf2864b..3f080dcaad 100644
--- a/src/zq/zquest.h
+++ b/src/zq/zquest.h
@@ -227,9 +227,6 @@ void set_debug(bool d);
 extern zquestheader        header;
 extern byte                midi_flags[MIDIFLAGS_SIZE];
 extern byte                music_flags[MUSICFLAGS_SIZE];
-extern word                map_count;
-extern std::vector<mapscr> TheMaps;
-extern std::vector<word>   map_autolayers;
 extern zcmap               *ZCMaps;
 extern int32_t				   msg_strings_size;
 extern class zctune        *customtunes;
@@ -1050,7 +1047,6 @@ int32_t InitPage_7();
 int32_t InitPage_8();
 int32_t onInit();
 int32_t onItemProps();
-int32_t onSubscreen();
 
 void get_cset(int32_t dataset,int32_t row,RGB *pal);
 void draw_edit_dataset_specs(int32_t index,int32_t copy);
@@ -1151,7 +1147,7 @@ int32_t get_bmaps(int32_t si);
 
 bool no_subscreen();
 
-extern int32_t Awpn, Bwpn, Bpos, Xwpn, Ywpn;
+extern int32_t Awpn, Bwpn, Xwpn, Ywpn;
 extern sprite_list Sitems;
 
 int32_t main(int32_t argc,char **argv);
diff --git a/tests/replays/triggers.zplay b/tests/replays/triggers.zplay
index a38bebdacd..230c761b8e 100644
--- a/tests/replays/triggers.zplay
+++ b/tests/replays/triggers.zplay
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04ce7865862c3d9c3f1f88bc0b028ff14394710bd1d9416705e4d9bc3674580a
-size 323512
+oid sha256:de9d1e20f9e5e9acb594231bed5646d11db8cd6c7937eedbf27f4e6a63a9148d
+size 323492