diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml
index 543c068fdc..d299823769 100644
--- a/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -14,12 +14,6 @@
 
 		<object style="StoneDialogTitleBar" type="text" size="50%-128 -16 50%+128 16">Civilizations</object>
 
-		<object type="button" style="wheatExit" tooltip_style="snToolTip">
-			<action on="Press"><![CDATA[
-				Engine.PopGuiPage();
-			]]></action>
-		</object>
-		
 		<!-- Civ selection -->
 		<object size="25 10 100% 30">
 			<object
@@ -51,7 +45,7 @@
 				/>
 			</object>
 			
-			<object type="image" sprite="TranslucentPanel" size="0 40 33%-5 100%">
+			<object type="image" style="TranslucentPanelThinBorder" size="0 40 33%-5 100%">
 				<object
 					name="civBonuses"
 					type="text"
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index 0e5c169977..12b4ce7f66 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -120,7 +120,7 @@
 	</sprite>
 
 	<!-- TranslucentPanel -->
-	<sprite name="TranslucentPanel">
+	<sprite name="TranslucentPanelThinBorder">
 		<image 	backcolor="0 0 0 85"
 			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 94102d8169..04a746e3a1 100644
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -98,26 +98,40 @@
 		text_valign="center"
 	/>
 
+
+
+
 	<!--
 	==========================================
 	MENU TOOLTIP STYLES
 	==========================================
 	-->
 
-	<style 	name="TranslucentPanel"
-		sprite="TranslucentPanel"
-		buffer_zone="10"
-		font="serif-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
+
 
 	<!--
 	==========================================
 	MENU WINDOW STYLES
 	==========================================
 	-->
+        
+        <style 	name="TranslucentPanel"
+		sprite="BackgroundTranslucent"
+		buffer_zone="10"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
+        
+        <style 	name="TranslucentPanelThinBorder"
+		sprite="TranslucentPanelThinBorder"
+		buffer_zone="10"
+		font="serif-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+	/>
 
 	<style 	name="MainMenuPanel"
 		sprite="MainMenuPanel"
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 5a0172a479..59c70656e0 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -33,13 +33,6 @@
 			Match Setup
 		</object>
 
-		<object type="button" style="StoneExit" tooltip_style="snToolTip" size="100%-16 0 100% 16">
-			<action on="Press"><![CDATA[
-				cancelSetup();
-				Engine.PopGuiPage();
-			]]></action>
-		</object>
-
 		<!-- Map selection -->
 		<object size="16 64 250 100%-16">
 			<object name="mapTypeHeading" type="text" style="LeftLabelText" size="0 0 100% 30">Match Type:</object>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
index eb2b4de4e7..2f55db9347 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
@@ -1,8 +1,22 @@
 var g_IsConnecting = false;
 var g_GameType; // "server" or "client"
 
-function init()
+function init(multiplayerGameType)
 {
+        switch (multiplayerGameType)
+        {
+                case "join":
+                        getGUIObjectByName("pageJoin").hidden = false;
+                        getGUIObjectByName("pageHost").hidden = true;
+                        break;
+                case "host":
+                        getGUIObjectByName("pageJoin").hidden = true;
+                        getGUIObjectByName("pageHost").hidden = false;
+                        break;
+                default:
+                        error("Unrecognised multiplayer game type : " + multiplayerGameType);
+                        break;
+        }
 }
 
 function cancelSetup()
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
index f1bff7f792..a8c9312780 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
@@ -9,127 +9,41 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="bkTranslucent"/>
 
-	<object type="image" style="wheatWindow" size="50%-190 50%-120 50%+190 50%+120">
+	<object type="image" style="StonePanelLight" size="50%-190 50%-120 50%+190 50%+120">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
-		<object type="text" style="wheatWindowTitleBar">
+		<object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
 			Multiplayer
 		</object>
