Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/browsedb.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/browsedb.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/browsedb.html	(working copy)
@@ -25,6 +25,10 @@
 				'[% "SORT_GENREARTISTALBUM" | string %]': 'genre.namesort,contributor.namesort,album.titlesort'
 			}
 		[% END %]
+
+		Ext.onReady(function(){
+			Browse.init();
+		});
 	</script>
 [%- END -%]
 [%- PROCESS pageheader.html dontscroll=1 -%]
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/home.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/home.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/home.html	(working copy)
@@ -17,7 +17,6 @@
 
 ELSE %]
 	[% extJsScripts = BLOCK %]
-		<script type="text/javascript" src="[% webroot %]html/Home.js?r=[% revision %]"></script>
 		<script type="text/javascript">
 			Ext.onReady(function(){
 				Home.init();
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/Browse.js
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/Browse.js	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/Browse.js	(working copy)
@@ -147,5 +147,3 @@
 	}
 };
 
-Ext.onReady(Browse.init, Browse, true);
-
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/docs/help.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/docs/help.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/docs/help.html	(working copy)
@@ -20,12 +20,9 @@
 		<link href="[% webroot %]ie7.css?r=[% revision %]" type="text/css" rel="stylesheet">
 		<![endif]-->
 
-		<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="/html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
- 		<script type="text/javascript" src="/html/SqueezeJS/Base.js?r=[% revision %]"></script>
+		<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-		<script type="text/javascript" src="[% webroot %]html/Help.js?r=[% revision %]"></script>
 
 		<script type="text/javascript">
 			Ext.onReady(Help.init, Help, true);
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/js.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/js.html	(revision 0)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/html/js.html	(revision 0)
@@ -0,0 +1,18 @@
+[%
+
+IF debug;
+	INCLUDE "html/ext/adapter/ext/ext-base-debug.js";
+ELSE;
+	INCLUDE "html/ext/adapter/ext/ext-base.js";
+END;
+
+INCLUDE "html/ext/ext-all.js";
+INCLUDE "html/SqueezeJS/Base.js";
+INCLUDE "html/SqueezeJS/UI.js";
+INCLUDE "html/Browse.js";
+INCLUDE "html/Help.js";
+INCLUDE "html/Home.js";
+INCLUDE "html/Main.js";
+INCLUDE "html/Settings.js";
+
+%]
\ No newline at end of file
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/index.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/index.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/index.html	(working copy)
@@ -78,13 +78,9 @@
 			document.getElementById('loading').style.display = 'block';
 		</script>
 
-		<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="/html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
- 		<script type="text/javascript" src="/html/SqueezeJS/Base.js?r=[% revision %]"></script>
+		<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-		<script type="text/javascript" src="/html/SqueezeJS/UI.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="[% webroot %]html/Main.js?r=[% revision %]"></script>
 
 		<script type="text/javascript">
 			[% IF moreThanThis != "" %]SqueezeJS.setCookie( 'SqueezeCenter-allLinks', "[% moreThanThis %]" )[% END %]
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/pageheader.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/pageheader.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/pageheader.html	(working copy)
@@ -10,12 +10,9 @@
 		[% IF pageHeaderScripts && NOT extJsScripts %]
 			[% pageHeaderScripts %]
 		[% ELSE %]
-			<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-			<script type="text/javascript" src="/html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 			<script type="text/javascript">[% PROCESS html/vars.js %]</script>
-			<script type="text/javascript" src="/html/SqueezeJS/Base.js?r=[% revision %]"></script>
+			<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
 			<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-			<script type="text/javascript" src="/html/SqueezeJS/UI.js?r=[% revision %]"></script>
 
 			<script type="text/javascript">
 				[% PROCESS jsString id='LOADING' jsId='loading' %]
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/header.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/header.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/header.html	(working copy)
@@ -14,13 +14,9 @@
 		<link rel="stylesheet" type="text/css" href="[% webroot %]slimserver.css?r=[% revision %]" />
 		<link rel="stylesheet" type="text/css" href="[% webroot %]skin.css?r=[% revision %]" />
 
-		<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="/html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
- 		<script type="text/javascript" src="/html/SqueezeJS/Base.js?r=[% revision %]"></script>
+		<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-		<script type="text/javascript" src="/html/SqueezeJS/UI.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="[% webroot %]html/Settings.js?r=[% revision %]"></script>
 
 		<script type="text/javascript">
 			[% PROCESS jsString id='SETTINGS' jsId='' %]
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/index.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/index.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/settings/index.html	(working copy)
@@ -20,13 +20,9 @@
 		<link href="[% webroot %]ie7.css?r=[% revision %]" type="text/css" rel="stylesheet">
 		<![endif]-->
 
-		<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="/html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
- 		<script type="text/javascript" src="/html/SqueezeJS/Base.js?r=[% revision %]"></script>
+		<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-		<script type="text/javascript" src="/html/SqueezeJS/UI.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="[% webroot %]html/Settings.js?r=[% revision %]"></script>
 
 		<script type="text/javascript">
 			[% PROCESS jsString id='APPLY' jsId='' %]
Index: /Users/mh/Documents/workspace/7.3/server/HTML/Default/status_header.html
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/HTML/Default/status_header.html	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/HTML/Default/status_header.html	(working copy)
@@ -10,9 +10,9 @@
 
 		[% PROCESS standardheader.html %]
 
-		<script type="text/javascript" src="html/ext/adapter/ext/ext-base.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="html/ext/ext-all[% IF debug %]-debug[% END %].js?r=[% revision %]"></script>
 		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
+		<script type="text/javascript" src="/html/js.html?r=[% revision %]"></script>
+		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
 
 		<style>
 			body {
@@ -21,10 +21,6 @@
 			}
 		</style>
 
-		<script type="text/javascript" src="[% webroot %]html/SqueezeJS/Base.js?r=[% revision %]"></script>
-		<script type="text/javascript">[% PROCESS html/SqueezeJS/Strings.js %]</script>
-		<script type="text/javascript" src="[% webroot %]html/SqueezeJS/UI.js?r=[% revision %]"></script>
-		<script type="text/javascript" src="[% webroot %]html/Main.js?r=[% revision %]"></script>
 		<script type="text/javascript">
 			var strings = new Array();