From 238792a5247d74297ced331f408e440b3cd7cb4b Mon Sep 17 00:00:00 2001
From: WhiteTreePaladin <brian@wildfiregames.com>
Date: Thu, 8 Sep 2011 03:49:57 +0000
Subject: [PATCH] Reworked game setup and loading screens, and adjusted title
 decoration for some windows.

This was SVN commit r10217.
---
 .../mods/public/gui/aiconfig/aiconfig.xml     |  28 +-
 .../data/mods/public/gui/civinfo/civinfo.xml  |   4 +-
 .../mods/public/gui/common/common_sprites.xml | 134 +++++++-
 .../mods/public/gui/common/common_styles.xml  |  29 +-
 .../mods/public/gui/gamesetup/gamesetup.js    |  52 ++-
 .../mods/public/gui/gamesetup/gamesetup.xml   | 133 +++++---
 .../public/gui/gamesetup/gamesetup_mp.xml     |  10 +-
 .../data/mods/public/gui/loading/loading.xml  |  54 ++-
 .../data/mods/public/gui/loading/sprites.xml  | 100 +++---
 .../data/mods/public/gui/loading/styles.xml   |  16 +-
 .../data/mods/public/gui/manual/manual.xml    |   3 +-
 .../data/mods/public/gui/msgbox/msgbox.xml    |   4 +-
 .../data/mods/public/gui/session/session.xml  |   6 +-
 .../data/mods/public/gui/summary/summary.xml  | 313 +++++++++---------
 14 files changed, 520 insertions(+), 366 deletions(-)

diff --git a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
index 3d8695aa38..e4bee7a9a6 100644
--- a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
+++ b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
@@ -7,46 +7,36 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-	<object type="image" style="StonePanelLight" size="50%-250 50%-100 50%+250 50%+100">
+	<object type="image" style="StoneDialog" size="50%-200 50%-100 50%+200 50%+140">
 
-		<object style="StoneDialogTitleBar" type="text" size="50%-128 -16 50%+128 16">AI Configuration</object>
-
-		<object type="button" style="StoneExit" tooltip_style="snToolTip">
-			<action on="Press"><![CDATA[
-				Engine.PopGuiPage();
-			]]></action>
-		</object>
+		<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">AI Configuration</object>
 
 		<object size="50%-128 46 50%+128 66">
 			<object type="text" style="RightLabelText" size="0 0 100 100%">
 				AI Player
 			</object>
 
-			<object name="aiSelection" type="dropdown" style="StoneDropDown" size="110 0 310 28">
+			<object name="aiSelection" type="dropdown" style="StoneDropDown" size="50%-16 0 50%+144 28">
 				<action on="SelectionChange">selectAI(this.selected);</action>
 			</object>
 		</object>
 
-		<object size="50%-192 66 50%+192 100%-52">
+		<object size="15% 50%-48 85% 50%+48">
 
-			<object name="aiDescription" type="text" style="CenteredLabelText" size="0 0 100% 100%"/>
+			<object name="aiDescription" type="text" style="LeftLabelText" size="0 0 100% 100%"/>
 
 			<!-- TODO: we might want to add things like difficulty controls into here -->
 
 		</object>
 
-		<object type="button" style="StoneButton" size="100%-280 100%-48 100%-154 100%-20">
+		<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
 			Cancel
-			<action on="Press"><![CDATA[
-				Engine.PopGuiPage();
-			]]></action>
+			<action on="Press">Engine.PopGuiPage();</action>
 		</object>
 
-		<object type="button" style="StoneButton" size="100%-146 100%-48 100%-20 100%-20">
+		<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
                         OK
-			<action on="Press"><![CDATA[
-				returnAI();
-			]]></action>
+			<action on="Press">returnAI();</action>
 		</object>
 
 	</object>
diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml
index 0ad4d661be..2651364d12 100644
--- a/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -10,9 +10,9 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="StonePanelLight" size="50%-466 50%-316 50%+466 50%+316">
+	<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
 
-		<object style="StoneDialogTitleBar" type="text" size="50%-128 -16 50%+128 16">Civilizations</object>
+		<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">Civilizations</object>
 
 		<!-- Civ selection -->
 		<object size="25 10 100% 30">
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index 75f3456e1c..6049dc7b51 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -312,15 +312,15 @@
 		/>
 	</sprite>
 
-	<!-- StonePanel -->
+<!--	 StonePanel
 	<sprite name="StonePanel">
-		<!-- background -->
+		 background
 		<image	texture="global/tile/stone_background.png"
 			texture_size="0 0 512 512"
 			size="4 4 100%-4 100%-4"
 		/>
 
-		<!-- sides -->
+		 sides
 		<image	texture="global/border/border-top.png"
 			texture_size="0 0 128 16"
 			size="16 0 100%-16 16"
@@ -338,7 +338,7 @@
 			size="0 16 16 100%-16"
 		/>
 
-		<!-- corners -->
+		 corners
 		<image	texture="global/border/border-corner.png"
 			texture_size="0 0 16 16"
 			size="100%-16 0 100% 16"
@@ -355,10 +355,10 @@
 			texture_size="0 0 16 16"
 			size="0 0 16 16"
 		/>
-	</sprite>
+	</sprite>-->
 
-	<!-- StonePanelLight -->
-	<sprite name="StonePanelLight">
+	<!-- StoneWindow -->
+	<sprite name="StoneWindow">
 		<!-- background -->
 		<image	texture="global/tile/stone_background_light.png"
 			texture_size="0 0 512 512"
@@ -443,10 +443,126 @@
 			texture_size="0 0 16 16"
 			size="0 0 16 16"
 		/>
