From dc2b2aeff49023a32be4b3b354d205a0ea143167 Mon Sep 17 00:00:00 2001
From: WhiteTreePaladin <brian@wildfiregames.com>
Date: Tue, 23 Aug 2011 03:27:13 +0000
Subject: [PATCH] Converted some more screens over

This was SVN commit r10072.
---
 .../ui/global/border/border-corner.png        |   4 +-
 .../ui/global/tile/stone_background_light.png |   3 +
 .../ui/global/titlebar/titlebar_left.png      |   4 +-
 .../ui/global/titlebar/titlebar_middle.png    |   4 +-
 .../ui/global/titlebar/titlebar_right.png     |   4 +-
 .../progressbar_background_left.png           |   4 +-
 .../progressbar_background_middle.png         |   4 +-
 .../progressbar_background_right.png          |   4 +-
 .../mods/public/gui/common/common_sprites.xml |  35 +++---
 .../mods/public/gui/common/common_styles.xml  |  45 +++++---
 .../mods/public/gui/gamesetup/gamesetup.xml   |  12 +--
 .../data/mods/public/gui/loading/sprites.xml  |  36 +++----
 .../data/mods/public/gui/page_session.xml     |   4 +
 .../data/mods/public/gui/page_summary.xml     |   8 +-
 .../data/mods/public/gui/pregame/mainmenu.xml |   4 +-
 binaries/data/mods/public/gui/session/menu.js |   2 +-
 .../data/mods/public/gui/session/session.xml  |  58 +++++-----
 .../public/gui/session/utility_functions.js   |   2 +-
 .../data/mods/public/gui/summary/sprites.xml  |   2 +-
 .../data/mods/public/gui/summary/summary.xml  | 100 +++++++++---------
 20 files changed, 186 insertions(+), 153 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/tile/stone_background_light.png

diff --git a/binaries/data/mods/public/art/textures/ui/global/border/border-corner.png b/binaries/data/mods/public/art/textures/ui/global/border/border-corner.png
index fcf4e8b6a0..bb823f2336 100644
--- a/binaries/data/mods/public/art/textures/ui/global/border/border-corner.png
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-corner.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cdc81cb3a400b39635e2fa2ec5388d6e38b2f37e5c49168cb533bdf911e07ca
-size 3570
+oid sha256:8178b0a5c2c2cb30956f03191c19f586fc2037c613cce091abe26b900e19c904
+size 673
diff --git a/binaries/data/mods/public/art/textures/ui/global/tile/stone_background_light.png b/binaries/data/mods/public/art/textures/ui/global/tile/stone_background_light.png
new file mode 100644
index 0000000000..89a91a7bf4
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/tile/stone_background_light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d59b393f7614023b18038add0e2d1d88fa20990cc1bbdbeaa7951a1e0aef6ef4
+size 477955
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png
index 5583ae5737..3ded696d67 100644
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0121878fb4ec016e8dfa1d78c1b20fe268c19c5d98c0d456a0e443045e904a9
-size 4782
+oid sha256:cab2b9749eeea4a899395950ed18b46b28dea53dd84074b318c3fa223e19801b
+size 4909
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png
index 803cd86403..6757639e5c 100644
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:914c849a61dfff3d601aa800b8ce461fa70ab97dee6cce3039bdae65ef18eebe
-size 887
+oid sha256:c614ab5c2eb15a3937b5ff8dc52b9607fc62e9a4aa5ed9ca83a94f33f7f06767
+size 913
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png
index d7d317c104..e55ee5b763 100644
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3540ef22c6e1fc6c70e0baff7c974812ad8ca4abe7bad89c6a3ff1379097dea9
-size 4624
+oid sha256:2f39bae2982e407d932411eaf6a0f09f9fd0878c1041b1cc01336118ca1b6d42
+size 4649
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
index 11b53c874f..37e1bd752c 100644
--- a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19fae5e9c3c68ca1d4fc6b53274f01acd17204f2b376fb3a97622665e1435bcb
-size 5279
+oid sha256:bee6101ca80d78b4fef04927a3b5637be9deead51130c5fdf3692e62db74804b
+size 5513
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
index 7fdedfe9f2..c331f5bfcf 100644
--- a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0123d390509aed34e5cfca3bd962e80f90e3d151213af82eb8d8f772dfe016d7
-size 2368
+oid sha256:3e33344c9dba9ee559a0abb75fbfb71cc509cb279db03fdfcf2910c1a84244aa
+size 2614
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
index f59f7ec3c4..4e4d408c70 100644
--- a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c5fdf19b33fd2401e3af9b930fabcd5c2126a72612a810b308c4fbc264613db
-size 5106
+oid sha256:b2596212dd43084619b7948eaf5e2a73bea42979e0bee6ad6666ad378a187e63
+size 5257
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index a335b64174..0be9376294 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -34,6 +34,12 @@
 		/>
 	</sprite>
 