-	
-		<object type="button" style="wheatExit" tooltip_style="snToolTip">
-			<action on="Press"><![CDATA[
-				cancelSetup();
-			]]></action>
-		</object>
-
-		<object name="pageSelectMode">
-
-			<object type="text" size="0 50%-60 100% 50%">
-				Please select whether you want to join a game or host your own game. 
-			</object>
-
-			<object type="text" size="0 50%+22 200 50%+50" style="wheatTextHeadBlack">
-				Game Mode:
-			</object>
-
-			<object type="button" style="wheatButton" size="130 50%+20 230 50%+50">
-				Join Game
-				<action on="Press"><![CDATA[
-					switchSetupPage("pageSelectMode", "pageJoin");
-				]]></action>
-			</object>
-
-			<object type="button" style="wheatButton" size="250 50%+20 350 50%+50">
-				Host Game
-				<action on="Press"><![CDATA[
-					switchSetupPage("pageSelectMode", "pageHost");
-				]]></action>
-			</object>
-
-		</object>
-
-		<object name="pageHost" hidden="true">
-
-			<object type="text" size="0 0 400 30">
-				Setting up your server.
-			</object>
-
-			<object type="text" size="0 40 200 70" style="wheatTextHeadBlack">
-				Player name:
-			</object>
-
-			<object name="hostPlayerName" type="input" size="220 40 370 60" style="wheatInput">
-				<action on="Load"><![CDATA[
-					this.caption = Engine.GetDefaultPlayerName();
-				]]></action>
-			</object>
-
-			<object hidden="true"> <!-- TODO: restore this when the server name is actually used -->
-			<object type="text" size="0 80 200 110" style="wheatTextHeadBlack">
-				Server name:
-			</object>
-
-			<object name="hostServerName" type="input" size="220 80 370 100" style="wheatInput">
-				<action on="Load"><![CDATA[
-					this.caption = Engine.GetDefaultPlayerName() + "'s game";
-				]]></action>
-			</object>
-			</object>
-
-			<object type="button" size="3 100%-33 103 100%-3" style="wheatButton">
-				Continue
-				<action on="Press"><![CDATA[
-					if (startHost(
-						getGUIObjectByName("hostPlayerName").caption,
-						getGUIObjectByName("hostServerName").caption))
-					{
-						switchSetupPage("pageHost", "pageConnecting");
-					}
-				]]></action>
-			</object>
-
-			<object type="button" style="wheatButton" size="50%-50 100%-33 50%+50 100%-3"> 
-				Back
-				<action on="Press"><![CDATA[
-					switchSetupPage("pageHost", "pageSelectMode");
-				]]></action>
-			</object>
-
-		</object>
-
-		<object type="button" style="wheatButton" size="100%-103 100%-33 100%-3 100%-3">
-			Cancel
-			<action on="Press"><![CDATA[cancelSetup();]]></action>
-		</object>
-
-		<object name="pageJoin" hidden="true">
+                
+                <object name="pageJoin" size="0 32 100% 100%" hidden="true">
 		
-			<object type="text" size="0 0 400 30">
+			<object type="text" style="CenteredLabelText" size="0 0 400 30">
 				Joining an existing game.
 			</object>
 
-			<object type="text" size="0 40 200 70" style="wheatTextHeadBlack">
+			<object type="text" size="0 40 200 70" style="RightLabelText">
 				Player name:
 			</object>
 
-			<object name="joinPlayerName" type="input" size="220 40 370 60" style="wheatInput">
+			<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
 				<action on="Load"><![CDATA[
 					this.caption = Engine.GetDefaultPlayerName();
 				]]></action>
 			</object>
 
-			<object type="text" size="0 80 200 110" style="wheatTextHeadBlack">
+			<object type="text" size="0 80 200 110" style="RightLabelText">
 				Server Hostname or IP:
 			</object>
 
-			<object name="joinIP" type="input" size="220 80 370 100" style="wheatInput">
+			<object name="joinIP" type="input" size="210 80 100%-32 104" style="StoneInput">
 				127.0.0.1
-			</object>
+			</object>3 100%-33 103 100%-3
 
