From 5582409973eabfa141386e0eef3ccd3db5b31306 Mon Sep 17 00:00:00 2001
From: scythetwirler <scythetwirler@wildfiregames.com>
Date: Tue, 4 Mar 2014 02:23:01 +0000
Subject: [PATCH] Converts most parts of the game to use Pureon's new UI

This was SVN commit r14804.
---
 .../mods/public/gui/aiconfig/aiconfig.xml     |  14 +-
 .../data/mods/public/gui/civinfo/civinfo.xml  |  18 +-
 .../mods/public/gui/common/modern/sprites.xml |  26 +
 .../mods/public/gui/common/modern/styles.xml  |  40 +-
 .../mods/public/gui/gamesetup/gamesetup.js    |   1 +
 .../mods/public/gui/gamesetup/gamesetup.xml   | 266 +++--
 .../public/gui/gamesetup/gamesetup_mp.xml     |  26 +-
 .../data/mods/public/gui/gamesetup/styles.xml |   4 +-
 .../data/mods/public/gui/loading/loading.xml  |   2 +-
 .../data/mods/public/gui/manual/manual.xml    |   4 +-
 .../data/mods/public/gui/manual/styles.xml    |   3 +-
 .../data/mods/public/gui/msgbox/msgbox.xml    |   4 +-
 .../data/mods/public/gui/page_aiconfig.xml    |   9 +-
 .../data/mods/public/gui/page_civinfo.xml     |  11 +-
 .../data/mods/public/gui/page_gamesetup.xml   |  13 +-
 .../mods/public/gui/page_gamesetup_mp.xml     |  11 +-
 .../data/mods/public/gui/page_loadgame.xml    |   9 +-
 .../data/mods/public/gui/page_loading.xml     |  15 +-
 binaries/data/mods/public/gui/page_lobby.xml  |  22 +-
 binaries/data/mods/public/gui/page_manual.xml |  11 +-
 binaries/data/mods/public/gui/page_msgbox.xml |  11 +-
 .../data/mods/public/gui/page_options.xml     |  14 +-
 .../data/mods/public/gui/page_pregame.xml     |  15 +-
 .../data/mods/public/gui/page_prelobby.xml    |  21 +-
 .../data/mods/public/gui/page_savegame.xml    |   9 +-
 .../data/mods/public/gui/page_session.xml     |  15 +-
 .../mods/public/gui/page_splashscreen.xml     |  11 +-
 .../data/mods/public/gui/page_summary.xml     |  11 +-
 .../data/mods/public/gui/savedgames/load.xml  |   4 +-
 .../data/mods/public/gui/session/session.xml  |  92 +-
 .../data/mods/public/gui/session/sprites.xml  |   2 +-
 .../public/gui/splashscreen/splashscreen.xml  |   8 +-
 .../data/mods/public/gui/summary/sprites.xml  |   8 +
 .../data/mods/public/gui/summary/summary.xml  | 934 +++++++++---------
 34 files changed, 889 insertions(+), 775 deletions(-)

diff --git a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
index 19cf728806..a6c69b313e 100644
--- a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
+++ b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
@@ -5,32 +5,32 @@
 	<script file="gui/aiconfig/aiconfig.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" sprite="BackgroundTranslucent"/>
+	<object type="image" z="0" sprite="modernFade"/>
 
-	<object type="image" style="StoneDialog" size="50%-200 40%-140 50%+200 40%+180">
+	<object type="image" style="ModernDialog" size="50%-200 40%-140 50%+200 40%+180">
 
 		<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">AI Configuration</object>
 
 		<object size="50%-128 30 50%+128 80">
-			<object type="text" style="RightLabelText" size="-10 0 90 50%">
+			<object type="text" style="ModernRightLabelText" size="-10 0 90 50%">
 				AI Player
 			</object>
 
-			<object name="aiSelection" type="dropdown" style="StoneDropDown" size="50%-24 0 50%+136 28">
+			<object name="aiSelection" type="dropdown" style="ModernDropDown" size="50%-24 0 50%+136 28">
 				<action on="SelectionChange">selectAI(this.selected);</action>
 			</object>
 
-			<object type="text" style="RightLabelText" size="-10 35 90 50%+35">
+			<object type="text" style="ModernRightLabelText" size="-10 35 90 50%+35">
 				AI Difficulty
 			</object>
 			
-			<object name="aiDifficulty" type="dropdown" style="StoneDropDown" size="50%-24 35 50%+136 63">
+			<object name="aiDifficulty" type="dropdown" style="ModernDropDown" size="50%-24 35 50%+136 63">
 			</object>
 		</object>
 
 		<object size="8% 50%-54 92% 50%+74">
 
-			<object name="aiDescription" type="text" style="LeftLabelText" size="0 0 100% 100%" text_align="center"/>
+			<object name="aiDescription" type="text" style="ModernLeftLabelText" size="0 0 100% 100%" text_align="center"/>
 
 			<!-- TODO: we might want to add things like difficulty controls into here -->
 
diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml
index 2651364d12..87743faf3c 100644
--- a/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -10,7 +10,7 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
+	<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
 
 		<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">Civilizations</object>
 
@@ -20,20 +20,20 @@
 				name="civSelectionHeading"
 				type="text"
 				font="serif-bold-20"
-                                textcolor="white"
+                textcolor="white"
 				text_align="left"
 				size="50%-320 10 50%-96 48">
 				Civilization Selection
 			</object>
 
-			<object name="civSelection" type="dropdown" style="StoneDropDown" size="50%-96 10 50%+96 40">
+			<object name="civSelection" type="dropdown" style="ModernDropDown" size="50%-96 10 50%+96 40">
 				<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 0 100% 40">
+			<object type="image" sprite="TranslucentPanelThinBorder" size="0 5 100% 40">
 				<object
 					name="civGameplayHeading"
 					type="text"
@@ -45,7 +45,7 @@
 				/>
 			</object>
 
-			<object type="image" sprite="BackgroundTranslucent" size="0 40 33%-5 100%">
+			<object type="image" sprite="ModernDarkBoxGold" size="0 45 33%-5 100%">
 				<object
 					name="civBonuses"
 					type="text"
@@ -56,7 +56,7 @@
 				/>
 			</object>
 
-			<object type="image" sprite="BackgroundTranslucent" size="33%+5 40 75%-5 100%">
+			<object type="image" sprite="ModernDarkBoxGold" size="33%+5 45 75%-5 100%">
 				<object
 					name="civTechs"
 					type="text"
@@ -67,7 +67,7 @@
 				/>
 			</object>
 
-			<object type="image" sprite="BackgroundTranslucent" size="75%+5 40 100% 100%">
+			<object type="image" sprite="ModernDarkBoxGold" size="75%+5 45 100% 100%">
 				<object
 					name="civHeroes"
 					type="text"
@@ -95,7 +95,7 @@
 				/>
 			</object>
 
-			<object type="image" sprite="BackgroundTranslucent" size="0 35 100% 100%">
+			<object type="image" sprite="ModernDarkBoxGold" size="0 35 100% 100%">
 				<object
 					name="civHistoryText"
 					type="text"
@@ -122,4 +122,4 @@
 
 	</object>
 
-</objects>
\ No newline at end of file
+</objects>
diff --git a/binaries/data/mods/public/gui/common/modern/sprites.xml b/binaries/data/mods/public/gui/common/modern/sprites.xml
index eb19821a59..ddf1536b88 100644
--- a/binaries/data/mods/public/gui/common/modern/sprites.xml
+++ b/binaries/data/mods/public/gui/common/modern/sprites.xml
@@ -148,6 +148,32 @@
 		/>
 	</sprite>
 
+		<!--
+	==========================================
+	- Panel -
+	==========================================
+	-->
+	<sprite name = "ModernPanel">
+
+		<!-- background -->
+		<image backcolor = "12 12 12"/>
+		<image texture = "global/modern/background.png"
+			texture_size = "0 0 1024 1024"
+			size = "12 22 100%-12 100%-12"
+		/>
+
+		<!-- shading -->
+		<!-- we just mirror the same texture on the top and bottom -->
+		<image texture = "global/modern/shadow-high.png"
+			texture_size = "0 0 1024 256"
+			size = "12 100%-268 100%-12 100%-12"
+		/>
+
+		<image texture = "global/modern/shadow-high.png"
+			texture_size = "1024 256 0 0"
+			size = "12 22 100%-12 268"
+		/>
+	</sprite>
 	<!--
 	==========================================
 	- Box -
diff --git a/binaries/data/mods/public/gui/common/modern/styles.xml b/binaries/data/mods/public/gui/common/modern/styles.xml
index 273f6ee21d..ad7add7fec 100644
--- a/binaries/data/mods/public/gui/common/modern/styles.xml
+++ b/binaries/data/mods/public/gui/common/modern/styles.xml
@@ -13,6 +13,12 @@
 		text_align = "left"
 		text_valign = "top"
 	/>
+	<style 	name = "ModernPanel"
+		sprite = "ModernPanel"
+		buffer_zone = "12"
+		text_align = "left"
+		text_valign = "top"
+	/>
 	<style 	name = "ModernList"
 		buffer_zone = "5"
 		font = "serif-bold-stroke-14"
@@ -29,7 +35,7 @@
 	/>
 	<style 	name="ModernDropDown"
 		dropdown_buffer="1"
-		font="serif-14"
+		font="serif-bold-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
@@ -39,7 +45,7 @@
 		sprite2="ModernDropDownArrow"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 
-		buffer_zone="5"
+		buffer_zone="8"
 		dropdown_size="200"
 		sprite_list="colour:12 12 12"
 		sprite_selectarea="ModernDarkBoxWhite"
@@ -58,6 +64,36 @@
 		text_align="center"
 		text_valign="center"
 	/>
+	<style name="ModernRightLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="right"
+		text_valign="center"
+	/>
+	<style name="ModernLeftLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="center"
+	/>
+	<style name="ModernTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="top"
+	/>
+	<style name="ModernRightTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="right"
+		text_valign="top"
+	/>
+	<style name="ModernLeftTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
 	<style name="ModernText"
 		font="serif-14"
 		textcolor="white"
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 5b09a46f37..64bd881b29 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1472,6 +1472,7 @@ function addChatMessage(msg)
 
 function toggleMoreOptions()
 {
+	Engine.GetGUIObjectByName("moreOptionsFade").hidden = !Engine.GetGUIObjectByName("moreOptionsFade").hidden;
 	Engine.GetGUIObjectByName("moreOptions").hidden = !Engine.GetGUIObjectByName("moreOptions").hidden;
 }
 
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 15c04f198a..8964972ab6 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -9,19 +9,19 @@
 	<script file="gui/gamesetup/gamesetup.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" style="StoneWindow" size="0 0 100% 100%">
+	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
 		<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
 			Match Setup
 		</object>
 	
-		<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
+		<object type="image" style="ModernDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
 
 			<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
 				Loading
 			</object>
 
-			<object type="text" style="CenteredLabelText">
+			<object type="text" style="ModernLabelText">
 				Loading map data. Please wait...
 			</object>
 
@@ -38,15 +38,15 @@
 
 				<!-- Number of Players-->
 				<object size="0 0 150 28">
-					<object size="0 0 100% 100%" type="text" style="RightLabelText">Number of players:</object>
+					<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Number of players:</object>
 				</object>
 					
 				<!-- Number of Players-->
 				<object size="150 0 200 28">
-					<object name="numPlayersText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
+					<object name="numPlayersText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
 						<object name="numPlayersSelection"
 							type="dropdown"
-							style="StoneDropDown"
+							style="ModernDropDown"
 							size="0 0 100% 28"
 							tooltip_style="onscreenToolTip"
 							tooltip="Select number of players.">
@@ -57,11 +57,11 @@
 			</object>
 			
 			<!-- Player assignments -->
-			<object size="24 59 100%-440 358" type="image" sprite="BackgroundIndentFillDark" name="playerAssignmentsPannel">
+			<object size="24 59 100%-440 358" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPannel">
 				<object size="0 6 100% 30">
-					<object name="playerNameHeading" type="text" style="CenteredLabelText" size="0 0 25% 100%">Player Name</object>
-					<object name="playerPlacementHeading" type="text" style="CenteredLabelText" size="25%+5 0 55% 100%">Player Placement</object>
-					<object name="playerCivHeading" type="text" style="CenteredLabelText" size="55%+65 0 85% 100%">Civilization</object>
+					<object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 25% 100%">Player Name</object>
+					<object name="playerPlacementHeading" type="text" style="ModernLabelText" size="25%+5 0 55% 100%">Player Placement</object>
+					<object name="playerCivHeading" type="text" style="ModernLabelText" size="55%+65 0 85% 100%">Civilization</object>
 					<object name="civInfoButton"
 						type="button"
 						sprite="iconInfoGold"
@@ -74,23 +74,23 @@
 							Engine.PushGuiPage("page_civinfo.xml");
 						]]></action>
 					</object>
-					<object name="playerTeamHeading" type="text" style="CenteredLabelText" size="85%+5 0 100%-5 100%">Team</object>
+					<object name="playerTeamHeading" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%">Team</object>
 				</object>
 				<object size="1 36 100%-1 100%">
 					<repeat count="8">
 						<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="CenteredLabelText" size="0 2 25% 30"/>
-							<object name="playerAssignment[n]" type="dropdown" style="StoneDropDown" size="25%+5 2 55% 30" tooltip_style="onscreenToolTip" tooltip="Select player."/>
+							<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 25% 30"/>
+							<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="25%+5 2 55% 30" tooltip_style="onscreenToolTip" tooltip="Select player."/>
 							<object name="playerConfig[n]" type="button" style="StoneButton" size="55%+5 6 55%+60 26"
 								tooltip_style="onscreenToolTip"
 								tooltip="Configure AI settings."
 								font="serif-bold-stroke-12"
 							>Settings</object>
-							<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="55%+65 2 85% 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization."/>
-							<object name="playerCivText[n]" type="text" style="CenteredLabelText" size="55%+65 0 85% 30"/>
-							<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip" tooltip="Select player's team."/>
-							<object name="playerTeamText[n]" type="text" style="CenteredLabelText" size="85%+5 0 100%-5 100%"/>
+							<object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="55%+65 2 85% 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization."/>
+							<object name="playerCivText[n]" type="text" style="ModernLabelText" size="55%+65 0 85% 30"/>
+							<object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip" tooltip="Select player's team."/>
+							<object name="playerTeamText[n]" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%"/>
 						</object>
 					</repeat>
 				</object>
