Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
+++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/modmod/modmod.js"/>
+
+	<script directory="gui/modmod/"/>
 
 	<object name="modmod" type="image" style="ModernWindow" size="0 0 100% 100%">
 		<!-- Page Title -->
Index: ps/trunk/binaries/data/mods/mod/gui/pregame/mainmenu.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/pregame/mainmenu.xml
+++ ps/trunk/binaries/data/mods/mod/gui/pregame/mainmenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/pregame/mainmenu.js"/>
+	<script directory="gui/pregame/"/>
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
+++ ps/trunk/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
@@ -2,10 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/settings.js"/>
-
-	<!-- After settings.js, which defines g_Settings -->
-	<script file="gui/aiconfig/aiconfig.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/aiconfig/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -2,9 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-	<script file="gui/civinfo/civinfo.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/civinfo/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
Index: ps/trunk/binaries/data/mods/public/gui/credits/credits.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/credits/credits.xml
+++ ps/trunk/binaries/data/mods/public/gui/credits/credits.xml
@@ -7,7 +7,8 @@
 -->
 
 <objects>
-	<script file="gui/common/functions_global_object.js"/>
+
+	<script directory="gui/common/"/>
 	<script directory="gui/credits/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -2,16 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/color.js"/>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-	<script file="gui/common/gamedescription.js"/>
-	<script file="gui/common/network.js"/>
-	<script file="gui/common/settings.js"/>
-	<script file="gui/common/timer.js"/>
-
-	<!-- After settings.js, which defines g_Settings -->
-	<script file="gui/gamesetup/gamesetup.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/gamesetup/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
@@ -2,11 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/network.js"/>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-
-	<script file="gui/gamesetup_mp/gamesetup_mp.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/gamesetup_mp/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/loading/loading.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/loading/loading.xml
+++ ps/trunk/binaries/data/mods/public/gui/loading/loading.xml
@@ -7,9 +7,8 @@
 -->
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
-
-	<script file="gui/loading/loading.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/loading/"/>
 
 	<object type="image" style="ModernWindow">
 
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
@@ -2,16 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/color.js"/>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-	<script file="gui/common/gamedescription.js"/>
-	<script file="gui/common/music.js"/>
-	<script file="gui/common/settings.js"/>
-	<script file="gui/common/timer.js"/>
-
-	<!-- After settings.js, which defines g_Settings -->
-	<script file="gui/lobby/lobby.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/lobby/"/>
 
 	<object type="image" style="ModernWindow" size="0 0 100% 100%" name="lobbyWindow">
 
Index: ps/trunk/binaries/data/mods/public/gui/locale/locale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/locale/locale.xml
+++ ps/trunk/binaries/data/mods/public/gui/locale/locale.xml
@@ -2,7 +2,7 @@
 
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
+	<script directory="gui/common/"/>
 	<script file="gui/locale/locale.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
Index: ps/trunk/binaries/data/mods/public/gui/locale/locale_advanced.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/locale/locale_advanced.xml
+++ ps/trunk/binaries/data/mods/public/gui/locale/locale_advanced.xml
@@ -2,8 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/locale/locale_advanced.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/locale/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/manual/manual.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/manual/manual.xml
+++ ps/trunk/binaries/data/mods/public/gui/manual/manual.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/manual/manual.js"/>
+
+	<script directory="gui/common/"/>
+	<script directory="gui/manual/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml
+++ ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/msgbox/msgbox.js"/>
-	<script file="gui/common/functions_global_object.js"/>
+
+	<script directory="gui/common/"/>
+	<script directory="gui/msgbox/"/>
 
 	<!-- Fade out the background because it's non-interactable -->
 	<object sprite="ModernFade" type="image" z="0"/>
Index: ps/trunk/binaries/data/mods/public/gui/options/options.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.xml
+++ ps/trunk/binaries/data/mods/public/gui/options/options.xml
@@ -2,8 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/options/options.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/options/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/common/music.js"/>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/pregame/mainmenu.js"/>
-	<script directory="gui/pregame/backgrounds/"/>
 
