From 748ebdfdb03ae52e7388f5172eb032d68dd45ee3 Mon Sep 17 00:00:00 2001
From: JoshuaJB <joshuajb@wildfiregames.com>
Date: Wed, 30 Apr 2014 04:38:53 +0000
Subject: [PATCH] Various GUI fixes and cleanup.

This was SVN commit r15070.
---
 .../ui/global/modern/tick-disabled.png        |  3 --
 .../mods/public/gui/common/modern/setup.xml   |  2 +-
 .../mods/public/gui/common/modern/sprites.xml | 27 +++++++---
 .../mods/public/gui/common/modern/styles.xml  |  2 +-
 .../data/mods/public/gui/lobby/prelobby.js    | 17 ++++++
 .../data/mods/public/gui/lobby/prelobby.xml   | 16 +-----
 .../data/mods/public/gui/locale/locale.xml    | 14 ++---
 .../public/gui/locale/locale_advanced.xml     | 22 ++++----
 .../data/mods/public/gui/manual/manual.xml    |  8 +--
 .../data/mods/public/gui/page_aiconfig.xml    |  2 +-
 .../data/mods/public/gui/page_civinfo.xml     |  2 +-
 .../data/mods/public/gui/page_gamesetup.xml   |  2 +-
 .../mods/public/gui/page_gamesetup_mp.xml     |  2 +-
 .../data/mods/public/gui/page_loadgame.xml    |  2 +-
 .../data/mods/public/gui/page_loading.xml     |  2 +-
 binaries/data/mods/public/gui/page_lobby.xml  |  2 +-
 binaries/data/mods/public/gui/page_locale.xml | 16 ++----
 .../mods/public/gui/page_locale_advanced.xml  | 16 ++----
 binaries/data/mods/public/gui/page_manual.xml |  8 +--
 binaries/data/mods/public/gui/page_msgbox.xml |  2 +-
 .../data/mods/public/gui/page_options.xml     |  2 +-
 .../data/mods/public/gui/page_pregame.xml     |  2 +-
 .../data/mods/public/gui/page_prelobby.xml    |  2 +-
 .../data/mods/public/gui/page_savegame.xml    |  2 +-
 .../data/mods/public/gui/page_session.xml     |  2 +-
 .../mods/public/gui/page_splashscreen.xml     |  2 +-
 .../data/mods/public/gui/page_summary.xml     |  2 +-
 .../data/mods/public/gui/pregame/mainmenu.js  | 52 ++++---------------
 .../data/mods/public/gui/pregame/mainmenu.xml |  6 +--
 29 files changed, 104 insertions(+), 135 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/modern/tick-disabled.png

diff --git a/binaries/data/mods/public/art/textures/ui/global/modern/tick-disabled.png b/binaries/data/mods/public/art/textures/ui/global/modern/tick-disabled.png
deleted file mode 100644
index 98d7c08ecf..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/modern/tick-disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0332970ec3aa87d1ed6258891fc56a7781da1d49b4f4fdf041a80e4993a92982
-size 4196
diff --git a/binaries/data/mods/public/gui/common/modern/setup.xml b/binaries/data/mods/public/gui/common/modern/setup.xml
index 8f35c091d1..fe96837da6 100644
--- a/binaries/data/mods/public/gui/common/modern/setup.xml
+++ b/binaries/data/mods/public/gui/common/modern/setup.xml
@@ -5,7 +5,7 @@
 	==========================================
 	- SCROLLBARS -
 	==========================================
-	<scrollbar	name="ModernScrollBar"
+	<scrollbar name="ModernScrollBar"
 			width = "15"
 			minimum_bar_size = "15"
 			maximum_bar_size = "15"
diff --git a/binaries/data/mods/public/gui/common/modern/sprites.xml b/binaries/data/mods/public/gui/common/modern/sprites.xml
index 61185d923e..7ad2ffdea4 100644
--- a/binaries/data/mods/public/gui/common/modern/sprites.xml
+++ b/binaries/data/mods/public/gui/common/modern/sprites.xml
@@ -415,6 +415,24 @@
 	</sprite>
 	<!--
 	==========================================