@@ -100,23 +100,23 @@
 			
 			
 			<object size="100%-425 363 100%-325 455" name="mapTypeSelectionTooltip">
-				<object type="text" style="RightLabelText" size="0 0 100% 30">Match Type:</object>
-				<object type="text" style="RightLabelText" size="0 32 100% 62">Map Filter:</object>
-				<object type="text" style="RightLabelText" size="0 64 100% 94">Select Map:</object>
-				<object name="mapSizeDesc" type="text" style="RightLabelText" size="0 96 100% 126">Map Size:</object>
+				<object type="text" style="ModernRightLabelText" size="0 0 100% 30">Match Type:</object>
+				<object type="text" style="ModernRightLabelText" size="0 32 100% 62">Map Filter:</object>
+				<object type="text" style="ModernRightLabelText" size="0 64 100% 94">Select Map:</object>
+				<object name="mapSizeDesc" type="text" style="ModernRightLabelText" size="0 96 100% 126">Map Size:</object>
 			</object>
 
 			<object size="100%-327 363 100%-25 423" name="mapFilterSelectionTooltip">
-				<object name="mapTypeText" type="text" style="LeftLabelText" size="0 0 100% 30"  hidden="true"/>
-				<object name="mapFilterText" type="text" style="LeftLabelText" size="0 32 100% 62"  hidden="true"/>
-				<object name="mapSelectionText" type="text" style="LeftLabelText" size="0 64 100% 94"  hidden="true"/>
-				<object name="mapSizeText" type="text" style="LeftLabelText" size="0 96 100% 126" hidden="true"/>
+				<object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30"  hidden="true"/>
+				<object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62"  hidden="true"/>
+				<object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94"  hidden="true"/>
+				<object name="mapSizeText" type="text" style="ModernLeftLabelText" size="0 96 100% 126" hidden="true"/>
 			</object>
 			
 			<object name="mapTypeSelection"
 				type="dropdown"
-				style="StoneDropDown"
-				size="100%-325 363 100%-25 391"
+				style="ModernDropDown"
+				size="100%-315 363 100%-25 391"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select a map type.">
 				<action on="SelectionChange">selectMapType(this.list_data[this.selected]);</action>
@@ -124,17 +124,17 @@
 
 			<object name="mapFilterSelection"
 				type="dropdown"
-				style="StoneDropDown"
-				size="100%-325 395 100%-25 423"
+				style="ModernDropDown"
+				size="100%-315 395 100%-25 423"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select a map filter.">
 				<action on="SelectionChange">selectMapFilter(this.list[this.selected]);</action>
 			</object>
 			
-			<object size="100%-325 427 100%-25 455" name="mapSelectionPannel" z="55">
+			<object size="100%-315 427 100%-25 455" name="mapSelectionPannel" z="55">
 
 				<object name="mapSelection"
-					style="StoneDropDown"
+					style="ModernDropDown"
 					type="dropdown"
 					size="0 0 100% 100%"
 					tooltip_style="onscreenToolTip"
@@ -143,123 +143,26 @@
 				</object>
 			</object>
 
-			<object name="mapSize" size="100%-325 459 100%-25 487" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size. (Larger sizes may reduce performance.)"/>
+			<object name="mapSize" size="100%-315 459 100%-25 487" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size. (Larger sizes may reduce performance.)"/>
 
 			<!-- Map Preview -->
-			<object  type="image" sprite="BackgroundIndentFillDark" name="gamePreviewBox" size="100%-426 57 100%-24 359">
+			<object  type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 57 100%-24 359">
 				<object type="image" sprite="snMapPreview" size="1 1 401 301" name="mapPreview"/>
 			</object>
 
 			<!-- Map Description -->
 			<object size="100%-425 497 100%-25 100%-60">
-				<object name="mapInfoName" type="text" style="LeftLabelText" size="0 0 100%-120 30"/>
-				<object type="image" sprite="BackgroundIndentFillDark" size="0 30 100% 100%">
+				<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/>
+				<object type="image" sprite="ModernDarkBoxGold" size="0 30 100% 100%">
 					<object name="mapInfoDescription" type="text" style="MapDescription" size="0 0 100% 100%"/>
 				</object>
 			</object>
 
-			<!-- Options -->
-			<object name="gameOptionsBox" size="100%-425 497 100%-25 525">
-				<!-- More Options Button -->
-				<object
-					name="showMoreOptions"
-					type="button"
-					style="StoneButton"
-					size="100%-120 0 100% 28"
-					tooltip_style="onscreenToolTip"
-					tooltip="See more game options"
-				>
-					More Options
-					<action on="Press">toggleMoreOptions();</action>
-				</object>
-
-			<!-- End Options -->
-			</object>
-
-			<!-- More Options -->
-			<object name="moreOptions" type="image" sprite="StoneWindow" size="50%-200 50%-150 50%+200 50%+155" z="70" hidden="true">
-				<object style="TitleText" type="text" size="50%-128 11 50%+128 27">
-					More Options
-				</object>
-
-				<object size="14 38 94% 66">
-					<object size="0 0 40% 28">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Game Speed:</object>
-					</object>
-					<object name="gameSpeedText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
-					<object name="gameSpeed" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select game speed."/>
-				</object>
-
-				<object size="14 68 94% 96">
-					<object size="0 0 40% 28">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Victory Condition:</object>
-					</object>
-					<object name="victoryConditionText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
-					<object name="victoryCondition" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition."/>
-				</object>
-
-				<object size="14 98 94% 126">
-					<object size="0 0 40% 28">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Population Cap:</object>
-					</object>
-					<object name="populationCapText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
-					<object name="populationCap" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select population cap."/>
-				</object>
-
-				<object size="14 128 94% 156">
-					<object size="0 0 40% 28">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Starting Resources:</object>
-					</object>
-					<object name="startingResourcesText" size="40% 0 100% 100%" type="text" style="LeftLabelText"/>
-					<object name="startingResources" size="40% 0 100% 28" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select the game's starting resources."/>
-				</object>
-
-				<object size="14 158 94% 246">
-					<object size="0 0 40% 28">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Reveal Map:</object>
-					</object>
-					<object size="0 30 40% 58">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Teams Locked:</object>
-					</object>
-					<object size="0 60 40% 88" name="enableCheatsDesc" hidden="true">
-						<object size="0 0 100% 100%" type="text" style="RightLabelText">Cheats:</object>
-					</object>
-
-					<object size="40% 0 100% 28">
-						<object name="revealMapText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
-						<object name="revealMap" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map."/>
-					</object>
-					<object size="40% 30 100% 58">
-						<object name="lockTeamsText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
-						<object name="lockTeams" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams."/>
-					</object>
-					<object size="40% 60 100% 88">
-						<object name="enableCheatsText" size="0 0 100% 100%" type="text" style="LeftLabelText" hidden="true"/>
-						<object name="enableCheats" size="4 50%-8 20 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle the usability of cheats."/>
-					</object>
-				</object>
-
-				<!-- Hide More Options Button -->
-				<object
-					name="hideMoreOptions"
-					type="button"
-					style="StoneButton"
-					size="50%-70 248 50%+70 274"
-					tooltip_style="onscreenToolTip"
-					tooltip="Close more game options window"
-				>
-					OK
-					<action on="Press">toggleMoreOptions();</action>
-				</object>
-			<!-- End More Options -->
-			</object>
-
-
 			<!-- Chat window -->
-			<object name="chatPanel" size="24 370 100%-435 100%-58" type="image" sprite="BackgroundIndentFillDark">
+			<object name="chatPanel" size="24 370 100%-440 100%-58" type="image" sprite="ModernDarkBoxGold">
 				<object name="chatText" size="2 2 100%-2 100%-26" type="text" style="ChatPanel"/>
 
-				<object name="chatInput" size="4 100%-24 100%-76 100%-4" type="input" style="StoneInput">
+				<object name="chatInput" size="4 100%-24 100%-76 100%-4" type="input" style="ModernInput">
 					<action on="Press">submitChatInput();</action>
 				</object>
 
@@ -312,6 +215,101 @@
 					]]>
 				</action>
 			</object>
+			
+			<!-- Options -->
+			<object name="gameOptionsBox" size="100%-425 497 100%-25 525">
+				<!-- More Options Button -->
+				<object
+					name="showMoreOptions"
+					type="button"
+					style="StoneButton"
+					size="100%-120 0 100% 28"
+					tooltip_style="onscreenToolTip"
+					tooltip="See more game options"
+				>
+					More Options
+					<action on="Press">toggleMoreOptions();</action>
+				</object>
+
+			<!-- End Options -->
+			</object>
+
+			<!-- More Options -->
+			<object hidden="true" name="moreOptionsFade" type="image" z="0" sprite="modernFade"/>
+			<object name="moreOptions" type="image" sprite="ModernDialog" size="50%-200 50%-150 50%+200 50%+155" z="70" hidden="true">
+				<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">More Options</object>
+
+				<object size="14 38 94% 66">
+					<object size="0 0 40% 28">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Game Speed:</object>
+					</object>
+					<object name="gameSpeedText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+					<object name="gameSpeed" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select game speed."/>
+				</object>
+
+				<object size="14 68 94% 96">
+					<object size="0 0 40% 28">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Victory Condition:</object>
+					</object>
+					<object name="victoryConditionText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+					<object name="victoryCondition" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition."/>
+				</object>
+
+				<object size="14 98 94% 126">
+					<object size="0 0 40% 28">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Population Cap:</object>
+					</object>
+					<object name="populationCapText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+					<object name="populationCap" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select population cap."/>
+				</object>
+
+				<object size="14 128 94% 156">
+					<object size="0 0 40% 28">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Starting Resources:</object>
+					</object>
+					<object name="startingResourcesText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+					<object name="startingResources" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select the game's starting resources."/>
+				</object>
+
+				<object size="14 158 94% 246">
+					<object size="0 0 40% 28">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Reveal Map:</object>
+					</object>
+					<object size="0 30 40% 58">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Teams Locked:</object>
+					</object>
+					<object size="0 60 40% 88" name="enableCheatsDesc" hidden="true">
+						<object size="0 0 100% 100%" type="text" style="ModernRightLabelText">Cheats:</object>
+					</object>
+
+					<object size="40% 0 100% 28">
+						<object name="revealMapText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+						<object name="revealMap" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map."/>
+					</object>
+					<object size="40% 30 100% 58">
+						<object name="lockTeamsText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+						<object name="lockTeams" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams."/>
+					</object>
+					<object size="40% 60 100% 88">
+						<object name="enableCheatsText" size="0 0 100% 100%" type="text" style="ModernLeftLabelText" hidden="true"/>
+						<object name="enableCheats" size="10 50%-8 26 50%+8" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle the usability of cheats."/>
+					</object>
+				</object>
+
+				<!-- Hide More Options Button -->
+				<object
+					name="hideMoreOptions"
+					type="button"
+					style="StoneButton"
+					size="50%-70 250 50%+70 276"
+					tooltip_style="onscreenToolTip"
+					tooltip="Close more game options window"
+				>
+					OK
+					<action on="Press">toggleMoreOptions();</action>
+				</object>
+			<!-- End More Options -->
+			</object>
 		</object>
 	</object>
 </objects>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
index a1ab8e2247..8fdb5d858e 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
@@ -9,7 +9,7 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="StoneDialog" size="50%-190 50%-120 50%+190 50%+120">
+	<object type="image" style="ModernDialog" size="50%-190 50%-120 50%+190 50%+120">
 
 		<action on="Tick">
 			onTick();
@@ -21,25 +21,25 @@
 
 		<object name="pageJoin" size="0 32 100% 100%" hidden="true">
 
-			<object type="text" style="CenteredLabelText" size="0 0 400 30">
+			<object type="text" style="ModernLabelText" size="0 0 400 30">
 				Joining an existing game.
 			</object>
 
-			<object type="text" size="0 40 200 70" style="RightLabelText">
+			<object type="text" size="0 40 200 70" style="ModernRightLabelText">
 				Player name:
 			</object>
 
-			<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
+			<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
 				<action on="Load">
 					this.caption = Engine.ConfigDB_GetValue("user", "playername");
 				</action>
 			</object>
 
-			<object type="text" size="0 80 200 110" style="RightLabelText">
+			<object type="text" size="0 80 200 110" style="ModernRightLabelText">
 				Server Hostname or IP:
 			</object>
 
-			<object name="joinServer" type="input" size="210 80 100%-32 104" style="StoneInput">
+			<object name="joinServer" type="input" size="210 80 100%-32 104" style="ModernInput">
 				<action on="Load">
 					this.caption = Engine.ConfigDB_GetValue("user", "multiplayerserver")
 				</action>
@@ -63,16 +63,16 @@
 
 		<object name="pageHost" size="0 32 100% 100%" hidden="true">
 
-			<object type="text" style="CenteredLabelText" size="0 0 400 30">
+			<object type="text" style="ModernLabelText" size="0 0 400 30">
 				Set up your server to host.
 			</object>
 
 			<object name="hostPlayerNameWrapper" hidden="true">
-			<object type="text" size="0 40 200 70" style="RightLabelText">
+			<object type="text" size="0 40 200 70" style="ModernRightLabelText">
 				Player name:
 			</object>
 
-			<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
+			<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
 				<action on="Load">
 					this.caption = Engine.ConfigDB_GetValue("user", "playername");
 				</action>
@@ -80,11 +80,11 @@
 			</object>
 
 			<object name="hostServerNameWrapper" hidden="true">
-			<object type="text" size="0 80 200 110" style="RightLabelText">
+			<object type="text" size="0 80 200 110" style="ModernRightLabelText">
 				Server name:
 			</object>
 
-			<object name="hostServerName" type="input" size="210 80 100%-32 104" style="StoneInput">
+			<object name="hostServerName" type="input" size="210 80 100%-32 104" style="ModernInput">
 				<action on="Load">
 					this.caption = Engine.ConfigDB_GetValue("user", "playername") + "'s game";
 				</action>
