Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	8 Aug 2006 21:27:00 -0000	1.2
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	4 Jan 2008 17:54:34 -0000	1.3
@@ -8,10 +8,6 @@
   <if @focus@ not nil>
     <property name="focus">@focus;noquote@</property>
   </if>
-   <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
-    @header_stuff;noquote@
-  </property> 
 
 
 <!-- Header -->
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl	8 Aug 2006 21:27:00 -0000	1.2
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl	4 Jan 2008 17:54:34 -0000	1.3
@@ -1,23 +1,18 @@
 # Expects properties:
 #   title
 #   focus
-#   header_stuff
 #   section
 
 if { ![info exists section] } {
     set section {}
 }
 
-if { ![info exists header_stuff] } {
-    set header_stuff {}
-}
-
 if { [template::util::is_nil subnavbar_link] } {
     set subnavbar_link ""
 }
 
 # Where to find the stylesheet
-set css_url "/resources/acs-subsite/site-master.css"
+template::head::add_css -href "/resources/acs-subsite/site-master.css"
 
 # Get system name
 set system_name [ad_system_name]
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp	8 Aug 2006 21:27:00 -0000	1.2
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp	4 Jan 2008 17:54:34 -0000	1.3
@@ -1,10 +1,4 @@
 <master src="/www/site-master-kelp">
-  <property name="header_stuff">
-     <link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master-kelp.css" media="all">
-     <link rel="stylesheet" type="text/css" href="/resources/calendar/calendar.css" media="all">
-     @header_stuff;noquote@
-     @header_customized_css;noquote@ 
-  </property>
   <if @context@ not nil>
      <property name="context">@context;noquote@</property>
   </if>
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl	8 Aug 2006 21:27:00 -0000	1.2
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl	4 Jan 2008 17:54:34 -0000	1.3
@@ -305,40 +305,10 @@
 }
 
 
-if { ![info exists header_stuff] } {
-    set header_stuff ""
-}
-
 if { [info exists text] } {
     set text [lang::util::localize $text]
 }
 
-# Focus
-multirow create attribute key value
-
-if { ![template::util::is_nil focus] } {
-    # Handle elements wohse name contains a dot
-    if { [regexp {^([^.]*)\.(.*)$} $focus match form_name element_name] } {
-
-        # Add safety code to test that the element exists '
-        set header_stuff "$header_stuff
-          <script language=\"JavaScript\">
-            function acs_focus( form_name, element_name ){
-                if (document.forms == null) return;
-                if (document.forms\[form_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\].type == 'hidden') return;
-
-                document.forms\[form_name\].elements\[element_name\].focus();
-            }
-          </script>
-        "
-        
-        template::multirow append \
-                attribute onload "javascript:acs_focus('${form_name}', '${element_name}')"
-    }
-}
-
 # Developer-support support
 set ds_enabled_p [parameter::get_from_package_key \
     -package_key acs-developer-support \
@@ -559,20 +529,13 @@
     }
 }
     
-set header_customized_css "
-
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-<STYLE TYPE=\"text/css\">
-
+template::head::add_style -style "
 $recolor_css
 
 .page-body {
     FONT-SIZE: $header_font_size;
     COLOR: $header_font_color;
     FONT-FAMILY: $header_font;
 }
-
-</STYLE>
-
 "
-	
\ No newline at end of file
+template::head::add_css -href "/resources/dotlrn/dotlrn-master-kelp.css"