+        <sprite name="BackgroundBlack">
+                <image 	backcolor="black"
+			size="0 0 100% 100%"
+		/>
+        </sprite>
+
         <sprite name="BackgroundRed">
                 <image 	backcolor="80 0 0 255"
 			size="0 0 100% 100%"
@@ -140,8 +146,8 @@
 		/>
 	</sprite>
 
-	<!-- Stone Panel -->
-	<sprite name="StonePanel">
+	<!-- StonePanelThinBorder -->
+	<sprite name="StonePanelThinBorder">
 		<image	texture="global/tile/stone_background.png"
 			texture_size="0 0 256 256"
 			size="4 4 100%-4 100%-4" 
@@ -185,8 +191,8 @@
 		/>
 	</sprite>
 
-	<!-- Stone Dialog -->
-	<sprite name="StoneDialog">
+	<!-- StonePanel -->
+	<sprite name="StonePanel">
 		<!-- background -->
 		<image	texture="global/tile/stone_background.png"
 			texture_size="0 0 256 256"
@@ -232,17 +238,17 @@
 
 	<!-- Stone Dialog Title Bar -->
 	<sprite name="StoneDialogTitleBar">
-		<image	texture="session/titlebar/titlebar_left.png"
+		<image	texture="global/titlebar/titlebar_left.png"
 			real_texture_placement="0 0 64 32"
-			size="50%-128 0 50%-64 32" 
+			size="50%-128 0 50%-64 32"
 		/>
-                <image 	texture="session/titlebar/titlebar_middle.png"
+                <image 	texture="global/titlebar/titlebar_middle.png"
 			real_texture_placement="0 0 64 32"
 			size="50%-64 0 50%+64 32" 
 		/>
-                <image 	texture="session/titlebar/titlebar_right.png"
+                <image 	texture="global/titlebar/titlebar_right.png"
 			real_texture_placement="0 0 64 32"
-			size="50%+64 0 50%+128 32" 
+			size="50%+64 0 50%+128 32"
 		/>
 	</sprite>
 
@@ -321,30 +327,31 @@
 			size="0 0 100% 100%" 
 		/>
         </sprite>
-
+<!--
 	<sprite name="StoneArrowLeft">
-		<image	texture="global/button/arrowbox_lt.dds"
+		<image	texture="global/button/arrowbox_lt.png"
 			size="0 0 100% 100%" 
 		/>
         </sprite>
 
 	<sprite name="StoneArrowLeftOver">
-		<image	texture="global/button/arrowbox_lt_over.dds"
+		<image	texture="global/button/arrowbox_lt_over.png"
 			size="0 0 100% 100%" 
 		/>
         </sprite>
 
 	<sprite name="StoneArrowRight">
-		<image	texture="global/button/arrowbox_rt.dds"
+		<image	texture="global/button/arrowbox_rt.png"
 			size="0 0 100% 100%" 
 		/>
         </sprite>
 
 	<sprite name="StoneArrowRightOver">
-		<image	texture="global/button/arrowbox_rt_over.dds"
+		<image	texture="global/button/arrowbox_rt_over.png"
 			size="0 0 100% 100%" 
 		/>
         </sprite>
+-->
 	<sprite name="StoneArrowUp">
 		<image	texture="global/button/arrowbox_up.dds"
 			size="0 0 100% 100%" 
diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
index 1244ec2680..8dd4c0050d 100644
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -29,6 +29,27 @@
 		text_valign="center"
 	/>
 
+	<style name="LeftTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="RightTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="right"
+		text_valign="top"
+	/>
+
+	<style name="CenteredTabLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="top"
+	/>
+
 	<style name="SmallLeftLabelText"
 		font="serif-12"
 		textcolor="white"
@@ -36,7 +57,7 @@
 		text_valign="top"
 	/>
 
-	<style name="logoText"
+	<style name="TitleText"
 		font="serif-bold-stroke-14"
 		textcolor="white"
 		text_align="center"
@@ -64,21 +85,15 @@
 	==========================================
 	-->
 