@@ -103,7 +103,7 @@
 			</object>
 		</object>
 
-		<object name="hostFeedback" type="text" style="CenteredLabelText" size="32 150 100%-32 180" textcolor="red" />
+		<object name="hostFeedback" type="text" style="ModernLabelText" size="32 150 100%-32 180" textcolor="red" />
 
 		<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
 			Cancel
@@ -111,7 +111,7 @@
 		</object>
 
 		<object name="pageConnecting" hidden="true">
-			<object name="connectionStatus" type="text" style="CenteredLabelText" size="0 100 100% 120">
+			<object name="connectionStatus" type="text" style="ModernLabelText" size="0 100 100% 120">
 				[Connection status]
 			</object>
 		</object>
diff --git a/binaries/data/mods/public/gui/gamesetup/styles.xml b/binaries/data/mods/public/gui/gamesetup/styles.xml
index e517509c92..6c418831ae 100644
--- a/binaries/data/mods/public/gui/gamesetup/styles.xml
+++ b/binaries/data/mods/public/gui/gamesetup/styles.xml
@@ -16,7 +16,7 @@
 		buffer_zone="8"
 		font="serif-12"
 		scrollbar="true"
-		scrollbar_style="wheatScrollBar"
+		scrollbar_style="ModernScrollBar"
 		scroll_bottom="true"
 		textcolor="white"
 		text_align="left"
@@ -28,7 +28,7 @@
 		buffer_zone="5"
 		font="serif-13"
 		scrollbar="true"
-		scrollbar_style="wheatScrollBar"
+		scrollbar_style="ModernScrollBar"
 		scroll_bottom="true"
 		textcolor="white"
 		textcolor_selected="gold"
diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml
index 7ad8c38ab8..07226e8e4f 100644
--- a/binaries/data/mods/public/gui/loading/loading.xml
+++ b/binaries/data/mods/public/gui/loading/loading.xml
@@ -10,7 +10,7 @@
 	<script file="gui/loading/loading.js"/>
 	<script file="gui/common/functions_utility_error.js"/>
 
-	<object type="image" style="StoneWindow">
+	<object type="image" style="ModernWindow">
 
 		<!-- LOADING SCREEN progress bar -->
 		<object size="50%-256 4 50%+256 36" type="image" sprite="LoadingProgressBarBackground">
diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml
index eff09d891a..70fbd38075 100644
--- a/binaries/data/mods/public/gui/manual/manual.xml
+++ b/binaries/data/mods/public/gui/manual/manual.xml
@@ -7,10 +7,10 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" style="TranslucentPanel"/>
 
-	<object type="image" style="StoneDialog" size="50%-466 50%-316 50%+466 50%+316">
+	<object type="image" style="ModernDialog" 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 type="image" sprite="modernFade" size="20 20 100%-20 100%-58">
 			<object name="mainText" type="text" style="textPanel"/>
 		</object>
 	<object type="button" style="StoneButton" size="100%-308 100%-52 100%-168 100%-24">
diff --git a/binaries/data/mods/public/gui/manual/styles.xml b/binaries/data/mods/public/gui/manual/styles.xml
index fdbff8920b..dccb39eb0c 100644
--- a/binaries/data/mods/public/gui/manual/styles.xml
+++ b/binaries/data/mods/public/gui/manual/styles.xml
@@ -6,11 +6,12 @@
 		buffer_zone="8"
 		font="serif-bold-16"
 		scrollbar="true"
-		scrollbar_style="wheatScrollBar"
+		scrollbar_style="ModernScrollBar"
 		textcolor="white"
 		textcolor_selected="black"
 		text_align="left"
 		text_valign="center"
+		sprite="ModernDarkBoxGold"
 	/>
 
 </styles>
diff --git a/binaries/data/mods/public/gui/msgbox/msgbox.xml b/binaries/data/mods/public/gui/msgbox/msgbox.xml
index fd6b6861e6..b777742fde 100644
--- a/binaries/data/mods/public/gui/msgbox/msgbox.xml
+++ b/binaries/data/mods/public/gui/msgbox/msgbox.xml
@@ -110,7 +110,7 @@
 
 	<object>
 		<object name="mbMain"
-			style="StoneDialog"
+			style="ModernDialog"
 			type="image"
 		>
 
@@ -122,7 +122,7 @@
 
 			<object name="mbText"
 				type="text"
-				style="CenteredLabelText"
+				style="ModernLabelText"
 				size="5% 20% 95% 100%-96"
 			/>
 
diff --git a/binaries/data/mods/public/gui/page_aiconfig.xml b/binaries/data/mods/public/gui/page_aiconfig.xml
index e2ca3a705f..f918b4335f 100644
--- a/binaries/data/mods/public/gui/page_aiconfig.xml
+++ b/binaries/data/mods/public/gui/page_aiconfig.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
     <include>common/styles.xml</include>
-
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
     <include>aiconfig/aiconfig.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_civinfo.xml b/binaries/data/mods/public/gui/page_civinfo.xml
index 8d34b037b1..777974ae0e 100644
--- a/binaries/data/mods/public/gui/page_civinfo.xml
+++ b/binaries/data/mods/public/gui/page_civinfo.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
     <include>common/styles.xml</include>
-    
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
     <include>civinfo/civinfo.xml</include>
     <include>civinfo/setup.xml</include>
     <include>civinfo/sprites.xml</include>
-</page>
\ No newline at end of file
+</page>
diff --git a/binaries/data/mods/public/gui/page_gamesetup.xml b/binaries/data/mods/public/gui/page_gamesetup.xml
index b6ecece4cd..b6c0c54e2c 100644
--- a/binaries/data/mods/public/gui/page_gamesetup.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/sprite1.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
     <include>gamesetup/setup.xml</include>
     <include>gamesetup/sprites.xml</include>
diff --git a/binaries/data/mods/public/gui/page_gamesetup_mp.xml b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
index 24c3a9d8a6..163283af79 100644
--- a/binaries/data/mods/public/gui/page_gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
-    
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
     
     <include>gamesetup/setup.xml</include>
     <include>gamesetup/sprites.xml</include>
diff --git a/binaries/data/mods/public/gui/page_loadgame.xml b/binaries/data/mods/public/gui/page_loadgame.xml
index 30272a384f..a04fc05183 100644
--- a/binaries/data/mods/public/gui/page_loadgame.xml
+++ b/binaries/data/mods/public/gui/page_loadgame.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/sprite1.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
     <include>common/common_sprites.xml</include>
     <include>common/common_styles.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_loading.xml b/binaries/data/mods/public/gui/page_loading.xml
index e35dc1b6b9..ebb3229f0d 100644
--- a/binaries/data/mods/public/gui/page_loading.xml
+++ b/binaries/data/mods/public/gui/page_loading.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
     <include>common/init.xml</include>
 
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
-
-	<include>loading/styles.xml</include>
-	<include>loading/sprites.xml</include>
+    <include>loading/styles.xml</include>
+    <include>loading/sprites.xml</include>
     <include>loading/loading.xml</include>
     <include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_lobby.xml b/binaries/data/mods/public/gui/page_lobby.xml
index ad4ee6a1d8..a4cad495f3 100644
--- a/binaries/data/mods/public/gui/page_lobby.xml
+++ b/binaries/data/mods/public/gui/page_lobby.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-  <include>common/modern/styles.xml</include>
-  <include>common/modern/sprites.xml</include>
-  <include>common/modern/setup.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
-  <include>common/setup.xml</include>
-  <include>common/styles.xml</include>
-  <include>common/sprite1.xml</include>
-  <include>common/global.xml</include>
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
-  <include>common/common_sprites.xml</include>
-  <include>common/common_styles.xml</include>
-
-  <include>lobby/styles.xml</include>
-  <include>lobby/lobby.xml</include>
+    <include>lobby/styles.xml</include>
+    <include>lobby/lobby.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_manual.xml b/binaries/data/mods/public/gui/page_manual.xml
index 3d56371431..1d6ce07c98 100644
--- a/binaries/data/mods/public/gui/page_manual.xml
+++ b/binaries/data/mods/public/gui/page_manual.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
-    
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
     <include>manual/styles.xml</include>
     <include>manual/manual.xml</include>
diff --git a/binaries/data/mods/public/gui/page_msgbox.xml b/binaries/data/mods/public/gui/page_msgbox.xml
index c5d741331d..e6535d32fa 100644
--- a/binaries/data/mods/public/gui/page_msgbox.xml
+++ b/binaries/data/mods/public/gui/page_msgbox.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
-    
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
     
     <include>msgbox/msgbox.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_options.xml b/binaries/data/mods/public/gui/page_options.xml
index 74ab18e446..e405468ed3 100644
--- a/binaries/data/mods/public/gui/page_options.xml
+++ b/binaries/data/mods/public/gui/page_options.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
     <include>common/icon_sprites.xml</include>
     <include>common/init.xml</include>
     <include>common/global.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
-    
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/sprites.xml</include>
 
     <include>options/options.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_pregame.xml b/binaries/data/mods/public/gui/page_pregame.xml
index 920f1c31e5..8ffce8275e 100644
--- a/binaries/data/mods/public/gui/page_pregame.xml
+++ b/binaries/data/mods/public/gui/page_pregame.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/sprite1.xml</include>
-    <include>common/init.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
+    <include>common/init.xml</include>
 
     <include>pregame/sprites.xml</include>
     <include>pregame/styles.xml</include>
diff --git a/binaries/data/mods/public/gui/page_prelobby.xml b/binaries/data/mods/public/gui/page_prelobby.xml
index 43a6e34f5f..3a88bbb3ae 100644
--- a/binaries/data/mods/public/gui/page_prelobby.xml
+++ b/binaries/data/mods/public/gui/page_prelobby.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-  <include>common/modern/styles.xml</include>
-  <include>common/modern/sprites.xml</include>
-  <include>common/modern/setup.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
-  <include>common/setup.xml</include>
-  <include>common/styles.xml</include>
-  <include>common/sprite1.xml</include>
-  <include>common/global.xml</include>
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
+    <include>common/global.xml</include>
 
-  <include>common/common_sprites.xml</include>
-  <include>common/common_styles.xml</include>
-
-  <include>lobby/prelobby.xml</include>
+    <include>lobby/prelobby.xml</include>
 </page>
 
diff --git a/binaries/data/mods/public/gui/page_savegame.xml b/binaries/data/mods/public/gui/page_savegame.xml
index 1aa8ec2044..15ec6801ce 100644
--- a/binaries/data/mods/public/gui/page_savegame.xml
+++ b/binaries/data/mods/public/gui/page_savegame.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/sprite1.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
 
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
     <include>common/common_sprites.xml</include>
     <include>common/common_styles.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 34c0bef7d5..73494e018d 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/sprite1.xml</include>
-    <include>common/icon_sprites.xml</include>
-
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
-
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
     <include>common/modern/setup.xml</include>
 
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
+    <include>common/icon_sprites.xml</include>
+    
     <include>session/sprites.xml</include>
     <include>session/setup.xml</include>
     <include>session/styles.xml</include>
diff --git a/binaries/data/mods/public/gui/page_splashscreen.xml b/binaries/data/mods/public/gui/page_splashscreen.xml
index ab0af9e517..96846d4bba 100644
--- a/binaries/data/mods/public/gui/page_splashscreen.xml
+++ b/binaries/data/mods/public/gui/page_splashscreen.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
-    
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
 
     <include>splashscreen/styles.xml</include>
     <include>splashscreen/setup.xml</include>
diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index b63ae2ca41..0ae563591c 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+    <include>common/modern/setup.xml</include>
+
     <include>common/setup.xml</include>
-    <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
     <include>common/icon_sprites.xml</include>
     <include>common/init.xml</include>
 
-<include>common/common_sprites.xml</include>
-<include>common/common_styles.xml</include>
-
     <include>summary/summary.xml</include>
     <include>summary/sprites.xml</include>
     <include>common/global.xml</include>
diff --git a/binaries/data/mods/public/gui/savedgames/load.xml b/binaries/data/mods/public/gui/savedgames/load.xml
index 81f245e1f7..6930c7989c 100644
--- a/binaries/data/mods/public/gui/savedgames/load.xml
+++ b/binaries/data/mods/public/gui/savedgames/load.xml
@@ -9,14 +9,14 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-	<object type="image" style="StoneDialog" size="50%-300 50%-200 50%+300 50%+200">
+	<object type="image" style="ModernDialog" size="50%-300 50%-200 50%+300 50%+200">
 
 		<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
 			Load Game
 		</object>
 
 		<object name="gameSelection"
-			style="StoneList"
+			style="ModernList"
 			type="list"
 			size="24 24 100%-24 100%-100">
 		</object>
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index d0adec21c3..f0f17ceb3e 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -251,7 +251,7 @@
 		<action on="Press">toggleDeveloperOverlay();</action>
 
 	    <object size="0 0 100%-18 16" type="text" style="devCommandsText">Control all units</object>
-	    <object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="StoneCrossBox">
+	    <object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="ModernTickBox">
 		<action on="Press">
 		    g_DevSettings.controlAll = this.checked;
 		    Engine.PostNetworkCommand( {"type": "control-all", "flag": this.checked} );
@@ -259,40 +259,40 @@
 	    </object>
 
 	    <object size="0 16 100%-18 32" type="text" style="devCommandsText">Change perspective</object>
-	    <object size="100%-16 16 100% 32" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 16 100% 32" type="checkbox" style="ModernTickBox">
 		<action on="Press">Engine.GetGUIObjectByName("viewPlayer").hidden = !this.checked;</action>
 	    </object>
 
 	    <object size="0 32 100%-18 48" type="text" style="devCommandsText">Display selection state</object>
-	    <object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="StoneCrossBox"/>
+	    <object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="ModernTickBox"/>
 
 	    <object size="0 48 100%-18 64" type="text" style="devCommandsText">Pathfinder overlay</object>
-	    <object size="100%-16 48 100% 64" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 48 100% 64" type="checkbox" style="ModernTickBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 64 100%-18 80" type="text" style="devCommandsText">Obstruction overlay</object>
-	    <object size="100%-16 64 100% 80" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 64 100% 80" type="checkbox" style="ModernTickBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 80 100%-18 96" type="text" style="devCommandsText">Unit motion overlay</object>
-	    <object size="100%-16 80 100% 96" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 80 100% 96" type="checkbox" style="ModernTickBox">
 		<action on="Press">g_Selection.SetMotionDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 96 100%-18 112" type="text" style="devCommandsText">Range overlay</object>
