diff --git a/binaries/data/mods/public/art/textures/ui/global/border/border-bottom.png b/binaries/data/mods/public/art/textures/ui/global/border/border-bottom.png
new file mode 100644
index 0000000000..64c2cd261d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-bottom.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a88070544536755d89acaec30d0de1a5f57119454575a1ecf5bd994d0e39238
+size 2058
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
new file mode 100644
index 0000000000..fcf4e8b6a0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-corner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cdc81cb3a400b39635e2fa2ec5388d6e38b2f37e5c49168cb533bdf911e07ca
+size 3570
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/border-left.png b/binaries/data/mods/public/art/textures/ui/global/border/border-left.png
new file mode 100644
index 0000000000..c794519a84
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05b7bcec0a4dba0edd71c354f43da786fcf845b032c63b7f3b1f67eb80037dba
+size 2826
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/border-right.png b/binaries/data/mods/public/art/textures/ui/global/border/border-right.png
new file mode 100644
index 0000000000..dc42c8ac37
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:387ac501d4fdb187a6615e052042500c81eff16f86161284816354cce36ab671
+size 2826
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/border-top.png b/binaries/data/mods/public/art/textures/ui/global/border/border-top.png
new file mode 100644
index 0000000000..9220514d97
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/border/border-top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f6aea23af51006bc0074c889b93f0798ed3e75877f9e5cd8f7c6e13c2f3aa7c
+size 2092
diff --git a/binaries/data/mods/public/art/textures/ui/global/tile/stone_background.png b/binaries/data/mods/public/art/textures/ui/global/tile/stone_background.png
new file mode 100644
index 0000000000..811260e5d1
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/tile/stone_background.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:783519fc4e9acaac2383b691f6df35a3899aef27be17e6bc584a1e0896995a59
+size 596287
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/textures.xml b/binaries/data/mods/public/art/textures/ui/global/titlebar/textures.xml
new file mode 100644
index 0000000000..e9cd22c6d3
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" format="rgba"/>
+</Textures>
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
new file mode 100644
index 0000000000..5583ae5737
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0121878fb4ec016e8dfa1d78c1b20fe268c19c5d98c0d456a0e443045e904a9
+size 4782
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
new file mode 100644
index 0000000000..803cd86403
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:914c849a61dfff3d601aa800b8ce461fa70ab97dee6cce3039bdae65ef18eebe
+size 887
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
new file mode 100644
index 0000000000..d7d317c104
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3540ef22c6e1fc6c70e0baff7c974812ad8ca4abe7bad89c6a3ff1379097dea9
+size 4624
diff --git a/binaries/data/mods/public/art/textures/ui/pregame/shading/menu_panel_background_shading.png b/binaries/data/mods/public/art/textures/ui/pregame/shading/menu_panel_background_shading.png
new file mode 100644
index 0000000000..5b52dc5a79
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/pregame/shading/menu_panel_background_shading.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ab6cce3c4e94e8102bb0f9aab7003f8949abf37a3b949668e2048d584b69b2c
+size 52630
diff --git a/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/0ad_logo.png b/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/0ad_logo.png
new file mode 100644
index 0000000000..8077f4e63c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/0ad_logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6c4bac25f93877aa1701c642e8c8a6fac904c83add11b511cae87ce5bd4da15
+size 37846
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
new file mode 100644
index 0000000000..f4862fb719
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<sprites>
+
+	<!--
+	==========================================
+	LOGOS
+	==========================================
+	-->
+        
+	<sprite name="productLogo">
+		<image 	texture="pregame/shell/logo/0ad_logo.png"
+			real_texture_placement="0 0 256 128"
+			size="0 0 100% 100%" 
+		/>
+	</sprite>
+        
+	<sprite name="companyLogo">
+		<image 	texture="pregame/shell/logo/wfg_logo_white.png"
+			real_texture_placement="0 0 48 48"
+			size="0 0 100% 100%" 
+		/>
+	</sprite>
+
+	<!--
+	==========================================
+	BACKCOLOR SPRITES
+	==========================================
+	-->
+
+	<sprite name="BackgroundTranslucent">
+		<image 	backcolor="0 0 0 85"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
+        <sprite name="BackgroundRedBorderGold">
+                <image 	backcolor="80 0 0 255"
+			bordercolor="gold"
+			size="0 0 100% 100%"
+			border="true"
+		/>
+        </sprite>
+
+	<sprite name="BackgroundTranslucentBorderDarkTan">
+		<image	backcolor="30 20 10 255"
+			size="0 0 100% 100%"
+			border="true"
+			bordercolor="60 60 40"
+		/>
+	</sprite>
+
+	<sprite name="BackgroundIndentFillDark">
+		<!-- Starting with top left corner continuing in a clockwise manner -->
+		<!-- Top border -->
+		<image	backcolor="60 60 40"
+			size="0 0 100%-1 1" 
+		/>
+		<!-- Right border -->
+		<image 	backcolor="120 120 80"
+			size="100%-1 0 100% 100%"
+		/>
+		<!-- Bottom border -->
+		<image 	backcolor="120 120 80"
+			size="0 100%-1 100% 100%"
+		/>
+		<!-- Left border -->
+		<image 	backcolor="60 60 40"
+			size="0 0 1 100%-1" 
+		/>
+		<!-- middle -->
+		<image 	backcolor="0 0 0 85"
+			size="1 1 100%-1 100%-1"
+		/>
+	</sprite>
+
+	<sprite name="MainMenuPanelShading">
+		<image	texture="pregame/shading/menu_panel_background_shading.png"
+			texture_size="0 0 256 1024"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+
+
+
+
+	<!--
+	==========================================
+	PANEL SPRITES
+	==========================================
+	-->
+
+	<!-- Stone Tooltip -->
+	<sprite name="stoneTooltip">
+		<image 	backcolor="0 0 0 85"
+			size="0 0 100% 100%"
+		/>
+
+		<!-- sides -->
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="4 0 100%-4 4"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="100%-4 4 100% 100%-4"
+		/>
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="4 100%-4 100%-4 100%"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="0 4 4 100%-4"
+		/>
+
+		<!-- corners -->
+		<image
+			texture="global/border/line_corner_top_right.png"
+			texture_size="0 0 4 4"
+			size="100%-4 0 100% 4"
+		/>
+		<image	texture="global/border/line_corner_bottom_right.png"
+			texture_size="0 0 4 4"
+			size="100%-4 100%-4 100% 100%"
+		/>
+		<image	texture="global/border/line_corner_bottom_left.png"
+			texture_size="0 0 4 4"
+			size="0 100%-4 4 100%"
+		/>
+		<image	texture="global/border/line_corner_top_left.png"
+			texture_size="0 0 4 4"
+			size="0 0 4 4"
+		/>
+	</sprite>
+
+	<!-- Stone Panel -->
+	<sprite name="StonePanel">
+		<image	texture="global/tile/stone_background.png"
+			texture_size="0 0 256 256"
+			size="4 4 100%-4 100%-4" 
+		/>
+
+		<!-- sides -->
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="4 0 100%-4 4"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="100%-4 4 100% 100%-4"
+		/>
+		<image	texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
+			size="4 100%-4 100%-4 100%"
+		/>
+		<image	texture="global/border/line_vert.png"
+			texture_size="0 0 4 64"
+			size="0 4 4 100%-4"
+		/>
+
+		<!-- corners -->
+		<image
+			texture="global/border/line_corner_top_right.png"
+			texture_size="0 0 4 4"
+			size="100%-4 0 100% 4"
+		/>
+		<image	texture="global/border/line_corner_bottom_right.png"
+			texture_size="0 0 4 4"
+			size="100%-4 100%-4 100% 100%"
+		/>
+		<image	texture="global/border/line_corner_bottom_left.png"
+			texture_size="0 0 4 4"
+			size="0 100%-4 4 100%"
+		/>
+		<image	texture="global/border/line_corner_top_left.png"
+			texture_size="0 0 4 4"
+			size="0 0 4 4"
+		/>
+	</sprite>
+
+	<!-- Stone Dialog -->
+	<sprite name="StoneDialog">
+		<!-- background -->
+		<image	texture="global/tile/stone_background.png"
+			texture_size="0 0 256 256"
+			size="4 4 100%-4 100%-4" 
+		/>
+
+		<!-- sides -->
+		<image	texture="global/border/border-top.png"
+			texture_size="0 0 128 16"
+			size="16 0 100%-16 16"
+		/>
+		<image	texture="global/border/border-right.png"
+			texture_size="0 0 16 128"
+			size="100%-16 16 100% 100%-16"
+		/>
+		<image	texture="global/border/border-bottom.png"
+			texture_size="0 0 128 16"
+			size="16 100%-16 100%-16 100%"
+		/>
+		<image	texture="global/border/border-left.png"
+			texture_size="0 0 16 128"
+			size="0 16 16 100%-16"
+		/>
+
+		<!-- corners -->
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="100%-16 0 100% 16"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="100%-16 100%-16 100% 100%"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="0 100%-16 16 100%"
+		/>
+		<image	texture="global/border/border-corner.png"
+			texture_size="0 0 16 16"
+			size="0 0 16 16"
+		/>
+	</sprite>
+
+	<!-- Stone Dialog Title Bar -->
+	<sprite name="StoneDialogTitleBar">
+		<image	texture="session/titlebar/titlebar_left.png"
+			real_texture_placement="0 0 64 32"
+			size="50%-128 0 50%-64 32" 
+		/>
+                <image 	texture="session/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"
+			real_texture_placement="0 0 64 32"
+			size="50%+64 0 50%+128 32" 
+		/>
+	</sprite>
+
+	<!--
+	==========================================
+	MENU CONTROL ELEMENT SPRITES
+	==========================================
+	-->
+	
+	<sprite name="StoneButton">
+		<image	texture="global/button/button_stone_unselected.png"
+			real_texture_placement="0 0 256 32"
+			size="0 0 100% 100%" 
+		/>
+	</sprite>
+        
+	<sprite name="StoneButtonOver">
+		<image 	texture="global/button/button_stone_selected.png"
+			real_texture_placement="0 0 256 32"
+			size="0 0 100% 100%" 
+		/>
+		<image 	texture="global/button/button_stone_selected_left_trim.png"
+			real_texture_placement="0 0 32 32"
+			size="0 0 32 32" 
+		/>
+		<image 	texture="global/button/button_stone_selected_right_trim.png"
+			real_texture_placement="0 0 32 32"
+			size="100%-32 0 100% 32" 
+		/>
+        </sprite>
+
+	<sprite name="StoneButtonGlow">
+		<effect	add_color="60 42 42 0" />
+		<image 	texture="global/button/button_stone_selected.png"
+			real_texture_placement="0 0 256 32"
+			size="0 0 100% 100%" 
+		/>
+		<image 	texture="global/button/button_stone_selected_left_trim.png"
+			real_texture_placement="0 0 32 32"
+			size="0 0 32 32" 
+		/>
+		<image 	texture="global/button/button_stone_selected_right_trim.png"
+			real_texture_placement="0 0 32 32"
+			size="100%-32 0 100% 32" 
+		/>
+        </sprite>
+
+	<sprite name="StoneButtonDisabled">
+		<effect grayscale="" />
+		<image 	texture="global/button/button_stone_unselected.png"
+			real_texture_placement="0 0 256 32"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneCheckBoxOpen">
+		<image	texture="global/button/checkbox_open_gray.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneCheckBoxTick">
+		<image	texture="global/button/checkbox_tick_gray.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneCheckBoxCross">
+		<image	texture="global/button/checkbox_cross_gray.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneCheckBoxCrossOver">
+		<image	texture="global/button/checkbox_cross_over_gray.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowLeft">
+		<image	texture="global/button/arrowbox_lt.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowLeftOver">
+		<image	texture="global/button/arrowbox_lt_over.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowRight">
+		<image	texture="global/button/arrowbox_rt.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowRightOver">
+		<image	texture="global/button/arrowbox_rt_over.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+	<sprite name="StoneArrowUp">
+		<image	texture="global/button/arrowbox_up.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowUpOver">
+		<image	texture="global/button/arrowbox_up_over.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowDn">
+		<image	texture="global/button/arrowbox_dn.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+
+	<sprite name="StoneArrowDnOver">
+		<image	texture="global/button/arrowbox_dn_over.dds"
+			size="0 0 100% 100%" 
+		/>
+        </sprite>
+	
+	<sprite name="StoneScrollSpriteBar">
+		<image	texture="global/border/scrollbar.dds"
+			real_texture_placement="0 0 16 128"
+			size="0 0 100% 100%" 
+		/>
+	</sprite>
+
+</sprites>
diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
new file mode 100644
index 0000000000..cde748d055
--- /dev/null
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<styles>
+
+	<!--
+	==========================================
+	MENU TEXT STYLES
+	==========================================
+	-->
+
+	<style name="LeftLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="left"
+		text_valign="center"
+	/>
+
+	<style name="RightLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="right"
+		text_valign="center"
+	/>
+
+	<style name="CenteredLabelText"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style name="SmallLeftLabelText"
+		font="serif-12"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style name="logoText"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<!--
+	==========================================
+	MENU TOOLTIP STYLES
+	==========================================
+	-->
+
+	<style 	name="stoneTooltip"
+		sprite="stoneTooltip"
+		buffer_zone="10"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<!--
+	==========================================
+	MENU WINDOW STYLES
+	==========================================
+	-->
+
+	<style 	name="StonePanel"
+		sprite="StonePanel"
+		buffer_zone="10"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<!--
+	==========================================
+	MENU DIALOG STYLES
+	==========================================
+	-->
+
+	<style 	name="StoneDialog"
+		sprite="StoneDialog"
+		buffer_zone="10"
+		text_align="left"
+		text_valign="top"
+	/>
+
+	<style 	name="StoneDialogTitleBar"
+		sprite="StoneDialogTitleBar"
+		buffer_zone="10"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="top"
+	/>
+
+	<!--
+	==========================================
+	MENU CONTROL ELEMENT STYLES
+	==========================================
+	-->
+
+	<style 	name="StoneButton"
+		sprite="StoneButton"
+		sprite_disabled="StoneButtonDisabled"
+		sprite_over="StoneButtonOver"
+		sprite_pressed="StoneButtonGlow"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style 	name="StoneButtonPlain"
+		sprite="StoneButton"
+		sprite_disabled="StoneButtonDisabled"
+		sprite_over="StoneButton"
+		sprite_pressed="StoneButton"
+		font="serif-bold-stroke-14"
+		textcolor="gold"
+		text_align="center"
+		text_valign="center"
+	/>
+
+	<style 	name="StoneCrossBox"
+		font="serif-14"
+		sprite="wheatCheckBoxOpen"
+		sprite2="wheatCheckBoxCross"
+		square_side="16"
+		textcolor="black"
+	/>
+
+	<style  name="StoneInput"
+		sprite="wheatIndentFillVeryLight"
+		sprite_selectarea="bkFillDarkBlue"
+		textcolor="black"
+		textcolor_selected="white"
+	/>
+
+	<style 	name="StoneDropDown"
+		dropdown_buffer="1"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+
+		sprite="StoneButton"
+		sprite_over="StoneButtonOver"
+		sprite_pressed="StoneButtonGlow"
+
+		button_width="15"
+		sprite2="wheatArrowDn"
+		sprite2_pressed="wheatArrowDnOver"
+
+		buffer_zone="10"
+		dropdown_size="200"
+		sprite_list="BackgroundTranslucentBorderDarkTan"
+		sprite_selectarea="BackgroundRedBorderGold"
+		textcolor_selected="white"
+
+		scrollbar="true"
+		scrollbar_style="wheatScrollBar"
+	/>
+
+	<style 	name="StoneList"
+		buffer_zone="5"
+		font="serif-bold-stroke-14"
+		scrollbar="true"
+		scrollbar_style="wheatScrollBar"
+		sprite="BackgroundIndentFillDark"
+		sprite_selectarea="BackgroundRedBorderGold"
+		sprite_over="BackgroundIndentFillDark"
+		textcolor="white"
+		textcolor_selected="white"
+		text_align="left"
+		text_valign="center"
+	/>
+
+	<style 	name="StoneExit"
+		size="100%+9 0%-25 100%+25 0%-9"
+		sprite="StoneCheckBoxCross"
+		sprite_over="StoneCheckBoxCrossOver"
+		tooltip="Close this window and return to the previous screen."
+		tooltip_style="pgToolTip"
+	/>
+
+</styles>
diff --git a/binaries/data/mods/public/gui/common/menu_sprites.xml b/binaries/data/mods/public/gui/common/menu_sprites.xml
deleted file mode 100644
index 667ba0faab..0000000000
--- a/binaries/data/mods/public/gui/common/menu_sprites.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<sprites>
-
-	<!--
-	==========================================
-	LOGOS
-	==========================================
-	-->
-        
-	<sprite name="productLogo">
-		<image 	texture="pregame/shell/logo/product.dds"
-			real_texture_placement="0 0 480 218"
-			size="0 0 100% 100%" 
-		/>
-	</sprite>
-        
-	<sprite name="companyLogo">
-		<image 	texture="pregame/shell/logo/wfg_logo_white.png"
-			real_texture_placement="0 0 48 48"
-			size="0 0 100% 100%" 
-		/>
-	</sprite>
-
-	<!--
-	==========================================
-	BACKCOLOR SPRITES
-	==========================================
-	-->
-
-	<sprite name="BackgroundTranslucent">
-		<image 	backcolor="0 0 0 85"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-	
-	<sprite name="BackgroundDarkTransparentBorderGold">
-		<image
-			backcolor="darkgray"
-			size="0 0 100% 100%"
-			border="true"
-			bordercolor="gray"
-		/>
-	</sprite>
-
-
-	<!--
-	==========================================
-	PANEL SPRITES
-	==========================================
-	-->
-
-	<!-- Stone Tooltip -->
-	<sprite name="stoneTooltip">
-		<image 	backcolor="0 0 0 85"
-			size="0 0 100% 100%"
-		/>
-
-		<!-- sides -->
-		<image
-			texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 0 100%-4 4"
-		/>
-		<image
-			texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="100%-4 4 100% 100%-4"
-		/>
-		<image
-			texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 100%-4 100%-4 100%"
-		/>
-		<image
-			texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="0 4 4 100%-4"
-		/>
-
-		<!-- corners -->
-		<image
-			texture="global/border/line_corner_top_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 0 100% 4"
-		/>
-		<image
-			texture="global/border/line_corner_bottom_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 100%-4 100% 100%"
-		/>
-		<image
-			texture="global/border/line_corner_bottom_left.png"
-			texture_size="0 0 4 4"
-			size="0 100%-4 4 100%"
-		/>
-		<image
-			texture="global/border/line_corner_top_left.png"
-			texture_size="0 0 4 4"
-			size="0 0 4 4"
-		/>
-	</sprite>
-
-	<!-- Stone Panel -->
-	<sprite name="stonePanel">
-		<image	texture="global/tile/tile_dark.png"
-			texture_size="0 0 256 256"
-			size="4 4 100%-4 100%-4" 
-		/>
-
-		<!-- sides -->
-		<image
-			texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 0 100%-4 4"
-		/>
-		<image
-			texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="100%-4 4 100% 100%-4"
-		/>
-		<image
-			texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 100%-4 100%-4 100%"
-		/>
-		<image
-			texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="0 4 4 100%-4"
-		/>
-
-		<!-- corners -->
-		<image
-			texture="global/border/line_corner_top_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 0 100% 4"
-		/>
-		<image
-			texture="global/border/line_corner_bottom_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 100%-4 100% 100%"
-		/>
-		<image
-			texture="global/border/line_corner_bottom_left.png"
-			texture_size="0 0 4 4"
-			size="0 100%-4 4 100%"
-		/>
-		<image
-			texture="global/border/line_corner_top_left.png"
-			texture_size="0 0 4 4"
-			size="0 0 4 4"
-		/>
-	</sprite>
-
-	<!-- Stone Dialog -->
-	<sprite name="stoneDialog">
-		<!-- background -->
-		<image	texture="global/tile/tile_dark.png"
-			texture_size="0 0 256 256"
-			size="4 4 100%-4 100%-4" 
-		/>
-
-		<!-- sides -->
-		<image
-			texture="session/border/border-top.png"
-			texture_size="0 0 128 16"
-			size="16 0 100%-16 16"
-		/>
-		<image
-			texture="session/border/border-right.png"
-			texture_size="0 0 16 128"
-			size="100%-16 16 100% 100%-16"
-		/>
-		<image
-			texture="session/border/border-bottom.png"
-			texture_size="0 0 128 16"
-			size="16 100%-16 100%-16 100%"
-		/>
-		<image
-			texture="session/border/border-left.png"
-			texture_size="0 0 16 128"
-			size="0 16 16 100%-16"
-		/>
-
-		<!-- corners -->
-		<image
-			texture="session/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 0 100% 16"
-		/>
-		<image
-			texture="session/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 100%-16 100% 100%"
-		/>
-		<image
-			texture="session/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 100%-16 16 100%"
-		/>
-		<image
-			texture="session/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 0 16 16"
-		/>
-	</sprite>
-
-	<!-- Stone Dialog Title Bar -->
-	<sprite name="stoneDialogTitleBar">
-		<image	texture="session/titlebar/titlebar_left.png"
-			real_texture_placement="0 0 64 32"
-			size="0%+0 0% 64 0%+32" 
-		/>
-                <image 	texture="session/titlebar/titlebar_middle.png"
-			real_texture_placement="0 0 64 32"
-			size="64 0% 100%-64 0%+32" 
-		/>
-                <image 	texture="session/titlebar/titlebar_right.png"
-			real_texture_placement="0 0 64 32"
-			size="100%-64 0% 100%+0 0%+32" 
-		/>
-	</sprite>
-
-	<!--
-	==========================================
-	MENU BUTTON SPRITES
-	==========================================
-	-->
-	
-	<sprite name="stoneButton">
-		<image	texture="global/button/button_stone_unselected.png"
-			real_texture_placement="0 0 256 32"
-			size="0 0 100% 100%" 
-		/>
-	</sprite>
-        
-	<sprite name="stoneButtonOver">
-		<image 	texture="global/button/button_stone_selected.png"
-			real_texture_placement="0 0 256 32"
-			size="0 0 100% 100%" 
-		/>
-		<image 	texture="global/button/button_stone_selected_left_trim.png"
-			real_texture_placement="0 0 32 32"
-			size="0 0 32 32" 
-		/>
-		<image 	texture="global/button/button_stone_selected_right_trim.png"
-			real_texture_placement="0 0 32 32"
-			size="100%-32 0 100% 32" 
-		/>
-        </sprite>
-
-	<sprite name="stoneButtonDisabled">
-		<effect grayscale="" />
-		<image 	texture="global/button/button_stone_unselected.png"
-			real_texture_placement="0 0 256 32"
-			size="0 0 100% 100%" 
-		/>
-        </sprite>
-
-</sprites>
diff --git a/binaries/data/mods/public/gui/common/menu_styles.xml b/binaries/data/mods/public/gui/common/menu_styles.xml
deleted file mode 100644
index 1de5ca55f9..0000000000
--- a/binaries/data/mods/public/gui/common/menu_styles.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<styles>
-
-	<!--
-	==========================================
-	MENU TEXT STYLES
-	==========================================
-	-->
-
-	<style name="menuCenteredText"
-		font="serif-bold-stroke-14"
-		textcolor="gold"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<style name="logoText"
-		font="serif-bold-stroke-14"
-		textcolor="white"
-		text_align="center"
-		text_valign="center"
-	/>
-
-	<!--
-	==========================================
-	MENU TOOLTIP STYLES
-	==========================================
-	-->
-
-	<style 	name="stoneTooltip"
-		sprite="stoneTooltip"
-		buffer_zone="10"
-		font="serif-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<!--
-	==========================================
-	MENU WINDOW STYLES
-	==========================================
-	-->
-
-	<style 	name="stoneWindow"
-		sprite="stonePanel"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<!--
-	==========================================
-	MENU DIALOG STYLES
-	==========================================
-	-->
-
-	<style 	name="stoneWindow"
-		sprite="stonePanel"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<!--
-	==========================================
-	MENU BUTTON STYLES
-	==========================================
-	-->
-
-	<style 	name="stoneButton"
-		sprite="stoneButton"
-		sprite_disabled="stoneButtonDisabled"
-		sprite_over="stoneButtonOver"
-		sprite_pressed="stoneButtonOver"
-		font="serif-bold-stroke-14"
-		textcolor="gold"
-		text_align="center"
-		text_valign="center"
-	/>
-
-</styles>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 3eaf10bb70..decf054e60 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -9,11 +9,11 @@
 	<script file="gui/gamesetup/gamesetup.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" sprite="bkTranslucent"/>