+	- Basic. -
+	==========================================
+	-->
+	<sprite name="logo">
+		<image texture="pregame/shell/logo/0ad_logo.png"
+			real_texture_placement="0 0 256 128"
+			size="0 -5% 100% 105%"
+		/>
+	</sprite>
+	<sprite name="BlackBorderOnGray">
+		<image backcolor="darkgray"
+			size="0 0 100% 100%"
+			border="true"
+			bordercolor="black"
+		/>
+	</sprite>
+	<!--
+	==========================================
 	- Misc. -
 	==========================================
 	-->
@@ -445,7 +463,8 @@
 		/>
 	</sprite>
 	<sprite name="ModernTickDisabled">
-		<image texture="global/modern/tick-disabled.png"
+		<effect grayscale=""/>
+		<image texture="global/modern/tick-on.png"
 			real_texture_placement="0 0 27 27"
 			size="0 0 22 22"
 		/>
@@ -465,10 +484,4 @@
 			texture_size="0 0 24 24"
 		/>
 	</sprite>
-	<sprite name="logo">
-		<image texture="pregame/shell/logo/0ad_logo.png"
-			real_texture_placement="0 0 256 128"
-			size="0 -5% 100% 105%"
-		/>
-	</sprite>
 </sprites>
diff --git a/binaries/data/mods/public/gui/common/modern/styles.xml b/binaries/data/mods/public/gui/common/modern/styles.xml
index 5ba0955719..0fc42a31ef 100644
--- a/binaries/data/mods/public/gui/common/modern/styles.xml
+++ b/binaries/data/mods/public/gui/common/modern/styles.xml
@@ -64,7 +64,7 @@
 
 		buffer_zone="8"
 		dropdown_size="224"
-		sprite_list="bkDarkGrayBorderBlack"
+		sprite_list="BlackBorderOnGray"
 		sprite_selectarea="ModernDarkBoxWhite"
 		textcolor_selected="white"
 
diff --git a/binaries/data/mods/public/gui/lobby/prelobby.js b/binaries/data/mods/public/gui/lobby/prelobby.js
index 7767e92f9d..10cc60cb28 100644
--- a/binaries/data/mods/public/gui/lobby/prelobby.js
+++ b/binaries/data/mods/public/gui/lobby/prelobby.js
@@ -253,4 +253,21 @@ function switchPage(page)
 			break;
 	}
 }
+function openTermsOfService()
+{
+	g_TermsOfServiceRead = true;
+	Engine.PushGuiPage("page_manual.xml", {
+				"page":"lobby/Terms_of_Service",
+				"title":translate("Terms of Service"),
+				})
+}
+
+function openTermsOfUse()
+{
+	g_TermsOfUseRead = true;
+	Engine.PushGuiPage("page_manual.xml", {
+				"page":"lobby/Terms_of_Use",
+				"title":translate("Terms of Use"),
+				})
+}
 
diff --git a/binaries/data/mods/public/gui/lobby/prelobby.xml b/binaries/data/mods/public/gui/lobby/prelobby.xml
index c40e109be8..24b7584462 100644
--- a/binaries/data/mods/public/gui/lobby/prelobby.xml
+++ b/binaries/data/mods/public/gui/lobby/prelobby.xml
@@ -14,12 +14,6 @@
 			onTick();
 		</action>
 
-		<object name="pageConnecting" hidden="true">
-			<object name="connectionStatus" type="text" text_align="center" size="0 100 100% 120">
-				<translatableAttribute id="caption">[Connection status]</translatableAttribute>
-			</object>
-		</object>
-
 		<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
 			<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
 		</object>
@@ -82,18 +76,12 @@
 
 			<object type="button" size="50 160 100%-50 188" style="ModernButtonRed">
 				<translatableAttribute id="caption">Terms of Service</translatableAttribute>
-				<action on="Press">
-					g_TermsOfServiceRead = true;
-					Engine.PushGuiPage("page_manual.xml", {"page":"lobby/Terms_of_Service", "title":"Terms of Service"})
-				</action>
+				<action on="Press">openTermsOfService();</action>
 			</object>
 
 			<object type="button" size="50 200 100%-50 228" style="ModernButtonRed">
 				<translatableAttribute id="caption">Terms of Use</translatableAttribute>
