diff --git a/3.0/modules/basket/helpers/basket_theme.php b/3.0/modules/basket/helpers/basket_theme.php
index 1ad535e5..db2c91da 100644
--- a/3.0/modules/basket/helpers/basket_theme.php
+++ b/3.0/modules/basket/helpers/basket_theme.php
@@ -20,7 +20,7 @@
 class basket_theme_Core {
 
   static function head($theme) {
-    $theme->css("basket.css");
+    return $theme->css("basket.css");
   }
 
   static function header_top($theme) {
diff --git a/3.0/modules/calendarview/helpers/calendarview_theme.php b/3.0/modules/calendarview/helpers/calendarview_theme.php
index 4342b11f..5f5a3e25 100644
--- a/3.0/modules/calendarview/helpers/calendarview_theme.php
+++ b/3.0/modules/calendarview/helpers/calendarview_theme.php
@@ -20,6 +20,6 @@
 class calendarview_theme_Core {
 		
   static function head($theme) {
-    $theme->css("calendarview_menu.css");
+    return $theme->css("calendarview_menu.css");
   }
 }
diff --git a/3.0/modules/downloadalbum/helpers/downloadalbum_theme.php b/3.0/modules/downloadalbum/helpers/downloadalbum_theme.php
index d88d8a52..cddbf1ee 100644
--- a/3.0/modules/downloadalbum/helpers/downloadalbum_theme.php
+++ b/3.0/modules/downloadalbum/helpers/downloadalbum_theme.php
@@ -19,6 +19,6 @@
  */
 class downloadalbum_theme {
   static function head($theme) {
-    $theme->css("downloadalbum_menu.css");
+    return $theme->css("downloadalbum_menu.css");
   }
 }
diff --git a/3.0/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/3.0/modules/downloadfullsize/helpers/downloadfullsize_theme.php
index 698b1488..80f9307d 100644
--- a/3.0/modules/downloadfullsize/helpers/downloadfullsize_theme.php
+++ b/3.0/modules/downloadfullsize/helpers/downloadfullsize_theme.php
@@ -20,7 +20,7 @@
 class downloadfullsize_theme {
   static function head($theme) {
     if ($theme->item && access::can("view_full", $theme->item)) {
-      $theme->css("downloadfullsize_menu.css");
+      return $theme->css("downloadfullsize_menu.css");
     }
   }
 }
diff --git a/3.0/modules/ecard/helpers/ecard_theme.php b/3.0/modules/ecard/helpers/ecard_theme.php
index dd3644e8..89ef19ed 100644
--- a/3.0/modules/ecard/helpers/ecard_theme.php
+++ b/3.0/modules/ecard/helpers/ecard_theme.php
@@ -19,6 +19,6 @@
  */
 class ecard_theme_Core {
   static function head($theme) {
-    $theme->css("ecard.css");
+    return $theme->css("ecard.css");
   }
 }
\ No newline at end of file
diff --git a/3.0/modules/editcreation/helpers/editcreation_theme.php b/3.0/modules/editcreation/helpers/editcreation_theme.php
index 1d570907..a51811c6 100644
--- a/3.0/modules/editcreation/helpers/editcreation_theme.php
+++ b/3.0/modules/editcreation/helpers/editcreation_theme.php
@@ -25,7 +25,7 @@ class editcreation_theme_Core {
     }
     $item = $theme->item();
     if ( $item && access::can("edit", $item) ) {
-      $theme->css("editcreation.css");
+      return $theme->css("editcreation.css");
     }
   }
 }
diff --git a/3.0/modules/exif_gps/helpers/exif_gps_theme.php b/3.0/modules/exif_gps/helpers/exif_gps_theme.php
index 160373a2..3940678d 100644
--- a/3.0/modules/exif_gps/helpers/exif_gps_theme.php
+++ b/3.0/modules/exif_gps/helpers/exif_gps_theme.php
@@ -19,6 +19,6 @@
  */
 class exif_gps_theme_Core {
   static function head($theme) {
-    $theme->css("exif_gps_menu.css");
+    return $theme->css("exif_gps_menu.css");
   }
 }