-	<style 	name="StonePanel"
-		sprite="StonePanel"
+	<style 	name="StonePanelThinBorder"
+		sprite="StonePanelThinBorder"
 		buffer_zone="10"
 		text_align="left"
 		text_valign="top"
 	/>
 
-	<!--
-	==========================================
-	MENU DIALOG STYLES
-	==========================================
-	-->
-
-	<style 	name="StoneDialog"
-		sprite="StoneDialog"
+	<style 	name="StonePanel"
+		sprite="StonePanel"
 		buffer_zone="10"
 		text_align="left"
 		text_valign="top"
@@ -123,8 +138,8 @@
 
 	<style 	name="StoneCrossBox"
 		font="serif-14"
-		sprite="wheatCheckBoxOpen"
-		sprite2="wheatCheckBoxCross"
+		sprite="StoneCheckBoxOpen"
+		sprite2="StoneCheckBoxCross"
 		square_side="16"
 		textcolor="black"
 	/>
@@ -148,8 +163,8 @@
 		sprite_pressed="StoneButtonGlow"
 
 		button_width="15"
-		sprite2="wheatArrowDn"
-		sprite2_pressed="wheatArrowDnOver"
+		sprite2="StoneArrowDn"
+		sprite2_pressed="StoneArrowDnOver"
 
 		buffer_zone="10"
 		dropdown_size="200"
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 0171c0a858..fd674002ee 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -9,9 +9,9 @@
 	<script file="gui/gamesetup/gamesetup.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="BackgroundBlack"/>
 
-	<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
+	<object type="image" style="StonePanel" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
 
 		<object type="text" style="StoneDialogTitleBar" size="50%-128 0%-16 50%+128 16">
 			Loading
@@ -23,7 +23,7 @@
 
 	</object>
 
-	<object type="image" style="StoneDialog" size="50%-400 50%-300 50%+400 50%+300" hidden="true" name="setupWindow">
+	<object type="image" style="StonePanel" size="0 16 100% 100%" hidden="true" name="setupWindow">
 
 		<action on="Tick">
 			onTick();
@@ -79,12 +79,12 @@
 		</object>
 
 		<!-- Player assignments -->
-		<object name="numPlayersBox" size="260 0 100% 30" hidden="true">
-			<object name="numPlayersSelectionHeading" type="text" text_valign="center" font="serif-bold-16">Number of Players</object>
+		<object name="numPlayersBox" size="260 28 100% 30" hidden="true">
+			<object name="numPlayersSelectionHeading" type="text" style="LeftLabelText" size="160 0 100% 32">Number of Players</object>
 			<object name="numPlayersSelection"
 				type="dropdown"
 				style="StoneDropDown"
-				size="150 0 200 30"
+				size="100 0 150 30"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select number of players.">
 				<action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action>
diff --git a/binaries/data/mods/public/gui/loading/sprites.xml b/binaries/data/mods/public/gui/loading/sprites.xml
index a50eda9347..0228d31ae6 100644
--- a/binaries/data/mods/public/gui/loading/sprites.xml
+++ b/binaries/data/mods/public/gui/loading/sprites.xml
@@ -6,7 +6,7 @@
 	<sprite name="loadingBackground">
 		<!-- background -->
 		<image
-			texture="loading/background-tile.png"
+			texture="global/tile/stone_background_light.png"
 			texture_size="0 0 512 512"
 			size="0 0 100% 100%"
 		/>
@@ -19,44 +19,44 @@
 
 		<!-- sides -->
 		<image
-			texture="loading/border/border-top.png"
+			texture="global/border/border-top.png"
 			texture_size="0 0 128 16"
 			size="16 0 100%-16 16"
 		/>
 		<image
-			texture="loading/border/border-right.png"
+			texture="global/border/border-right.png"
 			texture_size="0 0 16 128"
 			size="100%-16 16 100% 100%-16"
 		/>
 		<image
-			texture="loading/border/border-bottom.png"
+			texture="global/border/border-bottom.png"
 			texture_size="0 0 128 16"
 			size="16 100%-16 100%-16 100%"
 		/>
 		<image
-			texture="loading/border/border-left.png"
+			texture="global/border/border-left.png"
 			texture_size="0 0 16 128"
 			size="0 16 16 100%-16"
 		/>
 
 		<!-- corners -->
 		<image
-			texture="loading/border/border-corner.png"
+			texture="global/border/border-corner.png"
 			texture_size="0 0 16 16"
 			size="100%-16 0 100% 16"
 		/>
 		<image