+	<object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-	<object type="image" style="wheatWindow" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
+	<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
 
-		<object type="text" style="wheatWindowTitleBar">
+		<object type="text" style="StoneDialogTitleBar" size="50%-128 0%-16 50%+128 16">
 			Loading
 		</object>
 
@@ -23,15 +23,17 @@
 
 	</object>
 
-	<object type="image" style="wheatWindow" size="50%-400 50%-300 50%+400 50%+300" hidden="true" name="setupWindow">
+	<object type="image" style="StoneDialog" size="50%-400 50%-300 50%+400 50%+300" hidden="true" name="setupWindow">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
-		<object style="wheatWindowTitleBar" type="text">Match Setup</object>
+		<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
+			Match Setup
+		</object>
 
-		<object type="button" style="wheatExit" tooltip_style="snToolTip">
+		<object type="button" style="StoneExit" tooltip_style="snToolTip" size="100%-16 0 100% 16">
 			<action on="Press"><![CDATA[
 				cancelSetup();
 				Engine.PopGuiPage();
@@ -39,22 +41,21 @@
 		</object>
 
 		<!-- Map selection -->
-
-		<object size="0 0 250 100%">
-			<object name="mapTypeHeading" type="text" text_valign="center" size="0 0 100% 30" font="serif-bold-16">Match Type:</object>
+		<object size="16 64 250 100%-16">
+			<object name="mapTypeHeading" type="text" style="LeftLabelText" size="0 0 100% 30">Match Type:</object>
 			<object name="mapTypeSelection"
 				type="dropdown"
-				style="wheatDropDown"
+				style="StoneDropDown"
 				size="100 0 100% 30"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select a map type.">
 				<action on="SelectionChange">selectMapType(this.list_data[this.selected]);</action>
 			</object>
 			
-			<object name="mapFilterHeading" type="text" text_valign="center" size="0 34 100% 64" font="serif-bold-14">Map Filter:</object>
+			<object name="mapFilterHeading" type="text" style="LeftLabelText" size="0 34 100% 64">Map Filter:</object>
 			<object name="mapFilterSelection"
 				type="dropdown"
-				style="wheatDropDown"
+				style="StoneDropDown"
 				size="100 34 100% 64"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select a map filter.">
@@ -62,7 +63,7 @@
 			</object>
 		  
 			<object name="mapSelection"
-				style="wheatList"
+				style="StoneList"
 				type="list"
 				size="0 70 100% 100%-200"
 				tooltip_style="onscreenToolTip"
@@ -70,20 +71,19 @@
 				<action on="SelectionChange">selectMap(this.list_data[this.selected]);</action>
 			</object>
 			
-			<object type="image" style="indentedPanel" size="0 100%-190 100% 100%">
-				<object name="mapInfoName" type="text" size="0 0 100% 30" font="serif-bold-18"/>
-				<object name="mapInfoDescription" type="text" size="0 24 100% 100%" font="serif-13"/>
+			<object type="image" sprite="BackgroundIndentFillDark" size="0 100%-190 100% 100%">
+				<object name="mapInfoName" type="text" style="LeftLabelText" size="0 0 100% 30"/>
+				<object name="mapInfoDescription" type="text" style="SmallLeftLabelText" size="0 24 100% 100%"/>
 			</object>
 	
 		</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="numPlayersSelection"
 				type="dropdown"
-				style="wheatDropDown"
+				style="StoneDropDown"
 				size="150 0 200 30"
 				tooltip_style="onscreenToolTip"
 				tooltip="Select number of players.">
@@ -91,7 +91,7 @@
 			</object>
 		</object>
 
-		<object size="260 36 100% 100%-260" type="image" sprite="wheatIndentFillLight">
+		<object size="260 64 100%-16 100%-260" type="image" sprite="BackgroundIndentFillDark">
 			<object size="0 6 100% 30">
 				<object name="playerNameHeading" type="text" text_align="center" size="100 0 250 100%" font="serif-bold-14">Player Name</object>
 				<object name="playerCivHeading" type="text" text_align="center" size="250 0 400 100%" font="serif-bold-14">Civilization</object>
@@ -114,14 +114,14 @@
 					<object name="playerBox[n]" size="0 0 100% 30" hidden="true">
 						<object name="playerColour[n]" type="image" size="0 0 100% 100%"/>
 						<object name="playerName[n]" type="text" text_align="right" text_valign="center" size="0 0 100 100%"/>
-						<object name="playerAssignment[n]" type="dropdown" style="wheatDropDown" size="100 2 250 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player"/>
-						<object name="playerConfig[n]" type="button" style="wheatButton" size="251 6 264 24"
+						<object name="playerAssignment[n]" type="dropdown" style="StoneDropDown" size="100 2 250 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player"/>
+						<object name="playerConfig[n]" type="button" style="StoneButtonPlain" size="251 6 264 24"
 							tooltip_style="onscreenToolTip"
 							tooltip="Configure AI settings"
 						>c</object>
-						<object name="playerCiv[n]" type="dropdown" style="wheatDropDown" size="265 2 395 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's civilization"/>
+						<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="265 2 395 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's civilization"/>
 						<object name="playerCivText[n]" type="text" text_align="center" text_valign="center" size="265 0 395 100%"/>
-						<object name="playerTeam[n]" type="dropdown" style="wheatDropDown" size="415 2 485 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's team"/>
+						<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="415 2 485 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player's team"/>
 						<object name="playerTeamText[n]" type="text" text_align="center" text_valign="center" size="415 0 485 100%"/>
 					</object>
 				</repeat>
@@ -130,57 +130,54 @@
 				
 				
 		<!-- Options -->
-		
 		<object name="gameOptionsBox" size="260 100%-260 100% 100%-190">
 			<object size="2 2 100% 50%-2">	<!-- Top row -->
-				<object name="mapSizeText" size="0 0 175 100%" type="text">Map size:</object>
-				<object name="mapSize" size="75 -2 225 100%-6" type="dropdown" style="wheatDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size (larger may reduce performance)"/>
-				<object name="victoryConditionText" size="245 0 500 100%" type="text">Victory condition:</object>
-				<object name="victoryCondition" size="375 -2 500 100%-6" type="dropdown" style="wheatDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition"/>
+				<object name="mapSizeText" size="0 0 175 100%" type="text" style="LeftLabelText">Map size:</object>
+				<object name="mapSize" size="75 -2 225 100%-6" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size (larger may reduce performance)"/>
+				<object name="victoryConditionText" size="245 0 500 100%" type="text" style="LeftLabelText">Victory condition:</object>
+				<object name="victoryCondition" size="375 -2 500 100%-6" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition"/>
 			</object>
 			<object size="2 50%+2 100% 100%"> 	<!-- Bottom row -->
-				<object name="revealMapText" size="0 0 120 100%" type="text">Reveal map:</object>
-				<object name="revealMap" size="120 2 140 100%" type="checkbox" style="wheatCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map"/>
-				<object name="lockTeamsText" size="245 0 400 100%" type="text">Teams locked:</object>
-				<object name="lockTeams" size="400 2 420 100%" type="checkbox" style="wheatCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams"/>
+				<object name="revealMapText" size="0 0 120 100%" type="text" style="LeftLabelText">Reveal map:</object>
+				<object name="revealMap" size="120 2 140 100%" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle reveal map"/>
+				<object name="lockTeamsText" size="245 0 400 100%" type="text" style="LeftLabelText">Teams locked:</object>
+				<object name="lockTeams" size="400 2 420 100%" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams"/>
 			</object>
 		</object>
 		
 		
 		<!-- Chat window -->
-
-		<object name="chatPanel" size="260 100%-190 100% 100%-45" type="image" sprite="wheatIndentFillLight">
+		<object name="chatPanel" size="260 100%-190 100%-16 100%-45" type="image" sprite="BackgroundIndentFillDark">
 	
 			<object name="chatText" size="3 1 100%-1 100%-25" type="text" style="chatPanel"/>
 	
-			<object name="chatInput" size="2 100%-23 100%-66 100%-3" type="input" style="wheatInput">
+			<object name="chatInput" size="2 100%-23 100%-66 100%-3" type="input" style="StoneInput">
 				<action on="Press">submitChatInput();</action>
 			</object>
 	
-			<object size="100%-65 100%-25 100%-1 100%" type="button" style="wheatButton">
+			<object size="100%-65 100%-25 100%-1 100%" type="button" style="StoneButton">
 				Send
 				<action on="Press">submitChatInput();</action>
 			</object>
 	
 		</object>
 
+
 		<!-- Other things -->
-	
 		<object name="onscreenToolTip"
 			type="text"
 			font="serif-14"
 			textcolor="white"
-			sprite="bkTranslucent"
+			sprite="BackgroundTranslucent"
 			hidden="true"
-			size="260 100%-40 100%-290 100%"
+			size="260 100%-64 100%-310 100%-16"
 		>[Tooltip text]</object>
 	
 		<object
 			name="cancelGame"
 			type="button"
-			style="wheatButton"
-			font="serif-16"
-			size="100%-140 100%-40 100%+3 100%+3"
+			style="StoneButton"
+			size="100%-300 100%-48 100%-160 100%-16"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to return to the main menu."
 		>Cancel
@@ -193,9 +190,8 @@
 		<object
 			name="startGame"
 			type="button"
-			style="wheatButton"
-			font="serif-16"
-			size="100%-280 100%-40 100%-143 100%+3"
+			style="StoneButton"
+			size="100%-156 100%-48 100%-16 100%-16"
 			tooltip_style="onscreenToolTip"
 			tooltip="Click this button to start a new game with the current settings."
 		>Start game!
diff --git a/binaries/data/mods/public/gui/page_gamesetup.xml b/binaries/data/mods/public/gui/page_gamesetup.xml
index b05e6466a0..82dee02c98 100644
--- a/binaries/data/mods/public/gui/page_gamesetup.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup.xml
@@ -3,6 +3,10 @@
     <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>gamesetup/setup.xml</include>
     <include>gamesetup/sprites.xml</include>
     <include>gamesetup/styles.xml</include>
diff --git a/binaries/data/mods/public/gui/page_pregame.xml b/binaries/data/mods/public/gui/page_pregame.xml
index 3c889dc78f..920f1c31e5 100644
--- a/binaries/data/mods/public/gui/page_pregame.xml
+++ b/binaries/data/mods/public/gui/page_pregame.xml
@@ -5,8 +5,8 @@
     <include>common/sprite1.xml</include>
     <include>common/init.xml</include>
 
-<include>common/menu_sprites.xml</include>
-<include>common/menu_styles.xml</include>
+<include>common/common_sprites.xml</include>
+<include>common/common_styles.xml</include>
 
     <include>pregame/sprites.xml</include>
     <include>pregame/styles.xml</include>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 2f2172593a..04a9d6b745 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -54,7 +54,7 @@
 		-->
                 <object name="cornerExitButton"
                         type="button"
-                        style="wheatExit"
+                        style="StoneExit"
                         size="100%-16 0 100% 16"
                         tooltip=""
                 >
@@ -72,9 +72,15 @@
 		-->
 		<object
 			type="image"
-			style="stoneWindow"
+			style="StonePanel"
 			size="50 0 322 100%"
                 >
+     			<object type="image"
+                                ghost="true"
+                                size="0 0 100% 100%"
+                                sprite="MainMenuPanelShading"
+                        />
+
                         <object	name="productLogo"
                                 type="image"
                                 ghost="true"
@@ -87,7 +93,7 @@
                         >
 				<object name="menuLearnToPlayButton"
                                       type="button"
-                                      style="stoneButton"
+                                      style="StoneButton"
                                       size="4 4 100%-4 36"
                                       tooltip_style="pgToolTip"
                                       tooltip="The 0 A.D. Game Manual"
@@ -99,7 +105,7 @@
                                </object>
                             
                                <object name="menuSinglePlayerButton"
-                                       style="stoneButton"
+                                       style="StoneButton"
                                        type="button"
                                        size="4 36 100%-4 68"
                                        tooltip_style="pgToolTip"
@@ -113,7 +119,7 @@
                                 </object>
                                
                                 <object	name="menuMultiPlayerButton"
-                                        style="stoneButton"
+                                        style="StoneButton"
                                         type="button"
                                         size="4 68 100%-4 100"
                                         tooltip_style="pgToolTip"
@@ -127,7 +133,7 @@
                                 </object>
 
                                 <object name="menuEditorButton"
-                                        style="stoneButton"
+                                        style="StoneButton"
                                         type="button"
                                         size="4 100 100%-4 132"
                                         tooltip_style="pgToolTip"
@@ -143,7 +149,7 @@
                                 </object>
                                 
                                 <object name="menuOptionsButton"
-                                        style="stoneButton"
+                                        style="StoneButton"
                                         type="button"
                                         size="4 132 100%-4 164"
                                         tooltip_style="pgToolTip"
@@ -160,7 +166,7 @@
                                 <!-- EXIT BUTTON -->
                                 <object name="menuExitButton"
                                         type="button"
-                                        style="stoneButton"
+                                        style="StoneButton"
                                         size="4 164 100%-4 196"
                                         tooltip_style="pgToolTip"
                                         tooltip="Exit Game"
@@ -174,7 +180,7 @@
                                 </object>
 
 <!--                        <object name="menuCampaignsButton"
-                                       style="stoneButton"
+                                       style="StoneButton"
                                        type="button"
                                        size="4 36 100%-4 68"
                                        tooltip_style="pgToolTip"
@@ -188,7 +194,7 @@
                         </object>
 -->
 <!--                        <object name="menuHistoryButton"
-                                style="stoneButton"
+                                style="StoneButton"
                                 type="button"
                                 size="4 36 100%-4 68"
                                 tooltip_style="pgToolTip"
@@ -225,7 +231,7 @@ Watch for updates or get involved: wildfiregames.com/0ad
 
 				<!-- CONTACT METHODS -->
 		        	<object type="button"
-		        		style="stoneButton"
+		        		style="StoneButton"
 		       			size="4 100%-36 50%-2 100%-4"
 		       		>
 		                	Website
@@ -237,7 +243,7 @@ Watch for updates or get involved: wildfiregames.com/0ad
 				</object>
 
 		                <object type="button"
-		                        style="stoneButton"
+		                        style="StoneButton"
 		                        size="50%+2 100%-36 100%-4 100%-4"
 		                >
 		                	IRC
@@ -271,7 +277,7 @@ Watch for updates or get involved: wildfiregames.com/0ad
 
       			<!-- VERSION -->
 		        <object name="versionNumber"
-		       		style="menuCenteredText"
+		       		style="CenteredLabelText"
 		       	 	type="text"
 		       		ghost="true"
 		        	size="50%-128 100%-56 50%+128 100%"