diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css
index 2b4708bf..93adfd22 100644
--- a/themes/vivo-basic/css/screen.css
+++ b/themes/vivo-basic/css/screen.css
@@ -813,4 +813,8 @@ font-size:0.9em;
 .contactUsReturnHome{
 margin-top:30px;
 margin-bottom:250px;
+}
+/* This css rules will override the one in individual.css */
+.green {
+    color:#000 !important;
 }
\ No newline at end of file
diff --git a/themes/vivo-basic/templates/page.ftl b/themes/vivo-basic/templates/page.ftl
new file mode 100644
index 00000000..af0d23ff
--- /dev/null
+++ b/themes/vivo-basic/templates/page.ftl
@@ -0,0 +1,46 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#include "doctype.html">
+
+${stylesheets.addFromTheme("/css/screen.css")}
+<#-- print stylesheet commented out for now until we can add a media parameter to stylesheets.add method -->
+<#-- ${stylesheets.addFromTheme("/css/print.css")} -->
+
+<#include "head.ftl">
+
+<body>
+    <div id="wrap" class="container">
+        <div id="header">
+        
+            <#include "identity.ftl">
+            
+            <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
+            <div id="navAndSearch" class="block">
+                <#include "menu.ftl">  
+                <#include "search.ftl">                
+            </div> <!-- navAndSearch --> 
+            
+            <#include "breadcrumbs.ftl">         
+        </div> <!-- header --> 
+
+        <hr class="hidden" />
+
+        <div id="contentwrap"> 
+            <#if flash?has_content>
+                <div id="flash-message">
+                    ${flash}
+                </div>
+            </#if>
+            
+            <div id="content">                      
+                ${body}
+            </div> <!-- content -->
+        </div> <!-- contentwrap -->
+    
+        <#include "footer.ftl">
+                                      
+    </div> <!-- wrap --> 
+    
+    <#include "scripts.ftl"> 
+</body>
+</html>
\ No newline at end of file
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 8daf59d2..28e788b8 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -12,10 +12,8 @@
         <title>${title}</title>
 
         ${stylesheets.addFromTheme("/css/screen.css")}
-        ${stylesheets.tags}
-        <!-- script for enabling new HTML5 semantic markup in IE browsers-->
-        <script type="text/javascript" src="${urls.home}/js/html5.js"></script>
-        ${headScripts.tags}
+        <#include "stylesheets.ftl">
+        <#include "headScripts.ftl">
 
         <!--[if lt IE 7]>
         <link rel="stylesheet" href="css/ie6.css" />
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index fef6c544..099efb4f 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -13,9 +13,7 @@
         
         ${stylesheets.addFromTheme("/css/screen.css")}
         <#include "stylesheets.ftl">
-        <!-- script for enabling new HTML5 semantic markup in IE browsers-->
-        <script type="text/javascript" src="${urls.home}/js/html5.js"></script>
-        ${headScripts.tags}
+        <#include "headScripts.ftl">
         
         <!--[if lt IE 7]>
         <link rel="stylesheet" href="css/ie6.css" />
diff --git a/themes/wilma/templates/page/basicPage.jsp b/themes/wilma/templates/page/basicPage.jsp
index 5829a35d..a2c11e47 100644
--- a/themes/wilma/templates/page/basicPage.jsp
+++ b/themes/wilma/templates/page/basicPage.jsp
@@ -81,9 +81,9 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
         <meta charset="utf-8" />
         <title>${title}</title>
         <link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
-
-        <!-- script for enabling new HTML5 semantic markup in IE browsers-->
-        <%-- ${headScripts.add("/js/html5.js")} --%>
+        ${ftl_stylesheets}
+        ${ftl_headScripts}
+        
         <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
         
         <!--[if lt IE 7]>