+	<script directory="gui/common/"/>
+	<script directory="gui/pregame/"/>
+	<script directory="gui/pregame/backgrounds/"/>
 
 	<!--
 	==========================================
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
@@ -2,10 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-
-	<script file="gui/prelobby/prelobby.js"/>
+	<script directory="gui/common/"/>
+	<script directory="gui/prelobby/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
+++ ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <objects>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-	<script file="gui/common/tooltips.js"/>
+
+	<script directory="gui/common/"/>
 	<script directory="gui/reference/common/"/>
-	<script file="gui/reference/structree/structree.js"/>
-	<script file="gui/reference/structree/draw.js"/>
+	<script directory="gui/reference/structree/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -2,22 +2,8 @@
 
 <objects>
 
-	<!-- Used to display game info. -->
-	<script file="gui/common/color.js" />
-	<script file="gui/common/functions_utility.js" />
-	<script file="gui/common/gamedescription.js"/>
-	<script file="gui/common/settings.js" />
-
-	<!-- Used to display message boxes. -->
-	<script file="gui/common/functions_global_object.js" />
-
-	<!-- Used for engine + mod version checks and deleteTooltip. -->
-	<script file="gui/common/functions_utility_loadsave.js" />
-
-	<!-- Actual replay scripts after settings.js, as it initializes g_Settings. -->
-	<script file="gui/replaymenu/replay_menu.js" />
-	<script file="gui/replaymenu/replay_actions.js" />
-	<script file="gui/replaymenu/replay_filters.js" />
+	<script directory="gui/common/"/>
+	<script directory="gui/replaymenu/" />
 
 	<!-- Everything displayed in the replay menu. -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%" name="replayWindow">
Index: ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
+++ ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
@@ -2,13 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/color.js" />
-	<script file="gui/common/functions_global_object.js" />
-	<script file="gui/common/functions_utility.js" />
-	<script file="gui/common/functions_utility_loadsave.js" />
-	<script file="gui/common/gamedescription.js"/>
-	<script file="gui/common/settings.js" />
-	<script file="gui/savedgames/load.js" />
+	<script directory="gui/common/"/>
+	<script file="gui/savedgames/load.js"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="BackgroundTranslucent"/>
Index: ps/trunk/binaries/data/mods/public/gui/savedgames/save.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/savedgames/save.xml
+++ ps/trunk/binaries/data/mods/public/gui/savedgames/save.xml
@@ -2,10 +2,8 @@
 
 <objects>
 
-	<script file="gui/common/color.js"/>
-	<script file="gui/common/functions_global_object.js" />
-	<script file="gui/common/functions_utility_loadsave.js" />
-	<script file="gui/savedgames/save.js" />
+	<script directory="gui/common/"/>
+	<script directory="gui/savedgames/"/>
 
 	<!-- Add a translucent black background to fade out the page -->
 	<object type="image" z="0" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml
@@ -2,17 +2,7 @@
 
 <objects>
 
-<script file="gui/common/color.js"/>
-<script file="gui/common/colorFades.js"/>
-<script file="gui/common/functions_global_object.js"/>
-<script file="gui/common/functions_utility.js"/>
-<script file="gui/common/gamedescription.js"/>
-<script file="gui/common/music.js"/>
-<script file="gui/common/network.js"/>
-<script file="gui/common/settings.js"/>
-<script file="gui/common/timer.js"/>
-<script file="gui/common/tooltips.js"/>
-
+<script directory="gui/common/"/>
 <script directory="gui/session/"/>
 
 <object name="sn">
Index: ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
+++ ps/trunk/binaries/data/mods/public/gui/splashscreen/splashscreen.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/splashscreen/splashscreen.js"/>
+
+	<script directory="gui/common/"/>
+	<script directory="gui/splashscreen/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
Index: ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
+++ ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
-	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_utility.js"/>
-	<script file="gui/common/gamedescription.js"/>
-	<script file="gui/common/settings.js"/>
-	<script file="gui/common/tooltips.js"/>
 
-	<!-- After settings.js, which defines g_Settings and g_MaxPlayers. -->
+	<script directory="gui/common/"/>
+
 	<script file="gui/summary/counters.js"/>
 	<script file="gui/summary/summary.js"/>