-				<action on="Press">
-					g_TermsOfUseRead = true;
-					Engine.PushGuiPage("page_manual.xml", {"page":"lobby/Terms_of_Use", "title":"Terms of Use"})
-				</action>
+				<action on="Press">openTermsOfUse();</action>
 			</object>
 
 			<object name="registerAgreeTermsLabel" type="text" size="50 240 285 270" style="ModernLabelText">
diff --git a/binaries/data/mods/public/gui/locale/locale.xml b/binaries/data/mods/public/gui/locale/locale.xml
index 26d47c49f8..75bae856a7 100644
--- a/binaries/data/mods/public/gui/locale/locale.xml
+++ b/binaries/data/mods/public/gui/locale/locale.xml
@@ -6,14 +6,14 @@
 	<script file="gui/locale/locale.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="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-190 50%-100 50%+190 50%+100">
 		<object size="15 0 100%-15 100%">
-			<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
+			<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
 				<translatableAttribute id="caption">Language</translatableAttribute>
 			</object>
-			<object type="text" size="5 50 40% 75" style="ModernLeftLabelText">
+			<object type="text" size="5 50 40% 75" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Language:</translatableAttribute>
 			</object>
 			<object name="languageList"
@@ -22,7 +22,7 @@
 					size="40%+10 50 100% 75">
 					<action on="SelectionChange">languageSelectionChanged();</action>
 			</object>
-			<object type="text" size="5 80 40% 105" style="ModernLeftLabelText">
+			<object type="text" size="5 80 40% 105" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption" comment="A locale is a set of
 					parameters that defines the user’s language, country and any
 					special variant preferences that the user wants to see in
@@ -32,17 +32,17 @@
 			</object>
 			<object name="localeText" type="text" size="40%+10 80 100% 105" textcolor="white" />
 		
-			<object type="button" size="0 100%-60 33% 100%-32" style="StoneButton">
+			<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Accept</translatableAttribute>
 				<action on="Press">applySelectedLocale();</action>
 			</object>
 			
-			<object type="button" size="33%+5 100%-60 66% 100%-32" style="StoneButton">
+			<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Advanced</translatableAttribute>
 				<action on="Press">openAdvancedMenu();</action>
 			</object>
 
-			<object type="button" style="StoneButton" size="66%+5 100%-60  100% 100%-32">
+			<object type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
 				<translatableAttribute id="caption">Cancel</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
 			</object>
diff --git a/binaries/data/mods/public/gui/locale/locale_advanced.xml b/binaries/data/mods/public/gui/locale/locale_advanced.xml
index f9997c2252..a5e0cbd0c8 100644
--- a/binaries/data/mods/public/gui/locale/locale_advanced.xml
+++ b/binaries/data/mods/public/gui/locale/locale_advanced.xml
@@ -6,14 +6,14 @@
 	<script file="gui/locale/locale_advanced.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="ModernFade"/>
 	<object type="image" style="ModernDialog" size="50%-220 50%-200 50%+220 50%+200">
 		<action on="Tick">onTick();</action>
 		<object size="15 0 100%-15 100%">
-			<object style="TitleText" type="text" size="50%-150 0%-16 50%+150 16">
+			<object style="ModernLabelText" type="text" size="50%-150 0%-16 50%+150 16">
 				<translatableAttribute id="caption">Language</translatableAttribute>
 			</object>
-			<object type="text" size="5 50 50% 75" style="ModernLeftLabelText">
+			<object type="text" size="5 50 50% 75" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Language:</translatableAttribute>
 			</object>
 			<object name="languageList"
@@ -21,7 +21,7 @@
 					style="ModernDropDown"
 					size="50%+10 50 100% 75">
 			</object>
-			<object type="text" size="5 80 50% 105" style="ModernLeftLabelText">
+			<object type="text" size="5 80 50% 105" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Country:</translatableAttribute>
 			</object>
 			<object name="countryList"
@@ -30,7 +30,7 @@
 					size="50%+10 80 100% 105">
 			</object>
 			
-			<object type="text" size="5 110 50% 135" style="ModernLeftLabelText">
+			<object type="text" size="5 110 50% 135" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Script:</translatableAttribute>
 			</object>
 			<object name="scriptInput" size="50%+10 110 100% 135" type="input" style="ModernInput">