+
+		<!-- title frame -->
+		<image	texture="global/titlebar/titlebar_left.png"
+			real_texture_placement="0 0 64 32"
+			size="50%-128 36 50%-64 4"
+		/>
+                <image 	texture="global/titlebar/titlebar_middle.png"
+			real_texture_placement="0 0 64 32"
+			size="50%-64 36 50%+64 4"
+		/>
+                <image 	texture="global/titlebar/titlebar_right.png"
+			real_texture_placement="0 0 64 32"
+			size="50%+64 36 50%+128 4"
+		/>
+	</sprite>
+
+	<!-- StoneDialog -->
+	<sprite name="StoneDialog">
+		<!-- background -->
+		<image	texture="global/tile/stone_background_light.png"
+			texture_size="0 0 512 512"
+			size="4 4 100%-4 100%-4"
+		/>
+
+                <!-- shading -->
+		<image
+			texture="global/shading/gradient_wide.png"
+			size="0 0 100% 100%"
+		/>
+
+                <!-- thin sides -->
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="20 16 100%-20 20"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="100%-20 20 100%-16 100%-20"
+		/>
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="20 100%-20 100%-20 100%-16"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="16 20 20 100%-20"
+		/>
+
+		<!-- thin corners -->
+		<image
+			texture="global/border/line_corner_top_right.png"
+			texture_size="0 0 4 4"
+			size="100%-20 16 100%-16 20"
+		/>
+		<image	texture="global/border/line_corner_bottom_right.png"
+			texture_size="0 0 4 4"
+			size="100%-20 100%-20 100%-16 100%-16"
+		/>
+		<image	texture="global/border/line_corner_bottom_left.png"
+			texture_size="0 0 4 4"
+			size="16 100%-20 20 100%-16"
+		/>
+		<image	texture="global/border/line_corner_top_left.png"
+			texture_size="0 0 4 4"
+			size="16 16 20 20"
+		/>
+
+		<!-- sides -->
+		<image	texture="global/border/border-top.png"
+			texture_size="0 0 128 16"
+			size="16 0 100%-16 16"
+		/>
+		<image	texture="global/border/border-right.png"
+			texture_size="0 0 16 128"
+			size="100%-16 16 100% 100%-16"
+		/>
+		<image	texture="global/border/border-bottom.png"
+			texture_size="0 0 128 16"
+			size="16 100%-16 100%-16 100%"
+		/>
+		<image	texture="global/border/border-left.png"
+			texture_size="0 0 16 128"
+			size="0 16 16 100%-16"
+		/>
+
+		<!-- corners -->
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="100%-16 0 100% 16"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="100%-16 100%-16 100% 100%"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="0 100%-16 16 100%"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="0 0 16 16"
+		/>
+
+		<!-- title frame -->
+		<image	texture="global/titlebar/titlebar_left.png"
+			real_texture_placement="0 0 64 32"
+			size="50%-128 0%-16 50%-64 16"
+		/>
+                <image 	texture="global/titlebar/titlebar_middle.png"
+			real_texture_placement="0 0 64 32"
+			size="50%-64 0%-16 50%+64 16"
+		/>
+                <image 	texture="global/titlebar/titlebar_right.png"
+			real_texture_placement="0 0 64 32"
+			size="50%+64 0%-16 50%+128 16"
+		/>
 	</sprite>
 
 	<!-- Stone Dialog Title Bar -->
-	<sprite name="StoneDialogTitleBar">
+<!--	<sprite name="StoneDialogTitleBar">
 		<image	texture="global/titlebar/titlebar_left.png"
 			real_texture_placement="0 0 64 32"
 			size="50%-128 0 50%-64 32"
@@ -459,7 +575,7 @@
 			real_texture_placement="0 0 64 32"
 			size="50%+64 0 50%+128 32"
 		/>
-	</sprite>
+	</sprite>-->
 
 	<!--
 	==========================================
diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
index 1cb6b2f797..ed3daac4ec 100644
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -87,7 +87,14 @@
 		text_valign="center"
 	/>
 
-       <style name="MediumTitleText"
+	<style name="LargeTitleText"
+		font="serif-bold-24"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="MediumTitleText"
 		font="serif-bold-12"
 		textcolor="white"
 		text_align="center"
@@ -103,8 +110,6 @@
 
 
 
-
-
 	<!--
 	==========================================
 	MENU TOOLTIP STYLES
@@ -172,22 +177,26 @@
 		text_valign="top"
 	/>
 
-	<style 	name="StonePanelLight"
-		sprite="StonePanelLight"
+	<style 	name="StoneWindow"
+		sprite="StoneWindow"
 		buffer_zone="10"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<style 	name="StoneDialogTitleBar"
-		sprite="StoneDialogTitleBar"
+	<style 	name="StoneDialog"
+		sprite="StoneDialog"
 		buffer_zone="10"
-		font="serif-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
+		text_align="left"
 		text_valign="top"
 	/>
 
+
+
+
+
+
+
 	<!--
 	==========================================
 	MENU CONTROL ELEMENT STYLES
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 72243185c3..40caa1d749 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -115,13 +115,13 @@ function initMain()
 
 		initMapNameList();
 
-		var numPlayersSelect = getGUIObjectByName("numPlayersSelection");
+		var numPlayersSelection = getGUIObjectByName("numPlayersSelection");
 		var players = [];
 		for (var i = 1; i <= MAX_PLAYERS; ++i)
 			players.push(i);
-		numPlayersSelect.list = players;
-		numPlayersSelect.list_data = players;
-		numPlayersSelect.selected = MAX_PLAYERS - 1;
+		numPlayersSelection.list = players;
+		numPlayersSelection.list_data = players;
+		numPlayersSelection.selected = MAX_PLAYERS - 1;
 
 		var victoryConditions = getGUIObjectByName("victoryCondition");
 		victoryConditions.list = VICTORY_TEXT;
@@ -193,7 +193,7 @@ function initMain()
 			getGUIObjectByName("playerTeam["+i+"]").hidden = true;
 		}
 
-		getGUIObjectByName("numPlayersBox").hidden = true;
+		getGUIObjectByName("numPlayersSelection").hidden = true;
 
 		// Disable "start game" button
 		// TODO: Perhaps replace this with a "ready" button, and require host to wait?
@@ -761,15 +761,17 @@ function onGameAttributesChange()
 	}
 
 	// Controls common to all map types
+	var numPlayersSelection = getGUIObjectByName("numPlayersSelection");
 	var revealMap = getGUIObjectByName("revealMap");
 	var victoryCondition = getGUIObjectByName("victoryCondition");
 	var lockTeams = getGUIObjectByName("lockTeams");
 	var mapSize = getGUIObjectByName("mapSize");
+
+	var numPlayersText= getGUIObjectByName("numPlayersText");
+	var mapSizeText = getGUIObjectByName("mapSizeText");
 	var revealMapText = getGUIObjectByName("revealMapText");
 	var victoryConditionText = getGUIObjectByName("victoryConditionText");
 	var lockTeamsText = getGUIObjectByName("lockTeamsText");
-	var mapSizeText = getGUIObjectByName("mapSizeText");
-	var numPlayersBox = getGUIObjectByName("numPlayersBox");
 
 	var sizeIdx = (g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes.default);
 	var victoryIdx = (VICTORY_DATA.indexOf(mapSettings.GameType) != -1 ? VICTORY_DATA.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);
@@ -780,13 +782,19 @@ function onGameAttributesChange()
 	case "random":
 		if (g_IsController)
 		{	//Host
-			getGUIObjectByName("numPlayersSelection").selected = numPlayers - 1;
-			numPlayersBox.hidden = false;
+			numPlayersSelection.selected = numPlayers - 1;
+			numPlayersSelection.hidden = false;
 			mapSize.hidden = false;
 			revealMap.hidden = false;
 			victoryCondition.hidden = false;
 			lockTeams.hidden = false;
 
+			numPlayersText.hidden = true;
+			mapSizeText.hidden = true;
+			revealMapText.hidden = true;
+			victoryConditionText.hidden = true;
+			lockTeamsText.hidden = true;
+
 			mapSizeText.caption = "Map size:";
 			mapSize.selected = sizeIdx;
 			revealMapText.caption = "Reveal map:";
@@ -798,7 +806,14 @@ function onGameAttributesChange()
 			lockTeams.checked =  (mapSettings.LockTeams === undefined || mapSettings.LockTeams ? true : false);
 		}
 		else