diff --git a/3.0/modules/favourites/helpers/favourites_theme.php b/3.0/modules/favourites/helpers/favourites_theme.php
index 94f4d806..c39d31c2 100644
--- a/3.0/modules/favourites/helpers/favourites_theme.php
+++ b/3.0/modules/favourites/helpers/favourites_theme.php
@@ -19,8 +19,8 @@
  */
 class favourites_theme_Core {
   static function head($theme) {
-    $theme->css("favourites.css");
-    $theme->script("favourites.js");
+    return $theme->css("favourites.css")
+      . $theme->script("favourites.js");
   }
 
   static function header_top($theme) {
diff --git a/3.0/modules/highroller/helpers/highroller_theme.php b/3.0/modules/highroller/helpers/highroller_theme.php
index d42ca82f..999aeeb7 100644
--- a/3.0/modules/highroller/helpers/highroller_theme.php
+++ b/3.0/modules/highroller/helpers/highroller_theme.php
@@ -19,8 +19,8 @@
  */
 class highroller_theme_Core {
   static function head($theme) {
-    $theme->script("highroller.js");
-    printf("<script type=\"text/javascript\"> var PICK_THEME_URL = '%s'; </script>", url::site("highroller/pick_theme"));
+    return $theme->script("highroller.js")
+      . sprintf("<script type=\"text/javascript\"> var PICK_THEME_URL = '%s'; </script>", url::site("highroller/pick_theme"));
   }
 
   static function header_top($theme) {
diff --git a/3.0/modules/kbd_nav/helpers/kbd_nav_theme.php b/3.0/modules/kbd_nav/helpers/kbd_nav_theme.php
index 6540f020..e085f187 100644
--- a/3.0/modules/kbd_nav/helpers/kbd_nav_theme.php
+++ b/3.0/modules/kbd_nav/helpers/kbd_nav_theme.php
@@ -3,6 +3,6 @@
 class Kbd_Nav_theme_Core {
 
   static function head($theme) {
-    $theme->script("kbd_nav.js");
+    return $theme->script("kbd_nav.js");
   }
 }
\ No newline at end of file
diff --git a/3.0/modules/language_flags/helpers/language_flags_theme.php b/3.0/modules/language_flags/helpers/language_flags_theme.php
index 42c16191..9b5a7ada 100644
--- a/3.0/modules/language_flags/helpers/language_flags_theme.php
+++ b/3.0/modules/language_flags/helpers/language_flags_theme.php
@@ -19,6 +19,6 @@
  */
 class language_flags_theme_Core {
   static function head($theme) {
-    $theme->css("language_flags_sidebar.css");
+    return $theme->css("language_flags_sidebar.css");
   }
 }
diff --git a/3.0/modules/navcarousel/helpers/navcarousel_theme.php b/3.0/modules/navcarousel/helpers/navcarousel_theme.php
index 844af7f2..a22d42fd 100644
--- a/3.0/modules/navcarousel/helpers/navcarousel_theme.php
+++ b/3.0/modules/navcarousel/helpers/navcarousel_theme.php
@@ -36,8 +36,6 @@ class navcarousel_theme_Core {
                 }\n";
       }
       $thumbsize = module::get_var("navcarousel", "thumbsize", "50");
-      $theme->script("jquery.jcarousel.min.js");
-      $theme->css("skin.css");
       $showelements = module::get_var("navcarousel", "showelements", "7");
       $childcount = $theme->item->parent()->viewable()->children_count();
       $itemoffset = intval(floor($showelements / 2));
@@ -64,7 +62,10 @@ class navcarousel_theme_Core {
         $onwinload = "});\n
                   $(window).load(function () {\n";
       }
-      Return "\n<!-- Navcaoursel -->
+      return
+        $theme->script("jquery.jcarousel.min.js")
+        . $theme->css("skin.css")
+        . "\n<!-- Navcarousel -->
                 <style type=\"text/css\">\n
                 ". $containerwidth ."
                 .jcarousel-skin-tango .jcarousel-clip-horizontal {\n
diff --git a/3.0/modules/photoannotation/helpers/photoannotation_theme.php b/3.0/modules/photoannotation/helpers/photoannotation_theme.php
index 15f584f8..6f52c496 100644
--- a/3.0/modules/photoannotation/helpers/photoannotation_theme.php
+++ b/3.0/modules/photoannotation/helpers/photoannotation_theme.php
@@ -19,14 +19,14 @@
  */
 class photoannotation_theme_Core {
   static function head($theme) {
-    $theme->css("photoannotation.css");
+    $v = $theme->css("photoannotation.css");
     if ($theme->page_subtype == "photo") {
-      $theme->script("jquery.annotate.min.js");
+      $v .= $theme->script("jquery.annotate.min.js");
       $noborder = module::get_var("photoannotation", "noborder", false);
       $noclickablehover = module::get_var("photoannotation", "noclickablehover", false);
       $nohover = module::get_var("photoannotation", "nohover", false);
       $bordercolor = "#". module::get_var("photoannotation", "bordercolor", "000000");
-      $v = "<style type=\"text/css\">\n";
+      $v .= "<style type=\"text/css\">\n";
       $v .= ".photoannotation-del-button {\n
               border:1px solid ". $bordercolor ." !important;\n
               }\n";
@@ -73,8 +73,8 @@ class photoannotation_theme_Core {
   
   static function admin_head($theme) {
     if (strpos($theme->content->kohana_filename, "admin_photoannotation.html.php")) {
-      $theme->css("colorpicker.css");
-      $theme->script("jquery.colorpicker.min.js");
+      return $theme->css("colorpicker.css")
+        . $theme->script("jquery.colorpicker.min.js");
     }
   }
 
diff --git a/3.0/modules/sharephoto/helpers/sharephoto_theme.php b/3.0/modules/sharephoto/helpers/sharephoto_theme.php
index bcb5549a..4bd49ff8 100644
--- a/3.0/modules/sharephoto/helpers/sharephoto_theme.php
+++ b/3.0/modules/sharephoto/helpers/sharephoto_theme.php
@@ -19,9 +19,8 @@
  */
 class sharephoto_theme_Core {
   static function head($theme) {
-    $theme->css("sharephoto.css");
-    $theme->script("sharephoto.js");
-    return "";
+    return $theme->css("sharephoto.css") .
+      $theme->script("sharephoto.js");
   }
 
 
diff --git a/3.0/modules/tag_cloud/helpers/tag_cloud_theme.php b/3.0/modules/tag_cloud/helpers/tag_cloud_theme.php
index 72b22470..fd3e6b39 100644
--- a/3.0/modules/tag_cloud/helpers/tag_cloud_theme.php
+++ b/3.0/modules/tag_cloud/helpers/tag_cloud_theme.php
@@ -19,7 +19,7 @@
  */
 class tag_cloud_theme_Core {
   static function head($theme) {
-    $theme->script("swfobject.js");
-    $theme->script("tag_cloud.js");
+    return $theme->script("swfobject.js")
+      . $theme->script("tag_cloud.js");
   }
 }
\ No newline at end of file
diff --git a/3.0/modules/tagsmap/helpers/tagsmap_theme.php b/3.0/modules/tagsmap/helpers/tagsmap_theme.php
index 612f0ffd..c3750de6 100644
--- a/3.0/modules/tagsmap/helpers/tagsmap_theme.php
+++ b/3.0/modules/tagsmap/helpers/tagsmap_theme.php
@@ -20,6 +20,6 @@
 class tagsmap_theme_Core {
 		
   static function head($theme) {
-    $theme->css("tagsmap_menu.css");
+    return $theme->css("tagsmap_menu.css");
   }
 }
diff --git a/3.0/modules/videos/helpers/videos_theme.php b/3.0/modules/videos/helpers/videos_theme.php
index 9e994591..f1eb767c 100644
--- a/3.0/modules/videos/helpers/videos_theme.php
+++ b/3.0/modules/videos/helpers/videos_theme.php
@@ -19,9 +19,10 @@
  */
 class videos_theme_Core {
   static function head($theme) {
+    $buf = "";
     if (identity::active_user()->admin) {
-      $theme->css("videos.css");
-      $theme->script("videos.js");
+      $buf .= $theme->css("videos.css");
+      $buf .= $theme->script("videos.js");
     }
 
     $item = $theme->item();
@@ -32,24 +33,24 @@ class videos_theme_Core {
       if ($items_video->loaded()) {
         $view = new View("videos_display_js.html");
         //$view->embed_code = addslashes($embedded_video->embed_code);
-        return $view;
+        return $buf . $view;
       }
     }
   }
 
   static function admin_head($theme) {
-    $head = array();
+    $buf = "";
     if (strpos(Router::$current_uri, "admin/videos") !== false) {
-      $theme->css("videos.css");
-      $theme->css("jquery.autocomplete.css");
+      $buf .= $theme->css("videos.css");
+      $buf .= $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $theme->script("jquery.autocomplete.js");
-      $theme->script("admin_videos.js");
+      $buf .= $theme->script("jquery.autocomplete.js");
+      $buf .= $theme->script("admin_videos.js");
     }
 
-    return implode("\n", $head);
+    return $buf;
   }  
 }
\ No newline at end of file
diff --git a/3.1/modules/basket/helpers/basket_theme.php b/3.1/modules/basket/helpers/basket_theme.php
index 1ad535e5..9900a59f 100644
--- a/3.1/modules/basket/helpers/basket_theme.php
+++ b/3.1/modules/basket/helpers/basket_theme.php
@@ -20,7 +20,7 @@
 class basket_theme_Core {
 
   static function head($theme) {
-    $theme->css("basket.css");
+    return $theme->css("basket.css");
   }
 
   static function header_top($theme) {
@@ -37,7 +37,7 @@ class basket_theme_Core {
 
   static function admin_head($theme) {
     if (strpos(Router::$current_uri, "admin/product_lines") !== false) {
-      $theme->script("gallery.panel.js");
+      return $theme->script("gallery.panel.js");
     }
   }
   static function photo_top($theme){
diff --git a/3.1/modules/bitly/helpers/bitly_theme.php b/3.1/modules/bitly/helpers/bitly_theme.php
index 41aba38f..3a619065 100644
--- a/3.1/modules/bitly/helpers/bitly_theme.php
+++ b/3.1/modules/bitly/helpers/bitly_theme.php
@@ -19,6 +19,6 @@
  */
 class bitly_theme_Core {
   static function head($theme) {
-    $theme->script("bitly.js");
+    return $theme->script("bitly.js");
   }
 }
diff --git a/3.1/modules/calendarview/helpers/calendarview_theme.php b/3.1/modules/calendarview/helpers/calendarview_theme.php
index 4342b11f..5f5a3e25 100644
--- a/3.1/modules/calendarview/helpers/calendarview_theme.php
+++ b/3.1/modules/calendarview/helpers/calendarview_theme.php
@@ -20,6 +20,6 @@
 class calendarview_theme_Core {
 		
   static function head($theme) {
-    $theme->css("calendarview_menu.css");
+    return $theme->css("calendarview_menu.css");
   }
 }
diff --git a/3.1/modules/downloadalbum/helpers/downloadalbum_theme.php b/3.1/modules/downloadalbum/helpers/downloadalbum_theme.php
index d88d8a52..cddbf1ee 100644
--- a/3.1/modules/downloadalbum/helpers/downloadalbum_theme.php
+++ b/3.1/modules/downloadalbum/helpers/downloadalbum_theme.php
@@ -19,6 +19,6 @@
  */
 class downloadalbum_theme {
   static function head($theme) {
-    $theme->css("downloadalbum_menu.css");
+    return $theme->css("downloadalbum_menu.css");
   }
 }
diff --git a/3.1/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/3.1/modules/downloadfullsize/helpers/downloadfullsize_theme.php
index 698b1488..80f9307d 100644
--- a/3.1/modules/downloadfullsize/helpers/downloadfullsize_theme.php
+++ b/3.1/modules/downloadfullsize/helpers/downloadfullsize_theme.php
@@ -20,7 +20,7 @@
 class downloadfullsize_theme {
   static function head($theme) {
     if ($theme->item && access::can("view_full", $theme->item)) {
-      $theme->css("downloadfullsize_menu.css");
+      return $theme->css("downloadfullsize_menu.css");
     }
   }
 }
diff --git a/3.1/modules/ecard/helpers/ecard_theme.php b/3.1/modules/ecard/helpers/ecard_theme.php
index dd3644e8..89ef19ed 100644
--- a/3.1/modules/ecard/helpers/ecard_theme.php
+++ b/3.1/modules/ecard/helpers/ecard_theme.php
@@ -19,6 +19,6 @@
  */
 class ecard_theme_Core {
   static function head($theme) {
-    $theme->css("ecard.css");
+    return $theme->css("ecard.css");
   }
 }
\ No newline at end of file
diff --git a/3.1/modules/editcreation/helpers/editcreation_theme.php b/3.1/modules/editcreation/helpers/editcreation_theme.php
index 1d570907..a51811c6 100644
--- a/3.1/modules/editcreation/helpers/editcreation_theme.php
+++ b/3.1/modules/editcreation/helpers/editcreation_theme.php
@@ -25,7 +25,7 @@ class editcreation_theme_Core {
     }
     $item = $theme->item();
     if ( $item && access::can("edit", $item) ) {
-      $theme->css("editcreation.css");
+      return $theme->css("editcreation.css");
     }
   }
 }
diff --git a/3.1/modules/exif_gps/helpers/exif_gps_theme.php b/3.1/modules/exif_gps/helpers/exif_gps_theme.php
index 160373a2..3940678d 100644
--- a/3.1/modules/exif_gps/helpers/exif_gps_theme.php
+++ b/3.1/modules/exif_gps/helpers/exif_gps_theme.php
@@ -19,6 +19,6 @@
  */
 class exif_gps_theme_Core {
   static function head($theme) {
-    $theme->css("exif_gps_menu.css");
+    return $theme->css("exif_gps_menu.css");
   }
 }
diff --git a/3.1/modules/favourites/helpers/favourites_theme.php b/3.1/modules/favourites/helpers/favourites_theme.php
index 94f4d806..c39d31c2 100644
--- a/3.1/modules/favourites/helpers/favourites_theme.php
+++ b/3.1/modules/favourites/helpers/favourites_theme.php
@@ -19,8 +19,8 @@
  */
 class favourites_theme_Core {
   static function head($theme) {
-    $theme->css("favourites.css");
-    $theme->script("favourites.js");
+    return $theme->css("favourites.css")
+      . $theme->script("favourites.js");
   }
 
   static function header_top($theme) {
diff --git a/3.1/modules/highroller/helpers/highroller_theme.php b/3.1/modules/highroller/helpers/highroller_theme.php
index d42ca82f..999aeeb7 100644
--- a/3.1/modules/highroller/helpers/highroller_theme.php
+++ b/3.1/modules/highroller/helpers/highroller_theme.php
@@ -19,8 +19,8 @@
  */
 class highroller_theme_Core {
   static function head($theme) {
-    $theme->script("highroller.js");
-    printf("<script type=\"text/javascript\"> var PICK_THEME_URL = '%s'; </script>", url::site("highroller/pick_theme"));
+    return $theme->script("highroller.js")
+      . sprintf("<script type=\"text/javascript\"> var PICK_THEME_URL = '%s'; </script>", url::site("highroller/pick_theme"));
   }
 
   static function header_top($theme) {
diff --git a/3.1/modules/kbd_nav/helpers/kbd_nav_theme.php b/3.1/modules/kbd_nav/helpers/kbd_nav_theme.php
index 6540f020..e085f187 100644
--- a/3.1/modules/kbd_nav/helpers/kbd_nav_theme.php
+++ b/3.1/modules/kbd_nav/helpers/kbd_nav_theme.php
@@ -3,6 +3,6 @@
 class Kbd_Nav_theme_Core {
 
   static function head($theme) {
-    $theme->script("kbd_nav.js");
+    return $theme->script("kbd_nav.js");
   }
 }
\ No newline at end of file
diff --git a/3.1/modules/language_flags/helpers/language_flags_theme.php b/3.1/modules/language_flags/helpers/language_flags_theme.php
index 42c16191..9b5a7ada 100644
--- a/3.1/modules/language_flags/helpers/language_flags_theme.php
+++ b/3.1/modules/language_flags/helpers/language_flags_theme.php
@@ -19,6 +19,6 @@
  */
 class language_flags_theme_Core {
   static function head($theme) {
-    $theme->css("language_flags_sidebar.css");
+    return $theme->css("language_flags_sidebar.css");
   }
 }
diff --git a/3.1/modules/navcarousel/helpers/navcarousel_theme.php b/3.1/modules/navcarousel/helpers/navcarousel_theme.php
index 844af7f2..a22d42fd 100644
--- a/3.1/modules/navcarousel/helpers/navcarousel_theme.php
+++ b/3.1/modules/navcarousel/helpers/navcarousel_theme.php
@@ -36,8 +36,6 @@ class navcarousel_theme_Core {
                 }\n";
       }
       $thumbsize = module::get_var("navcarousel", "thumbsize", "50");
-      $theme->script("jquery.jcarousel.min.js");
-      $theme->css("skin.css");
       $showelements = module::get_var("navcarousel", "showelements", "7");
       $childcount = $theme->item->parent()->viewable()->children_count();
       $itemoffset = intval(floor($showelements / 2));
@@ -64,7 +62,10 @@ class navcarousel_theme_Core {
         $onwinload = "});\n
                   $(window).load(function () {\n";
       }
-      Return "\n<!-- Navcaoursel -->
+      return
+        $theme->script("jquery.jcarousel.min.js")
+        . $theme->css("skin.css")
+        . "\n<!-- Navcarousel -->
                 <style type=\"text/css\">\n
                 ". $containerwidth ."
                 .jcarousel-skin-tango .jcarousel-clip-horizontal {\n
diff --git a/3.1/modules/photoannotation/helpers/photoannotation_theme.php b/3.1/modules/photoannotation/helpers/photoannotation_theme.php
index 15f584f8..6f52c496 100644
--- a/3.1/modules/photoannotation/helpers/photoannotation_theme.php
+++ b/3.1/modules/photoannotation/helpers/photoannotation_theme.php
@@ -19,14 +19,14 @@
  */
 class photoannotation_theme_Core {
   static function head($theme) {
-    $theme->css("photoannotation.css");
+    $v = $theme->css("photoannotation.css");
     if ($theme->page_subtype == "photo") {
-      $theme->script("jquery.annotate.min.js");
+      $v .= $theme->script("jquery.annotate.min.js");
       $noborder = module::get_var("photoannotation", "noborder", false);
       $noclickablehover = module::get_var("photoannotation", "noclickablehover", false);
       $nohover = module::get_var("photoannotation", "nohover", false);
       $bordercolor = "#". module::get_var("photoannotation", "bordercolor", "000000");
-      $v = "<style type=\"text/css\">\n";
+      $v .= "<style type=\"text/css\">\n";
       $v .= ".photoannotation-del-button {\n
               border:1px solid ". $bordercolor ." !important;\n
               }\n";
@@ -73,8 +73,8 @@ class photoannotation_theme_Core {
   
   static function admin_head($theme) {
     if (strpos($theme->content->kohana_filename, "admin_photoannotation.html.php")) {
-      $theme->css("colorpicker.css");
-      $theme->script("jquery.colorpicker.min.js");
+      return $theme->css("colorpicker.css")
+        . $theme->script("jquery.colorpicker.min.js");
     }
   }
 
diff --git a/3.1/modules/sharephoto/helpers/sharephoto_theme.php b/3.1/modules/sharephoto/helpers/sharephoto_theme.php
index bcb5549a..e71de572 100644
--- a/3.1/modules/sharephoto/helpers/sharephoto_theme.php
+++ b/3.1/modules/sharephoto/helpers/sharephoto_theme.php
@@ -19,9 +19,8 @@
  */
 class sharephoto_theme_Core {
   static function head($theme) {
-    $theme->css("sharephoto.css");
-    $theme->script("sharephoto.js");
-    return "";
+    return $theme->css("sharephoto.css")
+      . $theme->script("sharephoto.js");
   }
 
 
diff --git a/3.1/modules/tag_cloud/helpers/tag_cloud_theme.php b/3.1/modules/tag_cloud/helpers/tag_cloud_theme.php
index 72b22470..050dbf44 100644
--- a/3.1/modules/tag_cloud/helpers/tag_cloud_theme.php
+++ b/3.1/modules/tag_cloud/helpers/tag_cloud_theme.php
@@ -19,7 +19,7 @@
  */
 class tag_cloud_theme_Core {
   static function head($theme) {
-    $theme->script("swfobject.js");
-    $theme->script("tag_cloud.js");
+    return $theme->script("swfobject.js") 
+      . $theme->script("tag_cloud.js");
   }
 }
\ No newline at end of file
diff --git a/3.1/modules/tagsmap/helpers/tagsmap_theme.php b/3.1/modules/tagsmap/helpers/tagsmap_theme.php
index 612f0ffd..c3750de6 100644
--- a/3.1/modules/tagsmap/helpers/tagsmap_theme.php
+++ b/3.1/modules/tagsmap/helpers/tagsmap_theme.php
@@ -20,6 +20,6 @@
 class tagsmap_theme_Core {
 		
   static function head($theme) {
-    $theme->css("tagsmap_menu.css");
+    return $theme->css("tagsmap_menu.css");
   }
 }
diff --git a/3.1/modules/videos/helpers/videos_theme.php b/3.1/modules/videos/helpers/videos_theme.php
index 9e994591..1a1ae107 100644
--- a/3.1/modules/videos/helpers/videos_theme.php
+++ b/3.1/modules/videos/helpers/videos_theme.php
@@ -19,9 +19,10 @@
  */
 class videos_theme_Core {
   static function head($theme) {
+    $buf = "";
     if (identity::active_user()->admin) {
-      $theme->css("videos.css");
-      $theme->script("videos.js");
+      $buf .= $theme->css("videos.css");
+      $buf .= $theme->script("videos.js");
     }
 
     $item = $theme->item();
@@ -32,24 +33,24 @@ class videos_theme_Core {
       if ($items_video->loaded()) {
         $view = new View("videos_display_js.html");
         //$view->embed_code = addslashes($embedded_video->embed_code);
-        return $view;
+        return $buf . $view;
       }
     }
   }
 
   static function admin_head($theme) {
-    $head = array();
+    $buf = "";
     if (strpos(Router::$current_uri, "admin/videos") !== false) {
-      $theme->css("videos.css");
-      $theme->css("jquery.autocomplete.css");
+      $buf .= $theme->css("videos.css");
+      $buf .= $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $theme->script("jquery.autocomplete.js");
-      $theme->script("admin_videos.js");
+      $buf .= $theme->script("jquery.autocomplete.js");
+      $buf .= $theme->script("admin_videos.js");
     }
 
-    return implode("\n", $head);
-  }  
+    return $buf;
+  }
 }
\ No newline at end of file