@@ -44,34 +44,34 @@
 				<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
 			</object>
 			
-			<object type="text" size="5 170 50% 195" style="ModernLeftLabelText">
+			<object type="text" size="5 170 50% 195" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Keywords (unused):</translatableAttribute>
 			</object>
 			<object name="keywordsInput" size="50%+10 170 100% 195" type="input" style="ModernInput">
 				<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
 			</object>
 			
-			<object type="text" size="5 230 50% 255" style="ModernLeftLabelText">
+			<object type="text" size="5 230 50% 255" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Resulting locale:</translatableAttribute>
 			</object>
 			<object name="resultingLocale" type="text" size="50%+10 230 100% 255" textcolor="white" />
 			
-			<object type="text" size="5 260 50% 285" style="ModernLeftLabelText">
+			<object type="text" size="5 260 50% 285" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Dictionary files used:</translatableAttribute>
 			</object>
 			<object name="dictionaryFile" type="text" size="50%+10 260 100% 345" textcolor="white" />
 		
-			<object type="button" size="0 100%-60 33% 100%-32" style="StoneButton">
+			<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Accept</translatableAttribute>
 				<action on="Press">applySelectedLocale();</action>
 			</object>
 			
-			<object type="button" size="33%+5 100%-60 66% 100%-32" style="StoneButton">
+			<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Auto detect</translatableAttribute>
 				<action on="Press">autoDetectLocale();</action>
 			</object>
 
-			<object type="button" style="StoneButton" size="66%+5 100%-60  100% 100%-32">
+			<object type="button" style="ModernButtonRed" size="66%+5 100%-60  100% 100%-32">
 				<translatableAttribute id="caption">Cancel</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
 			</object>
diff --git a/binaries/data/mods/public/gui/manual/manual.xml b/binaries/data/mods/public/gui/manual/manual.xml
index f1fece3c0b..28561425da 100644
--- a/binaries/data/mods/public/gui/manual/manual.xml
+++ b/binaries/data/mods/public/gui/manual/manual.xml
@@ -5,10 +5,10 @@
 	<script file="gui/manual/manual.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
-	<object type="image" z="0" style="TranslucentPanel"/>
+	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
-		<object name="title" type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
+		<object name="title" type="text" style="ModernLabelText" size="50%-128 0%-16 50%+128 16">
 			<translatableAttribute id="caption">Information</translatableAttribute>
 		</object>
 
@@ -16,10 +16,10 @@
 			<object name="mainText" type="text" style="textPanel"/>
 		</object>
 
-		<object name="url" type="button" style="StoneButton" size="100%-308 100%-52 100%-168 100%-24" hidden="true">
+		<object name="url" type="button" style="ModernButtonRed" size="100%-308 100%-52 100%-168 100%-24" hidden="true">
 			<translatableAttribute id="caption">View Online</translatableAttribute>
 		</object>
-		<object type="button" style="StoneButton" tooltip_style="snToolTip" size="100%-164 100%-52 100%-24 100%-24">
+		<object type="button" style="ModernButtonRed" tooltip_style="snToolTip" size="100%-164 100%-52 100%-24 100%-24">
 			<translatableAttribute id="caption">Close</translatableAttribute>
 			<action on="Press"><![CDATA[closeManual();]]></action>
 		</object>