-			texture="loading/border/border-corner.png"
+			texture="global/border/border-corner.png"
 			texture_size="0 0 16 16"
 			size="100%-16 100%-16 100% 100%"
 		/>
 		<image
-			texture="loading/border/border-corner.png"
+			texture="global/border/border-corner.png"
 			texture_size="0 0 16 16"
 			size="0 100%-16 16 100%"
 		/>
 		<image
-			texture="loading/border/border-corner.png"
+			texture="global/border/border-corner.png"
 			texture_size="0 0 16 16"
 			size="0 0 16 16"
 		/>
@@ -105,44 +105,44 @@
 	<sprite name="loadingTipImage">
 		<!-- sides -->
 		<image
-			texture="loading/border/line_horiz.png"
+			texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
 		<image
-			texture="loading/border/line_vert.png"
+			texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
 		<image
-			texture="loading/border/line_horiz.png"
+			texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
 		<image
-			texture="loading/border/line_vert.png"
+			texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
 
 		<!-- corners -->
 		<image
-			texture="loading/border/line_corner_top_right.png"
+			texture="global/border/line_corner_top_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
 		<image
-			texture="loading/border/line_corner_bottom_right.png"
+			texture="global/border/line_corner_bottom_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
 		<image
-			texture="loading/border/line_corner_bottom_left.png"
+			texture="global/border/line_corner_bottom_left.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
 		<image
-			texture="loading/border/line_corner_top_left.png"
+			texture="global/border/line_corner_top_left.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
@@ -165,4 +165,4 @@
 		/>
 	</sprite>
 
-</sprites>
\ No newline at end of file
+</sprites>
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 2837f4566a..eaf6a69ba7 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -4,6 +4,10 @@
     <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>session/sprites.xml</include>
     <include>session/styles.xml</include>
     <include>session/session.xml</include>
diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index 56d8d500f8..b63ae2ca41 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -3,9 +3,13 @@
     <include>common/setup.xml</include>
     <include>common/styles.xml</include>
     <include>common/sprite1.xml</include>
-	<include>common/icon_sprites.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>summary/sprites.xml</include>
     <include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 04a9d6b745..cdeeabd388 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -72,7 +72,7 @@
 		-->
 		<object
 			type="image"
-			style="StonePanel"
+			style="StonePanelThinBorder"
 			size="50 0 322 100%"
                 >
      			<object type="image"
@@ -270,7 +270,7 @@ Watch for updates or get involved: wildfiregames.com/0ad
 				<!-- COMPANY NAME -->
 		                <object
 					type="text"
-		                        style="logoText"
+		                        style="TitleText"
 		                        size="50%-128 52 50%+128 64"
 				>WILDFIRE GAMES</object>
 			</object>
diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js
index 173f77ec3f..7c13448579 100644
--- a/binaries/data/mods/public/gui/session/menu.js
+++ b/binaries/data/mods/public/gui/session/menu.js
@@ -9,7 +9,7 @@ function toggleDeveloperOverlay()
 function openMenuDialog()
 {
 	var menu = getGUIObjectByName("menuDialogPanel");
-	g_SessionDialog.open("Menu", null, menu, 156, 224, null);
+	g_SessionDialog.open("Menu", null, menu, 204, 224, null);
 }
 
 function openSettingsDialog()
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 82c28409ee..bf230f2dc9 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -193,16 +193,16 @@
 		</object>
 
 		<!-- Chat window -->
-		<object name="chatDialogPanel" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" sprite="genericPanel">
+		<object name="chatDialogPanel" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" style="StonePanelThinBorder">
 			<object name="chatInput" size="16 12 100%-16 36" type="input" style="chatInput" max_length="80">
 				<action on="Press">submitChatInput();</action>
 			</object>
 
-			<object  size="32 100%-44 144 100%-12" type="button" style="wheatButton">
+			<object  size="32 100%-44 144 100%-12" type="button" style="StoneButton">
 				Cancel
 				<action on="Press">closeChat();</action>
 			</object>
-			<object size="100%-144 100%-44 100%-32 100%-12" type="button" style="wheatButton">
+			<object size="100%-144 100%-44 100%-32 100%-12" type="button" style="StoneButton">
 				Send
 				<action on="Press">submitChatInput();</action>
 			</object>
@@ -213,25 +213,25 @@
 		<!-- Session Dialog -->
 		<!-- ================================  ================================ -->
 		<object name="sessionDialog"
