diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
index 15b5c5ed5..efff6c128 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
@@ -38,6 +38,8 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
request.setAttribute("ftl_identity", get("identity", root, config, vreq));
request.setAttribute("ftl_menu", get("menu", root, config, vreq));
+ request.setAttribute("ftl_stylesheets", get("stylesheets", root, config, vreq));
+ request.setAttribute("ftl_headScripts", get("headScripts", root, config, vreq));
request.setAttribute("ftl_search", get("search", root, config, vreq));
request.setAttribute("ftl_footer", get("footer", root, config, vreq));
request.setAttribute("ftl_googleAnalytics", get("googleAnalytics", root, config, vreq));
diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css
index 6550c4565..41d673b39 100644
--- a/webapp/web/css/login.css
+++ b/webapp/web/css/login.css
@@ -148,20 +148,4 @@ p.passwordNote {
.or {
display:inline;
vertical-align:middle;
-}
-/* WILMA THEME ------> */
-#error-alert{
- width:260px;
- position:relative;
-}
-#error-alert img{
- padding-left:38px;
-}
-#error-alert p.error-message{
- position:absolute;
- width:200px;
- top:8px;
- left:82px;
- font-size:0.7em;
- color:#b30d1c;
-}
+}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/partials/headScripts.ftl b/webapp/web/templates/freemarker/page/partials/headScripts.ftl
index 0de318d64..139c07226 100644
--- a/webapp/web/templates/freemarker/page/partials/headScripts.ftl
+++ b/webapp/web/templates/freemarker/page/partials/headScripts.ftl
@@ -2,4 +2,7 @@
<#-- Template for scripts that must be loaded in the head -->
+
+
+
${headScripts.tags}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
index 457b1d335..890356397 100644
--- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
+++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
@@ -1,10 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
<#-- Template for loading stylesheets in the head -->
-
-
${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed -->
${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created -->
${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created -->
-
${stylesheets.tags}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 6d5deb00b..946690be0 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -31,10 +31,8 @@
#if>
<#if errorMessage??>
-
#macro>