diff --git a/binaries/data/mods/public/gui/page_aiconfig.xml b/binaries/data/mods/public/gui/page_aiconfig.xml
index f918b4335f..1d67d9e009 100644
--- a/binaries/data/mods/public/gui/page_aiconfig.xml
+++ b/binaries/data/mods/public/gui/page_aiconfig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_civinfo.xml b/binaries/data/mods/public/gui/page_civinfo.xml
index 777974ae0e..8182a17e16 100644
--- a/binaries/data/mods/public/gui/page_civinfo.xml
+++ b/binaries/data/mods/public/gui/page_civinfo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_gamesetup.xml b/binaries/data/mods/public/gui/page_gamesetup.xml
index b6c0c54e2c..51ea7abe16 100644
--- a/binaries/data/mods/public/gui/page_gamesetup.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_gamesetup_mp.xml b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
index 163283af79..d6e011358e 100644
--- a/binaries/data/mods/public/gui/page_gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_loadgame.xml b/binaries/data/mods/public/gui/page_loadgame.xml
index a04fc05183..9365d64ced 100644
--- a/binaries/data/mods/public/gui/page_loadgame.xml
+++ b/binaries/data/mods/public/gui/page_loadgame.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_loading.xml b/binaries/data/mods/public/gui/page_loading.xml
index ebb3229f0d..5597d2a810 100644
--- a/binaries/data/mods/public/gui/page_loading.xml
+++ b/binaries/data/mods/public/gui/page_loading.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_lobby.xml b/binaries/data/mods/public/gui/page_lobby.xml
index a7d3d4fc04..1606f59a57 100644
--- a/binaries/data/mods/public/gui/page_lobby.xml
+++ b/binaries/data/mods/public/gui/page_lobby.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/global.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_locale.xml b/binaries/data/mods/public/gui/page_locale.xml
index 0dd1ede043..9fd16c6a45 100644
--- a/binaries/data/mods/public/gui/page_locale.xml
+++ b/binaries/data/mods/public/gui/page_locale.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-
-	<include>common/modern/styles.xml</include> 
-	<include>common/modern/sprites.xml</include> 
-	<include>common/modern/setup.xml</include> 
-	<include>common/setup.xml</include>
-	<include>common/styles.xml</include>
-	<include>common/sprite1.xml</include>
-	<include>common/common_sprites.xml</include>
-	<include>common/common_styles.xml</include>
-
-	<include>locale/locale.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
 	<include>common/global.xml</include>
+
+	<include>locale/locale.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_locale_advanced.xml b/binaries/data/mods/public/gui/page_locale_advanced.xml
index 4d6446f457..cdae7e6f2a 100644
--- a/binaries/data/mods/public/gui/page_locale_advanced.xml
+++ b/binaries/data/mods/public/gui/page_locale_advanced.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-
-	<include>common/modern/styles.xml</include> 
-	<include>common/modern/sprites.xml</include> 
-	<include>common/modern/setup.xml</include> 
-	<include>common/setup.xml</include>
-	<include>common/styles.xml</include>
-	<include>common/sprite1.xml</include>
-	<include>common/common_sprites.xml</include>
-	<include>common/common_styles.xml</include>
-
-	<include>locale/locale_advanced.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
 	<include>common/global.xml</include>
+
+	<include>locale/locale_advanced.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_manual.xml b/binaries/data/mods/public/gui/page_manual.xml
index 1d6ce07c98..86bdcbe49f 100644
--- a/binaries/data/mods/public/gui/page_manual.xml
+++ b/binaries/data/mods/public/gui/page_manual.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprite1.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/common_sprites.xml</include>
-    <include>common/common_styles.xml</include>
+    <include>common/global.xml</include>
 
     <include>manual/styles.xml</include>
     <include>manual/manual.xml</include>
diff --git a/binaries/data/mods/public/gui/page_msgbox.xml b/binaries/data/mods/public/gui/page_msgbox.xml
index e6535d32fa..62729670b1 100644
--- a/binaries/data/mods/public/gui/page_msgbox.xml
+++ b/binaries/data/mods/public/gui/page_msgbox.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_options.xml b/binaries/data/mods/public/gui/page_options.xml
index e405468ed3..83af6422ee 100644
--- a/binaries/data/mods/public/gui/page_options.xml
+++ b/binaries/data/mods/public/gui/page_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_pregame.xml b/binaries/data/mods/public/gui/page_pregame.xml
index 8ffce8275e..531ce24467 100644
--- a/binaries/data/mods/public/gui/page_pregame.xml
+++ b/binaries/data/mods/public/gui/page_pregame.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_prelobby.xml b/binaries/data/mods/public/gui/page_prelobby.xml
index 0028abd76b..1a75b5284e 100644
--- a/binaries/data/mods/public/gui/page_prelobby.xml
+++ b/binaries/data/mods/public/gui/page_prelobby.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/global.xml</include>
 