-			sprite="sessionDialog"
+			style="StonePanel"
 			type="image"
 			size="50%-180 50%-200 50%+180 50%+50"
 			hidden="true"
 			z="30"
 		>
-			<object name="sessionDialogTitleBar" size="50%-100 -16 50%+100 16" type="image" sprite="sessionDialogTitleBar">
-				<object name="sessionDialogTitle" size="0 -2 100% 100%" type="text" style="dialogTitleText">Title</object>
+			<object name="sessionDialogTitleBar" size="50%-96 -16 50%+96 16" type="image" style="StoneDialogTitleBar">
+				<object name="sessionDialogTitle" type="text" style="TitleText" size="0 -2 100% 100%">Title</object>
 			</object>
 			
 			<object name="sessionDialogMessage" size="20 10 100%-20 100%-48" type="text" style="dialogText"/>
 
 			<object size="0 100%-48 100% 100%">
-				<object name="sessionDialogConfirm" size="32 100%-64 144 100%-32" type="button" style="wheatButton">
+				<object name="sessionDialogConfirm" size="32 100%-64 144 100%-32" type="button" style="StoneButton">
 					OK
 				<action on="Press"></action>
 				</object>
 
-				<object name="sessionDialogCancel" size="100%-144 100%-64 100%-32 100%-32" type="button" style="wheatButton">
+				<object name="sessionDialogCancel" size="100%-144 100%-64 100%-32 100%-32" type="button" style="StoneButton">
 					Cancel
 				<action on="Press">g_SessionDialog.close();</action>
 				</object>
@@ -242,7 +242,7 @@
 		<!-- Menu -->
 		<!-- ================================  ================================ -->
 		<object name="menuDialogPanel"
-			size="50%-74 50%-180 50%+74 50%+20"
+			size="0 50%-180 100% 50%+20"
 			type="image"
 			hidden="true"
 			z="30"
@@ -250,44 +250,44 @@
 			<!-- Settings button -->
 			<object type="button"
 				name="settingsButton"
-				style="wheatButtonFancy"
-				size="50%-56 0 50%+56 32"
+				style="StoneButton"
+				size="0 0 100% 32"
 				tooltip_style="sessionToolTip"
 			>
-				<object size="0 0 100% 100%" type="text" style="centeredText" name="settingsButtonText" ghost="true">Settings</object>
+				Settings
 				<action on="Press">openSettingsDialog();</action>
 			</object>
 
 				<!-- Chat button -->
 				<object type="button"
 					name="chatButton"
-					style="wheatButtonFancy"
-					size="50%-56 32 50%+56 64"
+					style="StoneButton"
+					size="0 32 100% 64"
 					tooltip_style="sessionToolTip"
 				>
-					<object size="0 0 100% 100%" type="text" style="centeredText" name="chatButtonText" ghost="true">Chat</object>
+					Chat
 					<action on="Press">openChat();</action>
 				</object>
 
 				<!-- Pause Button -->
 				<object type="button"
-					style="wheatButtonFancy"
+					style="StoneButton"
 					name="pauseButton"
-					size="50%-56 64 50%+56 96"
+					size="0 64 100% 96"
 					tooltip_style="sessionToolTip"
 				>
-					<object name="pauseButtonText" size="0 0 100% 100%" type="text" ghost="true" style="centeredText">Pause</object>
+					<object name="pauseButtonText" type="text" style="CenteredLabelText" ghost="true">Pause</object>
 					<action on="Press">togglePause();</action>
 				</object>
 
 				<!-- Exit button -->
 				<object type="button"
 					name="menuExitButton"
-					style="wheatButtonFancy"
-					size="50%-56 96 50%+56 128"
+					style="StoneButton"
+					size="0 96 100% 128"
 					tooltip_style="sessionToolTip"
 				>
-					<object size="0 0 100% 100%" type="text" style="centeredText" name="exitButtonText" ghost="true" font="serif-14">Quit</object>
+					Quit
 					<action on="Press">
 						openExitGameDialog();
 					</action>
@@ -298,7 +298,7 @@
 		<!-- Settings Window -->
 		<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
-			sprite="genericPanel"
+			style="StonePanelThinBorder"
 			type="image"
 			size="80%-180 50%-200 50%+180 50%+50"
 			hidden="true"
@@ -469,7 +469,7 @@
 		<!-- ================================  ================================ -->
 		<!-- Supplemental Details Panel on Left -->
 		<!-- ================================  ================================ -->