-	    <object size="100%-16 96 100% 112" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 96 100% 112" type="checkbox" style="ModernTickBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 112 100%-18 128" type="text" style="devCommandsText">Bounding box overlay</object>
-	    <object size="100%-16 112 100% 128" type="checkbox" style="StoneCrossBox">
+	    <object size="100%-16 112 100% 128" type="checkbox" style="ModernTickBox">
 		<action on="Press">Engine.SetBoundingBoxDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 128 100%-18 144" type="text" style="devCommandsText">Restrict camera</object>
-	    <object size="100%-16 128 100% 144" type="checkbox" style="StoneCrossBox" checked="true">
+	    <object size="100%-16 128 100% 144" type="checkbox" style="ModernTickBox" checked="true">
 			<action on="Press">
 				Engine.GameView_SetConstrainCameraEnabled(this.checked);
 				// Make selection more durable at the expense of speed if unchecked.
@@ -304,13 +304,13 @@
 	    </object>
 
 	    <object size="0 144 100%-18 160" type="text" style="devCommandsText">Reveal map</object>
-	    <object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="StoneCrossBox">
+	    <object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="ModernTickBox">
 		<action on="Load">this.checked = Engine.GuiInterfaceCall("IsMapRevealed");</action>
 		<action on="Press">Engine.PostNetworkCommand({"type": "reveal-map", "enable": this.checked});</action>
 	    </object>
 
 	    <object size="0 160 100%-18 176" type="text" style="devCommandsText">Enable time warp</object>
-	    <object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="StoneCrossBox">
+	    <object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="ModernTickBox">
 		<action on="Press">
         if (this.checked)
           messageBox(500, 250, "Note: time warp mode is a developer option, and not intended\nfor use over long periods of time. Using it incorrectly may\ncause the game to run out of memory or crash.", "Time warp mode", 2);
@@ -318,7 +318,7 @@
 	    </object>
 
 	    <object size="0 176 100%-18 192" type="text" style="devCommandsText">Promote selected units</object>
-	    <object size="100%-16 176 100% 192" type="button" style="StoneCrossBox">
+	    <object size="100%-16 176 100% 192" type="button" style="ModernTickBox">
 		<action on="Press">Engine.PostNetworkCommand({"type": "promote", "entities": g_Selection.toList()});</action>
 	    </object>
 	</object>
@@ -369,7 +369,7 @@
 
 	<!-- Chat window -->
 	<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
-	    <object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
+	    <object name="chatInput" size="16 12 100%-16 36" type="input" style="ModernInput" max_length="80">
 		<action on="Press">submitChatInput();</action>
 	    </object>
 
@@ -382,8 +382,8 @@
 		Cancel
 		<action on="Press">closeChat();</action>
 	    </object>
-	    <object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="StoneCrossBox"/>
-	    <object size="60%+48 100%-40 100% 100%-12" type="text"  style="LeftLabelText">
+	    <object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="ModernTickBox"/>
+	    <object size="60%+48 100%-40 100% 100%-12" type="text"  style="ModernLeftLabelText">
 		Team Only
 	    </object>
 	</object>
@@ -395,7 +395,7 @@
 		size="50%-300 50%-200 50%+300 50%+150"
 		type="image"
 		hidden="true"
-		sprite="StoneDialog"
+		sprite="ModernDialog"
 	>
 		<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Diplomacy</object>
 
@@ -500,7 +500,7 @@
 	<!-- Settings Window -->
 	<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
-			style="StoneDialog"
+			style="ModernDialog"
 			type="image"
 			size="50%-180 50%-225 50%+180 50%+225"
 			hidden="true"
@@ -513,91 +513,91 @@
 				size="32 32 100%-32 100%-70"
 				>
 				<!-- Settings / shadows -->
-				<object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
-				<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 10 100%-80 35" type="text" style="ModernRightLabelText" ghost="true">Enable Shadows</object>
+				<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowsEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowsEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadow PCF -->
-				<object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
-				<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 35 100%-80 60" type="text" style="ModernRightLabelText" ghost="true">Enable Shadow Filtering</object>
+				<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowPCFEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowPCFEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Water Normals -->
-				<object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Water - HQ Waviness</object>
-				<object name="waterNormalCheckox" size="100%-56 65 100%-30 90"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 60 100%-80 85" type="text" style="ModernRightLabelText" ghost="true">Water - HQ Waviness</object>
+				<object name="waterNormalCheckox" size="100%-56 65 100%-30 90"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterNormalEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterNormalEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Real Depth -->
-				<object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Water - Use Actual Depth</object>
-				<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 85 100%-80 110" type="text" style="ModernRightLabelText" ghost="true">Water - Use Actual Depth</object>
+				<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRealDepthEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRealDepthEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Reflection -->
-				<object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Water - Enable Reflections</object>
-				<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 110 100%-80 135" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Reflections</object>
+				<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterReflectionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterReflectionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Refraction -->
-				<object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Water - Enable Refraction</object>
-				<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 135 100%-80 160" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Refraction</object>
+				<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRefractionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRefractionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Foam -->
-				<object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Foam</object>
-				<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 160 100%-80 185" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Shore Foam</object>
+				<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterFoamEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterFoamEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Waves -->
-				<object size="0 185 100%-80 210" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Waves</object>
-				<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 185 100%-80 210" type="text" style="ModernRightLabelText" ghost="true">Water - Enable Shore Waves</object>
+				<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterCoastalWavesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterCoastalWavesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadows -->
-				<object size="0 210 100%-80 235" type="text" style="RightLabelText" ghost="true">Water - Use Surface Shadows</object>
-				<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240"  type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 210 100%-80 235" type="text" style="ModernRightLabelText" ghost="true">Water - Use Surface Shadows</object>
+				<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240"  type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">if (Engine.Renderer_GetWaterShadowEnabled()) this.checked = true; else this.checked = false;</action>
 					<action on="Press">Engine.Renderer_SetWaterShadowEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Particles -->
-				<object size="0 235 100%-80 260" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
-				<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 235 100%-80 260" type="text" style="ModernRightLabelText" ghost="true">Enable Particles</object>
+				<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetParticlesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetParticlesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Unit Silhouettes -->
-				<object size="0 260 100%-80 285" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
-				<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 260 100%-80 285" type="text" style="ModernRightLabelText" ghost="true">Enable Unit Silhouettes</object>
+				<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetSilhouettesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetSilhouettesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Music-->
-				<object size="0 285 100%-80 310" type="text" style="RightLabelText" ghost="true">Enable Music</object>
-				<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="StoneCrossBox" checked="true">
+				<object size="0 285 100%-80 310" type="text" style="ModernRightLabelText" ghost="true">Enable Music</object>
+				<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="ModernTickBox" checked="true">
 					<action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
 				</object>
 				
 				<!-- Settings / Dev Overlay -->