diff --git a/binaries/data/mods/public/gui/page_savegame.xml b/binaries/data/mods/public/gui/page_savegame.xml
index 15ec6801ce..3bd9031061 100644
--- a/binaries/data/mods/public/gui/page_savegame.xml
+++ b/binaries/data/mods/public/gui/page_savegame.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 73494e018d..c4571bc2e7 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_splashscreen.xml b/binaries/data/mods/public/gui/page_splashscreen.xml
index 96846d4bba..02ccff2aa7 100644
--- a/binaries/data/mods/public/gui/page_splashscreen.xml
+++ b/binaries/data/mods/public/gui/page_splashscreen.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index 0ae563591c..821cbf05be 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
+    <include>common/modern/setup.xml</include>
     <include>common/modern/styles.xml</include>
     <include>common/modern/sprites.xml</include>
-    <include>common/modern/setup.xml</include>
 
     <include>common/setup.xml</include>
     <include>common/sprite1.xml</include>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.js b/binaries/data/mods/public/gui/pregame/mainmenu.js
index 63a2318652..3693cf21f0 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.js
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.js
@@ -205,14 +205,6 @@ function EnableUserReport(Enabled)
  * MENU FUNCTIONS
  */
 
-// Temporarily adding this here
-//const BUTTON_SOUND = "audio/interface/ui/ui_button_longclick.ogg";
-//function playButtonSound()
-//{
-//    var buttonSound = new Sound(BUTTON_SOUND);
-//    buttonSound.play();
-//}
-
 // Slide menu
 function updateMenuPosition(dt)
 {
@@ -291,39 +283,6 @@ function getBuildString()
  * FUNCTIONS BELOW DO NOT WORK YET
  */
 
-//// Switch to a given options tab window.
-//function openOptionsTab(tabName)
-//{
-//	// Hide the other tabs.
-//	for (var i = 1; i <= 3; i++)
-//	{
-//		switch (i)
-//		{
-//			case 1:
-//				var tmpName = "pgOptionsAudio";
-//			break;
-//			case 2:
-//				var tmpName = "pgOptionsVideo";
-//			break;
-//			case 3:
-//				var tmpName = "pgOptionsGame";
-//			break;
-//			default:
-//			break;
-//		}
-//
-//		if (tmpName != tabName)
-//		{
-//			Engine.GetGUIObjectByName (tmpName + "Window").hidden = true;
-//			Engine.GetGUIObjectByName (tmpName + "Button").enabled = true;
-//		}
-//	}
-//
-//	// Make given tab visible.
-//	Engine.GetGUIObjectByName (tabName + "Window").hidden = false;
-//	Engine.GetGUIObjectByName (tabName + "Button").enabled = false;
-//}
-//
 //// Move the credits up the screen.
 //function updateCredits()
 //{
@@ -365,3 +324,14 @@ function getLobbyDisabledByBuild()
 {
 	return translate("Launch the multiplayer lobby. [DISABLED BY BUILD]");
 }
+
+function getTechnicalDetails()
+{
+	return translate("Technical Details");
+}
+
+function getManual()
+{
+	return translate("Manual");
+}
+
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 1c59d82aa3..d25cf0f2ce 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -106,7 +106,7 @@
 			</object>
 			<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
 				<translatableAttribute id="caption">Technical details</translatableAttribute>
-				<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":translate("Technical Details")});</action>
+				<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":getTechnicalDetails()});</action>
 			</object>
 		</object>
 
@@ -137,7 +137,7 @@
 			</object>
 			<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
 				<translatableAttribute id="caption">Technical details</translatableAttribute>
-				<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":translate("Technical Details")});</action>
+				<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":getTechnicalDetails()});</action>
 			</object>
 		</object>
 
@@ -398,7 +398,7 @@
 					<action on="Press">
 						closeMenu();
 						<![CDATA[
-							Engine.PushGuiPage("page_manual.xml", { "page":"manual/intro", "title":translate("Manual"), "url":"http://trac.wildfiregames.com/wiki/0adManual"});
+							Engine.PushGuiPage("page_manual.xml", {"page":"manual/intro", "title":getManual(), "url":"http://trac.wildfiregames.com/wiki/0adManual"});
 						]]>
 					</action>
 				</object>