-		<object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="bottomLeft" z="30">
+		<object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" style="StonePanelThinBorder" z="30">
 
 			<object name="unitFormationPanel"
 				size="24 12 100% 100%"
@@ -498,7 +498,7 @@
 
 			<!-- Stance Selection -->
 			<object name="unitStancePanel"
-				sprite="bottomMiddle"
+				style="StonePanelThinBorder"
 				size="0 100%-43 100% 100%"
 				type="text"
 			>
@@ -517,7 +517,7 @@
 		<!-- ================================  ================================ -->
 		<object name="selectionDetails"
 			type="image"
-			sprite="bottomMiddle"
+			style="StonePanelThinBorder"
 			size="50%-114 100%-205 50%+114 100%"
 			hidden="false"
 		>
@@ -648,7 +648,7 @@
 		<!-- ================================  ================================ -->
 		<object name="unitCommands"
 			type="image"
-			sprite="bottomRight"
+			style="StonePanelThinBorder"
 			size="622 100%-170 100% 100%"
 			hidden="false"
 		>
@@ -668,7 +668,7 @@
 			</object>
 
 			<object name="unitResearchPanel"
-				style="goldPanelFrilly"
+				style="StonePanelThinBorder"
 				size="0 100%-56 100% 100%"
 				type="text"
 			>
@@ -696,7 +696,7 @@
 			<object name="unitQueuePanel"
 				size="4 -56 100% 0"
 				type="image"
-				sprite="genericPanel"
+				style="StonePanelThinBorder"
 			>
 				<object size="-4 -2 52 54" type="image" sprite="snIconSheetTab" tooltip_style="sessionToolTipBottom" cell_id="3" tooltip="Production queue">
 						<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
@@ -730,7 +730,7 @@
 	<object name="netStatus" type="text" style="netStatus" z="100" hidden="true">
 			<object type="button"
 				name="disconnectedExitButton"
-				style="wheatButtonFancy"
+				style="StoneButton"
 				size="50%-84 50%+128 50%+84 50%+160"
 				tooltip_style="sessionToolTip"
 				hidden="true"