-		{	// Client
+		{
+			// Client
+			numPlayersText.hidden = true;
+			mapSizeText.hidden = true;
+			revealMapText.hidden = true;
+			victoryConditionText.hidden = true;
+			lockTeamsText.hidden = true;
+
 			mapSizeText.caption = "Map size: " + g_MapSizes.names[sizeIdx];
 			revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
 			victoryConditionText.caption = "Victory condition: " + VICTORY_TEXT[victoryIdx];
@@ -809,16 +824,23 @@ function onGameAttributesChange()
 
 	case "scenario":
 		// For scenario just reflect settings for the current map
-		numPlayersBox.hidden = true;
+		numPlayersSelection.hidden = true;
 		mapSize.hidden = true;
 		revealMap.hidden = true;
 		victoryCondition.hidden = true;
 		lockTeams.hidden = true;
 
-		mapSizeText.caption = "Map size: Default";
-		revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
-		victoryConditionText.caption = "Victory condition: " + VICTORY_TEXT[victoryIdx];
-		lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams === undefined || mapSettings.LockTeams  ? "Yes" : "No");
+		numPlayersText.hidden = false;
+		mapSizeText.hidden = false;
+		revealMapText.hidden = false;
+		victoryConditionText.hidden = false;
+		lockTeamsText.hidden = false;
+
+		numPlayersText.caption = numPlayers;
+		mapSizeText.caption = "Default";
+		revealMapText.caption = (mapSettings.RevealMap ? "Yes" : "No");
+		victoryConditionText.caption = VICTORY_TEXT[victoryIdx];
+		lockTeamsText.caption = (mapSettings.LockTeams === undefined || mapSettings.LockTeams  ? "Yes" : "No");
 
 		break;
 
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index df0898cb5e..4cf71619f7 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -9,11 +9,11 @@
 	<script file="gui/gamesetup/gamesetup.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" sprite="BackgroundBlack"/>
+	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-	<object type="image" style="StonePanelLight" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
+	<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
 
-		<object type="text" style="StoneDialogTitleBar" size="50%-128 0%-16 50%+128 16">
+		<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
 			Loading
 		</object>
 
@@ -23,18 +23,18 @@
 
 	</object>
 
-	<object type="image" style="StonePanelLight" size="24 24 100%-24 100%-24" hidden="true" name="setupWindow">
+	<object type="image" style="StoneWindow" size="0 0 100% 100%" hidden="true" name="setupWindow">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
-		<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
+		<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
 			Match Setup
 		</object>
 
 		<!-- Map selection -->
-		<object size="20 64 300 100%-20">
+		<object size="24 64 300 100%-24">
 
 			<object size="0 0 100%-180 100%">
 				<object name="mapTypeHeading" type="text" style="RightLabelText" size="0 0 100% 28">Match Type:</object>
@@ -76,27 +76,15 @@
 		</object>
 
 		<!-- Player assignments -->
-		<object name="numPlayersBox" size="320 28 100% 58" hidden="true">
-			<object name="numPlayersSelectionHeading" type="text" style="LeftLabelText" size="160 0 100% 32">Number of Players</object>
-			<object name="numPlayersSelection"
-				type="dropdown"
-				style="StoneDropDown"
-				size="100 0 150 30"
-				tooltip_style="onscreenToolTip"
-				tooltip="Select number of players.">
-				<action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action>
-			</object>
-		</object>
-
-		<object size="320 64 100%-20 100%-260" type="image" sprite="BackgroundIndentFillDark">
+		<object size="320 64 100%-24 50%+120" type="image" sprite="BackgroundIndentFillDark">
 			<object size="0 6 100% 30">
 				<object name="playerNameHeading" type="text" style="CenteredLabelText" size="100 0 250 100%">Player Name</object>
-				<object name="playerCivHeading" type="text" style="CenteredLabelText" size="250 0 400 100%">Civilization</object>
+				<object name="playerCivHeading" type="text" style="CenteredLabelText" size="285 0 415 100%">Civilization</object>
 				<object name="civInfoButton"
 					type="button"
 					sprite="iconInfo"
 					sprite_over="iconInfoOver"
-					size="375 0 391 16"
+					size="395 0 411 16"
 					tooltip_style="onscreenToolTip"
 					tooltip="View civilization info"
 				>
@@ -104,22 +92,22 @@
 						Engine.PushGuiPage("page_civinfo.xml");
 					]]></action>
 				</object>
-				<object name="playerTeamHeading" type="text" style="CenteredLabelText" size="400 0 500 100%">Team</object>
+				<object name="playerTeamHeading" type="text" style="CenteredLabelText" size="420 0 520 100%">Team</object>
 			</object>
 			<object size="1 36 100%-1 100%">
 				<repeat count="8">
-					<object name="playerBox[n]" size="0 0 100% 30" hidden="true">
+					<object name="playerBox[n]" size="0 0 100% 32" hidden="true">
 						<object name="playerColour[n]" type="image" size="0 0 100% 100%"/>
-						<object name="playerName[n]" type="text" style="RightLabelText" size="0 0 100 100%"/>
+						<object name="playerName[n]" type="text" style="RightLabelText" size="0 2 100 30"/>
 						<object name="playerAssignment[n]" type="dropdown" style="StoneDropDown" size="100 2 250 30" tooltip_style="onscreenToolTip" tooltip="Select player"/>
-						<object name="playerConfig[n]" type="button" style="StoneButton" size="251 6 264 24"
+						<object name="playerConfig[n]" type="button" style="StoneButton" size="255 6 280 26"
 							tooltip_style="onscreenToolTip"
 							tooltip="Configure AI settings"
-						>c</object>
-						<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="265 2 395 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's civilization"/>
-						<object name="playerCivText[n]" type="text" style="CenteredLabelText" size="265 0 395 100%"/>
-						<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="415 2 485 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's team"/>
-						<object name="playerTeamText[n]" type="text" text_align="center" text_valign="center" size="415 0 485 100%"/>
+						>C</object>
+						<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="285 2 415 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization"/>
+						<object name="playerCivText[n]" type="text" style="CenteredLabelText" size="285 0 415 30"/>
+						<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="435 2 505 30" tooltip_style="onscreenToolTip" tooltip="Select player's team"/>
+						<object name="playerTeamText[n]" type="text" text_align="center" text_valign="center" size="435 0 505 100%"/>
 					</object>
 				</repeat>
 			</object>
