diff --git a/combust b/combust
index c96a53910..3d16f725d 160000
--- a/combust
+++ b/combust
@@ -1 +1 @@
-Subproject commit c96a53910ec1726d9c9cc011eb7978f32fe277d1
+Subproject commit 3d16f725d88bca7e5ce4ae38c91b2ebb6e05463d
diff --git a/docs/cpanratings/display/short_review.html b/docs/cpanratings/display/short_review.html
index bf5639ee5..67c771466 100644
--- a/docs/cpanratings/display/short_review.html
+++ b/docs/cpanratings/display/short_review.html
@@ -1,10 +1,7 @@
 
-[% UNLESS page.added_helpful_js;
-    page.added_helpful_js = 1;
-    page.morehead = page.morehead _ ' 
-<script type="text/javascript" src="/js/helpful.js"></script>
-';
-  END;
+[% 
+  page.js.push("helpful.js");
+
   UNLESS (page.added_cpanratings_css);
     page.css_more.push('/css/cpanratings.css');
     page.added_cpanratings_css = 1;
diff --git a/docs/cpanratings/tpl/defaults b/docs/cpanratings/tpl/defaults
index cc3781790..64a4b2dd8 100644
--- a/docs/cpanratings/tpl/defaults
+++ b/docs/cpanratings/tpl/defaults
@@ -1,18 +1,10 @@
-[%-  page = {
-            title = template.title,
-            style = template.style or 'default.html',
-	    site  = "CPAN Ratings"
-    };
+[%- page.site = "CPAN Ratings";
 
     page.morehead = page.morehead _ '
      <script type="text/javascript">
        var global_auth_token = \'' _ combust.user_auth_token _ "';
      </script>";
 
-    page.morehead = page.morehead _ '
-       <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
-    ';
-
     page.banner_prefix = page.site;	
 
     page.style = 'default.html';
diff --git a/docs/dev/perl6/tpl/defaults b/docs/dev/perl6/tpl/defaults
deleted file mode 100644
index 0b4f91af1..000000000
--- a/docs/dev/perl6/tpl/defaults
+++ /dev/null
@@ -1 +0,0 @@
-slkdfj
diff --git a/docs/shared/tpl/defaults b/docs/shared/tpl/defaults
index 8a1384f40..9d91a4f56 100644
--- a/docs/shared/tpl/defaults
+++ b/docs/shared/tpl/defaults
@@ -1,8 +1,4 @@
-[%-  page = {
-	    title = template.title,
-            style = template.style or 'default.html'
-    };
-
+[%-
     PROCESS "tpl/quicknews";
 
     # don't include any whitespace from here...
diff --git a/docs/shared/tpl/js_includes.html b/docs/shared/tpl/js_includes.html
new file mode 100644
index 000000000..599920f17
--- /dev/null
+++ b/docs/shared/tpl/js_includes.html
@@ -0,0 +1,31 @@
+[%
+
+MACRO show_js(list_js_files) BLOCK;
+  Dumper.dump(list_js_files);
+ IF list_js_files && list_js_files.list && list_js_files.list.size;
+  FOR js_elem = list_js_files.list;
+    FOR js = js_elem.list;   
+        IF !unique_js.${js};
+            IF js.match('^https?://');
+                jspath = js;
+            ELSIF js.match('^//');
+                jspath = js;
+            ELSIF js.match('^/');
+               jspath = combust.static_url(js) || js;
+            ELSE;
+               jspath = combust.static_url("/js/${js}") || "/js/${js}";
+            END;
+
+            %]<script type="text/javascript" src="[%- jspath -%]" charset="UTF-8"></script>
+[%
+
+            unique_js.${js} = 1;
+        END;
+    END;
+  END;
+ END;
+END; # END BLOCK
+
+show_js(js_files);
+
+%]
diff --git a/docs/shared/tpl/style/default.html b/docs/shared/tpl/style/default.html
index 199839a40..8c0b654de 100644
--- a/docs/shared/tpl/style/default.html
+++ b/docs/shared/tpl/style/default.html
@@ -140,8 +140,12 @@
 </TABLE>
 
 [% END %]
+ 
+[%
+   page.js.unshift("http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js");
+   PROCESS tpl/js_includes.html(js_files = page.js);
+%]
 
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript" src="http://ipv4.v6test.develooper.com/js/v1/v6test.js"></script>
 <script type="text/javascript">
    // v6.target = '';