diff --git a/binaries/data/mods/public/gui/session/utility_functions.js b/binaries/data/mods/public/gui/session/utility_functions.js
index f4d7fad206..a25ee949e8 100644
--- a/binaries/data/mods/public/gui/session/utility_functions.js
+++ b/binaries/data/mods/public/gui/session/utility_functions.js
@@ -52,7 +52,7 @@ SessionDialog.prototype.open = function(title, message, referencedPanel, x, y, c
 	else
 	{
 		getGUIObjectByName("sessionDialogConfirm").hidden = true;
-		getGUIObjectByName("sessionDialogCancel").size = "50%-56 100%-56 50%+56 100%-24";
+		getGUIObjectByName("sessionDialogCancel").size = "50%-72 100%-56 50%+72 100%-24";
 		getGUIObjectByName("sessionDialogCancel").caption = "Close";
 	}
 
diff --git a/binaries/data/mods/public/gui/summary/sprites.xml b/binaries/data/mods/public/gui/summary/sprites.xml
index 9a9e604e1d..712bda3e32 100644
--- a/binaries/data/mods/public/gui/summary/sprites.xml
+++ b/binaries/data/mods/public/gui/summary/sprites.xml
@@ -6,6 +6,6 @@
 	</sprite>
 	
 	<sprite name="bgInfoBox">
-		<image 	backcolor="120 70 0 100" size="0 0 100% 100%" />
+		<image 	backcolor="80 80 60 120" 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 21ef6c6834..ab90d88b5e 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -12,14 +12,14 @@
 	<object type="image" sprite="bkFillBlack">
 
 		<object type="image"
-			style="wheatWindow"
+			style="StonePanel"
 			size="25 35 100%-25 100%-25"
 		>
-			<object type="button" style="wheatWindowTitleBar">
+			<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
 				Summary
 			</object>
 			
-			<object type="image" sprite="bgInfoHeading" size="0 10 100% 40">				
+			<object type="image" sprite="bgInfoHeading" size="16 16 100%-16 46">				
 				<object 
 					name="summaryText"
 					type="text"
@@ -40,40 +40,40 @@
  			</object>
 			
 			
-			<object name="unitsBuildingsPanelButton" type="button" sprite="bgInfoBox" text_align="center" size="10 75 160 101">
+			<object name="unitsBuildingsPanelButton" type="button" sprite="bgInfoBox" size="16 75 166 101">
 				<action on="Press">selectPanel(0);</action>
-				Units/buildings
+				<object type="text" style="TitleText" ghost="true">Units/buildings</object>
 			</object>
-			<object name="conquestPanelButton" type="button" sprite="bgInfoHeading" text_align="center" size="160 75 310 101">
+			<object name="conquestPanelButton" type="button" sprite="bgInfoHeading" size="172 75 322 101">
 				<action on="Press">selectPanel(1);</action>
-				Conquest
+				<object type="text" style="TitleText" ghost="true">Conquest</object>
 			</object>
-			<object name="resourcesPanelButton" type="button" sprite="bgInfoHeading" text_align="center" size="310 75 460 101">
+			<object name="resourcesPanelButton" type="button" sprite="bgInfoHeading" size="328 75 476 101">
 				<action on="Press">selectPanel(2);</action>
-				Resources
+				<object type="text" style="TitleText" ghost="true">Resources</object>
 			</object>
 			<object name="unitsBuildingsPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50">
 				
 				<object size="0 0 100% 100%-50">
-					<object name="playerName0Heading" type="text" text_align="left" font="serif-bold-14"	>
+					<object name="playerName0Heading" type="text" style="LeftTabLabelText">
 						Player name
 					</object>
-					<object name="unitsTrainedHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="unitsTrainedHeading" type="text" style="CenteredTabLabelText">
 						Units&#10;trained
 					</object>
-					<object name="unitsLostHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="unitsLostHeading" type="text" style="CenteredTabLabelText">
 						Units&#10;lost
 					</object>
-					<object name="enemyUnitsKilledHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="enemyUnitsKilledHeading" type="text" style="CenteredTabLabelText">
 						Enemy units&#10;killed
 					</object>
-					<object name="buildingsConstructedHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="buildingsConstructedHeading" type="text" style="CenteredTabLabelText">
 						Buildings&#10;constructed
 					</object>
-					<object name="buildingsLostHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="buildingsLostHeading" type="text" style="CenteredTabLabelText">
 						Buildings&#10;lost
 					</object>
-					<object name="enemyBuildingsDestroyedHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="enemyBuildingsDestroyedHeading" type="text" style="CenteredTabLabelText">
 						Enemy&#10;buildings&#10;destroyed
 					</object>
 					
@@ -83,14 +83,14 @@
 					<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"  text_align="left"  size="40 2 208 100%" />
-							<object name="civIcon0[n]" 					type="image" size="208 0 240 32"/>
-							<object name="unitsTrained[n]"         		type="text"  text_align="center" />
-							<object name="unitsLost[n]"            		type="text"  text_align="center" />
-							<object name="enemyUnitsKilled[n]"     		type="text"  text_align="center" />
-							<object name="buildingsConstructed[n]" 		type="text"  text_align="center" />
-							<object name="buildingsLost[n]"        		type="text"  text_align="center" />
-							<object name="enemyBuildingsDestroyed[n]"   type="text"  text_align="center" />
+							<object name="playerName0[n]"          		type="text" style="LeftLabelText" size="40 2 208 100%" />
+							<object name="civIcon0[n]" 			type="image" size="208 0 240 32"/>
+							<object name="unitsTrained[n]"         		type="text" style="CenteredLabelText"/>
+							<object name="unitsLost[n]"            		type="text" style="CenteredLabelText"/>
+							<object name="enemyUnitsKilled[n]"     		type="text" style="CenteredLabelText"/>
+							<object name="buildingsConstructed[n]" 		type="text" style="CenteredLabelText"/>
+							<object name="buildingsLost[n]"        		type="text" style="CenteredLabelText"/>
+							<object name="enemyBuildingsDestroyed[n]"   	type="text" style="CenteredLabelText"/>
 						</object>
 					</repeat>
 				</object>
@@ -99,16 +99,16 @@
 			<object name="conquestPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true">
 				
 				<object size="0 0 100% 100%-50">
-					<object name="playerName1Heading" type="text" text_align="left" font="serif-bold-14"	>
+					<object name="playerName1Heading" type="text" style="LeftTabLabelText">
 						Player name
 					</object>
-					<object name="civCentresBuiltHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="civCentresBuiltHeading" type="text" style="CenteredTabLabelText">
 						Civ centres&#10;built
 					</object>
-					<object name="enemyCivCentresDestroyedHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="enemyCivCentresDestroyedHeading" type="text" style="CenteredTabLabelText">
 						Enemy&#10;civ centres&#10;destroyed
 					</object>
-					<object name="mapExplorationHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="mapExplorationHeading" type="text" style="CenteredTabLabelText">
 						Map&#10;exploration
 					</object>
 				</object>	
@@ -117,11 +117,11 @@
 					<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"  text_align="left"  size="40 2 208 100%" />
-							<object name="civIcon1[n]" 					type="image" size="208 0 240 32"/>
-							<object name="civCentresBuilt[n]"      		type="text"  text_align="center" />
-							<object name="enemyCivCentresDestroyed[n]" 	type="text"  text_align="center" />
-							<object name="mapExploration[n]" 			type="text"  text_align="center" />
+							<object name="playerName1[n]"          		type="text"  style="LeftLabelText" size="40 2 208 100%" />
+							<object name="civIcon1[n]" 			type="image" size="208 0 240 32"/>
+							<object name="civCentresBuilt[n]"      		type="text" style="CenteredLabelText"/>
+							<object name="enemyCivCentresDestroyed[n]" 	type="text" style="CenteredLabelText"/>
+							<object name="mapExploration[n]" 		type="text" style="CenteredLabelText"/>
 						</object>
 					</repeat>
 				</object>
@@ -130,25 +130,25 @@
 			<object name="resourcesPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true">
 			
 				<object size="0 0 100% 100%-50">
-					<object name="playerName2Heading" type="text" text_align="left" font="serif-bold-14" >
+					<object name="playerName2Heading" type="text" style="LeftTabLabelText">
 						Player name
 					</object>
-					<object name="foodGatheredHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="foodGatheredHeading" type="text" style="CenteredTabLabelText">
 						Food&#10;gathered
 					</object>
-					<object name="vegetarianRatioHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="vegetarianRatioHeading" type="text" style="CenteredTabLabelText">
 						Vegetarian&#10;ratio
 					</object>
-					<object name="woodGatheredHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="woodGatheredHeading" type="text" style="CenteredTabLabelText">
 						Wood&#10;gathered
 					</object>
-					<object name="metalGatheredHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="metalGatheredHeading" type="text" style="CenteredTabLabelText">
 						Metal&#10;gathered
 					</object>
-					<object name="stoneGatheredHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="stoneGatheredHeading" type="text" style="CenteredTabLabelText">
 						Stone&#10;gathered
 					</object>
-					<object name="treasuresCollectedHeading" type="text" text_align="center" font="serif-bold-14" >
+					<object name="treasuresCollectedHeading" type="text" style="CenteredTabLabelText">
 						Treasures&#10;collected
 					</object>
 				</object>	
@@ -157,22 +157,22 @@
 					<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"  text_align="left"  size="40 2 208 100%" />
-							<object name="civIcon2[n]" 		   		type="image" size="208 0 240 32"/>
-							<object name="foodGathered[n]"     		type="text"  text_align="center" />
-							<object name="vegetarianRatio[n]"  		type="text"  text_align="center" />
-							<object name="woodGathered[n]"     		type="text"  text_align="center" />
-							<object name="metalGathered[n]"    		type="text"  text_align="center" />
-							<object name="stoneGathered[n]"    		type="text"  text_align="center" />
-							<object name="treasuresCollected[n]"    type="text"  text_align="center" />
+							<object name="playerName2[n]"      		type="text"  style="LeftLabelText" size="40 2 208 100%" />
+							<object name="civIcon2[n]" 		   	type="image" size="208 0 240 32"/>
+							<object name="foodGathered[n]"     		type="text" style="CenteredLabelText"/>
+							<object name="vegetarianRatio[n]"  		type="text" style="CenteredLabelText"/>
+							<object name="woodGathered[n]"     		type="text" style="CenteredLabelText"/>
+							<object name="metalGathered[n]"    		type="text" style="CenteredLabelText"/>
+							<object name="stoneGathered[n]"    		type="text" style="CenteredLabelText" />
+							<object name="treasuresCollected[n]"    	type="text" style="CenteredLabelText"/>
 						</object>
 					</repeat>
 				</object>
 			
 			</object>
 			
-			<object type="button" style="wheatButton" size="100%-150 100%-40 100% 100%">
-				Main menu
+			<object type="button" style="StoneButton" size="100%-172 100%-48 100%-16 100%-16">
+				Main Menu
 				<action on="Press"><![CDATA[
 					Engine.SwitchGuiPage("page_pregame.xml");
 				]]></action>