diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
index 828c74a06..1a76203aa 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
@@ -35,6 +35,6 @@
         <% } %>
     </fieldset>
     <fieldset>
-       <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
+       <input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" />
     </fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
index 135878a1e..1424f4042 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
@@ -10,7 +10,7 @@
         </select>
 		<input class="button" type="submit" value="<%=_Encoded("Apply") %>" />
 	</fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a role").ToString(), "Create", new {}, new { @class = "button" }) %></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
     <fieldset>
         <table class="items" summary="<%=_Encoded("This is a table of the roles currently available for use in your application.") %>">
             <colgroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx
index 41924541d..b2840289a 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx
@@ -8,6 +8,6 @@
     <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
     <%=Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button" type="submit" value="<%=_Encoded("Save") %>" />
+        <input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" />
     </fieldset>
 <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
index 5daa5d801..bc0f16d14 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
@@ -3,7 +3,7 @@
 <h1><%=Html.TitleForPage(T("Manage Users").ToString()) %></h1>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary()%>
-    <div class="manage"><%=Html.ActionLink(T("Add a new user").ToString(), "Create", new { }, new { @class = "button" })%></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a new user").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
     <fieldset>
         <table class="items">
             <colgroup>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 012764b45..44b5fc4a5 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -170,7 +170,6 @@
     <Content Include="Themes\Classic\Content\Images\mainBackgroundgrey.png" />
     <Content Include="Themes\Classic\Content\Images\navDivider.gif" />
     <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
-    <Content Include="Themes\Classic\DesignerNotes\Sidebar.html" />
     <Content Include="Themes\Classic\Styles\blog.css" />
     <Content Include="Themes\Classic\Styles\site.css" />
     <Content Include="Themes\Classic\Theme.png" />
@@ -180,6 +179,7 @@
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
+    <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
     <Content Include="Themes\Classic\Views\Footer.ascx" />
     <Content Include="Themes\Classic\Views\Layout.ascx" />
@@ -193,15 +193,12 @@
     <Content Include="Themes\Green\Content\Images\tabLeftOn.gif" />
     <Content Include="Themes\Green\Content\Images\tabRightOff.gif" />
     <Content Include="Themes\Green\Content\Images\tabRightOn.gif" />
-    <Content Include="Themes\Green\DesignerNotes\Sidebar.html" />
-    <Content Include="Themes\Green\DesignerNotes\User2.html" />
-    <Content Include="Themes\Green\DesignerNotes\User3.html" />
-    <Content Include="Themes\Green\DesignerNotes\User1.html" />
     <Content Include="Themes\Green\Styles\blog.css" />
     <Content Include="Themes\Green\Styles\site.css" />
     <Content Include="Themes\Green\Styles\yui.css" />
     <Content Include="Themes\Green\Theme.png" />
     <Content Include="Themes\Green\Theme.txt" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
     <Content Include="Themes\Green\Views\Layout.HomePage.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
@@ -210,7 +207,6 @@
     <Content Include="Themes\Green\Views\Footer.ascx" />
     <Content Include="Themes\Green\Views\Layout.ascx" />
     <Content Include="Themes\Green\Views\ListOfComments.ascx" />
-    <Content Include="Themes\SafeMode\Content\orchard.ico" />
     <Content Include="Themes\SafeMode\Styles\ie6.css" />
     <Content Include="Themes\SafeMode\Styles\images\backgroundHeader.gif" />
     <Content Include="Themes\SafeMode\Styles\images\backgroundVines.gif" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
index 03bb4f709..169dc04d8 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
@@ -3,5 +3,5 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%
     if (Model.Creator != null) { 
-       %><%=_Encoded(" | Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %><%
+       %><%=_Encoded("Posted by {0} {1}", Model.Creator.UserName, "|", Html.PublishedWhen(Model)) %><%
     } %>