Index: ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.js	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.js	(revision 22669)
@@ -1,164 +1,164 @@
 /**
  * Display selectable civs only.
  */
 const g_CivData = loadCivData(true, false);
 
 /**
  * Callback function name on closing gui via Engine.PopGuiPage().
  */
 var g_Callback = "";
 
 var g_SelectedCiv = "";
 
 /**
  * Initialize the dropdown containing all the available civs.
  */
 function init(data = {})
 {
 	if (data.callback)
 		g_Callback = data.callback;
 
 	var civList = Object.keys(g_CivData).map(civ => ({ "name": g_CivData[civ].Name, "code": civ })).sort(sortNameIgnoreCase);
 	var civSelection = Engine.GetGUIObjectByName("civSelection");
 
 	civSelection.list = civList.map(civ => civ.name);
 	civSelection.list_data = civList.map(civ => civ.code);
 	civSelection.selected = data.civ ? civSelection.list_data.indexOf(data.civ) : 0;
 
 	Engine.GetGUIObjectByName("structreeButton").tooltip = colorizeHotkey(translate("%(hotkey)s: Switch to Structure Tree."), "structree");
 	Engine.GetGUIObjectByName("close").tooltip = colorizeHotkey(translate("%(hotkey)s: Close History."), "cancel");
 }
 
 /**
  * Give the first character a larger font.
  */
 function bigFirstLetter(str, size)
 {
 	return '[font="sans-bold-' + (size + 6) + '"]' + str[0] + '[/font]' + '[font="sans-bold-' + size + '"]' + str.substring(1) + '[/font]';
 }
 
 /**
  * Set heading font - bold and mixed caps
  *
  * @param string {string}
  * @param size {number} - Font size
  * @returns {string}
  */
 function heading(string, size)
 {
 	var textArray = string.split(" ");
 
 	for (let i in textArray)
 	{
 		var word = textArray[i];
 		var wordCaps = word.toUpperCase();
 
 		// Check if word is capitalized, if so assume it needs a big first letter
 		// Check if toLowerCase changes the character to avoid false positives from special signs
 		if (word.length && word[0].toLowerCase() != word[0])
 			textArray[i] = bigFirstLetter(wordCaps, size);
 		else
 			textArray[i] = '[font="sans-bold-' + size + '"]' + wordCaps + '[/font]';	// TODO: Would not be necessary if we could do nested tags
 	}
 
 	return textArray.join(" ");
 }
 
 /**
  * Prepends a backslash to all quotation marks.
  * @param str {string}
  * @returns {string}
  */
 function escapeQuotation(str)
 {
 	return str.replace(/"/g, "\\\"");
 }
 
 /**
  * Returns a styled concatenation of Name, History and Description of the given object.
  *
  * @param obj {Object}
  * @returns {string}
  */
 function subHeading(obj)
 {
 	if (!obj.Name)
 		return "";
 	let string = '[font="sans-bold-14"]' + obj.Name + '[/font] ';
 	if (obj.History)
 		string += '[icon="iconInfo" tooltip="' + escapeQuotation(obj.History) + '" tooltip_style="civInfoTooltip"]';
 	if (obj.Description)
 		string += '\n     ' + obj.Description;
 	return coloredText(string + "\n", "white");
 }
 
 function switchToStrucTreePage()
 {
 	Engine.PopGuiPage();
 	Engine.PushGuiPage("page_structree.xml", { "civ": g_SelectedCiv, "callback": g_Callback });
 }
 
-function close()
+function closePage()
 {
 	if (g_Callback)
 		Engine.PopGuiPageCB({ "civ": g_SelectedCiv, "page": "page_civinfo.xml" });
 	else
 		Engine.PopGuiPage();
 }
 
 /**
  * Updates the GUI after the user selected a civ from dropdown.
  *
  * @param code {string}
  */
 function selectCiv(code)
 {
 	var civInfo = g_CivData[code];
 
 	g_SelectedCiv = code;
 
 	if(!civInfo)
 		error(sprintf("Error loading civ data for \"%(code)s\"", { "code": code }));
 
 	// Update civ gameplay display
 	Engine.GetGUIObjectByName("civGameplayHeading").caption = heading(sprintf(translate("%(civilization)s Gameplay"), { "civilization": civInfo.Name }), 16);
 
 	// Bonuses
 	var bonusCaption = heading(translatePlural("Civilization Bonus", "Civilization Bonuses", civInfo.CivBonuses.length), 12) + '\n';
 	for (let bonus of civInfo.CivBonuses)
 		bonusCaption += subHeading(bonus);
 
 	// Team Bonuses
 	bonusCaption += heading(translatePlural("Team Bonus", "Team Bonuses", civInfo.TeamBonuses.length), 12) + '\n';
 	for (let bonus of civInfo.TeamBonuses)
 		bonusCaption += subHeading(bonus);
 
 	Engine.GetGUIObjectByName("civBonuses").caption = bonusCaption;
 
 	// Special techs
 	var techCaption = heading(translate("Special Technologies"), 12) + '\n';
 	for (let faction of civInfo.Factions)
 		for (let technology of faction.Technologies)
 			techCaption += subHeading(technology);
 
 	// Special buildings
 	techCaption += heading(translatePlural("Special Building", "Special Buildings", civInfo.Structures.length), 12) + '\n';
 	for (let structure of civInfo.Structures)
 		techCaption += subHeading(structure);
 
 	Engine.GetGUIObjectByName("civTechs").caption = techCaption;
 
 	// Heroes
 	var heroCaption = heading(translate("Heroes"), 12) + '\n';
 	for (let faction of civInfo.Factions)
 	{
 		for (let hero of faction.Heroes)
 			heroCaption += subHeading(hero);
 		heroCaption += '\n';
 	}
 	Engine.GetGUIObjectByName("civHeroes").caption = heroCaption;
 
 	// Update civ history display
 	Engine.GetGUIObjectByName("civHistoryHeading").caption = heading(sprintf(translate("History of the %(civilization)s"), { "civilization": civInfo.Name }), 16);
 	Engine.GetGUIObjectByName("civHistoryText").caption = civInfo.History;
 }