-			<object type="button" size="3 100%-33 103 100%-3" style="wheatButton"> 
+			<object type="button" size="50%+16 100%-64 50%+144 100%-32" style="StoneButton"> 
 				Continue
 				<action on="Press"><![CDATA[
 					if (startJoin(
@@ -140,17 +54,56 @@
 					}
 				]]></action>
 			</object>
+		</object>
 
-			<object type="button" size="50%-50 100%-33 50%+50 100%-3" style="wheatButton"> 
-				Back
+		<object name="pageHost" size="0 32 100% 100%" hidden="true">
+
+			<object type="text" style="CenteredLabelText" size="0 0 400 30">
+				Set up your server to host.
+			</object>
+
+			<object type="text" size="0 40 200 70" style="RightLabelText">
+				Player name:
+			</object>
+
+			<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput">
+				<action on="Load"><![CDATA[
+					this.caption = Engine.GetDefaultPlayerName();
+				]]></action>
+			</object>
+
+			<object hidden="true"> <!-- TODO: restore this when the server name is actually used -->
+			<object type="text" size="0 80 200 110" style="RightLabelText">
+				Server name:
+			</object>
+
+			<object name="hostServerName" type="input" size="210 80 100%-32 104" style="StoneInput">
+				<action on="Load"><![CDATA[
+					this.caption = Engine.GetDefaultPlayerName() + "'s game";
+				]]></action>
+			</object>
+			</object>
+
+			<object type="button" size="50%+16 100%-64 50%+144 100%-32" style="StoneButton">
+				Continue
 				<action on="Press"><![CDATA[
-					switchSetupPage("pageJoin", "pageSelectMode");
+					if (startHost(
+						getGUIObjectByName("hostPlayerName").caption,
+						getGUIObjectByName("hostServerName").caption))
+					{
+						switchSetupPage("pageHost", "pageConnecting");
+					}
 				]]></action>
 			</object>
 		</object>
 
+                <object type="button" style="StoneButton" size="50%-144 100%-64 50%-16 100%-32">
+			Cancel
+			<action on="Press"><![CDATA[cancelSetup();]]></action>
+		</object>
+
 		<object name="pageConnecting" hidden="true">
-			<object name="connectionStatus" type="text" text_align="center" size="0 100 100% 120">
+			<object name="connectionStatus" type="text" style="CenteredLabelText" size="0 100 100% 120">
 				[Connection status]
 			</object>
 		</object>
diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml
index 45f94d1f58..d8552e87b8 100644
--- a/binaries/data/mods/public/gui/loading/loading.xml
+++ b/binaries/data/mods/public/gui/loading/loading.xml
@@ -11,7 +11,7 @@
 	<script file="gui/common/functions_utility_error.js"/>
 
 	<!-- LOADING SCREEN BACKGROUND -->
-	<object type="image" sprite="StonePanelLight"/>
+	<object type="image" style="StonePanelLight"/>
 	
 	<object size="50%-400 30 50%+400 150">
 		<object name="loadingMapName" size="0 0 100% 32" type="text" style="loadingPageTitleText"/>
diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml
index ac7742f2fd..b33c25e9f3 100644
--- a/binaries/data/mods/public/gui/manual/manual.xml
+++ b/binaries/data/mods/public/gui/manual/manual.xml
@@ -5,21 +5,16 @@
 	<script file="gui/manual/manual.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" sprite="bkTranslucent"/>
+	<object type="image" z="0" style="TranslucentPanel"/>
 
-	<object type="image" style="wheatWindow" size="150 100 100%-150 100%-100">
+	<object type="image" style="StonePanelLight" size="150 100 100%-150 100%-100">
 
-		<object type="button" style="wheatExit" tooltip_style="snToolTip">
-			<action on="Press"><![CDATA[
-				Engine.PopGuiPage();
-			]]></action>
-		</object>
-
-		<object type="image" sprite="wheatIndentFillVeryLight" size="0 0 100% 100%-45">
-			<object name="mainText" type="text" style="textPanel"/>
-		</object>
-		
-        <object type="button" style="wheatButton" size="100%-275 100%-33 100%-113 100%-3">
+                <object type="image" style="TranslucentPanelThinBorder" size="16 16 100%-16 100%-48">
+                    <object type="image" style="TranslucentPanel" size="16 4 100%-4 100%-4">
+                            <object name="mainText" type="text" style="textPanel"/>
+                    </object>
+                </object>	
+        <object type="button" style="StoneButton" size="100%-320 100%-48 100%-160 100%-16">
 			Online Manual
 			<action on="Press"><![CDATA[
 				var url = "http://trac.wildfiregames.com/wiki/0adManual";
@@ -27,7 +22,7 @@
 				messageBox(500, 200, "Opening "+url+" in default web browser. Please wait...", "Opening page", 2);
 				]]></action>
 		</object>
-		<object type="button" style="wheatButton" tooltip_style="snToolTip" size="100%-103 100%-33 100%-3 100%-3">
+		<object type="button" style="StoneButton" tooltip_style="snToolTip" size="100%-144 100%-48 100%-16 100%-16">
 			Close
 			<action on="Press"><![CDATA[Engine.PopGuiPage();]]></action>
 		</object>
diff --git a/binaries/data/mods/public/gui/manual/styles.xml b/binaries/data/mods/public/gui/manual/styles.xml
index 95ad0b60ca..fdbff8920b 100644
--- a/binaries/data/mods/public/gui/manual/styles.xml
+++ b/binaries/data/mods/public/gui/manual/styles.xml
@@ -4,11 +4,11 @@
 
 	<style name="textPanel"
 		buffer_zone="8"
-		font="serif-13"
+		font="serif-bold-16"
 		scrollbar="true"
 		scrollbar_style="wheatScrollBar"
-		textcolor="black"
-		textcolor_selected="white"
+		textcolor="white"
+		textcolor_selected="black"
 		text_align="left"
 		text_valign="center"
 	/>
diff --git a/binaries/data/mods/public/gui/msgbox/msgbox.xml b/binaries/data/mods/public/gui/msgbox/msgbox.xml
index 9aafdeff43..5d0b401dfd 100644
--- a/binaries/data/mods/public/gui/msgbox/msgbox.xml
+++ b/binaries/data/mods/public/gui/msgbox/msgbox.xml
@@ -71,11 +71,11 @@
 		switch (data.buttonCaptions.length)
 		{
 		case 1:
-			mbButton1Obj.size = "30% 100%-80 70% 100%-50";
+			mbButton1Obj.size = "50%-64 100%-64 50%+64 100%-32";
 			break;
 		case 2:
-			mbButton1Obj.size = "10% 100%-80 45% 100%-50";
-			mbButton2Obj.size = "55% 100%-80 90% 100%-50";
+			mbButton1Obj.size = "50%-144 100%-64 50%-16 100%-32";
+			mbButton2Obj.size = "50%+16 100%-64 50%+144 100%-32";
 			break;
 		case 3:
 			mbButton1Obj.size = "10% 100%-80 30% 100%-50";
@@ -87,35 +87,36 @@
 	]]></script>
 	<object>
 		<object name="mbMain"