@@ -127,24 +115,79 @@
 
 
 		<!-- Options -->
-		<object name="gameOptionsBox" size="320 100%-260 100% 100%-190">
-			<object size="2 2 100% 50%-2">	<!-- Top row -->
-				<object name="mapSizeText" size="0 0 175 100%" type="text" style="LeftLabelText">Map size:</object>
-				<object name="mapSize" size="75 -2 225 100%-6" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size (larger may reduce performance)"/>
-				<object name="victoryConditionText" size="245 0 500 100%" type="text" style="LeftLabelText">Victory condition:</object>
-				<object name="victoryCondition" size="375 -2 500 100%-6" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition"/>
+		<object name="gameOptionsBox" size="320 50%+124 100%-24 50%+220">
+
+			<!-- First Column -->
+			<object size="0 0 25% 100%">
+
+				<!-- Number of Players-->
+				<object size="0 0 100% 32">
+					<object size="0 0 100% 100%" type="text" style="RightLabelText">Number of Players:</object>
+				</object>
+
+				<object size="0 32 100% 64">
+					<object size="0 0 100% 100%" type="text" style="RightLabelText">Map size:</object>
+				</object>
+
+				<object size="0 64 100% 96">
+					<object size="0 0 100% 100%" type="text" style="RightLabelText">Victory condition:</object>
+				</object>
+
 			</object>
-			<object size="2 50%+2 100% 100%"> 	<!-- Bottom row -->
-				<object name="revealMapText" size="0 0 120 100%" type="text" style="LeftLabelText">Reveal map:</object>
-				<object name="revealMap" size="120 2 140 100%" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map"/>
-				<object name="lockTeamsText" size="245 0 400 100%" type="text" style="LeftLabelText">Teams locked:</object>
-				<object name="lockTeams" size="400 2 420 100%" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams"/>
+
+			<!-- Second Column -->
+			<object size="25% 0 52% 100%">
+
+				<!-- Number of Players-->
+				<object size="0 0 100% 32">
+				<object name="numPlayersText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="numPlayersSelection"
+						type="dropdown"
+						style="StoneDropDown"
+						size="0 2 100% 30"
+						tooltip_style="onscreenToolTip"
+						tooltip="Select number of players.">
+						<action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action>
+					</object>
+				</object>
+
+				<object size="0 32 100% 64">
+					<object name="mapSizeText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="mapSize" size="0 2 100% 30" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size (larger may reduce performance)"/>
+				</object>
+
+			    	<object size="0 64 100% 96">
+					<object name="victoryConditionText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="victoryCondition" size="0 2 100% 30" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition"/>
+				</object>
+			</object>
+
+			<!-- Third Column -->
+			<object size="52% 0 70% 100%">
+				<object size="0 0 100% 32">
+					<object size="0 0 100% 100%" type="text" style="RightLabelText">Reveal map:</object>
+				</object>
+				<object size="0 32 100% 64">
+					<object size="0 0 100% 100%" type="text" style="RightLabelText">Teams locked:</object>
+				</object>
+			</object>
+
+			<!-- Fourth Column -->
+			<object size="70% 0 100% 100%">
+				<object size="0 0 100% 32">
+					<object name="revealMapText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="revealMap" size="0 50%-8 16 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map"/>
+				</object>
+				<object size="0 32 100% 64">
+					<object name="lockTeamsText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="lockTeams" size="0 50%-8 16 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams"/>
+				</object>
 			</object>
 		</object>
 
 
 		<!-- Chat window -->
-		<object name="chatPanel" size="320 100%-190 100%-20 100%-64" type="image" sprite="BackgroundIndentFillDark">
+		<object name="chatPanel" size="320 50%+224 100%-24 100%-58" type="image" sprite="BackgroundIndentFillDark">
 
 			<object name="chatText" size="3 1 100%-1 100%-25" type="text" style="chatPanel"/>
 
@@ -178,7 +221,8 @@
 			size="100%-308 100%-52 100%-168 100%-24"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to start a new game with the current settings."
-		>Start game!
+		>
+			Start game!
 			<action on="Press">launchGame();</action>
 		</object>
 
@@ -190,7 +234,8 @@
                         size="100%-164 100%-52 100%-24 100%-24"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to return to the main menu."