Index: ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml	(revision 22669)
@@ -1,145 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/civinfo/"/>
 
 	<object	hotkey="civinfo">
-		<action on="Press">
-			close();
-		</action>
+		<action on="Press">closePage();</action>
 	</object>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
 	<object type="image" style="ModernDialog" size="50%-500 50%-368 50%+500 50%+370">
 
 		<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Civilizations</translatableAttribute>
 		</object>
 
 		<!-- Civ selection -->
 		<object size="25 10 100% 30">
 			<object
 				name="civSelectionHeading"
 				type="text"
 				font="sans-bold-20"
 				textcolor="white"
 				text_align="left"
 				size="50%-420 10 50%-96 48">
 				<translatableAttribute id="caption">Civilization Selection</translatableAttribute>
 			</object>
 
 			<object name="civSelection" type="dropdown" style="ModernDropDown" size="50%-96 10 50%+96 40" dropdown_size="424">
 				<action on="SelectionChange">selectCiv(this.list_data[this.selected]);</action>
 			</object>
 		</object>
 
 		<!-- Civ data display -->
 		<object size="25 50 100%-25 65%-5">
 			<object type="image" sprite="TranslucentPanelThinBorder" size="0 5 100% 40">
 				<object
 					name="civGameplayHeading"
 					type="text"
 					font="sans-bold-16"
 					textcolor="white"
 					text_align="left"
 					text_valign="center"
 					size="10 0 100% 100%"
 				/>
 			</object>
 
 			<object type="image" sprite="ModernDarkBoxGold" size="0 45 33%-5 100%">
 				<object
 					name="civBonuses"
 					type="text"
 					font="sans-14"
 					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
 			</object>
 
 			<object type="image" sprite="ModernDarkBoxGold" size="33%+5 45 75%-5 100%">
 				<object
 					name="civTechs"
 					type="text"
 					font="sans-14"
 					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
 			</object>
 
 			<object type="image" sprite="ModernDarkBoxGold" size="75%+5 45 100% 100%">
 				<object
 					name="civHeroes"
 					type="text"
 					font="sans-14"
 					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
 			</object>
 
 		</object>
 
 
 		<!-- Civ history display -->
 		<object size="25 65% 100%-25 100%-56">
 			<object type="image" sprite="TranslucentPanelThinBorder" size="0 0 100% 35">
 				<object
 					name="civHistoryHeading"
 					type="text"
 					font="sans-bold-16"
 					textcolor="white"
 					text_align="left"
 					text_valign="center"
 					size="10 0 100% 100%"
 				/>
 			</object>
 
 			<object type="image" sprite="ModernDarkBoxGold" size="0 35 100% 100%">
 				<object
 					name="civHistoryText"
 					type="text"
 					font="sans-14"
 					textcolor="white"
 					text_align="left"
 					size="10 0 100% 100%"
 				/>
 			</object>
 
 		</object>
 
 		<!-- Structure tree page -->
 		<object
 			type="button"
 			style="StoneButton"
 			size="100%-309 100%-52 100%-169 100%-24"
 			name="structreeButton"
 			hotkey="structree"
 		>
 			<translatableAttribute id="caption">Structure Tree</translatableAttribute>
 			<action on="Press">switchToStrucTreePage();</action>
 		</object>
 
 		<!-- Close dialog -->
 		<object
 			type="button"
 			style="StoneButton"
 			size="100%-164 100%-52 100%-24 100%-24"
 			name="close"
 			hotkey="cancel"
 		>
 			<translatableAttribute id="caption">Close</translatableAttribute>