-			style="wheatWindow"
+			style="StonePanelLight"
 			type="image"
 		>
 
 			<object name="mbTitleBar"
-				style="wheatWindowTitleBar"
+				style="StoneDialogTitleBar"
 				type="text"
+                                size="50%-128 0%-16 50%+128 16"
 			/>
 
 			<object name="mbText"
 				type="text"
-				font="serif-16"
+				style="CenteredLabelText"
 				size="30 30 100%-30 100%-100"
 			/>
                         
 			<object name="mbButton1"
-				style="wheatButtonFancy"
+				style="StoneButton"
 				type="button"
 				hidden="true"
 				size="40 100%-50 33%-30 100%-20" 
 			/>
 			<object name="mbButton2"
-				style="wheatButtonFancy"
+				style="StoneButton"
 				type="button"
 				hidden="true"
 				size="33%+30 100%-50 66%-40 100%-20" 
 			/>
 			<object name="mbButton3"
-				style="wheatButtonFancy"
+				style="StoneButton"
 				type="button"
 				hidden="true"
 				size="66%+30 100%-50 100%-40 100%-20"
diff --git a/binaries/data/mods/public/gui/options/options.js b/binaries/data/mods/public/gui/options/options.js
new file mode 100644
index 0000000000..956a82fcec
--- /dev/null
+++ b/binaries/data/mods/public/gui/options/options.js
@@ -0,0 +1,4 @@
+function init()
+{
+
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/gui/options/options.xml b/binaries/data/mods/public/gui/options/options.xml
new file mode 100644
index 0000000000..08b2086d3e
--- /dev/null
+++ b/binaries/data/mods/public/gui/options/options.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+==========================================
+- POST-GAME SUMMARY SCREEN -
+==========================================
+-->
+
+<objects>
+	<script file="gui/common/functions_civinfo.js"/>
+	<script file="gui/common/functions_utility.js" />
+	<script file="gui/common/functions_global_object.js" />
+	<script file="gui/session/music.js"/>
+	<script file="gui/options/options.js"/>
+	
+        <!-- Add a translucent black background to fade out the menu page -->
+	<object type="image" z="0" style="TranslucentPanel"/>
+        
+        <!-- Settings Window -->
+	<object name="options" type="image" style="StonePanelLight" size="50%-190 50%-120 50%+190 50%+120">
+
+                <object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
+			Game Options
+		</object>
+
+                <object size="50%-190 50%-80 50%+140 50%+120">
+        
+                        <!-- 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">
+                                <action on="Load">if (renderer.shadows) this.checked = true; else this.checked = false;</action>
+                                <action on="Press">renderer.shadows = 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">
+                                <action on="Load">if (renderer.shadowPCF) this.checked = true; else this.checked = false;</action>
+                                <action on="Press">renderer.shadowPCF = this.checked;</action>
+                        </object>
+
+                        <!-- Settings / Water -->
+                        <object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Enable Water Reflections</object>
+                        <object name="fancyWaterCheckbox" size="100%-56 65 100%-30 90"  type="checkbox" style="StoneCrossBox" checked="true">
+                                <action on="Load">if (renderer.fancyWater) this.checked = true; else this.checked = false;</action>
+                                <action on="Press">renderer.fancyWater = this.checked;</action>
+                        </object>
+
+                        <!-- Settings / Music-->
+                        <object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Enable Music</object>
+                        <object size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
+                                <action on="Press">if (this.checked) startMusic(); else stopMusic();</action>
+                        </object>
+
+                        <!-- Settings / Dev Overlay -->
+<!--                        <object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
+                                <object size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="false">
+                                <action on="Press">toggleDeveloperOverlay();</action>
+                        </object>-->
+                </object>
+                
+                <object type="button" style="StoneButton" size="50%-64 100%-64 50%+64 100%-32">
+			Cancel
+			<action on="Press"><![CDATA[Engine.PopGuiPage();]]></action>
+		</object>
+
+        </object>
+</objects>
diff --git a/binaries/data/mods/public/gui/page_gamesetup_mp.xml b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
index dc11542b22..a1dacff07c 100644
--- a/binaries/data/mods/public/gui/page_gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup_mp.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_manual.xml b/binaries/data/mods/public/gui/page_manual.xml
index 43edcea76a..3d56371431 100644
--- a/binaries/data/mods/public/gui/page_manual.xml
+++ b/binaries/data/mods/public/gui/page_manual.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>manual/styles.xml</include>
     <include>manual/manual.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_msgbox.xml b/binaries/data/mods/public/gui/page_msgbox.xml
index 25bd9206a7..c5d741331d 100644
--- a/binaries/data/mods/public/gui/page_msgbox.xml
+++ b/binaries/data/mods/public/gui/page_msgbox.xml
@@ -3,5 +3,9 @@
     <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>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
new file mode 100644
index 0000000000..67e7847f3c
--- /dev/null
+++ b/binaries/data/mods/public/gui/page_options.xml
@@ -0,0 +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/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>options/options.xml</include>
+</page>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.js b/binaries/data/mods/public/gui/pregame/mainmenu.js
index 5450e06960..651be630c8 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.js
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.js
@@ -1,5 +1,5 @@
 var userReportEnabledText; // contains the original version with "$status" placeholder
-var currentSubmenu; // contains placeholdersubmenu
+var currentSubmenu; // contains placeholder submenu
 
 function init()
 {
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 4febba3439..c586615e17 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -205,7 +205,7 @@ Status: $status.
                                 >
                                     Single Player
                                     <action on="Press"><![CDATA[
-                                            updateSubmenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 3);
+                                            updateSubmenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
                                     ]]></action>
                                 </object>
                                
@@ -259,26 +259,25 @@ Status: $status.
                                         tooltip_style="pgToolTip"
                                         tooltip="Exit Game"
                                 >
-                                        Quit
+                                        Exit
                                         <action on="Press"><![CDATA[
                                                 var btCaptions = ["Yes", "No"];
                                                 var btCode = [exit, null];
-                                                messageBox (400, 200, "Are you sure you want to quit [icon=iconProduct] A.D.?", "Confirmation", 0, btCaptions, btCode);
+                                                messageBox (400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
                                         ]]></action>
                                 </object>
                         </object>
 
 			<!-- PRE-RELEASE INFO --> 
-			<object size="8 100%-340 100%-8 100%-100" 
+			<object size="8 100%-340 100%-8 100%-100"
 				type="image" 
-				style="TranslucentPanel"
+				style="TranslucentPanelThinBorder"
 			>
 
 				<!-- PRE-RELEASE WARNING --> 
 				<object 
 					style="fancyTextHeadWhite" 
 					type="text" 
-					sprite="bkTranslucent" 
 					textcolor="white"
 					size="8 8 100%-8 100%-36"
                                         ghost="true"
@@ -365,8 +364,7 @@ Get involved at: wildfiregames.com/0ad
 		==========================================
 		-->
                 
-                <object
-                        name="submenuScreen"
+                <object name="submenuScreen"
 			type="image"
                         hidden="true"
                 >
@@ -376,45 +374,49 @@ Get involved at: wildfiregames.com/0ad
 			</action>
                         
                         <!-- submenu -->
-                        <object
-                                name="submenu"
+                        <object name="submenu"
                                 type="image"
                                 style="MainMenuPanel"
                                 size="298 50%-100 538 50%+100"
                         >
                                 <!-- submenuSinglePlayer -->
                                 <object name="submenuSinglePlayer"
-                                              type="image"
-                                              size="4 4 100%-4 100%-4"
-                                              tooltip_style="pgToolTip"
-                                              tooltip="The 0 A.D. Game Manual"
-                                              hidden="true"
+                                        type="image"
+                                        size="4 4 100%-4 100%-4"
+                                        tooltip_style="pgToolTip"
+                                        tooltip="The 0 A.D. Game Manual"
+                                        hidden="true"
                                 >
                                         <object name="subMenuSinglePlayerButton"
-                                                      type="button"
-                                                      style="StoneButtonFancy"
-                                                      size="0 0 100% 32"
-                                                      tooltip_style="pgToolTip"
-                                                      tooltip="Click here to start a new single player game. (A very basic computer opponent is available for testing purposes.)"
+                                                type="button"
+                                                style="StoneButtonFancy"
+                                                size="0 0 100% 32"
+                                                tooltip_style="pgToolTip"
+                                                tooltip="Click here to start a new single player game. (A very basic computer opponent is available for testing purposes.)"
                                         >
-                                                Single Player Matches
+                                                Matches
                                                 <action on="Press"><![CDATA[
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
                                                         // Open Session Setup window.
                                                         Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
                                                 ]]></action>
                                         </object>
 
                                         <object name="subMenuCampaignButton"
-                                                      type="button"
-                                                      style="StoneButtonFancy"
-                                                      size="0 32 100% 64"
-                                                      tooltip_style="pgToolTip"
-                                                      tooltip="Want to play a campaign? Unfortunately you'll have to wait as they're not yet implemented."
-                                                      enabled="false"
+                                                type="button"
+                                                style="StoneButtonFancy"
+                                                size="0 32 100% 64"
+                                                tooltip_style="pgToolTip"
+                                                tooltip="Want to play a campaign? Unfortunately you'll have to wait as they're not yet implemented."
+                                                enabled="false"
                                         >
-                                                Historical Campaigns
+                                                Campaigns
                                                 <action on="Press"><![CDATA[
-                                                    openMainMenuSubWindow ("pgCampaigns");
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
+                                                        // Open Campaigns window.
+                                                        // NOT IMPLEMENTED YET
                                                 ]]></action>
                                         </object>
                                 </object>
@@ -427,27 +429,46 @@ Get involved at: wildfiregames.com/0ad
                                               tooltip="The 0 A.D. Game Manual"
                                               hidden="true"
                                 >
-                                        <object name="subMenuMultiplayerJoinGameButton"
-                                                      type="button"
-                                                      style="StoneButtonFancy"
-                                                      size="0 0 100% 32"
-                                                      tooltip_style="pgToolTip"
-                                                      tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game."
+                                        <object name="subMenuMultiplayerJoinButton"
+                                                type="button"
+                                                style="StoneButtonFancy"
+                                                size="0 0 100% 32"
+                                                tooltip_style="pgToolTip"
+                                                tooltip="Joining an existing multiplayer game."
                                         >
-                                                Multiplayer
+                                                Join Game
                                                 <action on="Press"><![CDATA[
-                                                        // Open Multiplayer connection window.
-                                                        Engine.PushGuiPage("page_gamesetup_mp.xml");
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
+                                                        // Open Multiplayer connection window with join option.
+                                                        Engine.PushGuiPage("page_gamesetup_mp.xml", "join");
                                                 ]]></action>
                                         </object>
+                                        
+                                        <object name="subMenuMultiplayerHostButton"
+                                                type="button"
+                                                style="StoneButtonFancy"
+                                                size="0 32 100% 64"
+                                                tooltip_style="pgToolTip"
+                                                tooltip="Host a multiplayer game."
+                                        >
+                                                Host Game
+                                                <action on="Press"><![CDATA[
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
+                                                        // Open Multiplayer connection window with host option.
+                                                        Engine.PushGuiPage("page_gamesetup_mp.xml", "host");
+                                                ]]></action>
+                                        </object>
+
                                 </object>
 
                                 <!-- submenuToolsAndOptions -->
                                 <object name="submenuToolsAndOptions"
-                                              type="image"
-                                              size="4 4 100%-4 100%-4"
-                                              tooltip_style="pgToolTip"
-                                              tooltip="The 0 A.D. Game Manual"
+                                        type="image"
+                                        size="4 4 100%-4 100%-4"
+                                        tooltip_style="pgToolTip"
+                                        tooltip="The 0 A.D. Game Manual"
                                               hidden="true"
                                 >
                                         <object name="submenuOptionsButton"
@@ -460,8 +481,10 @@ Get involved at: wildfiregames.com/0ad
                                         >
                                                 Options
                                                 <action on="Press"><![CDATA[
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
                                                         // Open Options window.
-                                                        openMainMenuSubWindow ("pgOptions");
+                                                        Engine.PushGuiPage("page_options.xml");
                                                 ]]></action>
                                         </object>
 
@@ -474,6 +497,9 @@ Get involved at: wildfiregames.com/0ad
                                         >
                                                 Scenario Editor
                                                 <action on="Press"><![CDATA[
+                                                        // Hide submenu
+                                                        this.parent.parent.hidden = true;
+                                                        // Start Atlas
                                                         if (Engine.AtlasIsAvailable())
                                                                 Engine.RestartInAtlas();
                                                         else
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 520564f5bd..4670c43466 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -194,7 +194,7 @@
 
 		<!-- Chat window -->
 		<object name="chatDialogPanel" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" sprite="genericPanel">
-			<object name="chatInput" size="16 12 100%-16 36" type="input" style="chatInput" max_length="80">
+			<object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
 				<action on="Press">submitChatInput();</action>
 			</object>
 
@@ -298,7 +298,7 @@
 		<!-- Settings Window -->
 		<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
-			style="TranslucentPanel"
+			style="TranslucentPanelThinBorder"
 			type="image"
 			size="80%-180 50%-200 50%+180 50%+50"
 			hidden="true"