-		>Main Menu
+		>
+			Main Menu
 			<action on="Press">
 				<![CDATA[
 					cancelSetup();
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
index 11591c84ce..9a3f90bea4 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
@@ -9,18 +9,18 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="StonePanelLight" size="50%-190 50%-120 50%+190 50%+120">
+	<object type="image" style="StoneDialog" size="50%-190 50%-120 50%+190 50%+120">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
-		<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
+		<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
 			Multiplayer
 		</object>
-                
+
                 <object name="pageJoin" size="0 32 100% 100%" hidden="true">
-		
+
 			<object type="text" style="CenteredLabelText" size="0 0 400 30">
 				Joining an existing game.
 			</object>
@@ -43,7 +43,7 @@
 				127.0.0.1
 			</object>3 100%-33 103 100%-3
 
-			<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton"> 
+			<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
 				Continue
 				<action on="Press"><![CDATA[
 					if (startJoin(
diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml
index 73be385aef..7ad8c38ab8 100644
--- a/binaries/data/mods/public/gui/loading/loading.xml
+++ b/binaries/data/mods/public/gui/loading/loading.xml
@@ -10,46 +10,42 @@
 	<script file="gui/loading/loading.js"/>
 	<script file="gui/common/functions_utility_error.js"/>
 
-	<!-- LOADING SCREEN BACKGROUND -->
-	<object type="image" style="StonePanelLight"/>
+	<object type="image" style="StoneWindow">
 
-	<object size="50%-400 30 50%+400 150">
-		<object name="loadingMapName" size="0 0 100% 32" type="text" style="loadingPageTitleText"/>
-
-		<!-- LOADING SCREEN progressbar -->
-		<object size="50%-256 48 50%+256 80" type="image" sprite="loadingProgressBarBackground">
+		<!-- LOADING SCREEN progress bar -->
+		<object size="50%-256 4 50%+256 36" type="image" sprite="LoadingProgressBarBackground">
 			<object name="progressbar"
 				type="progressbar"
-				style="loadingProgressbar"
+				style="LoadingProgressbar"
 				size="56 5 456 100%-5"
 			>
-				<object name="progressbar_left" size="-8 0 8 100%" type="image" sprite="loadingProgressbar_left"/>
-				<object name="progressbar_right" size="8 0 24 100%" type="image" sprite="loadingProgressbar_right"/>
+				<object name="progressbar_left" size="-8 0 8 100%" type="image" sprite="LoadingProgressBarLeft"/>
+				<object name="progressbar_right" size="8 0 24 100%" type="image" sprite="LoadingProgressBarRight"/>
 				<action on="Progress">displayProgress();</action>
+				<object name="progressText" size="0 0 100% 100%" type="text" style="LoadingBarText"/>
 			</object>
 		</object>
 
 		<!-- LOADING SCREEN TEXT -->
-		<object name="progressText" size="0 64 100% 100%" type="text" style="loadingBarText"/>
-	</object>
+		<object name="loadingMapName" size="50%-256 36 50%+256 50%-196" type="text" style="LargeTitleText"/>
+`
+		<!-- LOADING SCREEN TIP IMAGE-->
+		<object size="50%-452 50%-196 50%+68 50%+196" type="image" sprite="LoadingTipImage">
+			<object name="tipImage" size="4 4 516 516" type="image">
+				<object name="tipImageCover" size="0 0 100% 100%" type="image" sprite="LoadingTipImageCover"/>
+			</object>
+		</object>
 
-	<!-- LOADING SCREEN TIP IMAGE-->
-	<object size="50%-452 50%-196 50%+68 50%+196" type="image" sprite="loadingTipImage">
-		<object name="tipImage" size="4 4 516 516" type="image">
-			<object name="tipImageCover" size="0 0 100% 100%" type="image" sprite="loadingTipImageCover"/>
+		<!-- LOADING SCREEN TIP TEXT-->
+		<object size="50%+128 50%-193 50%+448 50%+193" type="image" sprite="LoadingTipText">
+			<object name="tipTitle" size="30 30 100% 50" type="text" style="LoadingTipTitleText"/>
+			<object name="tipText" size="30 50 100%-30 100%" type="text" style="LoadingTipText"/>
+		</object>
+
+		<!-- LOADING SCREEN QUOTE (needs increased z value to overcome the transparent area of the tip image above it -->
+		<object size="50%-448 50%+230 50%+448 100%-16" z="20">
+			<object name="quoteTitleText" size="0 0 100% 30" type="text" style="LoadingTitleText">Quote of the Day:</object>
+			<object name="quoteText" size="0 30 100% 100%" type="text" style="LoadingText"></object>
 		</object>
 	</object>
-
-	<!-- LOADING SCREEN TIP TEXT-->
-	<object size="50%+128 50%-193 50%+448 50%+193" type="image" sprite="loadingTipText">
-		<object name="tipTitle" size="30 30 100% 50" type="text" style="loadingTipTitleText"/>
-		<object name="tipText" size="30 50 100%-30 100%" type="text" style="loadingTipText"/>
-	</object>
-
-	<!-- LOADING SCREEN QUOTE (needs increased z value to overcome the transparent area of the tip image above it -->
-	<object size="50%-448 50%+230 50%+448 100%-16" z="20">
-		<object name="quoteTitleText" size="0 0 100% 30" type="text" style="loadingTitleText">Quote of the Day:</object>
-		<object name="quoteText" size="0 30 100% 100%" type="text" style="loadingText"></object>
-	</object>
-
 </objects>
diff --git a/binaries/data/mods/public/gui/loading/sprites.xml b/binaries/data/mods/public/gui/loading/sprites.xml
index 0e5cccff97..6a235719f8 100644
--- a/binaries/data/mods/public/gui/loading/sprites.xml
+++ b/binaries/data/mods/public/gui/loading/sprites.xml
@@ -1,63 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sprites>
-
-	<!-- BACKGROUND -->
-	<sprite name="loadingBackground">
-		<!-- background -->
+	<!-- PROGRESS BAR BACKGROUND-->
+	<sprite name="LoadingProgressBarBackground">
 		<image
-			texture="global/tile/stone_background_light.png"
-			texture_size="0 0 512 512"
-			size="0 0 100% 100%"
+			texture="loading/progressbar/progressbar_background_left.png"
+			size="0%+0 32 64 0"
 		/>
-
-		<!-- sides -->
-		<image
-			texture="global/border/border-top.png"
-			texture_size="0 0 128 16"
-			size="16 0 100%-16 16"
+        <image
+			texture="loading/progressbar/progressbar_background_middle.png"
+			size="64 32 100%-64 0"
 		/>
-		<image
-			texture="global/border/border-right.png"
-			texture_size="0 0 16 128"
-			size="100%-16 16 100% 100%-16"
-		/>
-		<image
-			texture="global/border/border-bottom.png"
-			texture_size="0 0 128 16"
-			size="16 100%-16 100%-16 100%"
-		/>
-		<image
-			texture="global/border/border-left.png"
-			texture_size="0 0 16 128"
-			size="0 16 16 100%-16"
-		/>
-
-		<!-- corners -->
-		<image
-			texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 0 100% 16"
-		/>
-		<image
-			texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 100%-16 100% 100%"
-		/>
-		<image
-			texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 100%-16 16 100%"
-		/>
-		<image
-			texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 0 16 16"
+        <image
+			texture="loading/progressbar/progressbar_background_right.png"
+			size="100%-64 32 100%+0 0"
 		/>
 	</sprite>
-
-	<!-- PROGRESS BAR BACKGROUND-->
-	<sprite name="loadingProgressBarBackground">
+<!--	<sprite name="LoadingProgressBarBackground">
 		<image
 			texture="loading/progressbar/progressbar_background_left.png"
 			size="0%+0 0% 64 0%+32"
@@ -70,33 +29,54 @@
 			texture="loading/progressbar/progressbar_background_right.png"
 			size="100%-64 0% 100%+0 0%+32"
 		/>
-	</sprite>
+	</sprite>-->
 
 	<!-- PROGRESS BAR -->
-	<sprite name="loadingProgressbar_left">
+	<sprite name="LoadingProgressBarLeft">
+		<image
+			texture="loading/progressbar/progressbar_left.png"
+			real_texture_placement="16 6 32 26"
+			size="0 100% 100% 0"
+		/>
+	</sprite>
+	<sprite name="LoadingProgressBarMiddle">
+		<image
+			texture="loading/progressbar/progressbar_middle.png"
+			real_texture_placement="0 6 1 26"
+			size="0 100% 100% 0"
+		/>
+	</sprite>
+	<sprite name="LoadingProgressBarRight">
+		<image
+			texture="loading/progressbar/progressbar_right.png"
+			real_texture_placement="0 6 16 26"
+			size="0 100% 100% 0"
+		/>
+	</sprite>
+<!--	<sprite name="LoadingProgressBarLeft">
 		<image
 			texture="loading/progressbar/progressbar_left.png"
 			real_texture_placement="16 6 32 26"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	<sprite name="loadingProgressbar_middle">
+	<sprite name="LoadingProgressBarMiddle">
 		<image
 			texture="loading/progressbar/progressbar_middle.png"
 			real_texture_placement="0 6 1 26"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	<sprite name="loadingProgressbar_right">
+	<sprite name="LoadingProgressBarRight">
 		<image
 			texture="loading/progressbar/progressbar_right.png"
 			real_texture_placement="0 6 16 26"
 			size="0 0 100% 100%"
 		/>
-	</sprite>
+	</sprite>-->
 
 	<!-- TIP IMAGE-->
-	<sprite name="loadingTipImage">
+	<sprite name="LoadingTipImage">
 		<!-- sides -->
 		<image
 			texture="global/border/line_horiz.png"
@@ -143,7 +123,7 @@
 	</sprite>
 
 	<!-- TIP IMAGE GRADIENT -->
-	<sprite name="loadingTipImageCover">
+	<sprite name="LoadingTipImageCover">
 		<image
 			texture="loading/gradient_tips.png"
 			texture_size="0 0 100% 100%"
@@ -152,7 +132,7 @@
 	</sprite>
 
 	<!-- TIP TEXT -->
-	<sprite name="loadingTipText">
+	<sprite name="LoadingTipText">
 		<image
 			texture="loading/parchment.png"
 			real_texture_placement="0 0 322 386"
diff --git a/binaries/data/mods/public/gui/loading/styles.xml b/binaries/data/mods/public/gui/loading/styles.xml
index 4f29128ed3..edf9ce85f3 100644
--- a/binaries/data/mods/public/gui/loading/styles.xml
+++ b/binaries/data/mods/public/gui/loading/styles.xml
@@ -2,50 +2,50 @@
 
 <styles>
 
-	<style name="loadingPageTitleText"
+	<style name="LoadingPageTitleText"
 		font="serif-bold-18"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
 	/>
 
-	<style name="loadingBarText"
+	<style name="LoadingBarText"
 		font="serif-bold-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
 	/>
 
-	<style name="loadingTitleText"
+	<style name="LoadingTitleText"
 		font="serif-bold-18"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<style name="loadingText"
+	<style name="LoadingText"
 		font="serif-bold-stroke-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<style name="loadingTipTitleText"
+	<style name="LoadingTipTitleText"
 		font="serif-bold-16"
 		textcolor="black"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<style name="loadingTipText"
+	<style name="LoadingTipText"
 		font="serif-bold-14"
 		textcolor="black"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<style name="loadingProgressbar"
-		sprite_bar="loadingProgressbar_middle"
+	<style name="LoadingProgressbar"
+		sprite_bar="LoadingProgressBarMiddle"
 		ghost="true"
 		tooltip_style="snToolTip"
 		tooltip="(TBA)"
diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml
index 048f7d0029..60deb95c0a 100644
--- a/binaries/data/mods/public/gui/manual/manual.xml
+++ b/binaries/data/mods/public/gui/manual/manual.xml
@@ -7,7 +7,8 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" style="TranslucentPanel"/>
 
-	<object type="image" style="StonePanelLight" size="50%-466 50%-316 50%+466 50%+316">
+	<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
+	<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">Manual</object>
 
 		<object type="image" sprite="BackgroundTranslucent" size="20 20 100%-20 100%-58">
 			<object name="mainText" type="text" style="textPanel"/>
diff --git a/binaries/data/mods/public/gui/msgbox/msgbox.xml b/binaries/data/mods/public/gui/msgbox/msgbox.xml
index 5487346d84..10e9aaa2b0 100644
--- a/binaries/data/mods/public/gui/msgbox/msgbox.xml
+++ b/binaries/data/mods/public/gui/msgbox/msgbox.xml
@@ -87,12 +87,12 @@
 	]]></script>
 	<object>
 		<object name="mbMain"
-			style="StonePanelLight"
+			style="StoneDialog"
 			type="image"
 		>
 
 			<object name="mbTitleBar"
-				style="StoneDialogTitleBar"
+				style="TitleText"
 				type="text"
                                 size="50%-128 0%-16 50%+128 16"
 			/>
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 9809e57f4c..6d8f3d9e5f 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -199,14 +199,12 @@
 		<!-- Settings Window -->
 		<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
-			style="StonePanelLight"
+			style="StoneDialog"
 			type="image"
 			size="50%-180 50%-200 50%+180 50%+50"
 			hidden="true"
 		>
-			<object name="sessionDialogTitleBar" size="50%-96 -16 50%+96 16" type="image" style="StoneDialogTitleBar">
-				<object name="sessionDialogTitle" type="text" style="TitleText" size="0 -2 100% 100%">Settings</object>
-			</object>
+			<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
 
 			<object style="TranslucentPanelThinBorder"
 				type="image"
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index d8c7db66e9..fdb896c490 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -9,181 +9,178 @@
 <objects>
 	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/summary/summary.js"/>
-	<object type="image" sprite="BackgroundBlack">
 
-		<object type="image"
-			style="StonePanelLight"
-			size="24 24 100%-24 100%-24"
-		>
-			<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
-				Summary
-			</object>
+	    <object type="image"
+		    style="StoneWindow"
+		    size="0 0 100% 100%"
+	    >
+		    <object style="TitleText" type="text" size="50%-128 4 50%+128 36">
+			    Summary
+		    </object>
 
-			<object type="image" sprite="ForegroundBody" size="20 20 100%-20 50">
-				<object
-					name="summaryText"
-					type="text"
-					size="50 0 100%-50 30"
-					font="serif-bold-18"
-					textcolor="255 255 255"
-					text_align="center"
-				/>
+		    <object type="image" sprite="ForegroundBody" size="20 20 100%-20 64">
+			    <object name="summaryText"
+				    type="text"
+				    size="50 8 100%-50 100%-8"
+				    font="serif-bold-18"
+				    textcolor="255 255 255"
+				    text_align="center"
+				    text_valign="bottom"
+			    />
 
-				<object
-					name="timeElapsed"
-					type="text"
-					size="100%-200 0 100%-10 30"
-					font="serif-16"
-					textcolor="255 255 255"
-					text_align="center"
-				/>
- 			</object>
+			    <object name="timeElapsed"
+				    type="text"
+				    size="100%-200 8 100%-10 100%-8"
+				    font="serif-16"
+				    textcolor="255 255 255"
+				    text_align="center"
+				    text_valign="bottom"
+			    />
+		    </object>
 
-			<object name="tabDividerLeft" type="image" sprite="TabSpacer" size="172 100 174 102"/>
-			<object name="tabDividerRight" type="image" sprite="TabSpacer" size="328 100 330 102"/>
+		    <object name="tabDividerLeft" type="image" sprite="TabSpacer" size="172 120 174 122"/>
+		    <object name="tabDividerRight" type="image" sprite="TabSpacer" size="328 120 330 122"/>
 
-			<object name="unitsBuildingsPanelButton" type="button" sprite="ForegroundTab" size="20 75 170 100">
-				<action on="Press">selectPanel(0);</action>
-				<object type="text" style="TitleText" ghost="true">Units/buildings</object>
-			</object>
+		    <object name="unitsBuildingsPanelButton" type="button" sprite="ForegroundTab" size="20 95 170 120">
+			    <action on="Press">selectPanel(0);</action>
+			    <object type="text" style="TitleText" ghost="true">Units/buildings</object>
+		    </object>
 
-			<object name="conquestPanelButton" type="button" sprite="BackgroundTab" size="176 75 326 100">
-				<action on="Press">selectPanel(1);</action>
-				<object type="text" style="TitleText" ghost="true">Conquest</object>
-			</object>
+		    <object name="conquestPanelButton" type="button" sprite="BackgroundTab" size="176 95 326 120">
+			    <action on="Press">selectPanel(1);</action>
+			    <object type="text" style="TitleText" ghost="true">Conquest</object>
+		    </object>
 
-			<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="332 75 480 100">
-				<action on="Press">selectPanel(2);</action>
-				<object type="text" style="TitleText" ghost="true">Resources</object>
-			</object>
+		    <object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="332 95 480 120">
+			    <action on="Press">selectPanel(2);</action>
+			    <object type="text" style="TitleText" ghost="true">Resources</object>
+		    </object>
 
-			<object name="unitsBuildingsPanel" type="image" sprite="ForegroundBody" size="20 100 100%-20 100%-58">
+		    <object name="unitsBuildingsPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58">
 
-				<object size="0 0 100% 100%-50">
-					<object name="playerName0Heading" type="text" style="LeftTabLabelText">
-						Player name
-					</object>
-					<object name="unitsTrainedHeading" type="text" style="CenteredTabLabelText">
-						Units&#10;trained
-					</object>
-					<object name="unitsLostHeading" type="text" style="CenteredTabLabelText">
-						Units&#10;lost
-					</object>
-					<object name="enemyUnitsKilledHeading" type="text" style="CenteredTabLabelText">
-						Enemy units&#10;killed
-					</object>
-					<object name="buildingsConstructedHeading" type="text" style="CenteredTabLabelText">
-						Buildings&#10;constructed
-					</object>
-					<object name="buildingsLostHeading" type="text" style="CenteredTabLabelText">
-						Buildings&#10;lost
-					</object>
-					<object name="enemyBuildingsDestroyedHeading" type="text" style="CenteredTabLabelText">
-						Enemy&#10;buildings&#10;destroyed
-					</object>
+			    <object size="0 0 100% 100%-50">
+				    <object name="playerName0Heading" type="text" style="LeftTabLabelText">
+					    Player name
+				    </object>
+				    <object name="unitsTrainedHeading" type="text" style="CenteredTabLabelText">
+					    Units&#10;trained
+				    </object>
+				    <object name="unitsLostHeading" type="text" style="CenteredTabLabelText">
+					    Units&#10;lost
+				    </object>
+				    <object name="enemyUnitsKilledHeading" type="text" style="CenteredTabLabelText">
+					    Enemy units&#10;killed
+				    </object>
+				    <object name="buildingsConstructedHeading" type="text" style="CenteredTabLabelText">
+					    Buildings&#10;constructed
+				    </object>
+				    <object name="buildingsLostHeading" type="text" style="CenteredTabLabelText">
+					    Buildings&#10;lost
+				    </object>
+				    <object name="enemyBuildingsDestroyedHeading" type="text" style="CenteredTabLabelText">
+					    Enemy&#10;buildings&#10;destroyed
+				    </object>
 
-				</object>
+			    </object>
 
-				<object size="0 65 100% 100%-50">
-					<repeat count="8">
-						<object type="image" name="playerBox0[n]" size="10 0 10 30" hidden="true">
-							<object name="playerColourBox0[n]"     		type="image" size="10 4 30 24" />
-							<object name="playerName0[n]"          		type="text" style="LeftLabelText" size="40 2 208 100%" />
-							<object name="civIcon0[n]" 			type="image" size="208 0 240 32"/>
-							<object name="unitsTrained[n]"         		type="text" style="CenteredLabelText"/>
-							<object name="unitsLost[n]"            		type="text" style="CenteredLabelText"/>
-							<object name="enemyUnitsKilled[n]"     		type="text" style="CenteredLabelText"/>
-							<object name="buildingsConstructed[n]" 		type="text" style="CenteredLabelText"/>
-							<object name="buildingsLost[n]"        		type="text" style="CenteredLabelText"/>
-							<object name="enemyBuildingsDestroyed[n]"   	type="text" style="CenteredLabelText"/>
-						</object>
-					</repeat>
-				</object>
+			    <object size="0 65 100% 100%-50">
+				    <repeat count="8">
+					    <object type="image" name="playerBox0[n]" size="10 0 10 30" hidden="true">
+						    <object name="playerColourBox0[n]"     		type="image" size="10 4 30 24" />
+						    <object name="playerName0[n]"          		type="text" style="LeftLabelText" size="40 2 208 100%" />
+						    <object name="civIcon0[n]" 			type="image" size="208 0 240 32"/>
+						    <object name="unitsTrained[n]"         		type="text" style="CenteredLabelText"/>
+						    <object name="unitsLost[n]"            		type="text" style="CenteredLabelText"/>
+						    <object name="enemyUnitsKilled[n]"     		type="text" style="CenteredLabelText"/>
+						    <object name="buildingsConstructed[n]" 		type="text" style="CenteredLabelText"/>
+						    <object name="buildingsLost[n]"        		type="text" style="CenteredLabelText"/>
+						    <object name="enemyBuildingsDestroyed[n]"   	type="text" style="CenteredLabelText"/>
+					    </object>
+				    </repeat>
+			    </object>
 
-			</object>
-			<object name="conquestPanel" type="image" sprite="ForegroundBody" size="20 100 100%-20 100%-58" hidden="true">
+		    </object>
+		    <object name="conquestPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58" hidden="true">
 
-				<object size="0 0 100% 100%-50">
-					<object name="playerName1Heading" type="text" style="LeftTabLabelText">
-						Player name
-					</object>
-					<object name="civCentresBuiltHeading" type="text" style="CenteredTabLabelText">
-						Civ centres&#10;built
-					</object>
-					<object name="enemyCivCentresDestroyedHeading" type="text" style="CenteredTabLabelText">
-						Enemy&#10;civ centres&#10;destroyed
-					</object>
-					<object name="mapExplorationHeading" type="text" style="CenteredTabLabelText">
-						Map&#10;exploration
-					</object>
-				</object>
+			    <object size="0 0 100% 100%-50">
+				    <object name="playerName1Heading" type="text" style="LeftTabLabelText">
+					    Player name
+				    </object>
+				    <object name="civCentresBuiltHeading" type="text" style="CenteredTabLabelText">
+					    Civ centres&#10;built
+				    </object>
+				    <object name="enemyCivCentresDestroyedHeading" type="text" style="CenteredTabLabelText">
+					    Enemy&#10;civ centres&#10;destroyed
+				    </object>
+				    <object name="mapExplorationHeading" type="text" style="CenteredTabLabelText">
+					    Map&#10;exploration
+				    </object>
+			    </object>
 
-				<object size="0 65 100% 100%-50">
-					<repeat count="8">
-						<object type="image" name="playerBox1[n]" size="10 0 10 30" hidden="true">
-							<object name="playerColourBox1[n]"     		type="image" size="10 4 30 24" />
-							<object name="playerName1[n]"          		type="text"  style="LeftLabelText" size="40 2 208 100%" />
-							<object name="civIcon1[n]" 			type="image" size="208 0 240 32"/>
-							<object name="civCentresBuilt[n]"      		type="text" style="CenteredLabelText"/>
-							<object name="enemyCivCentresDestroyed[n]" 	type="text" style="CenteredLabelText"/>
-							<object name="mapExploration[n]" 		type="text" style="CenteredLabelText"/>
-						</object>
-					</repeat>
-				</object>
+			    <object size="0 65 100% 100%-50">
+				    <repeat count="8">
+					    <object type="image" name="playerBox1[n]" size="10 0 10 30" hidden="true">
+						    <object name="playerColourBox1[n]"     		type="image" size="10 4 30 24" />
+						    <object name="playerName1[n]"          		type="text"  style="LeftLabelText" size="40 2 208 100%" />
+						    <object name="civIcon1[n]" 			type="image" size="208 0 240 32"/>
+						    <object name="civCentresBuilt[n]"      		type="text" style="CenteredLabelText"/>
+						    <object name="enemyCivCentresDestroyed[n]" 	type="text" style="CenteredLabelText"/>
+						    <object name="mapExploration[n]" 		type="text" style="CenteredLabelText"/>
+					    </object>
+				    </repeat>
+			    </object>
 
-			</object>
-			<object name="resourcesPanel" type="image" sprite="ForegroundBody" size="20 100 100%-20 100%-58" hidden="true">
+		    </object>
+		    <object name="resourcesPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58" hidden="true">
 
-				<object size="0 0 100% 100%-50">
-					<object name="playerName2Heading" type="text" style="LeftTabLabelText">
-						Player name
-					</object>
-					<object name="foodGatheredHeading" type="text" style="CenteredTabLabelText">
-						Food&#10;gathered
-					</object>
-					<object name="vegetarianRatioHeading" type="text" style="CenteredTabLabelText">
-						Vegetarian&#10;ratio
-					</object>
-					<object name="woodGatheredHeading" type="text" style="CenteredTabLabelText">
-						Wood&#10;gathered
-					</object>
-					<object name="metalGatheredHeading" type="text" style="CenteredTabLabelText">
-						Metal&#10;gathered
-					</object>
-					<object name="stoneGatheredHeading" type="text" style="CenteredTabLabelText">
-						Stone&#10;gathered
-					</object>
-					<object name="treasuresCollectedHeading" type="text" style="CenteredTabLabelText">
-						Treasures&#10;collected
-					</object>
-				</object>
+			    <object size="0 0 100% 100%-50">
+				    <object name="playerName2Heading" type="text" style="LeftTabLabelText">
+					    Player name
+				    </object>
+				    <object name="foodGatheredHeading" type="text" style="CenteredTabLabelText">
+					    Food&#10;gathered
+				    </object>
+				    <object name="vegetarianRatioHeading" type="text" style="CenteredTabLabelText">
+					    Vegetarian&#10;ratio
+				    </object>
+				    <object name="woodGatheredHeading" type="text" style="CenteredTabLabelText">
+					    Wood&#10;gathered
+				    </object>
+				    <object name="metalGatheredHeading" type="text" style="CenteredTabLabelText">
+					    Metal&#10;gathered
+				    </object>
+				    <object name="stoneGatheredHeading" type="text" style="CenteredTabLabelText">
+					    Stone&#10;gathered
+				    </object>
+				    <object name="treasuresCollectedHeading" type="text" style="CenteredTabLabelText">
+					    Treasures&#10;collected
+				    </object>
+			    </object>
 
-				<object size="0 65 100% 100%-50">
-					<repeat count="8">
-						<object type="image" name="playerBox2[n]" size="10 0 10 30" hidden="true">
-							<object name="playerColourBox2[n]" 		type="image" size="10 4 30 24" />
-							<object name="playerName2[n]"      		type="text"  style="LeftLabelText" size="40 2 208 100%" />
-							<object name="civIcon2[n]" 		   	type="image" size="208 0 240 32"/>
-							<object name="foodGathered[n]"     		type="text" style="CenteredLabelText"/>
-							<object name="vegetarianRatio[n]"  		type="text" style="CenteredLabelText"/>
-							<object name="woodGathered[n]"     		type="text" style="CenteredLabelText"/>
-							<object name="metalGathered[n]"    		type="text" style="CenteredLabelText"/>
-							<object name="stoneGathered[n]"    		type="text" style="CenteredLabelText" />
-							<object name="treasuresCollected[n]"    	type="text" style="CenteredLabelText"/>
-						</object>
-					</repeat>
-				</object>
+			    <object size="0 65 100% 100%-50">
+				    <repeat count="8">
+					    <object type="image" name="playerBox2[n]" size="10 0 10 30" hidden="true">
+						    <object name="playerColourBox2[n]" 		type="image" size="10 4 30 24" />
+						    <object name="playerName2[n]"      		type="text"  style="LeftLabelText" size="40 2 208 100%" />
+						    <object name="civIcon2[n]" 		   	type="image" size="208 0 240 32"/>
+						    <object name="foodGathered[n]"     		type="text" style="CenteredLabelText"/>
+						    <object name="vegetarianRatio[n]"  		type="text" style="CenteredLabelText"/>
+						    <object name="woodGathered[n]"     		type="text" style="CenteredLabelText"/>
+						    <object name="metalGathered[n]"    		type="text" style="CenteredLabelText"/>
+						    <object name="stoneGathered[n]"    		type="text" style="CenteredLabelText" />
+						    <object name="treasuresCollected[n]"    	type="text" style="CenteredLabelText"/>
+					    </object>
+				    </repeat>
+			    </object>
 
-			</object>
+		    </object>
 
-			<object type="button" style="StoneButton" size="100%-164 100%-52 100%-24 100%-24">
-				Continue
-				<action on="Press">
-					Engine.SwitchGuiPage("page_pregame.xml");
-					Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
-				</action>
-			</object>
-
-		</object>
-	</object>
+		    <object type="button" style="StoneButton" size="100%-164 100%-52 100%-24 100%-24">
+			    Continue
+			    <action on="Press">
+				    Engine.SwitchGuiPage("page_pregame.xml");
+				    Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
+			    </action>
+		    </object>
+	    </object>
 </objects>