-			<action on="Press">
-				close();
-			</action>
+			<action on="Press">closePage();</action>
 		</object>
 
 	</object>
 
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js	(revision 22669)
@@ -1,232 +1,234 @@
 var currentSubmenuType; // contains submenu type
 var MARGIN = 4; // menu border size
 var g_ShowSplashScreens;
 
 /**
  * Available backdrops
  */
 var g_BackgroundLayerData = [];
 
 /**
  * Chosen backdrop
  */
 var g_BackgroundLayerset;
 
 var g_T0 = Date.now();
 var g_LastTickTime = Date.now();
 
 function init(initData, hotloadData)
 {
 	initMusic();
 
 	global.music.setState(global.music.states.MENU);
 
 	// Initialize currentSubmenuType with placeholder to avoid null when switching
 	currentSubmenuType = "submenuSinglePlayer";
 
 	// Only show splash screen(s) once at startup, but not again after hotloading
 	g_ShowSplashScreens = hotloadData ? hotloadData.showSplashScreens : initData && initData.isStartup;
 
 	// Pick a random background and initialise it
 	g_BackgroundLayerset = pickRandom(g_BackgroundLayerData);
 	for (let i = 0; i < g_BackgroundLayerset.length; ++i)
 	{
 		let guiObj = Engine.GetGUIObjectByName("background[" + i + "]");
 		guiObj.hidden = false;
 		guiObj.sprite = g_BackgroundLayerset[i].sprite;
 		guiObj.z = i;
 	}
 
 	Engine.GetGUIObjectByName("structreeButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: View the structure tree of civilizations featured in 0 A.D."),
 		"structree");
 
 	Engine.GetGUIObjectByName("civInfoButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: Learn about the many civilizations featured in 0 A.D."),
 		"civinfo");
 
 	Engine.GetGUIObjectByName("lobbyButton").tooltip = colorizeHotkey(
 		translate("%(hotkey)s: Launch the multiplayer lobby to join and host publicly visible games and chat with other players."),
 		"lobby");
 }
 
 function getHotloadData()
 {
 	return { "showSplashScreens": g_ShowSplashScreens };
 }
 
 function scrollBackgrounds()
 {
 	for (let i = 0; i < g_BackgroundLayerset.length; ++i)
 	{
 		let guiObj = Engine.GetGUIObjectByName("background[" + i + "]");
 
 		let screen = guiObj.parent.getComputedSize();
 		let h = screen.bottom - screen.top;
 		let w = h * 16/9;
 		let iw = h * 2;
 
 		let offset = g_BackgroundLayerset[i].offset((Date.now() - g_T0) / 1000, w);
 
 		if (g_BackgroundLayerset[i].tiling)
 		{
 			let left = offset % iw;
 			if (left >= 0)
 				left -= iw;
 			guiObj.size = new GUISize(left, screen.top, screen.right, screen.bottom);
 		}
 		else
 			guiObj.size = new GUISize(screen.right/2 - h + offset, screen.top, screen.right/2 + h + offset, screen.bottom);
 	}
 }
 
 function onTick()
 {
 	let now = Date.now();
 	let tickLength = Date.now() - g_LastTickTime;
 	g_LastTickTime = now;
 
 	scrollBackgrounds();
 
 	updateMenuPosition(tickLength);
 
 	// Show splash screens here, so we don't interfere with main menu hotloading
 	if (g_ShowSplashScreens)
 	{
 		g_ShowSplashScreens = false;
 
 		if (Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true" ||
 		    Engine.ConfigDB_GetValue("user", "gui.splashscreen.version") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"))
-			Engine.PushGuiPage("page_splashscreen.xml", { "page": "splashscreen", "callback": "SplashScreenClosedCallback" });
+			ShowSplashScreen();
 		else
 			ShowRenderPathMessage();
 	}
 }
 
+function ShowSplashScreen()
+{
+	Engine.PushGuiPage("page_splashscreen.xml", {
+		"callback": "ShowRenderPathMessage"
+	});
+}
+
 function ShowRenderPathMessage()
 {
 	// Warn about removing fixed render path
 	if (Engine.Renderer_GetRenderPath() == "fixed")
 		messageBox(
 			600, 300,
 			"[font=\"sans-bold-16\"]" +
 			sprintf(translate("%(warning)s You appear to be using non-shader (fixed function) graphics. This option will be removed in a future 0 A.D. release, to allow for more advanced graphics features. We advise upgrading your graphics card to a more recent, shader-compatible model."), {
 				"warning": coloredText("Warning:", "200 20 20")
 			}) +
 			"\n\n" +
 			// Translation: This is the second paragraph of a warning. The
 			// warning explains that the user is using “non-shader“ graphics,
 			// and that in the future this will not be supported by the game, so
 			// the user will need a better graphics card.
 			translate("Please press \"Read More\" for more information or \"OK\" to continue."),
 			translate("WARNING!"),
 			[translate("OK"), translate("Read More")],
 			[ null, function() { Engine.OpenURL("https://www.wildfiregames.com/forum/index.php?showtopic=16734"); } ]
 		);
 }
 
-function SplashScreenClosedCallback()
-{
-	ShowRenderPathMessage();
-}
-
 /**
  * Slide menu.
  */
 function updateMenuPosition(dt)
 {
 	let submenu = Engine.GetGUIObjectByName("submenu");
 
 	if (submenu.hidden == false)
 	{
 		// Number of pixels per millisecond to move
 		let SPEED = 1.2;
 
 		let maxOffset = Engine.GetGUIObjectByName("mainMenu").size.right - submenu.size.left;
 		if (maxOffset > 0)
 		{
 			let offset = Math.min(SPEED * dt, maxOffset);
 			let size = submenu.size;
 			size.left += offset;
 			size.right += offset;
 			submenu.size = size;
 		}
 	}
 }
 
 /**
  * Opens the menu by revealing the screen which contains the menu.
  */
 function openMenu(newSubmenu, position, buttonHeight, numButtons)
 {
 	currentSubmenuType = newSubmenu;
 	Engine.GetGUIObjectByName(currentSubmenuType).hidden = false;
 
 	let submenu = Engine.GetGUIObjectByName("submenu");
 	let top = position - MARGIN;
 	let bottom = position + ((buttonHeight + MARGIN) * numButtons);
 	submenu.size = new GUISize(submenu.size.left, top, submenu.size.right, bottom);
 
 	// Blend in right border of main menu into the left border of the submenu
 	blendSubmenuIntoMain(top, bottom);
 
 	submenu.hidden = false;
 }
 
 function closeMenu()
 {
 	Engine.GetGUIObjectByName(currentSubmenuType).hidden = true;
 
 	let submenu = Engine.GetGUIObjectByName("submenu");
 	submenu.hidden = true;
 	submenu.size = Engine.GetGUIObjectByName("mainMenu").size;
 
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% 100%";
 }
 
 /**
  * Sizes right border on main menu panel to match the submenu.
  */
 function blendSubmenuIntoMain(topPosition, bottomPosition)
 {
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% " + (topPosition + MARGIN);
 	Engine.GetGUIObjectByName("MainMenuPanelRightBorderBottom").size = "100%-2 " + (bottomPosition) + " 100% 100%";
 }
 
 function exitGamePressed()
 {
 	closeMenu();
 
 	messageBox(
 		400, 200,
 		translate("Are you sure you want to quit 0 A.D.?"),
 		translate("Confirmation"),
 		[translate("No"), translate("Yes")],
 		[null, Engine.Exit]
 	);
 }
 
 function pressedScenarioEditorButton()
 {
 	closeMenu();
 
 	if (Engine.AtlasIsAvailable())
 		messageBox(
 			400, 200,
 			translate("Are you sure you want to quit 0 A.D. and open the Scenario Editor?"),
 			translate("Confirmation"),
 			[translate("No"), translate("Yes")],
 			[null, Engine.RestartInAtlas]
 		);
 	else
 		messageBox(
 			400, 200,
 			translate("The scenario editor is not available or failed to load. See the game logs for additional information."),
 			translate("Error")
 		);
 }
 
 function getLobbyDisabledByBuild()
 {
 	return translate("Launch the multiplayer lobby to join and host publicly visible games and chat with other players. \\[DISABLED BY BUILD]");
 }
Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml	(revision 22669)
@@ -1,620 +1,617 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/pregame/"/>
 	<script directory="gui/pregame/backgrounds/"/>
 	<script directory="gui/pregame/userreport/"/>
 
 	<!--
 	==========================================
 	- MAIN MENU
 	==========================================
 	-->
 	<object>
 
 		<action on="Tick">
 			onTick();
 		</action>
 
 		<repeat count="5">
 			<object name="background[n]"
 				type="image"
 				hidden="true"
 				ghost="true"
 			/>
 		</repeat>
 
 		<!--
 		==========================================
 		- MAIN MENU - STATIC TOOLTIP WINDOW
 		==========================================
 		-->
 		<object name="pgToolTip"
 			style="TranslucentPanel"
 			type="text"
 			hidden="true"
 			size="100%-290 25 100% 140"
 			ghost="true"
 		/>
 
 		<!--
 		==========================================
 		- MAIN MENU - USER REPORT
 		==========================================
 		-->
 		<include file="gui/pregame/userreport/userreport.xml"/>
 
 		<!--
 		==========================================
 		- SUBMENU
 		==========================================
 		-->
 
 		<object hotkey="cancel">
 			<action on="Press">
 				closeMenu();
 			</action>
 		</object>
 
 		<!-- hide submenu when user clicks on the background -->
 		<object type="button">
 			<action on="Press">
 				closeMenu();
 			</action>
 		</object>
 
 		<!-- submenu -->
 		<object name="submenu"
 			type="image"
 			style="SubmenuPanel"
 			size="60 50%-100 300 50%+100"
 			hidden="true"
 		>
 			<!-- submenuLearnToPlay -->
 			<object name="submenuLearn"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<!-- LEARN TO PLAY BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Manual</translatableAttribute>
 					<translatableAttribute id="tooltip">Open the 0 A.D. Game Manual.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_manual.xml");
 					</action>
 				</object>
 
 				<!-- START TUTORIAL BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Tutorial</translatableAttribute>
 					<translatableAttribute id="tooltip">Start the economic tutorial.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_gamesetup.xml", { "tutorial": true });
 					</action>
 				</object>
 
 				<!-- STRUCTREE BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 					name="structreeButton"
 					hotkey="structree"
 				>
 					<translatableAttribute id="caption">Structure Tree</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_structree.xml", {});
 					</action>
 				</object>
 
 				<!-- HISTORY BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 					name="civInfoButton"
 					hotkey="civinfo"
 				>
 					<translatableAttribute id="caption">History</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_civinfo.xml");
 					</action>
 				</object>
 
 			</object>
 
 			<!-- submenuSinglePlayer -->
 			<object name="submenuSinglePlayer"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Matches</translatableAttribute>
 					<translatableAttribute id="tooltip">Click here to start a new single player game.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_gamesetup.xml", {});
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 					enabled="false"
 				>
 					<translatableAttribute id="caption">Campaigns</translatableAttribute>
 					<translatableAttribute id="tooltip">Relive history through historical military campaigns. \[NOT YET IMPLEMENTED]</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Load Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Click here to load a saved game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_loadgame.xml", { "type": "offline" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Replays</translatableAttribute>
 					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.SwitchGuiPage("page_replaymenu.xml", {
 							"replaySelectionData": {
 								"filters": {
 									"singleplayer": "Singleplayer"
 								}
 							}
 						});
 					</action>
 				</object>
 			</object>
 
 			<!-- submenuMultiplayer -->
 			<object name="submenuMultiplayer"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption" comment="Join a game by specifying the host's IP address.">Join Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Joining an existing multiplayer game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_gamesetup_mp.xml", { "multiplayerGameType": "join" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Host Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Host a multiplayer game.\n\nRequires UDP port 20595 to be open.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "host" });
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 					name="lobbyButton"
 					hotkey="lobby"
 				>
 					<translatableAttribute id="caption">Game Lobby</translatableAttribute>
 					<action on="Press">
 						if (!Engine.StartXmppClient)
 							return;
 						closeMenu();
 						Engine.PushGuiPage("page_prelobby_entrance.xml");
 					</action>
 					<action on="load">
 						if (!Engine.StartXmppClient)
 						{
 							this.enabled = false;
 							this.tooltip = getLobbyDisabledByBuild();
 						}
 					</action>
 				</object>
 
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Replays</translatableAttribute>
 					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.SwitchGuiPage("page_replaymenu.xml", {
 							"replaySelectionData": {
 								"filters": {
 									"singleplayer": "Multiplayer"
 								}
 							}
 						});
 					</action>
 				</object>
 			</object>
 
 			<!-- submenuOptions -->
 			<object name="submenuOptions"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
 				hidden="true"
 			>
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Options</translatableAttribute>
 					<translatableAttribute id="tooltip">Adjust game settings.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_options.xml");
 					</action>
 				</object>
 
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 32 100% 60"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Language</translatableAttribute>
 					<translatableAttribute id="tooltip">Choose the language of the game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						Engine.PushGuiPage("page_locale.xml");
 					</action>
 				</object>
 
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Mod Selection</translatableAttribute>
 					<translatableAttribute id="tooltip">Select and download mods for the game.</translatableAttribute>
 					<action on="Press">
 						Engine.SwitchGuiPage("page_modmod.xml");
 					</action>
 				</object>
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Welcome Screen</translatableAttribute>
 					<translatableAttribute id="tooltip">Show the Welcome Screen. Useful if you hid it by mistake.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
-						Engine.PushGuiPage("page_splashscreen.xml", {
-							"page": "splashscreen",
-							"callback": "SplashScreenClosedCallback"
-						});
+						ShowSplashScreen();
 					</action>
 				</object>
 			</object>
 		</object>
 
 
 		<!--
 		==========================================
 		- MAIN MENU PANEL
 		==========================================
 		-->
 		<object name="mainMenu"
 			type="image"
 			style="MainMenuPanel"
 			size="60 -2 300 100%+2"
 			z="50"
 		>
 			<!-- These are used to make the right side blend in with the submenu -->
 			<object name="MainMenuPanelRightBorderTop"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
 			<object name="MainMenuPanelRightBorderBottom"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
 
 			<object
 				type="image"
 				sprite="productLogo"
 				ghost="true"
 				size="50%-110 30 50%+110 130"
 			/>
 
 			<object
 				type="image"
 				size="8 156 100%-8 356"
 				ghost="false"
 			>
 				<!-- LEARN BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 4 100%-4 32"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Learn to Play</translatableAttribute>
 					<translatableAttribute id="tooltip">Learn how to play, start the tutorial, discover the technology trees, and the history behind the civilizations</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuLearn", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- SINGLEPLAYER BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 36 100%-4 64"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Single Player</translatableAttribute>
 					<translatableAttribute id="tooltip">Challenge the computer player to a single player match.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuSinglePlayer", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- MULTIPLAYER BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 68 100%-4 96"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Multiplayer</translatableAttribute>
 					<translatableAttribute id="tooltip">Fight against one or more human players in a multiplayer game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuMultiplayer", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- OPTIONS BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 100 100%-4 128"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Settings</translatableAttribute>
 					<translatableAttribute id="tooltip">Game options and mod selection.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
 						openMenu("submenuOptions", this.parent.size.top + this.size.top, this.size.bottom - this.size.top, 4);
 					</action>
 				</object>
 
 				<!-- SCENARIO EDITOR BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 132 100%-4 160"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Scenario Editor</translatableAttribute>
 					<translatableAttribute id="tooltip">Open the Atlas Scenario Editor in a new window. You can run this more reliably by starting the game with the command-line argument &quot;-editor&quot;.</translatableAttribute>
 					<action on="Press">
 						pressedScenarioEditorButton();
 					</action>
 				</object>
 
 				<!-- EXIT BUTTON -->
 				<object
 					type="button"
 					style="StoneButtonFancy"
 					size="4 164 100%-4 192"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Exit</translatableAttribute>
 					<translatableAttribute id="tooltip">Exits the game.</translatableAttribute>
 					<action on="Press">exitGamePressed();</action>
 				</object>
 			</object>
 
 			<!-- PRE-RELEASE INFO -->
 			<object size="8 100%-420 100%-8 100%-94"
 				type="image"
 				style="TranslucentPanelThinBorder"
 			>
 				<!-- PRE-RELEASE WARNING -->
 				<object
 					font="sans-14"
 					type="text"
 					textcolor="white"
 					size="8 8 100%-8 100%-36"
 					ghost="true"
 				>
 					<!-- IMPORTANT: remember to update session/top_panel/label.xml in sync with this: -->
 					<attribute id="caption">
 						<keep>[font="sans-bold-16"]</keep>
 						<translate>Alpha XXIV</translate>
 						<keep>[/font]\n\n</keep>
 						<translate>WARNING: This is an early development version of the game. Many features have not been added yet.</translate>
 					</attribute>
 				</object>
 
 				<!-- GET INVOLVED -->
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-180 50%-4 100%-152"
 				>
 					<translatableAttribute id="caption">Website</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open play0ad.com in your web browser.</translatableAttribute>
 					<action on="Press">
 						openURL("https://play0ad.com/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="50%+4 100%-180 100%-8 100%-152"
 				>
 					<translatableAttribute id="caption">Chat</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open the 0 A.D. IRC chat in your browser. (#0ad on webchat.quakenet.org)</translatableAttribute>
 					<action on="Press">
 						openURL("https://webchat.quakenet.org/?channels=0ad");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-144 100%-8 100%-116"
 				>
 					<translatableAttribute id="caption">Report a Bug</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to visit 0 A.D. Trac to report a bug, crash, or error.</translatableAttribute>
 					<action on="Press">
 						openURL("https://trac.wildfiregames.com/wiki/ReportingErrors/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-108 100%-8 100%-80"
 				>
 					<translatableAttribute id="caption">Translate the Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open the 0 A.D. translate page in your browser.</translatableAttribute>
 					<action on="Press">
 						openURL("https://trac.wildfiregames.com/wiki/Localization");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-72 100%-8 100%-44"
 				>
 					<translatableAttribute id="caption">Donate</translatableAttribute>
 					<translatableAttribute id="tooltip">Help with the project expenses by donating.</translatableAttribute>
 					<action on="Press">
 						openURL("https://play0ad.com/community/donate/");
 					</action>
 				</object>
 
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
 					size="8 100%-36 100%-8 100%-8"
 				>
 					<translatableAttribute id="caption">Credits</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to see the 0 A.D. credits.</translatableAttribute>
 					<action on="Press">
 						Engine.PushGuiPage("page_credits.xml");
 					</action>
 				</object>
 
 			</object>
 
 			<!-- LOGO AND BUILD VERSION -->
 			<object
 				size="4 100%-84 100%-4 100%-56"
 				ghost="true"
 			>
 
 				<!-- COMPANY LOGO -->
 				<object
 					type="image"
 					sprite="companyLogo"
 					ghost="true"
 					size="50%-16 0 50%+16 32"
 				/>
 
 				<!-- COMPANY NAME -->
 				<object type="text"
 					style="MediumTitleText"
 					ghost="true"
 					size="50%-128 32 50%+128 48"
 				>
 					<translatableAttribute id="caption">WILDFIRE GAMES</translatableAttribute>
 				</object>
 			</object>
 
 			<!-- VERSION -->
 			<object
 				type="text"
 				style="MediumTitleText"
 				ghost="true"
 				size="50%-128 100%-36 50%+128 100%"
 			>
 				<action on="Load">
 					this.caption = getBuildString();
 				</action>
 			</object>
 		</object>
 	</object>
 
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.js	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.js	(revision 22669)
@@ -1,206 +1,206 @@
 /**
  * Array of structure template names when given a civ and a phase name.
  */
 var g_BuildList = {};
 
 /**
  * Array of template names that can be trained from a unit, given a civ and unit template name.  
  */
 var g_TrainList = {};
 
 /**
  * Callback function name on closing gui via Engine.PopGuiPage().
  */
 var g_Callback = "";
 
 /**
  * Initialize the page
  *
  * @param {object} data - Parameters passed from the code that calls this page into existence.
  */
 function init(data = {})
 {
 	if (data.callback)
 		g_Callback = data.callback;
 
 	let civList = Object.keys(g_CivData).map(civ => ({
 		"name": g_CivData[civ].Name,
 		"code": civ,
 	})).sort(sortNameIgnoreCase);
 
 	if (!civList.length)
 	{
 		closePage();
 		return;
 	}
 
 	g_ParsedData = {
 		"units": {},
 		"structures": {},
 		"techs": {},
 		"phases": {}
 	};
 
 	let civSelection = Engine.GetGUIObjectByName("civSelection");
 	civSelection.list = civList.map(c => c.name);
 	civSelection.list_data = civList.map(c => c.code);
 	civSelection.selected = data.civ ? civSelection.list_data.indexOf(data.civ) : 0;
 
 	Engine.GetGUIObjectByName("civinfo").tooltip = colorizeHotkey(translate("%(hotkey)s: Switch to History."), "civinfo");
 	Engine.GetGUIObjectByName("close").tooltip = colorizeHotkey(translate("%(hotkey)s: Close Structure Tree."), "cancel");
 }
 
 function switchToCivInfoPage()
 {
 	Engine.PopGuiPage();
 	Engine.PushGuiPage("page_civinfo.xml", { "civ": g_SelectedCiv, "callback": g_Callback });
 }
 
-function close()
+function closePage()
 {
 	if (g_Callback)
 		Engine.PopGuiPageCB({ "civ": g_SelectedCiv, "page": "page_structree.xml" });
 	else
 		Engine.PopGuiPage();
 }
 
 /**
  * @param {string} civCode
  */
 function selectCiv(civCode)
 {
 	if (civCode === g_SelectedCiv || !g_CivData[civCode])
 		return;
 
 	g_SelectedCiv = civCode;
 
 	g_CurrentModifiers = deriveModifications(g_AutoResearchTechList);
 
 	// If a buildList already exists, then this civ has already been parsed
 	if (g_BuildList[g_SelectedCiv])
 	{
 		draw();
 		drawPhaseIcons();
 		return;
 	}
 
 	let templateLists = compileTemplateLists(civCode);
 
 	for (let u of templateLists.units.keys())
 		if (!g_ParsedData.units[u])
 			g_ParsedData.units[u] = loadEntityTemplate(u);
 
 	for (let s of templateLists.structures.keys())
 		if (!g_ParsedData.structures[s])
 			g_ParsedData.structures[s] = loadEntityTemplate(s);
 
 	// Load technologies
 	g_ParsedData.techs[civCode] = {};
 	for (let techcode of templateLists.techs.keys())
 		if (basename(techcode).startsWith("phase"))
 			g_ParsedData.phases[techcode] = loadPhase(techcode);
 		else
 			g_ParsedData.techs[civCode][techcode] = loadTechnology(techcode);
 
 	// Establish phase order
 	g_ParsedData.phaseList = UnravelPhases(g_ParsedData.phases);
 
 	// Load any required generic phases that aren't already loaded
 	for (let phasecode of g_ParsedData.phaseList)
 		if (!g_ParsedData.phases[phasecode])
 			g_ParsedData.phases[phasecode] = loadPhase(phasecode);
 
 	// Group production and upgrade lists of structures by phase
 	for (let structCode of templateLists.structures.keys())
 	{
 		let structInfo = g_ParsedData.structures[structCode];
 		structInfo.phase = getPhaseOfTemplate(structInfo);
 		let structPhaseIdx = g_ParsedData.phaseList.indexOf(structInfo.phase);
 
 		// If this building is shared with another civ,
 		// it may have already gone through the grouping process already
 		if (!Array.isArray(structInfo.production.techs))
 			continue;
 
 		// Sort techs by phase
 		let newProdTech = {};
 		for (let prod of structInfo.production.techs)
 		{
 			let phase = getPhaseOfTechnology(prod);
 			if (phase === false)
 				continue;
 
 			if (g_ParsedData.phaseList.indexOf(phase) < structPhaseIdx)
 				phase = structInfo.phase;
 
 			if (!(phase in newProdTech))
 				newProdTech[phase] = [];
 
 			newProdTech[phase].push(prod);
 		}
 
 		// Sort units by phase
 		let newProdUnits = {};
 		for (let prod of structInfo.production.units)
 		{
 			let phase = getPhaseOfTemplate(g_ParsedData.units[prod]);
 			if (phase === false)
 				continue;
 
 			if (g_ParsedData.phaseList.indexOf(phase) < structPhaseIdx)
 				phase = structInfo.phase;
 
 			if (!(phase in newProdUnits))
 				newProdUnits[phase] = [];
 
 			newProdUnits[phase].push(prod);
 		}
 
 		g_ParsedData.structures[structCode].production = {
 			"techs": newProdTech,
 			"units": newProdUnits
 		};
 
 		// Sort upgrades by phase
 		let newUpgrades = {};
 		if (structInfo.upgrades)
 			for (let upgrade of structInfo.upgrades)
 			{
 				let phase = getPhaseOfTemplate(upgrade);
 
 				if (g_ParsedData.phaseList.indexOf(phase) < structPhaseIdx)
 					phase = structInfo.phase;
 
 				if (!newUpgrades[phase])
 					newUpgrades[phase] = [];
 				newUpgrades[phase].push(upgrade);
 			}
 		g_ParsedData.structures[structCode].upgrades = newUpgrades;
 	}
 
 	// Determine the buildList for the civ (grouped by phase)
 	let buildList = {};
 	let trainerList = [];
 	for (let pha of g_ParsedData.phaseList)
 		buildList[pha] = [];
 	for (let structCode of templateLists.structures.keys())
 	{
 		let phase = g_ParsedData.structures[structCode].phase;
 		buildList[phase].push(structCode);
 	}
 
 	for (let unitCode of templateLists.units.keys())
 	{
 		let unitTemplate = g_ParsedData.units[unitCode];
 		if (!unitTemplate.production.units.length && !unitTemplate.production.techs.length && !unitTemplate.upgrades)
 			continue;
 
 		trainerList.push(unitCode);
 	}
 
 	g_BuildList[g_SelectedCiv] = buildList;
 	g_TrainList[g_SelectedCiv] = trainerList;
 
 	draw();
 	drawPhaseIcons();
 }
Index: ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml	(revision 22669)
@@ -1,143 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/reference/common/"/>
 	<script directory="gui/reference/structree/"/>
 
 	<object	hotkey="structree">
 		<action on="Press">
-			close();
+			closePage();
 		</action>
 	</object>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
 	<object type="image" style="ModernDialog" size="16 24 100%-16 100%-24">
 		<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Structure Tree</translatableAttribute>
 		</object>
 
 		<!-- Civ selection -->
 		<object size="16 10 100%-16 30">
 			<object
 				name="civSelectionHeading"
 				type="text"
 				font="sans-bold-16"
 				textcolor="white"
 				text_align="left"
 				size="100%-290 10 100%-180 48">
 				<translatableAttribute id="caption">Civilization:</translatableAttribute>
 			</object>
 
 			<object name="civSelection" type="dropdown" style="ModernDropDown" size="100%-180 8 100% 34" dropdown_size="424">
 				<action on="SelectionChange">selectCiv(this.list_data[this.selected]);</action>
 			</object>
 		</object>
 
 		<object
 			name="civEmblem"
 			type="image"
 			size="6 6 96+6 96+6"
 			sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
 		/>
 
 		<object
 			name="civName"
 			type="text"
 			font="sans-bold-20"
 			textcolor="white"
 			text_align="left"
 			text_valign="top"
 			size="104 32 100%-8 96"
 		/>
 
 		<object
 			name="civHistory"
 			type="text"
 			font="sans-12"
 			textcolor="white"
 			text_align="left"
 			text_valign="top"
 			size="104 52 100%-8 100%"
 		/>
 
 		<!-- Structure Tree display -->
 		<object size="0 54+64 100%-124 100%-54" name="display_tree">
 			<object name="phase_ident">
 				<repeat count="4" var="n">
 					<object>
 						<object name="phase[n]_phase" type="image"/>
 						<object name="phase[n]_bars">
 							<repeat count="4" var="k">
 								<object name="phase[n]_bar[k]" type="image" sprite="ProdBar">
 									<object name="phase[n]_bar[k]_icon" type="image" size="2 2 20 20"/>
 								</object>
 							</repeat>
 						</object>
 					</object>
 				</repeat>
 			</object>
 
 			<object type="image" name="tree_display" style="TreeDisplay" size="48+16+8 0 100%-12 100%">
 				<include file="gui/reference/structree/rows.xml"/>
 			</object>
 		</object>
 
 		<!-- Trainer Units display -->
 		<object size="100%-124 54+64 100%-16 100%-54" name="display_trainers">
 			<object
 				type="text"
 				font="sans-bold-14"
 				textcolor="white"
 				text_align="center"
 				text_valign="top"
 				size="0 0 100% 16"
 			>
 				<translatableAttribute id="caption">Trainer Units</translatableAttribute>
 			</object>
 
 			<object type="image" style="TreeDisplay" size="0 24 100% 100%" name="trainers">
 				<repeat count="6" var="t">
 					<object type="image" style="StructBox" name="trainer[t]">
 						<object type="text" style="StructNameSpecific" name="trainer[t]_name"/>
 						<object type="button" style="StructIcon" name="trainer[t]_icon"
 							sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
 						/>
 						<object name="trainer[t]_row">
 							<repeat count="4" var="p">
 								<object type="button" style="ProdBox" name="trainer[t]_prod[p]"/>
 							</repeat>
 						</object>
 					</object>
 				</repeat>
 			</object>
 		</object>
 
 		<!-- History page -->
 		<object
 			type="button"
 			style="StoneButton"
 			size="100%-309 100%-44 100%-169 100%-16"
 			name="civinfo"
 			hotkey="civinfo"
 		>
 			<translatableAttribute id="caption">History</translatableAttribute>
 			<action on="Press">switchToCivInfoPage();</action>
 		</object>
 		<!-- Close dialog -->
 		<object
 			type="button"
 			style="StoneButton"
 			size="100%-164 100%-44 100%-16 100%-16"
 			name="close"
 			hotkey="cancel"
 		>
 			<translatableAttribute id="caption">Close</translatableAttribute>
-			<action on="Press">
-				close();
-			</action>
+			<action on="Press">closePage();</action>
 		</object>
 	</object>
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.js	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.js	(revision 22669)
@@ -1,5 +1,14 @@
+var g_SplashScreenFile = "gui/splashscreen/splashscreen.txt";
+
 function init(data)
 {
-	Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile("gui/splashscreen/" + data.page + ".txt"));
+	Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile(g_SplashScreenFile));
 	Engine.GetGUIObjectByName("displaySplashScreen").checked = Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true";
 }
+
+function closePage()
+{
+	Engine.ConfigDB_CreateAndWriteValueToFile("user", "gui.splashscreen.enable", String(Engine.GetGUIObjectByName("displaySplashScreen").checked), "config/user.cfg");
+	Engine.ConfigDB_CreateAndWriteValueToFile("user", "gui.splashscreen.version", Engine.GetFileMTime(g_SplashScreenFile), "config/user.cfg");
+	Engine.PopGuiPageCB();
+}
Index: ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml	(revision 22668)
+++ ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml	(revision 22669)
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/splashscreen/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
+
 		<object type="text" style="ModernLabelText" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Welcome!</translatableAttribute>
 		</object>
 
 		<object name="mainText" type="text" style="ModernTextPanel" size="20 20 100%-20 100%-52">
 			<object name="displaySplashScreenText" size="30 100%-30 100% 100%-8" type="text" style="ModernLeftLabelText">
 				<translatableAttribute id="caption">Show this message in the future</translatableAttribute>
 			</object>
 			<object name="displaySplashScreen" size="8 100%-30 22 100%-8" type="checkbox" style="ModernTickBox"/>
 		</object>
+
 		<object type="button" style="ModernButtonRed" size="50%+5 100%-45 100%-18 100%-17">
 			<translatableAttribute id="caption">Known Issues (web)</translatableAttribute>
-			<action on="Press"><![CDATA[
-				openURL("https://www.wildfiregames.com/forum/index.php?showtopic=15796");
-			]]></action>
+			<action on="Press">openURL("https://www.wildfiregames.com/forum/index.php?showtopic=15796");</action>
 		</object>
+
 		<object name="btnOK" type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17" hotkey="cancel">
 			<translatableAttribute id="caption">OK</translatableAttribute>
-			<action on="Press"><![CDATA[
-			Engine.ConfigDB_CreateAndWriteValueToFile("user", "gui.splashscreen.enable", String(Engine.GetGUIObjectByName("displaySplashScreen").checked), "config/user.cfg");
-			Engine.ConfigDB_CreateAndWriteValueToFile("user", "gui.splashscreen.version", Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"), "config/user.cfg");
-			Engine.PopGuiPageCB();
-			]]></action>
+			<action on="Press">closePage();</action>
 		</object>
+
 	</object>
 </objects>