-				<object size="0 310 100%-80 335" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
-				<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="StoneCrossBox" checked="false">
+				<object size="0 310 100%-80 335" type="text" style="ModernRightLabelText" ghost="true">Developer Overlay</object>
+				<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="ModernTickBox" checked="false">
 					<action on="Load"><![CDATA[
 						if (Engine.HasXmppClient() && Engine.IsRankedGame())
 							this.enabled = false;
@@ -668,7 +668,7 @@
 	    <object size="50%-48 -26 50%+48 70" name="civIcon" type="image" tooltip_style="sessionToolTipBold"/>
 
 	    <!-- Switch the view perspective to another player's (largely for AI development) -->
-	    <object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="StoneDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
+	    <object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="ModernDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
 		<action on="SelectionChange">selectViewPlayer(this.selected);</action>
 	    </object>
 
@@ -683,7 +683,7 @@
 	    <!-- ================================  ================================ -->
 
 	    <!-- Displays Alpha name and number -->
-	    <object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="CenteredLabelText" text_valign="top" ghost="true">
+	    <object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="ModernLabelText" text_valign="top" ghost="true">
 		ALPHA XV : Osiris<!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this -->
 
 		<!-- Displays build date and revision number-->
@@ -708,7 +708,7 @@
 			</action>
 	    </object>
 
-		<object size="100%-380 40 100%-230 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="StoneDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
+		<object size="100%-380 40 100%-230 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="ModernDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
 		
 	    <!-- ================================  ================================ -->
 	    <!-- Diplomacy Button -->
diff --git a/binaries/data/mods/public/gui/session/sprites.xml b/binaries/data/mods/public/gui/session/sprites.xml
index af3f676659..e1eaefe302 100644
--- a/binaries/data/mods/public/gui/session/sprites.xml
+++ b/binaries/data/mods/public/gui/session/sprites.xml
@@ -35,7 +35,7 @@
 	<!-- Generic Panel -->
 	<sprite name="genericPanel">
 		<image
-			texture="global/tile/tile_dark.png"
+			texture="global/modern/background.png"
 			texture_size="0 0 100% 100%"
 			size="0 0 100% 100%"
 		/>
diff --git a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
index b438cfcbdf..155e83c4c6 100644
--- a/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
+++ b/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
@@ -5,17 +5,17 @@
 	<script file="gui/splashscreen/splashscreen.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" style="TranslucentPanel"/>
+	<object type="image" z="0" style="modernFade"/>
 
-	<object type="image" style="StoneDialog" size="50%-274 50%-200 50%+274 50%+200">
+	<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
 		<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">Welcome to 0 A.D. !</object>
 
 			<object type="image" sprite="BackgroundTranslucent" size="20 20 100%-20 100%-52">
 				<object name="mainText" type="text" style="textPanel"/>
 				<object size="8 100%-60 100% 100%">
 					<object size="0 20 100% 100%">
-						<object name="displaySplashScreenText" size="20 0 100% 100%" type="text" style="LeftLabelText">Show this message in the future</object>
-						<object name="displaySplashScreen" checked="true" size="0 50%-8 16 50%+8" type="checkbox" style="StoneCrossBox"/>
+						<object name="displaySplashScreenText" size="20 0 100% 100%" type="text" style="ModernLeftLabelText">Show this message in the future</object>
+						<object name="displaySplashScreen" checked="true" size="0 50%-8 16 50%+8" type="checkbox" style="ModernTickBox"/>
 					</object>
 				</object>
 			</object>
diff --git a/binaries/data/mods/public/gui/summary/sprites.xml b/binaries/data/mods/public/gui/summary/sprites.xml
index feb8e7eaf4..3701e0b971 100644
--- a/binaries/data/mods/public/gui/summary/sprites.xml
+++ b/binaries/data/mods/public/gui/summary/sprites.xml
@@ -25,4 +25,12 @@
                 <image backcolor="gold" size="2 100%-2 100%-2 100%"/>
                 <image backcolor="gold" size="100%-2 0 100% 100%"/>
 	</sprite>
+	
+	<sprite name="ForegroundBox">
+		<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
+                <image backcolor="gold" size="0 0 2 100%"/>
+                <image backcolor="gold" size="2 100%-2 100%-2 100%"/>
+                <image backcolor="gold" size="100%-2 0 100% 100%"/>
+		<image backcolor="gold" size="0 0 100% 100%"/>
+	</sprite>
 </sprites>
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 1810898aea..0a54730a1e 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -12,7 +12,7 @@
 	<script file="gui/summary/summary.js"/>
 
 	<object type="image"
-		style="StoneWindow"
+		style="ModernWindow"
 		size="0 0 100% 100%"
 	>
 		<action on="Tick">
@@ -23,7 +23,7 @@
 			Summary
 		</object>
 
-		<object type="image" sprite="ForegroundBody" size="20 20 100%-20 70">
+		<object type="image" sprite="ForegroundBody" size="20 24 100%-20 80">
 
 			<object name="summaryText"
 				type="text"
@@ -57,32 +57,32 @@
 		<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="scorePanelButton" type="button" sprite="ForegroundTab" size="20 82 136 120">
+		<object name="scorePanelButton" type="button" sprite="ForegroundTab" size="20 92 136 120">
 			<action on="Press">selectPanel(0);</action>
 			<object type="text" style="TitleText" ghost="true">Score</object>
 		</object>
 		
-		<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" size="142 82 260 120">
+		<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" size="142 92 260 120">
 			<action on="Press">selectPanel(1);</action>
 			<object type="text" style="TitleText" ghost="true">Buildings</object>
 		</object>
 
-		<object name="unitsPanelButton" type="button" sprite="BackgroundTab" size="266 82 384 120">
+		<object name="unitsPanelButton" type="button" sprite="BackgroundTab" size="266 92 384 120">
 			<action on="Press">selectPanel(2);</action>
 			<object type="text" style="TitleText" ghost="true">Units</object>
 		</object>
 
-		<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="390 82 508 120">
+		<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="390 92 508 120">
 			<action on="Press">selectPanel(3);</action>
 			<object type="text" style="TitleText" ghost="true">Resources</object>
 		</object>
 
-		<object name="marketPanelButton" type="button" sprite="BackgroundTab" size="514 82 632 120">
+		<object name="marketPanelButton" type="button" sprite="BackgroundTab" size="514 92 632 120">
 			<action on="Press">selectPanel(4);</action>
 			<object type="text" style="TitleText" ghost="true">Market</object>
 		</object>
 		
-		<object name="miscPanelButton" type="button" sprite="BackgroundTab" size="638 82 756 120">
+		<object name="miscPanelButton" type="button" sprite="BackgroundTab" size="638 92 756 120">
 			<action on="Press">selectPanel(5);</action>
 			<object type="text" style="TitleText" ghost="true">Miscellaneous</object>
 		</object>
@@ -90,118 +90,120 @@
 		<object name="scorePanel" 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">
+				<object name="playerName0Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="economyScoreHeading" type="text" style="CenteredTabLabelText">
+				<object name="economyScoreHeading" type="text" style="ModernTabLabelText">
 					Economy&#10;score
 				</object>
-				<object name="militaryScoreHeading" type="text" style="CenteredTabLabelText">
+				<object name="militaryScoreHeading" type="text" style="ModernTabLabelText">
 					Military&#10;score
 				</object>
-				<object name="explorationScoreHeading" type="text" style="CenteredTabLabelText">
+				<object name="explorationScoreHeading" type="text" style="ModernTabLabelText">
 					Exploration&#10;score
 				</object>
-				<object name="totalScoreHeading" type="text" style="CenteredTabLabelText">
+				<object name="totalScoreHeading" type="text" style="ModernTabLabelText">
 					Total&#10;score
 				</object>
 			</object>
 
 			<object type="image" name="teamBox0t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading0t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading0t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox0t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox0t0p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName0t0p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText" />
+							<object name="playerName0t0p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText" />
 							<object name="civIcon0t0p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="economyScoret0p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="militaryScoret0p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="explorationScoret0p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="totalScoret0p[n]"       type="text"  style="CenteredLabelText"/>
+							<object name="economyScoret0p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="militaryScoret0p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="explorationScoret0p[n]" type="text"  style="ModernLabelText"/>
+							<object name="totalScoret0p[n]"       type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading0t0"     type="text" style="LeftTabLabelText"/>
-				<object name="economyScoret0"     type="text" style="CenteredLabelText"/>
-				<object name="militaryScoret0"    type="text" style="CenteredLabelText"/>
-				<object name="explorationScoret0" type="text" style="CenteredLabelText"/>
-				<object name="totalScoret0" 	  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading0t0"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="economyScoret0"     type="text" style="ModernLabelText"/>
+				<object name="militaryScoret0"    type="text" style="ModernLabelText"/>
+				<object name="explorationScoret0" type="text" style="ModernLabelText"/>
+				<object name="totalScoret0" 	  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox0t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading0t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading0t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox0t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox0t1p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName0t1p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName0t1p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon0t1p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="economyScoret1p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="militaryScoret1p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="explorationScoret1p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="totalScoret1p[n]"       type="text"  style="CenteredLabelText"/>
+							<object name="economyScoret1p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="militaryScoret1p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="explorationScoret1p[n]" type="text"  style="ModernLabelText"/>
+							<object name="totalScoret1p[n]"       type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading0t1"     type="text" style="LeftTabLabelText"/>
-				<object name="economyScoret1"     type="text" style="CenteredLabelText"/>
-				<object name="militaryScoret1"    type="text" style="CenteredLabelText"/>
-				<object name="explorationScoret1" type="text" style="CenteredLabelText"/>
-				<object name="totalScoret1" 	  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading0t1"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="economyScoret1"     type="text" style="ModernLabelText"/>
+				<object name="militaryScoret1"    type="text" style="ModernLabelText"/>
+				<object name="explorationScoret1" type="text" style="ModernLabelText"/>
+				<object name="totalScoret1" 	  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox0t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading0t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading0t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox0t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox0t2p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName0t2p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName0t2p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon0t2p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="economyScoret2p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="militaryScoret2p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="explorationScoret2p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="totalScoret2p[n]"       type="text"  style="CenteredLabelText"/>
+							<object name="economyScoret2p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="militaryScoret2p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="explorationScoret2p[n]" type="text"  style="ModernLabelText"/>
+							<object name="totalScoret2p[n]"       type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading0t2"     type="text" style="LeftTabLabelText"/>
-				<object name="economyScoret2"     type="text" style="CenteredLabelText"/>
-				<object name="militaryScoret2"    type="text" style="CenteredLabelText"/>
-				<object name="explorationScoret2" type="text" style="CenteredLabelText"/>
-				<object name="totalScoret2" 	  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading0t2"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="economyScoret2"     type="text" style="ModernLabelText"/>
+				<object name="militaryScoret2"    type="text" style="ModernLabelText"/>
+				<object name="explorationScoret2" type="text" style="ModernLabelText"/>
+				<object name="totalScoret2" 	  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox0t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading0t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading0t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox0t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox0t3p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName0t3p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName0t3p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon0t3p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="economyScoret3p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="militaryScoret3p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="explorationScoret3p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="totalScoret3p[n]"       type="text"  style="CenteredLabelText"/>
+							<object name="economyScoret3p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="militaryScoret3p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="explorationScoret3p[n]" type="text"  style="ModernLabelText"/>
+							<object name="totalScoret3p[n]"       type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading0t3"     type="text" style="LeftTabLabelText"/>
-				<object name="economyScoret3"     type="text" style="CenteredLabelText"/>
-				<object name="militaryScoret3"    type="text" style="CenteredLabelText"/>
-				<object name="explorationScoret3" type="text" style="CenteredLabelText"/>
-				<object name="totalScoret3" 	  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading0t3"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="economyScoret3"     type="text" style="ModernLabelText"/>
+				<object name="militaryScoret3"    type="text" style="ModernLabelText"/>
+				<object name="explorationScoret3" type="text" style="ModernLabelText"/>
+				<object name="totalScoret3" 	  type="text" style="ModernLabelText"/>
 			</object>yy
 			
 			<object type="image" name="noTeamsBox0" size="0 65 100% 100%-50" hidden="true"> 
 				<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"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox0[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName0[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon0[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-						<object name="economyScore[n]"     type="text"  style="CenteredLabelText"/>
-						<object name="militaryScore[n]"    type="text"  style="CenteredLabelText"/>
-						<object name="explorationScore[n]" type="text"  style="CenteredLabelText"/>
-						<object name="totalScore[n]"       type="text"  style="CenteredLabelText"/>
+						<object name="economyScore[n]"     type="text"  style="ModernLabelText"/>
+						<object name="militaryScore[n]"    type="text"  style="ModernLabelText"/>
+						<object name="explorationScore[n]" type="text"  style="ModernLabelText"/>
+						<object name="totalScore[n]"       type="text"  style="ModernLabelText"/>
 					</object>
 				</repeat>
 			</object>
@@ -210,170 +212,172 @@
 		<object name="buildingsPanel" 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">
+				<object name="playerName1Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="buildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="buildingsHeading" type="text" style="ModernTabLabelText">
 					Buildings Statistics (Constructed / Lost / Destroyed)
 				</object>
-				<object name="totalBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="totalBuildingsHeading" type="text" style="ModernTabLabelText">
 					Total
 				</object>
-				<object name="houseBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="houseBuildingsHeading" type="text" style="ModernTabLabelText">
 					Houses
 				</object>
-				<object name="economicBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="economicBuildingsHeading" type="text" style="ModernTabLabelText">
 					Economic
 				</object>
-				<object name="outpostBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="outpostBuildingsHeading" type="text" style="ModernTabLabelText">
 					Outposts
 				</object>
-				<object name="militaryBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="militaryBuildingsHeading" type="text" style="ModernTabLabelText">
 					Military
 				</object> 
-				<object name="fortressBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="fortressBuildingsHeading" type="text" style="ModernTabLabelText">
 					Fortresses
 				</object>
-				<object name="civCentreBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="civCentreBuildingsHeading" type="text" style="ModernTabLabelText">
 					Civ&#160;Centers
 				</object>
-				<object name="wonderBuildingsHeading" type="text" style="CenteredTabLabelText">
+				<object name="wonderBuildingsHeading" type="text" style="ModernTabLabelText">
 					Wonders
 				</object>
 
 			</object>
 			
 			<object type="image" name="teamBox1t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading1t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading1t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox1t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox1t0p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName1t0p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName1t0p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon1t0p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="totalBuildingst0p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="houseBuildingst0p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="economicBuildingst0p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="outpostBuildingst0p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="militaryBuildingst0p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="fortressBuildingst0p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="civCentreBuildingst0p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="wonderBuildingst0p[n]"    type="text"  style="CenteredLabelText"/>
+							<object name="totalBuildingst0p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="houseBuildingst0p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="economicBuildingst0p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="outpostBuildingst0p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="militaryBuildingst0p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="fortressBuildingst0p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="civCentreBuildingst0p[n]" type="text"  style="ModernLabelText"/>
+							<object name="wonderBuildingst0p[n]"    type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading1t0"       type="text" style="LeftTabLabelText"/>
-				<object name="totalBuildingst0"     type="text" style="CenteredLabelText"/>
-				<object name="houseBuildingst0"     type="text" style="CenteredLabelText"/>
-				<object name="economicBuildingst0"  type="text" style="CenteredLabelText"/>
-				<object name="outpostBuildingst0"   type="text" style="CenteredLabelText"/>
-				<object name="militaryBuildingst0"  type="text" style="CenteredLabelText"/>
-				<object name="fortressBuildingst0"  type="text" style="CenteredLabelText"/>
-				<object name="civCentreBuildingst0" type="text" style="CenteredLabelText"/>
-				<object name="wonderBuildingst0"    type="text" style="CenteredLabelText"/>
+				<object name="teamHeading1t0"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalBuildingst0"     type="text" style="ModernLabelText"/>
+				<object name="houseBuildingst0"     type="text" style="ModernLabelText"/>
+				<object name="economicBuildingst0"  type="text" style="ModernLabelText"/>
+				<object name="outpostBuildingst0"   type="text" style="ModernLabelText"/>
+				<object name="militaryBuildingst0"  type="text" style="ModernLabelText"/>
+				<object name="fortressBuildingst0"  type="text" style="ModernLabelText"/>
+				<object name="civCentreBuildingst0" type="text" style="ModernLabelText"/>
+				<object name="wonderBuildingst0"    type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox1t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading1t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading1t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox1t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox1t1p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName1t1p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName1t1p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon1t1p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="totalBuildingst1p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="houseBuildingst1p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="economicBuildingst1p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="outpostBuildingst1p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="militaryBuildingst1p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="fortressBuildingst1p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="civCentreBuildingst1p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="wonderBuildingst1p[n]"    type="text"  style="CenteredLabelText"/>
+							<object name="totalBuildingst1p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="houseBuildingst1p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="economicBuildingst1p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="outpostBuildingst1p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="militaryBuildingst1p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="fortressBuildingst1p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="civCentreBuildingst1p[n]" type="text"  style="ModernLabelText"/>
+							<object name="wonderBuildingst1p[n]"    type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading1t1"       type="text" style="LeftTabLabelText"/>
-				<object name="totalBuildingst1"     type="text" style="CenteredLabelText"/>
-				<object name="houseBuildingst1"     type="text" style="CenteredLabelText"/>
-				<object name="economicBuildingst1"  type="text" style="CenteredLabelText"/>
-				<object name="outpostBuildingst1"   type="text" style="CenteredLabelText"/>
-				<object name="militaryBuildingst1"  type="text" style="CenteredLabelText"/>
-				<object name="fortressBuildingst1"  type="text" style="CenteredLabelText"/>
-				<object name="civCentreBuildingst1" type="text" style="CenteredLabelText"/>
-				<object name="wonderBuildingst1"    type="text" style="CenteredLabelText"/>
+				<object name="teamHeading1t1"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalBuildingst1"     type="text" style="ModernLabelText"/>
+				<object name="houseBuildingst1"     type="text" style="ModernLabelText"/>
+				<object name="economicBuildingst1"  type="text" style="ModernLabelText"/>
+				<object name="outpostBuildingst1"   type="text" style="ModernLabelText"/>
+				<object name="militaryBuildingst1"  type="text" style="ModernLabelText"/>
+				<object name="fortressBuildingst1"  type="text" style="ModernLabelText"/>
+				<object name="civCentreBuildingst1" type="text" style="ModernLabelText"/>
+				<object name="wonderBuildingst1"    type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox1t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading1t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading1t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox1t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox1t2p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName1t2p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName1t2p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon1t2p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="totalBuildingst2p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="houseBuildingst2p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="economicBuildingst2p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="outpostBuildingst2p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="militaryBuildingst2p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="fortressBuildingst2p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="civCentreBuildingst2p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="wonderBuildingst2p[n]"    type="text"  style="CenteredLabelText"/>
+							<object name="totalBuildingst2p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="houseBuildingst2p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="economicBuildingst2p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="outpostBuildingst2p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="militaryBuildingst2p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="fortressBuildingst2p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="civCentreBuildingst2p[n]" type="text"  style="ModernLabelText"/>
+							<object name="wonderBuildingst2p[n]"    type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading1t2"       type="text" style="LeftTabLabelText"/>
-				<object name="totalBuildingst2"     type="text" style="CenteredLabelText"/>
-				<object name="houseBuildingst2"     type="text" style="CenteredLabelText"/>
-				<object name="economicBuildingst2"  type="text" style="CenteredLabelText"/>
-				<object name="outpostBuildingst2"   type="text" style="CenteredLabelText"/>
-				<object name="militaryBuildingst2"  type="text" style="CenteredLabelText"/>
-				<object name="fortressBuildingst2"  type="text" style="CenteredLabelText"/>
-				<object name="civCentreBuildingst2" type="text" style="CenteredLabelText"/>
-				<object name="wonderBuildingst2"    type="text" style="CenteredLabelText"/>
+				<object name="teamHeading1t2"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalBuildingst2"     type="text" style="ModernLabelText"/>
+				<object name="houseBuildingst2"     type="text" style="ModernLabelText"/>
+				<object name="economicBuildingst2"  type="text" style="ModernLabelText"/>
+				<object name="outpostBuildingst2"   type="text" style="ModernLabelText"/>
+				<object name="militaryBuildingst2"  type="text" style="ModernLabelText"/>
+				<object name="fortressBuildingst2"  type="text" style="ModernLabelText"/>
+				<object name="civCentreBuildingst2" type="text" style="ModernLabelText"/>
+				<object name="wonderBuildingst2"    type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox1t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading1t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading1t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox1t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox1t3p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName1t3p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName1t3p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon1t3p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="totalBuildingst3p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="houseBuildingst3p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="economicBuildingst3p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="outpostBuildingst3p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="militaryBuildingst3p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="fortressBuildingst3p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="civCentreBuildingst3p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="wonderBuildingst3p[n]"    type="text"  style="CenteredLabelText"/>
+							<object name="totalBuildingst3p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="houseBuildingst3p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="economicBuildingst3p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="outpostBuildingst3p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="militaryBuildingst3p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="fortressBuildingst3p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="civCentreBuildingst3p[n]" type="text"  style="ModernLabelText"/>
+							<object name="wonderBuildingst3p[n]"    type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading1t3"       type="text" style="LeftTabLabelText"/>
-				<object name="totalBuildingst3"     type="text" style="CenteredLabelText"/>
-				<object name="houseBuildingst3"     type="text" style="CenteredLabelText"/>
-				<object name="economicBuildingst3"  type="text" style="CenteredLabelText"/>
-				<object name="outpostBuildingst3"   type="text" style="CenteredLabelText"/>
-				<object name="militaryBuildingst3"  type="text" style="CenteredLabelText"/>
-				<object name="fortressBuildingst3"  type="text" style="CenteredLabelText"/>
-				<object name="civCentreBuildingst3" type="text" style="CenteredLabelText"/>
-				<object name="wonderBuildingst3"    type="text" style="CenteredLabelText"/>
+				<object name="teamHeading1t3"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalBuildingst3"     type="text" style="ModernLabelText"/>
+				<object name="houseBuildingst3"     type="text" style="ModernLabelText"/>
+				<object name="economicBuildingst3"  type="text" style="ModernLabelText"/>
+				<object name="outpostBuildingst3"   type="text" style="ModernLabelText"/>
+				<object name="militaryBuildingst3"  type="text" style="ModernLabelText"/>
+				<object name="fortressBuildingst3"  type="text" style="ModernLabelText"/>
+				<object name="civCentreBuildingst3" type="text" style="ModernLabelText"/>
+				<object name="wonderBuildingst3"    type="text" style="ModernLabelText"/>
 			</object>
 			
 			<object type="image" name="noTeamsBox1" size="0 65 100% 100%-50" hidden="true"> 
 				<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"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox1[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName1[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon1[n]"           type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-						<object name="totalBuildings[n]"     type="text"  style="CenteredLabelText"/>
-						<object name="houseBuildings[n]"     type="text"  style="CenteredLabelText"/>
-						<object name="economicBuildings[n]"  type="text"  style="CenteredLabelText"/>
-						<object name="outpostBuildings[n]"   type="text"  style="CenteredLabelText"/>
-						<object name="militaryBuildings[n]"  type="text"  style="CenteredLabelText"/>
-						<object name="fortressBuildings[n]"  type="text"  style="CenteredLabelText"/>
-						<object name="civCentreBuildings[n]" type="text"  style="CenteredLabelText"/>
-						<object name="wonderBuildings[n]"    type="text"  style="CenteredLabelText"/>
+						<object name="totalBuildings[n]"     type="text"  style="ModernLabelText"/>
+						<object name="houseBuildings[n]"     type="text"  style="ModernLabelText"/>
+						<object name="economicBuildings[n]"  type="text"  style="ModernLabelText"/>
+						<object name="outpostBuildings[n]"   type="text"  style="ModernLabelText"/>
+						<object name="militaryBuildings[n]"  type="text"  style="ModernLabelText"/>
+						<object name="fortressBuildings[n]"  type="text"  style="ModernLabelText"/>
+						<object name="civCentreBuildings[n]" type="text"  style="ModernLabelText"/>
+						<object name="wonderBuildings[n]"    type="text"  style="ModernLabelText"/>
 					</object>
 				</repeat>
 			</object>
@@ -382,157 +386,159 @@
 		<object name="unitsPanel" 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">
+				<object name="playerName2Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="unitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="unitsHeading" type="text" style="ModernTabLabelText">
 					Units Statistics (Trained / Lost / Killed)
 				</object>
-				<object name="totalUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="totalUnitsHeading" type="text" style="ModernTabLabelText">
 					Total
 				</object>
-				<object name="infantryUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="infantryUnitsHeading" type="text" style="ModernTabLabelText">
 					Infantry
 				</object>
-				<object name="workerUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="workerUnitsHeading" type="text" style="ModernTabLabelText">
 					Worker
 				</object>
-				<object name="cavalryUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="cavalryUnitsHeading" type="text" style="ModernTabLabelText">
 					Cavalry
 				</object>
-				<object name="championUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="championUnitsHeading" type="text" style="ModernTabLabelText">
 					Champion
 				</object>
-				<object name="heroesUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="heroesUnitsHeading" type="text" style="ModernTabLabelText">
 					Heroes
 				</object>
-				<object name="navyUnitsHeading" type="text" style="CenteredTabLabelText">
+				<object name="navyUnitsHeading" type="text" style="ModernTabLabelText">
 					Navy
 				</object>
 			</object>
 			
 			<object type="image" name="teamBox2t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading2t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading2t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox2t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox2t0p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName2t0p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName2t0p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon2t0p[n]"         type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-							<object name="totalUnitst0p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="infantryUnitst0p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="workerUnitst0p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="cavalryUnitst0p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="championUnitst0p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="heroesUnitst0p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="navyUnitst0p[n]"        type="text"  style="CenteredLabelText"/>
+							<object name="totalUnitst0p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="infantryUnitst0p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="workerUnitst0p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="cavalryUnitst0p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="championUnitst0p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="heroesUnitst0p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="navyUnitst0p[n]"        type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading2t0"  type="text" style="LeftTabLabelText"/>
-				<object name="totalUnitst0"    type="text" style="CenteredLabelText"/>
-				<object name="infantryUnitst0" type="text" style="CenteredLabelText"/>
-				<object name="workerUnitst0"   type="text" style="CenteredLabelText"/>
-				<object name="cavalryUnitst0"  type="text" style="CenteredLabelText"/>
-				<object name="championUnitst0" type="text" style="CenteredLabelText"/>
-				<object name="heroesUnitst0"   type="text" style="CenteredLabelText"/>
-				<object name="navyUnitst0"     type="text" style="CenteredLabelText"/>
+				<object name="teamHeading2t0"  type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalUnitst0"    type="text" style="ModernLabelText"/>
+				<object name="infantryUnitst0" type="text" style="ModernLabelText"/>
+				<object name="workerUnitst0"   type="text" style="ModernLabelText"/>
+				<object name="cavalryUnitst0"  type="text" style="ModernLabelText"/>
+				<object name="championUnitst0" type="text" style="ModernLabelText"/>
+				<object name="heroesUnitst0"   type="text" style="ModernLabelText"/>
+				<object name="navyUnitst0"     type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox2t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading2t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading2t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox2t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox2t1p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName2t1p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName2t1p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon2t1p[n]"         type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-							<object name="totalUnitst1p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="infantryUnitst1p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="workerUnitst1p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="cavalryUnitst1p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="championUnitst1p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="heroesUnitst1p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="navyUnitst1p[n]"        type="text"  style="CenteredLabelText"/>
+							<object name="totalUnitst1p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="infantryUnitst1p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="workerUnitst1p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="cavalryUnitst1p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="championUnitst1p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="heroesUnitst1p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="navyUnitst1p[n]"        type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading2t1"  type="text" style="LeftTabLabelText"/>
-				<object name="totalUnitst1"    type="text" style="CenteredLabelText"/>
-				<object name="infantryUnitst1" type="text" style="CenteredLabelText"/>
-				<object name="workerUnitst1"   type="text" style="CenteredLabelText"/>
-				<object name="cavalryUnitst1"  type="text" style="CenteredLabelText"/>
-				<object name="championUnitst1" type="text" style="CenteredLabelText"/>
-				<object name="heroesUnitst1"   type="text" style="CenteredLabelText"/>
-				<object name="navyUnitst1"     type="text" style="CenteredLabelText"/>
+				<object name="teamHeading2t1"  type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalUnitst1"    type="text" style="ModernLabelText"/>
+				<object name="infantryUnitst1" type="text" style="ModernLabelText"/>
+				<object name="workerUnitst1"   type="text" style="ModernLabelText"/>
+				<object name="cavalryUnitst1"  type="text" style="ModernLabelText"/>
+				<object name="championUnitst1" type="text" style="ModernLabelText"/>
+				<object name="heroesUnitst1"   type="text" style="ModernLabelText"/>
+				<object name="navyUnitst1"     type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox2t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading2t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading2t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox2t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox2t2p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName2t2p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName2t2p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon2t2p[n]"         type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-							<object name="totalUnitst2p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="infantryUnitst2p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="workerUnitst2p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="cavalryUnitst2p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="championUnitst2p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="heroesUnitst2p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="navyUnitst2p[n]"        type="text"  style="CenteredLabelText"/>
+							<object name="totalUnitst2p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="infantryUnitst2p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="workerUnitst2p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="cavalryUnitst2p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="championUnitst2p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="heroesUnitst2p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="navyUnitst2p[n]"        type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading2t2"  type="text" style="LeftTabLabelText"/>
-				<object name="totalUnitst2"    type="text" style="CenteredLabelText"/>
-				<object name="infantryUnitst2" type="text" style="CenteredLabelText"/>
-				<object name="workerUnitst2"   type="text" style="CenteredLabelText"/>
-				<object name="cavalryUnitst2"  type="text" style="CenteredLabelText"/>
-				<object name="championUnitst2" type="text" style="CenteredLabelText"/>
-				<object name="heroesUnitst2"   type="text" style="CenteredLabelText"/>
-				<object name="navyUnitst2"     type="text" style="CenteredLabelText"/>
+				<object name="teamHeading2t2"  type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalUnitst2"    type="text" style="ModernLabelText"/>
+				<object name="infantryUnitst2" type="text" style="ModernLabelText"/>
+				<object name="workerUnitst2"   type="text" style="ModernLabelText"/>
+				<object name="cavalryUnitst2"  type="text" style="ModernLabelText"/>
+				<object name="championUnitst2" type="text" style="ModernLabelText"/>
+				<object name="heroesUnitst2"   type="text" style="ModernLabelText"/>
+				<object name="navyUnitst2"     type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox2t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading2t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading2t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox2t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox2t3p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName2t3p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName2t3p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon2t3p[n]"         type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-							<object name="totalUnitst3p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="infantryUnitst3p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="workerUnitst3p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="cavalryUnitst3p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="championUnitst3p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="heroesUnitst3p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="navyUnitst3p[n]"        type="text"  style="CenteredLabelText"/>
+							<object name="totalUnitst3p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="infantryUnitst3p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="workerUnitst3p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="cavalryUnitst3p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="championUnitst3p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="heroesUnitst3p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="navyUnitst3p[n]"        type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading2t3"  type="text" style="LeftTabLabelText"/>
-				<object name="totalUnitst3"    type="text" style="CenteredLabelText"/>
-				<object name="infantryUnitst3" type="text" style="CenteredLabelText"/>
-				<object name="workerUnitst3"   type="text" style="CenteredLabelText"/>
-				<object name="cavalryUnitst3"  type="text" style="CenteredLabelText"/>
-				<object name="championUnitst3" type="text" style="CenteredLabelText"/>
-				<object name="heroesUnitst3"   type="text" style="CenteredLabelText"/>
-				<object name="navyUnitst3"     type="text" style="CenteredLabelText"/>
+				<object name="teamHeading2t3"  type="text" style="ModernLeftTabLabelText"/>
+				<object name="totalUnitst3"    type="text" style="ModernLabelText"/>
+				<object name="infantryUnitst3" type="text" style="ModernLabelText"/>
+				<object name="workerUnitst3"   type="text" style="ModernLabelText"/>
+				<object name="cavalryUnitst3"  type="text" style="ModernLabelText"/>
+				<object name="championUnitst3" type="text" style="ModernLabelText"/>
+				<object name="heroesUnitst3"   type="text" style="ModernLabelText"/>
+				<object name="navyUnitst3"     type="text" style="ModernLabelText"/>
 			</object>
 
 			<object type="image" name="noTeamsBox2" size="0 65 100% 100%-50" hidden="true"> 
 				<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"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox2[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName2[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon2[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-						<object name="totalUnits[n]"       type="text"  style="CenteredLabelText"/>
-						<object name="infantryUnits[n]"    type="text"  style="CenteredLabelText"/>
-						<object name="workerUnits[n]"      type="text"  style="CenteredLabelText"/>
-						<object name="cavalryUnits[n]"     type="text"  style="CenteredLabelText"/>
-						<object name="championUnits[n]"    type="text"  style="CenteredLabelText"/>
-						<object name="heroesUnits[n]"      type="text"  style="CenteredLabelText"/>
-						<object name="navyUnits[n]"        type="text"  style="CenteredLabelText"/>
+						<object name="totalUnits[n]"       type="text"  style="ModernLabelText"/>
+						<object name="infantryUnits[n]"    type="text"  style="ModernLabelText"/>
+						<object name="workerUnits[n]"      type="text"  style="ModernLabelText"/>
+						<object name="cavalryUnits[n]"     type="text"  style="ModernLabelText"/>
+						<object name="championUnits[n]"    type="text"  style="ModernLabelText"/>
+						<object name="heroesUnits[n]"      type="text"  style="ModernLabelText"/>
+						<object name="navyUnits[n]"        type="text"  style="ModernLabelText"/>
 					</object>
 				</repeat>
 			</object>
@@ -541,157 +547,159 @@
 		<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="playerName3Heading" type="text" style="LeftTabLabelText">
+				<object name="playerName3Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="resourceHeading" type="text" style="CenteredTabLabelText">
+				<object name="resourceHeading" type="text" style="ModernTabLabelText">
 					Resource Statistics (Gathered / Used)
 				</object>
-				<object name="foodGatheredHeading" type="text" style="CenteredTabLabelText">
+				<object name="foodGatheredHeading" type="text" style="ModernTabLabelText">
 					Food
 				</object>
-				<object name="woodGatheredHeading" type="text" style="CenteredTabLabelText">
+				<object name="woodGatheredHeading" type="text" style="ModernTabLabelText">
 					Wood
 				</object>
-				<object name="stoneGatheredHeading" type="text" style="CenteredTabLabelText">
+				<object name="stoneGatheredHeading" type="text" style="ModernTabLabelText">
 					Stone
 				</object>
-				<object name="metalGatheredHeading" type="text" style="CenteredTabLabelText">
+				<object name="metalGatheredHeading" type="text" style="ModernTabLabelText">
 					Metal
 				</object>
-				<object name="totalGatheredHeading" type="text" style="CenteredTabLabelText">
+				<object name="totalGatheredHeading" type="text" style="ModernTabLabelText">
 					Total
 				</object>
-				<object name="treasuresCollectedHeading" type="text" style="CenteredTabLabelText">
+				<object name="treasuresCollectedHeading" type="text" style="ModernTabLabelText">
 					Treasures&#10;collected
 				</object>
-				<object name="resourcesTributedHeading" type="text" style="CenteredTabLabelText">
+				<object name="resourcesTributedHeading" type="text" style="ModernTabLabelText">
 					Tributes&#10;(Sent / Received)
 				</object>
 			</object>
 
 			<object type="image" name="teamBox3t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading3t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading3t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox3t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox3t0p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName3t0p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName3t0p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon3t0p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="foodGatheredt0p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="woodGatheredt0p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="stoneGatheredt0p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="metalGatheredt0p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="totalGatheredt0p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="treasuresCollectedt0p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="resourcesTributedt0p[n]"  type="text"  style="CenteredLabelText"/>
+							<object name="foodGatheredt0p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="woodGatheredt0p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="stoneGatheredt0p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="metalGatheredt0p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="totalGatheredt0p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="treasuresCollectedt0p[n]" type="text"  style="ModernLabelText"/>
+							<object name="resourcesTributedt0p[n]"  type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading3t0"       type="text" style="LeftTabLabelText"/>
-				<object name="foodGatheredt0"       type="text" style="CenteredLabelText"/>
-				<object name="woodGatheredt0"       type="text" style="CenteredLabelText"/>
-				<object name="stoneGatheredt0"      type="text" style="CenteredLabelText"/>
-				<object name="metalGatheredt0"      type="text" style="CenteredLabelText"/>
-				<object name="totalGatheredt0"      type="text" style="CenteredLabelText"/>
-				<object name="treasuresCollectedt0" type="text" style="CenteredLabelText"/>
-				<object name="resourcesTributedt0"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading3t0"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="foodGatheredt0"       type="text" style="ModernLabelText"/>
+				<object name="woodGatheredt0"       type="text" style="ModernLabelText"/>
+				<object name="stoneGatheredt0"      type="text" style="ModernLabelText"/>
+				<object name="metalGatheredt0"      type="text" style="ModernLabelText"/>
+				<object name="totalGatheredt0"      type="text" style="ModernLabelText"/>
+				<object name="treasuresCollectedt0" type="text" style="ModernLabelText"/>
+				<object name="resourcesTributedt0"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox3t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading3t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading3t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox3t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox3t1p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName3t1p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName3t1p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon3t1p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="foodGatheredt1p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="woodGatheredt1p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="stoneGatheredt1p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="metalGatheredt1p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="totalGatheredt1p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="treasuresCollectedt1p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="resourcesTributedt1p[n]"  type="text"  style="CenteredLabelText"/>
+							<object name="foodGatheredt1p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="woodGatheredt1p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="stoneGatheredt1p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="metalGatheredt1p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="totalGatheredt1p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="treasuresCollectedt1p[n]" type="text"  style="ModernLabelText"/>
+							<object name="resourcesTributedt1p[n]"  type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading3t1"       type="text" style="LeftTabLabelText"/>
-				<object name="foodGatheredt1"       type="text" style="CenteredLabelText"/>
-				<object name="woodGatheredt1"       type="text" style="CenteredLabelText"/>
-				<object name="stoneGatheredt1"      type="text" style="CenteredLabelText"/>
-				<object name="metalGatheredt1"      type="text" style="CenteredLabelText"/>
-				<object name="totalGatheredt1"      type="text" style="CenteredLabelText"/>
-				<object name="treasuresCollectedt1" type="text" style="CenteredLabelText"/>
-				<object name="resourcesTributedt1"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading3t1"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="foodGatheredt1"       type="text" style="ModernLabelText"/>
+				<object name="woodGatheredt1"       type="text" style="ModernLabelText"/>
+				<object name="stoneGatheredt1"      type="text" style="ModernLabelText"/>
+				<object name="metalGatheredt1"      type="text" style="ModernLabelText"/>
+				<object name="totalGatheredt1"      type="text" style="ModernLabelText"/>
+				<object name="treasuresCollectedt1" type="text" style="ModernLabelText"/>
+				<object name="resourcesTributedt1"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox3t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading3t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading3t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox3t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox3t2p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName3t2p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName3t2p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon3t2p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="foodGatheredt2p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="woodGatheredt2p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="stoneGatheredt2p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="metalGatheredt2p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="totalGatheredt2p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="treasuresCollectedt2p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="resourcesTributedt2p[n]"  type="text"  style="CenteredLabelText"/>
+							<object name="foodGatheredt2p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="woodGatheredt2p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="stoneGatheredt2p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="metalGatheredt2p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="totalGatheredt2p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="treasuresCollectedt2p[n]" type="text"  style="ModernLabelText"/>
+							<object name="resourcesTributedt2p[n]"  type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading3t2"       type="text" style="LeftTabLabelText"/>
-				<object name="foodGatheredt2"       type="text" style="CenteredLabelText"/>
-				<object name="woodGatheredt2"       type="text" style="CenteredLabelText"/>
-				<object name="stoneGatheredt2"      type="text" style="CenteredLabelText"/>
-				<object name="metalGatheredt2"      type="text" style="CenteredLabelText"/>
-				<object name="totalGatheredt2"      type="text" style="CenteredLabelText"/>
-				<object name="treasuresCollectedt2" type="text" style="CenteredLabelText"/>
-				<object name="resourcesTributedt2"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading3t2"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="foodGatheredt2"       type="text" style="ModernLabelText"/>
+				<object name="woodGatheredt2"       type="text" style="ModernLabelText"/>
+				<object name="stoneGatheredt2"      type="text" style="ModernLabelText"/>
+				<object name="metalGatheredt2"      type="text" style="ModernLabelText"/>
+				<object name="totalGatheredt2"      type="text" style="ModernLabelText"/>
+				<object name="treasuresCollectedt2" type="text" style="ModernLabelText"/>
+				<object name="resourcesTributedt2"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox3t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading3t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading3t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox3t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox3t3p[n]"   type="image" size="10 4 30 24"/>
-							<object name="playerName3t3p[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName3t3p[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon3t3p[n]"           type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="foodGatheredt3p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="woodGatheredt3p[n]"       type="text"  style="CenteredLabelText"/>
-							<object name="stoneGatheredt3p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="metalGatheredt3p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="totalGatheredt3p[n]"      type="text"  style="CenteredLabelText"/>
-							<object name="treasuresCollectedt3p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="resourcesTributedt3p[n]"  type="text"  style="CenteredLabelText"/>
+							<object name="foodGatheredt3p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="woodGatheredt3p[n]"       type="text"  style="ModernLabelText"/>
+							<object name="stoneGatheredt3p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="metalGatheredt3p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="totalGatheredt3p[n]"      type="text"  style="ModernLabelText"/>
+							<object name="treasuresCollectedt3p[n]" type="text"  style="ModernLabelText"/>
+							<object name="resourcesTributedt3p[n]"  type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading3t3"       type="text" style="LeftTabLabelText"/>
-				<object name="foodGatheredt3"       type="text" style="CenteredLabelText"/>
-				<object name="woodGatheredt3"       type="text" style="CenteredLabelText"/>
-				<object name="stoneGatheredt3"      type="text" style="CenteredLabelText"/>
-				<object name="metalGatheredt3"      type="text" style="CenteredLabelText"/>
-				<object name="totalGatheredt3"      type="text" style="CenteredLabelText"/>
-				<object name="treasuresCollectedt3" type="text" style="CenteredLabelText"/>
-				<object name="resourcesTributedt3"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading3t3"       type="text" style="ModernLeftTabLabelText"/>
+				<object name="foodGatheredt3"       type="text" style="ModernLabelText"/>
+				<object name="woodGatheredt3"       type="text" style="ModernLabelText"/>
+				<object name="stoneGatheredt3"      type="text" style="ModernLabelText"/>
+				<object name="metalGatheredt3"      type="text" style="ModernLabelText"/>
+				<object name="totalGatheredt3"      type="text" style="ModernLabelText"/>
+				<object name="treasuresCollectedt3" type="text" style="ModernLabelText"/>
+				<object name="resourcesTributedt3"  type="text" style="ModernLabelText"/>
 			</object>
 			
 			<object type="image" name="noTeamsBox3" size="0 65 100% 100%-50" hidden="true"> 
 				<repeat count="8">
 					<object type="image" name="playerBox3[n]" size="10 0 10 30" hidden="true">
-						<object name="playerColourBox3[n]"   type="image" size="10 4 30 24" />
-						<object name="playerName3[n]"        type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox3[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName3[n]"        type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon3[n]"           type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-						<object name="foodGathered[n]"       type="text"  style="CenteredLabelText"/>
-						<object name="woodGathered[n]"       type="text"  style="CenteredLabelText"/>
-						<object name="stoneGathered[n]"      type="text"  style="CenteredLabelText" />
-						<object name="metalGathered[n]"      type="text"  style="CenteredLabelText"/>
-						<object name="totalGathered[n]"      type="text"  style="CenteredLabelText"/>
-						<object name="treasuresCollected[n]" type="text"  style="CenteredLabelText"/>
-						<object name="resourcesTributed[n]"  type="text"  style="CenteredLabelText"/>
+						<object name="foodGathered[n]"       type="text"  style="ModernLabelText"/>
+						<object name="woodGathered[n]"       type="text"  style="ModernLabelText"/>
+						<object name="stoneGathered[n]"      type="text"  style="ModernLabelText" />
+						<object name="metalGathered[n]"      type="text"  style="ModernLabelText"/>
+						<object name="totalGathered[n]"      type="text"  style="ModernLabelText"/>
+						<object name="treasuresCollected[n]" type="text"  style="ModernLabelText"/>
+						<object name="resourcesTributed[n]"  type="text"  style="ModernLabelText"/>
 					</object>
 				</repeat>
 			</object>
@@ -700,142 +708,144 @@
 		<object name="marketPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58" hidden="true">
 
 			<object size="0 0 100% 100%-50">
-				<object name="playerName4Heading" type="text" style="LeftTabLabelText">
+				<object name="playerName4Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="exchangedFoodHeading" type="text" style="CenteredTabLabelText">
+				<object name="exchangedFoodHeading" type="text" style="ModernTabLabelText">
 					Food&#10;exchanged
 				</object>
-				<object name="exchangedWoodHeading" type="text" style="CenteredTabLabelText">
+				<object name="exchangedWoodHeading" type="text" style="ModernTabLabelText">
 					Wood&#10;exchanged
 				</object>
-				<object name="exchangedStoneHeading" type="text" style="CenteredTabLabelText">
+				<object name="exchangedStoneHeading" type="text" style="ModernTabLabelText">
 					Stone&#10;exchanged
 				</object>
-				<object name="exchangedMetalHeading" type="text" style="CenteredTabLabelText">
+				<object name="exchangedMetalHeading" type="text" style="ModernTabLabelText">
 					Metal&#10;exchanged
 				</object>
-				<object name="barterEfficiencyHeading" type="text" style="CenteredTabLabelText">
+				<object name="barterEfficiencyHeading" type="text" style="ModernTabLabelText">
 					Barter&#10;efficiency
 				</object>
-				<object name="tradeIncomeHeading" type="text" style="CenteredTabLabelText">
+				<object name="tradeIncomeHeading" type="text" style="ModernTabLabelText">
 					Trade&#10;income
 				</object>
 			</object>
 			
 			<object type="image" name="teamBox4t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading4t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading4t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox4t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox4t0p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName4t0p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName4t0p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon4t0p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="exchangedFoodt0p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedWoodt0p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedStonet0p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="exchangedMetalt0p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="barterEfficiencyt0p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="tradeIncomet0p[n]"      type="text"  style="CenteredLabelText"/>
+							<object name="exchangedFoodt0p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedWoodt0p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedStonet0p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="exchangedMetalt0p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="barterEfficiencyt0p[n]" type="text"  style="ModernLabelText"/>
+							<object name="tradeIncomet0p[n]"      type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading4t0"     type="text" style="LeftTabLabelText"/>
-				<object name="exchangedFoodt0"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedWoodt0"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedStonet0"   type="text" style="CenteredLabelText"/>
-				<object name="exchangedMetalt0"   type="text" style="CenteredLabelText"/>
-				<object name="barterEfficiencyt0" type="text" style="CenteredLabelText"/>
-				<object name="tradeIncomet0"      type="text" style="CenteredLabelText"/>
+				<object name="teamHeading4t0"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="exchangedFoodt0"    type="text" style="ModernLabelText"/>
+				<object name="exchangedWoodt0"    type="text" style="ModernLabelText"/>
+				<object name="exchangedStonet0"   type="text" style="ModernLabelText"/>
+				<object name="exchangedMetalt0"   type="text" style="ModernLabelText"/>
+				<object name="barterEfficiencyt0" type="text" style="ModernLabelText"/>
+				<object name="tradeIncomet0"      type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox4t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading4t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading4t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox4t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox4t1p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName4t1p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName4t1p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon4t1p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="exchangedFoodt1p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedWoodt1p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedStonet1p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="exchangedMetalt1p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="barterEfficiencyt1p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="tradeIncomet1p[n]"      type="text"  style="CenteredLabelText"/>
+							<object name="exchangedFoodt1p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedWoodt1p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedStonet1p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="exchangedMetalt1p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="barterEfficiencyt1p[n]" type="text"  style="ModernLabelText"/>
+							<object name="tradeIncomet1p[n]"      type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading4t1"     type="text" style="LeftTabLabelText"/>
-				<object name="exchangedFoodt1"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedWoodt1"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedStonet1"   type="text" style="CenteredLabelText"/>
-				<object name="exchangedMetalt1"   type="text" style="CenteredLabelText"/>
-				<object name="barterEfficiencyt1" type="text" style="CenteredLabelText"/>
-				<object name="tradeIncomet1"      type="text" style="CenteredLabelText"/>
+				<object name="teamHeading4t1"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="exchangedFoodt1"    type="text" style="ModernLabelText"/>
+				<object name="exchangedWoodt1"    type="text" style="ModernLabelText"/>
+				<object name="exchangedStonet1"   type="text" style="ModernLabelText"/>
+				<object name="exchangedMetalt1"   type="text" style="ModernLabelText"/>
+				<object name="barterEfficiencyt1" type="text" style="ModernLabelText"/>
+				<object name="tradeIncomet1"      type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox4t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading4t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading4t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox4t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox4t2p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName4t2p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName4t2p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon4t2p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="exchangedFoodt2p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedWoodt2p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedStonet2p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="exchangedMetalt2p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="barterEfficiencyt2p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="tradeIncomet2p[n]"      type="text"  style="CenteredLabelText"/>
+							<object name="exchangedFoodt2p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedWoodt2p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedStonet2p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="exchangedMetalt2p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="barterEfficiencyt2p[n]" type="text"  style="ModernLabelText"/>
+							<object name="tradeIncomet2p[n]"      type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading4t2"     type="text" style="LeftTabLabelText"/>
-				<object name="exchangedFoodt2"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedWoodt2"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedStonet2"   type="text" style="CenteredLabelText"/>
-				<object name="exchangedMetalt2"   type="text" style="CenteredLabelText"/>
-				<object name="barterEfficiencyt2" type="text" style="CenteredLabelText"/>
-				<object name="tradeIncomet2"      type="text" style="CenteredLabelText"/>
+				<object name="teamHeading4t2"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="exchangedFoodt2"    type="text" style="ModernLabelText"/>
+				<object name="exchangedWoodt2"    type="text" style="ModernLabelText"/>
+				<object name="exchangedStonet2"   type="text" style="ModernLabelText"/>
+				<object name="exchangedMetalt2"   type="text" style="ModernLabelText"/>
+				<object name="barterEfficiencyt2" type="text" style="ModernLabelText"/>
+				<object name="tradeIncomet2"      type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox4t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading4t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading4t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox4t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox4t3p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName4t3p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName4t3p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon4t3p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="exchangedFoodt3p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedWoodt3p[n]"    type="text"  style="CenteredLabelText"/>
-							<object name="exchangedStonet3p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="exchangedMetalt3p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="barterEfficiencyt3p[n]" type="text"  style="CenteredLabelText"/>
-							<object name="tradeIncomet3p[n]"      type="text"  style="CenteredLabelText"/>
+							<object name="exchangedFoodt3p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedWoodt3p[n]"    type="text"  style="ModernLabelText"/>
+							<object name="exchangedStonet3p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="exchangedMetalt3p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="barterEfficiencyt3p[n]" type="text"  style="ModernLabelText"/>
+							<object name="tradeIncomet3p[n]"      type="text"  style="ModernLabelText"/>
 						</object>
 					</repeat>
 				</object>
-				<object name="teamHeading4t3"     type="text" style="LeftTabLabelText"/>
-				<object name="exchangedFoodt3"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedWoodt3"    type="text" style="CenteredLabelText"/>
-				<object name="exchangedStonet3"   type="text" style="CenteredLabelText"/>
-				<object name="exchangedMetalt3"   type="text" style="CenteredLabelText"/>
-				<object name="barterEfficiencyt3" type="text" style="CenteredLabelText"/>
-				<object name="tradeIncomet3"      type="text" style="CenteredLabelText"/>
+				<object name="teamHeading4t3"     type="text" style="ModernLeftTabLabelText"/>
+				<object name="exchangedFoodt3"    type="text" style="ModernLabelText"/>
+				<object name="exchangedWoodt3"    type="text" style="ModernLabelText"/>
+				<object name="exchangedStonet3"   type="text" style="ModernLabelText"/>
+				<object name="exchangedMetalt3"   type="text" style="ModernLabelText"/>
+				<object name="barterEfficiencyt3" type="text" style="ModernLabelText"/>
+				<object name="tradeIncomet3"      type="text" style="ModernLabelText"/>
 			</object>
 			
 			<object type="image" name="noTeamsBox4" size="0 65 100% 100%-50" hidden="true"> 
 				<repeat count="8">
 					<object type="image" name="playerBox4[n]" size="10 0 10 30" hidden="true">
-						<object name="playerColourBox4[n]" type="image" size="10 4 30 24"/>
-						<object name="playerName4[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox4[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName4[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon4[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-						<object name="exchangedFood[n]"    type="text"  style="CenteredLabelText"/>
-						<object name="exchangedWood[n]"    type="text"  style="CenteredLabelText"/>
-						<object name="exchangedStone[n]"   type="text"  style="CenteredLabelText"/>
-						<object name="exchangedMetal[n]"   type="text"  style="CenteredLabelText"/>
-						<object name="barterEfficiency[n]" type="text"  style="CenteredLabelText"/>
-						<object name="tradeIncome[n]"      type="text"  style="CenteredLabelText"/>
+						<object name="exchangedFood[n]"    type="text"  style="ModernLabelText"/>
+						<object name="exchangedWood[n]"    type="text"  style="ModernLabelText"/>
+						<object name="exchangedStone[n]"   type="text"  style="ModernLabelText"/>
+						<object name="exchangedMetal[n]"   type="text"  style="ModernLabelText"/>
+						<object name="barterEfficiency[n]" type="text"  style="ModernLabelText"/>
+						<object name="tradeIncome[n]"      type="text"  style="ModernLabelText"/>
 					</object>
 				</repeat>
 			</object>
@@ -844,118 +854,120 @@
 		<object name="miscPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58" hidden="true">
 
 			<object size="0 0 100% 100%-50">
-				<object name="playerName5Heading" type="text" style="LeftTabLabelText">
+				<object name="playerName5Heading" type="text" style="ModernLeftTabLabelText">
 					Player name
 				</object>
-				<object name="vegetarianRatioHeading" type="text" style="CenteredTabLabelText">
+				<object name="vegetarianRatioHeading" type="text" style="ModernTabLabelText">
 					Vegetarian&#10;ratio
 				</object>
-				<object name="feminisationHeading" type="text" style="CenteredTabLabelText">
+				<object name="feminisationHeading" type="text" style="ModernTabLabelText">
 					Feminisation
 				</object>
-				<object name="killDeathRatioHeading" type="text" style="CenteredTabLabelText">
+				<object name="killDeathRatioHeading" type="text" style="ModernTabLabelText">
 					Kill / Death&#10;ratio
 				</object>
-				<object name="mapExplorationHeading" type="text" style="CenteredTabLabelText">
+				<object name="mapExplorationHeading" type="text" style="ModernTabLabelText">
 					Map&#10;exploration
 				</object>
 			</object>
 			
 			<object type="image" name="teamBox5t0" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading5t0" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading5t0" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox5t0p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox5t0p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName5t0p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName5t0p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon5t0p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="vegetarianRatiot0p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="feminisationt0p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="killDeathRatiot0p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="mapExplorationt0p[n]"   type="text"  style="CenteredLabelText"/>
+							<object name="vegetarianRatiot0p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="feminisationt0p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="killDeathRatiot0p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="mapExplorationt0p[n]"   type="text"  style="ModernLabelText"/>
 						</object>	
 					</repeat>
 				</object>
-				<object name="teamHeading5t0"    type="text" style="LeftTabLabelText"/>
-				<object name="vegetarianRatiot0" type="text" style="CenteredLabelText"/>
-				<object name="feminisationt0"    type="text" style="CenteredLabelText"/>
-				<object name="killDeathRatiot0"  type="text" style="CenteredLabelText"/>
-				<object name="mapExplorationt0"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading5t0"    type="text" style="ModernLeftTabLabelText"/>
+				<object name="vegetarianRatiot0" type="text" style="ModernLabelText"/>
+				<object name="feminisationt0"    type="text" style="ModernLabelText"/>
+				<object name="killDeathRatiot0"  type="text" style="ModernLabelText"/>
+				<object name="mapExplorationt0"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox5t1" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading5t1" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading5t1" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox5t1p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox5t1p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName5t1p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName5t1p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon5t1p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="vegetarianRatiot1p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="feminisationt1p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="killDeathRatiot1p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="mapExplorationt1p[n]"   type="text"  style="CenteredLabelText"/>
+							<object name="vegetarianRatiot1p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="feminisationt1p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="killDeathRatiot1p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="mapExplorationt1p[n]"   type="text"  style="ModernLabelText"/>
 						</object>	
 					</repeat>
 				</object>
-				<object name="teamHeading5t1"    type="text" style="LeftTabLabelText"/>
-				<object name="vegetarianRatiot1" type="text" style="CenteredLabelText"/>
-				<object name="feminisationt1"    type="text" style="CenteredLabelText"/>
-				<object name="killDeathRatiot1"  type="text" style="CenteredLabelText"/>
-				<object name="mapExplorationt1"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading5t1"    type="text" style="ModernLeftTabLabelText"/>
+				<object name="vegetarianRatiot1" type="text" style="ModernLabelText"/>
+				<object name="feminisationt1"    type="text" style="ModernLabelText"/>
+				<object name="killDeathRatiot1"  type="text" style="ModernLabelText"/>
+				<object name="mapExplorationt1"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox5t2" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading5t2" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading5t2" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox5t2p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox5t2p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName5t2p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName5t2p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon5t2p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="vegetarianRatiot2p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="feminisationt2p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="killDeathRatiot2p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="mapExplorationt2p[n]"   type="text"  style="CenteredLabelText"/>
+							<object name="vegetarianRatiot2p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="feminisationt2p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="killDeathRatiot2p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="mapExplorationt2p[n]"   type="text"  style="ModernLabelText"/>
 						</object>	
 					</repeat>
 				</object>
-				<object name="teamHeading5t2"    type="text" style="LeftTabLabelText"/>
-				<object name="vegetarianRatiot2" type="text" style="CenteredLabelText"/>
-				<object name="feminisationt2"    type="text" style="CenteredLabelText"/>
-				<object name="killDeathRatiot2"  type="text" style="CenteredLabelText"/>
-				<object name="mapExplorationt2"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading5t2"    type="text" style="ModernLeftTabLabelText"/>
+				<object name="vegetarianRatiot2" type="text" style="ModernLabelText"/>
+				<object name="feminisationt2"    type="text" style="ModernLabelText"/>
+				<object name="killDeathRatiot2"  type="text" style="ModernLabelText"/>
+				<object name="mapExplorationt2"  type="text" style="ModernLabelText"/>
 			</object>
 			<object type="image" name="teamBox5t3" size="0 65 100% 100%-50" hidden="true">
-				<object type="text" name="teamNameHeading5t3" size="15 5 100% 100%" style="LeftTabLabelText"/>
+				<object type="text" name="teamNameHeading5t3" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
 				<object size="0 30 100% 100%">
 					<repeat count="8">
 						<object type="image" name="playerBox5t3p[n]" size="10 0 10 30" hidden="true">
 							<object name="playerColourBox5t3p[n]" type="image" size="10 4 30 24"/>
-							<object name="playerName5t3p[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+							<object name="playerName5t3p[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 							<object name="civIcon5t3p[n]"         type="image" size="208 0 240 32"  tooltip_style="sessionToolTip"/>
-							<object name="vegetarianRatiot3p[n]"  type="text"  style="CenteredLabelText"/>
-							<object name="feminisationt3p[n]"     type="text"  style="CenteredLabelText"/>
-							<object name="killDeathRatiot3p[n]"   type="text"  style="CenteredLabelText"/>
-							<object name="mapExplorationt3p[n]"   type="text"  style="CenteredLabelText"/>
+							<object name="vegetarianRatiot3p[n]"  type="text"  style="ModernLabelText"/>
+							<object name="feminisationt3p[n]"     type="text"  style="ModernLabelText"/>
+							<object name="killDeathRatiot3p[n]"   type="text"  style="ModernLabelText"/>
+							<object name="mapExplorationt3p[n]"   type="text"  style="ModernLabelText"/>
 						</object>	
 					</repeat>
 				</object>
-				<object name="teamHeading5t3"    type="text" style="LeftTabLabelText"/>
-				<object name="vegetarianRatiot3" type="text" style="CenteredLabelText"/>
-				<object name="feminisationt3"    type="text" style="CenteredLabelText"/>
-				<object name="killDeathRatiot3"  type="text" style="CenteredLabelText"/>
-				<object name="mapExplorationt3"  type="text" style="CenteredLabelText"/>
+				<object name="teamHeading5t3"    type="text" style="ModernLeftTabLabelText"/>
+				<object name="vegetarianRatiot3" type="text" style="ModernLabelText"/>
+				<object name="feminisationt3"    type="text" style="ModernLabelText"/>
+				<object name="killDeathRatiot3"  type="text" style="ModernLabelText"/>
+				<object name="mapExplorationt3"  type="text" style="ModernLabelText"/>
 			</object>
 			
 			<object type="image" name="noTeamsBox5" size="0 65 100% 100%-50" hidden="true"> 
 				<repeat count="8">
 					<object type="image" name="playerBox5[n]" size="10 0 10 30" hidden="true">
-						<object name="playerColourBox5[n]" type="image" size="10 4 30 24"/>
-						<object name="playerName5[n]"      type="text"  size="40 2 208 100%" style="LeftLabelText"/>
+						<object type="image" sprite="ForegroundBox" size="10 4 34 28">
+							<object name="playerColourBox5[n]" type="image" size="2 2 22 22"/>
+						</object>
+						<object name="playerName5[n]"      type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon5[n]"         type="image" size="208 0 240 32" tooltip_style="sessionToolTip"/>
-						<object name="vegetarianRatio[n]"  type="text"  style="CenteredLabelText"/>
-						<object name="feminisation[n]"     type="text"  style="CenteredLabelText"/>
-						<object name="killDeathRatio[n]"   type="text"  style="CenteredLabelText"/>
-						<object name="mapExploration[n]"   type="text"  style="CenteredLabelText"/>
+						<object name="vegetarianRatio[n]"  type="text"  style="ModernLabelText"/>
+						<object name="feminisation[n]"     type="text"  style="ModernLabelText"/>
+						<object name="killDeathRatio[n]"   type="text"  style="ModernLabelText"/>
+						<object name="mapExploration[n]"   type="text"  style="ModernLabelText"/>
 					</object>	
 				</repeat>
 			</object>