diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 2d5045c4d..7db7fdf13 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Azure.Web</RootNamespace>
     <AssemblyName>Orchard.Azure.Web</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
index b699143bb..894b8e66b 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx
@@ -10,7 +10,7 @@
     <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" }) %>
 </fieldset>
 <fieldset class="permalink">
-    <label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%=Html.Encode(Request.ToRootUrlString())%>/<%=Html.Encode(Model.RoutableAspect.ContentItemBasePath) %></span></label>
+    <label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%: Request.ToRootUrlString() %>/<%: Model.RoutableAspect.ContentItemBasePath %></span></label>
     <span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
 </fieldset>
 <% using (this.Capture("end-of-page-scripts")) { %>
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
index b4442b16c..1ba9e0991 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Futures.Widgets</RootNamespace>
     <AssemblyName>Futures.Widgets</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index ffe487a97..797ed7bcc 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Blogs</RootNamespace>
     <AssemblyName>Orchard.Blogs</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index 14be9a7ca..84ee0d3e0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -3,5 +3,5 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h2>
-<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %><p><%=Html.Encode(Model.Item.Description) %></p><% } %>
+<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %><p><%: Model.Item.Description %></p><% } %>
 <div class="blog metadata"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%> | <%Html.Zone("meta");%></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx
index 61f265c43..737d708e4 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx
@@ -17,7 +17,7 @@
         <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %></h3>
         <p><% Html.Zone("meta");%></p>
         <%--<p>[list of authors] [modify blog access]</p>--%>
-        <p><%=Html.Encode(Model.Item.Description) %></p>              
+        <p><%: Model.Item.Description %></p>              
     </div>
     <div style="clear:both;"></div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx
index a79b21067..beab3fb41 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <div class="blogdescription">
-    <p><%=Html.Encode(Model.Description) %></p>
+    <p><%: Model.Description %></p>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 391eb11c5..95e38c50c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Comments</RootNamespace>
     <AssemblyName>Orchard.Comments</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
index 13d2a6aeb..cc24a9ec9 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
@@ -77,10 +77,10 @@
                        else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } 
                        else { %><%=_Encoded("Approved") %><% } %>
                 </td>
-                <td><%=Html.Encode(commentEntry.Comment.UserName) %></td>
+                <td><%: commentEntry.Comment.UserName %></td>
                 <td>
                 <% if (commentEntry.Comment.CommentText != null) {%>
-                    <%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %>
+                    <%: commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %><%=_Encoded(" ...") %>
                 <% } %> 
                 </td>
                 <td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx
index ae46c1ded..704b80713 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx
@@ -7,21 +7,21 @@
     <fieldset class="who">
         <div>
             <label for="Name"><%=_Encoded("Name") %></label>
-            <input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
+            <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
         </div>
         <div>
             <label for="Email"><%=_Encoded("Email") %></label>
-            <input id="Email" class="text" name="Email" type="text" value="<%=Html.Encode(Model.Email)%>" />				
+            <input id="Email" class="text" name="Email" type="text" value="<%: Model.Email %>" />				
         </div>
         <div>
             <label for="SiteName"><%=_Encoded("Url") %></label>
-            <input id="SiteName" class="text" name="SiteName" type="text" value="<%=Html.Encode(Model.SiteName) %>" />
+            <input id="SiteName" class="text" name="SiteName" type="text" value="<%: Model.SiteName %>" />
         </div>
     </fieldset>
     <fieldset class="what">
         <div>
             <label for="CommentText"><%=_Encoded("Body") %></label>
-            <textarea id="CommentText" rows="10" cols="30" name="CommentText"><%=Html.Encode(Model.CommentText) %></textarea>
+            <textarea id="CommentText" rows="10" cols="30" name="CommentText"><%: Model.CommentText %></textarea>
 	        <input id="CommentId" name="Id" type="hidden" value="<%=Model.Id %>" />
         </div>
     </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
index 62a851cae..9f6a210e8 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
@@ -60,11 +60,11 @@
                 <td><% if (commentEntry.Comment.Status == CommentStatus.Spam) { %><%=_Encoded("Spam") %><% } 
                        else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } 
                        else { %><%=_Encoded("Approved") %><% } %></td>
-                <td><%=Html.Encode(commentEntry.Comment.UserName) %></td>
+                <td><%: commentEntry.Comment.UserName %></td>
                 <td>
                 <% if (commentEntry.Comment.CommentText != null) {%>
                     <%-- todo: (heskew) same text processing comment as on the public display, also need to use the ellipsis character instead of ... --%>
-                    <%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %>
+                    <%: commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %><%=_Encoded(" ...") %>
                 <% } %> 
                 </td>
                 <td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx
index 10fca431e..b92e64e06 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx
@@ -10,7 +10,7 @@ foreach (var comment in Model) { %>
         </div>
         <div class="text">
             <%-- todo: (heskew) comment text needs processing depending on comment markup style --%>
-            <p><%=Html.Encode(comment.Record.CommentText)%></p>
+            <p><%: comment.Record.CommentText %></p>
         </div>
     </li><%
 } %>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj
index b97bf93cd..81e865d38 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.DevTools</RootNamespace>
     <AssemblyName>Orchard.DevTools</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx
index 4bf063ddc..237149c1c 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx
@@ -20,10 +20,10 @@
 <ul>
     <%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%>
     <li><span style="font-weight: bold;">
-        <%if (partType.IsGenericType) {%><%=Html.Encode(partType.Name +" "+partType.GetGenericArguments().First().Name)%>
-        <%=Html.Encode(" (" + partType.GetGenericArguments().First().Namespace + ")")%><%}
-          else {%><%=Html.Encode(partType.Name)%>
-        <%=Html.Encode( " (" + partType.Namespace + ")")%><%
+        <%if (partType.IsGenericType) {%><%: partType.Name +" "+partType.GetGenericArguments().First().Name %>
+        <%: " (" + partType.GetGenericArguments().First().Namespace + ")" %><%}
+          else {%><%: partType.Name %>
+        <%:  " (" + partType.Namespace + ")" %><%
                                                             }
           
           %></span>
@@ -31,8 +31,8 @@
             <%foreach (var prop in partType.GetProperties().Where(x => x.DeclaringType == partType)) {
                   var value = prop.GetValue(Model.Locate(partType), null);%>
             <li style="font-weight: normal;">
-                <%=Html.Encode(prop.Name) %>:
-                <%=Html.Encode(value) %>
+                <%: prop.Name %>:
+                <%: value %>
                 <%var valueItem = value as ContentItem;
                   if (valueItem == null && value is IContent) {
                       valueItem = (value as IContent).ContentItem;
@@ -46,7 +46,7 @@
                       else if (typeof(IEnumerable).IsAssignableFrom(prop.PropertyType)) {
                           foreach (var item in value as IEnumerable) {
                     %>
-                    <li><%=Html.Encode(item.GetType().Name) %>:<%=Html.Encode(item) %></li>
+                    <li><%: item.GetType().Name %>:<%: item %></li>
                     <%
                         }
 
@@ -54,8 +54,8 @@
                       else {%>
                     <%foreach (var prop2 in value.GetType().GetProperties().Where(x => x.GetIndexParameters().Count() == 0)) {%>
                     <li>
-                        <%=Html.Encode(prop2.Name)%>
-                        <%=Html.Encode(prop2.GetValue(value, null))%></li>
+                        <%: prop2.Name %>
+                        <%: prop2.GetValue(value, null) %></li>
                     <%} %>
                     <%} %>
                 </ul>
@@ -71,13 +71,13 @@
 <ul>
     <%foreach (var display in Model.Displays) {%>
     <li><span style="font-weight: bold">
-        <%=Html.Encode(display.Prefix)%></span>
-        <%=Html.Encode(display.Model.GetType().Name)%>
-        (<%=Html.Encode(display.Model.GetType().Namespace)%>)
-        Template:<%=Html.Encode(display.TemplateName ?? "(null)")%>
-        Prefix:<%=Html.Encode(display.Prefix ?? "(null)")%>
-        Zone:<%=Html.Encode(display.ZoneName ?? "(null)")%>
-        Position:<%=Html.Encode(display.Position ?? "(null)")%>
+        <%: display.Prefix %></span>
+        <%: display.Model.GetType().Name %>
+        (<%: display.Model.GetType().Namespace %>)
+        Template:<%: display.TemplateName ?? "(null)" %>
+        Prefix:<%: display.Prefix ?? "(null)" %>
+        Zone:<%: display.ZoneName ?? "(null)" %>
+        Position:<%: display.Position ?? "(null)" %>
         <div style="margin-left: 20px; border: solid 1px black;">
             <%=Html.DisplayFor(x => display.Model, display.TemplateName, display.Prefix)%>
         </div>
@@ -91,13 +91,13 @@
 <ul>
     <%foreach (var editor in Model.Editors) {%>
     <li><span style="font-weight: bold">
-        <%=Html.Encode(editor.Prefix) %></span>
-        <%=Html.Encode(editor.Model.GetType().Name) %>                    
-        (<%=Html.Encode(editor.Model.GetType().Namespace) %>)
-        Template:<%=Html.Encode(editor.TemplateName ?? "(null)")%>
-        Prefix:<%=Html.Encode(editor.Prefix ?? "(null)")%>
-        Zone:<%=Html.Encode(editor.ZoneName ?? "(null)")%>
-        Position:<%=Html.Encode(editor.Position??"(null)") %>
+        <%: editor.Prefix %></span>
+        <%: editor.Model.GetType().Name %>                    
+        (<%: editor.Model.GetType().Namespace %>)
+        Template:<%: editor.TemplateName ?? "(null)" %>
+        Prefix:<%: editor.Prefix ?? "(null)" %>
+        Zone:<%: editor.ZoneName ?? "(null)" %>
+        Position:<%: editor.Position??"(null)" %>
         <div style="margin-left: 20px; border: solid 1px black;">
             <%=Html.EditorFor(x=>editor.Model, editor.TemplateName, editor.Prefix) %>
         </div>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx
index 5c185c4e6..7bc154dfb 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx
@@ -4,7 +4,7 @@
 <h2><%=_Encoded("Content Types")%></h2>
 <ul>
 <%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%>
-    <li><%=Html.Encode(item.Name) %></li>
+    <li><%: item.Name %></li>
 <%}%>
 </ul>
 <h2><%=_Encoded("Content Items")%></h2>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 9c6082b22..d7c4f79db 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Media</RootNamespace>
     <AssemblyName>Orchard.Media</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
index 1fb37f2ff..09aec2a30 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
@@ -19,8 +19,8 @@
         <label for="pageTitle"><%=T("File Path <span> - multiple files must be in a zipped folder</span>")%></label>
         <input id="MediaItemPath" name="MediaItemPath" type="file" class="text" value="<%=_Encoded("Browse") %>" size="64"/>
 		<span class="hint"><%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%></span>
-        <input type="hidden" id="FolderName" name="FolderName" value="<%=Html.Encode(Model.FolderName) %>" />
-        <input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
+        <input type="hidden" id="FolderName" name="FolderName" value="<%: Model.FolderName %>" />
+        <input type="hidden" id="MediaPath" name="MediaPath" value="<%: Model.MediaPath %>" />
     </fieldset>
     <fieldset>
 		<input type="submit" class="button primaryAction" value="<%=_Encoded("Upload") %>" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
index 60dcd8fb4..c30f5d94b 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
@@ -17,7 +17,7 @@
     <fieldset>
         <label for="Name"><%=_Encoded("Folder Name") %></label>
 		<input id="Name" class="textMedium" name="Name" type="text" />
-	    <input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
+	    <input type="hidden" id="MediaPath" name="MediaPath" value="<%: Model.MediaPath %>" />
     </fieldset>
 	<fieldset>
 	    <input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
index cd02356b8..213854122 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
@@ -70,7 +70,7 @@
                 </td>
                 <td><%=_Encoded("Orchard User")%></td>
                 <td><%=mediaFile.LastUpdated %></td>
-                <td><%=Html.Encode(mediaFile.Type) %></td>
+                <td><%: mediaFile.Type %></td>
                 <td><%=mediaFile.Size %></td>
             </tr>
             <%}%>
@@ -79,7 +79,7 @@
             <tr>
                 <td>
                     <input type="checkbox" value="true" name="<%=_Encoded("Checkbox.Folder.{0}", mediaFolder.Name)  %>"/>
-                    <input type="hidden" value="<%=Html.Encode(mediaFolder.MediaPath) %>" name="<%=Html.Encode(mediaFolder.Name) %>" />
+                    <input type="hidden" value="<%: mediaFolder.MediaPath %>" name="<%: mediaFolder.Name %>" />
                 </td>
                 <td>
                     <img src="<%=ResolveUrl("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")%>" height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
index 0d5554e77..bb666820d 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -18,7 +18,7 @@
         <%= Html.ValidationSummary() %>
         <div class="primary">
 		    <div>
-		    <img src="<%=Model.PublicUrl%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" />
+		    <img src="<%=Model.PublicUrl%>" class="previewImage" alt="<%: Model.Caption %>" />
 		    </div>
 		    <fieldset>
 		        <%-- todo: make these real (including markup) --%>
@@ -37,8 +37,8 @@
 			  
                 <div>
                     <label for="Name"><%=_Encoded("Name")%></label>
-			        <input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/>
-			        <input id="NewName" class="textMedium" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
+			        <input id="Name" name="Name" type="hidden" value="<%: Model.Name %>"/>
+			        <input id="NewName" class="textMedium" name="NewName" type="text" value="<%: Model.Name %>"/>
 			    </div>
                 <div>
 			        <label for="Caption"><%=_Encoded("Caption")%></label>
@@ -57,7 +57,7 @@
 	    </div>
 	    <%--<div class="secondary" style="border:1px solid #ff0000;">
 		    <h2><%=_Encoded("Preview")%></h2>
-		    <div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div>
+		    <div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%: Model.Caption %>" /></div>
 		    <ul>
 		        <%-- todo: make these real (including markup) 
 			    <li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
index 3741a936d..4bcf75abb 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
@@ -17,8 +17,8 @@
     <%=Html.ValidationSummary() %>
     <fieldset>
         <label for="Name"><%=_Encoded("Folder Name:") %></label>
-		<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" />
-		<input id="Name" class="textMedium" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
+		<input id="MediaPath" name="MediaPath" type="hidden" value="<%: Model.MediaPath %>" />
+		<input id="Name" class="textMedium" name="Name" type="text" value="<%: Model.Name %>" />
     </fieldset>
     <fieldset>		
 		<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj
index 5f6504dcd..6dd6479a1 100644
--- a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.MetaData</RootNamespace>
     <AssemblyName>Orchard.MetaData</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx b/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx
index c0b78eead..16c66fd3f 100644
--- a/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx
@@ -60,7 +60,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedCon
             <input name="<%="part_" + item.Name%>" type="checkbox" /><%}%>
             </td>
             <td class="ContentTypePartListRowItem">
-                <%= Html.Encode(item.Name)%>
+                <%: item.Name %>
             </td>
         </tr>
     
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index 2668aeaf5..9e20f453b 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Modules</RootNamespace>
     <AssemblyName>Orchard.Modules</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
index 075b91ed4..897269d2f 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -21,7 +21,7 @@
         //temporarily "disable" actions on core features
         var showActions = categoryName.ToString() != "Core"; %>
     <li class="<%=categoryClassName %>">
-        <h2><%=Html.Encode(categoryName) %></h2>
+        <h2><%: categoryName %></h2>
         <ul><%
             var features = featureGroup.OrderBy(f => f.Descriptor.Name);
             foreach (var feature in features) {
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
index 4a47b8b77..73a838b47 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
@@ -3,21 +3,21 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Modules.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Installed Modules").ToString()) %></h1>
-<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Add", null, new { @class = "button primaryAction" })%></div>
+<div class="manage"><%: Html.ActionLink(T("Install a module"), "Add", null, new { @class = "button primaryAction" })%></div>
 <% if (Model.Modules.Count() > 0) { %>
 <ul class="contentItems"><%
     foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %>
     <li>
         <div class="summary">
             <div class="properties">
-                <h2><%:module.DisplayName %><span> - <%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></span></h2><%
+                <h2><%: module.DisplayName %><span> - <%: T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? module.Version : T("1.0").ToString()) %></span></h2><%
             if (!string.IsNullOrEmpty(module.Description)) { %>
-                <p><%:module.Description %></p><%
+                <p><%: module.Description %></p><%
             } %>
                 <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
                     <li><%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li>
-                    <li>&nbsp;&#124;&nbsp;<%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
-                    <li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li>
+                    <li>&nbsp;&#124;&nbsp;<%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
+                    <li>&nbsp;&#124;&nbsp;<%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>").ToString())%></li>
                 </ul>
             </div>
         </div>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
index 6ab56cf17..aa6a19d74 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.MultiTenancy</RootNamespace>
     <AssemblyName>Orchard.MultiTenancy</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx
index 44305f195..815bc7f93 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx
@@ -7,7 +7,7 @@
     <%=Html.ValidationSummary() %>
     <fieldset>
         <div>
-            <h2><%=Html.Encode(Model.Name) %></h2>
+            <h2><%: Model.Name %></h2>
         </div>
         <div>
             <label for="RequestUrlHost"><%=_Encoded("Host") %></label>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
index d6853f6d5..8fba8c50f 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx
@@ -9,7 +9,7 @@
     <li class="tenant <%=tenant.State.CurrentState %>">
         <div class="summary">
             <div class="properties">
-                <h3><span class="tenantName"><%=Html.Encode(tenant.Name) %></span><%
+                <h3><span class="tenantName"><%: tenant.Name %></span><%
                     if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) {
                          %><span class="tenantHost"> - <%=Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%></span><%
                     } %></h3>
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
index 301406985..be3ec1239 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Pages</RootNamespace>
     <AssemblyName>Orchard.Pages</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
index 48b621531..0cc265efb 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { area = "Orchard.Pages", slug = Model.Item.Slug }) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>
+<h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { area = "Orchard.Pages", slug = Model.Item.Slug }) %>"><%: Model.Item.Title %></a></h3>
 <div class="content">
 <% Html.Zone("primary", ":manage :metadata"); %>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
index 09b1438cb..d36b83d4c 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <div class="metadata">
-    <div class="posted"><%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%></div>
+    <div class="posted"><%: T("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)").ToString())%></div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
index 671501046..288b8fef5 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Roles</RootNamespace>
     <AssemblyName>Orchard.Roles</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
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 1a76203aa..068c02276 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx
@@ -6,7 +6,7 @@
     <fieldset>
 	    <legend><%=_Encoded("Information") %></legend>
 	    <label for="pageTitle"><%=_Encoded("Role Name:") %></label>
-	    <input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
+	    <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
     </fieldset>
     <fieldset>
         <legend><%=_Encoded("Permissions") %></legend>
@@ -26,7 +26,7 @@
                 </thead>
                 <% foreach (var permission in Model.ModulePermissions[moduleName]) { %>
                 <tr>
-                    <td><%=Html.Encode(permission.Description) %></td>
+                    <td><%: permission.Description %></td>
                     <td style="width:60px;/* todo: (heskew) make not inline :( */"><input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>"/></td>
                 </tr>
                 <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx
index b1e086cdf..e1a4a1765 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx
@@ -6,7 +6,7 @@
     <fieldset>
 	    <legend><%=_Encoded("Information") %></legend>
 	    <label for="pageTitle"><%=_Encoded("Role Name:") %></label>
-	    <input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
+	    <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
 	    <input type="hidden" value="<%=Model.Id %>" name="Id" />
 	</fieldset>
     <fieldset>
@@ -28,7 +28,7 @@
 			    </thead>
 			    <% foreach (var permission in Model.ModulePermissions[moduleName]) { %>
                 <tr>
-				    <td><%=Html.Encode(permission.Description) %></td>
+				    <td><%: permission.Description %></td>
 				    <td style="width:60px;/* todo: (heskew) make not inline :(">
 				        <% if (Model.CurrentPermissions.Contains(permission.Name)) { %>
 				            <input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>" checked="checked"/>
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 c4e598cbb..5e1c51962 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx
@@ -28,7 +28,7 @@
 		    <%foreach (var row in Model.Rows) { %>
                 <tr>
                     <td><input type="checkbox" value="true" name="<%="Checkbox." + row.Id %>"/></td>
-                    <td><%=Html.Encode(row.Name) %></td>
+                    <td><%: row.Name %></td>
                     <td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%></td>
                 </tr>
             <%}%>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
index 79ce22756..c36fdec88 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
@@ -12,7 +12,7 @@
     <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
     <div>
     <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%>
-    <label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%=Html.Encode(entry.Name) %></label>
+    <label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%: entry.Name %></label>
     </div>
     <%++index;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
index 54b613b8f..b2d5bd58b 100644
--- a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Sandbox</RootNamespace>
     <AssemblyName>Orchard.Sandbox</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 47e1b5f1d..0b648ae3b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Setup</RootNamespace>
     <AssemblyName>Orchard.Setup</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index 2c93a394a..d5ce73dba 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Tags</RootNamespace>
     <AssemblyName>Orchard.Tags</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx
index dc3207a4e..b8ef25192 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx
@@ -5,7 +5,7 @@
     <%=Html.ValidationSummary() %>
     <fieldset>
         <label for="TagName"><%=_Encoded("Name:")%></label>
-	    <input id="TagName" class="text" name="TagName" type="text" value="<%=Html.Encode(Model.TagName) %>" />
+	    <input id="TagName" class="text" name="TagName" type="text" value="<%: Model.TagName %>" />
         <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
     </fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx
index b50e55d6f..fa3f86416 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx
@@ -6,7 +6,7 @@
     <fieldset>
         <label for="Name"><%=_Encoded("Name:") %></label>
         <input id="Id" name="Id" type="hidden" value="<%=Model.Id %>" />
-        <input id="TagName" class="text" name="TagName" type="text" value="<%=Html.Encode(Model.TagName) %>" />
+        <input id="TagName" class="text" name="TagName" type="text" value="<%: Model.TagName %>" />
 	    <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
 	</fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index d5cfcd5ff..500dff09c 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Themes</RootNamespace>
     <AssemblyName>Orchard.Themes</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
index 618845880..8c36298d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
@@ -6,15 +6,15 @@
     %><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")
              %><br /><%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %></p><%
    } else {
-    %><h3><%=_Encoded("Current Theme")%> - <%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
+    %><h3><%=_Encoded("Current Theme")%> - <%: Model.CurrentTheme.DisplayName %></h3>
 
         <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%>
-        <h5><%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %></h5>
+        <h5><%=_Encoded("By") %> <%: Model.CurrentTheme.Author %></h5>
         
         <p>
-        <%=_Encoded("Version:") %> <%=Html.Encode(Model.CurrentTheme.Version) %><br />
-        <%=Html.Encode(Model.CurrentTheme.Description) %><br />
-        <%=Html.Encode(Model.CurrentTheme.HomePage) %>
+        <%=_Encoded("Version:") %> <%: Model.CurrentTheme.Version %><br />
+        <%: Model.CurrentTheme.Description %><br />
+        <%: Model.CurrentTheme.HomePage %>
         </p>
         <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })%>
      
@@ -25,7 +25,7 @@
     if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
         %> <li>
       <div>
-        <h3><%=Html.Encode(theme.DisplayName) %></h3>
+        <h3><%: theme.DisplayName %></h3>
         <%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%>
         <% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { %>
             <%=Html.Hidden("themeName", theme.ThemeName)%>
@@ -35,11 +35,11 @@
             <%=Html.Hidden("themeName", theme.ThemeName)%>
             <button type="submit" title="<%=_Encoded("Preview") %>"><%=_Encoded("Preview") %></button>
         <% } %>
-        <h5><%=_Encoded("By") %> <%=Html.Encode(theme.Author) %></h5>
+        <h5><%=_Encoded("By") %> <%: theme.Author %></h5>
         <p>
-            <%=_Encoded("Version:") %> <%=Html.Encode(theme.Version) %><br />
-            <%=Html.Encode(theme.Description) %><br />
-            <%=Html.Encode(theme.HomePage) %>
+            <%=_Encoded("Version:") %> <%: theme.Version %><br />
+            <%: theme.Description %><br />
+            <%: theme.HomePage %>
         </p>
         <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %>
             <%=Html.Hidden("themeName", theme.ThemeName)%>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
index d8fc19423..394a60d93 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
@@ -1,3 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<div id="title"><%=Html.Encode(Html.SiteName()) %></div>
\ No newline at end of file
+<div id="title"><%: Html.SiteName() %></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
index c402c2f05..8fad33c88 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
@@ -6,5 +6,5 @@
                          : item.Type == NotifyType.Warning
                                ? "warning"
                                : "info"; %>
-<div class="<%=className %> message"><%=Html.Encode(item.Message) %></div>
+<div class="<%=className %> message"><%: item.Message %></div>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index 747a36978..faf53194c 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Users</RootNamespace>
     <AssemblyName>Orchard.Users</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
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 3ebac9da5..7f86e0f8a 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
@@ -22,10 +22,10 @@
                { %>
             <tr>
                 <td>
-                    <%=Html.Encode(row.User.UserName)%>
+                    <%: row.User.UserName %>
                 </td>
                 <td>
-                    <%=Html.Encode(row.User.Email)%>
+                    <%: row.User.Email %>
                 </td>
                 <td>
                     <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | 
diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
index 9f7e48552..d51a80f38 100644
--- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>TinyMce</RootNamespace>
     <AssemblyName>TinyMce</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 92a1b60ed..958b9a842 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>Orchard.Web</RootNamespace>
     <AssemblyName>Orchard.Web</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
+    <MvcBuildViews>true</MvcBuildViews>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index c5952fce6..11765e677 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -5,4 +5,4 @@
 
 <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
 <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
-<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
+<div class="blogdescription"><p><%: Model.Item.Description %></p></div>
diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
index fe247668c..b0c39f539 100644
--- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
@@ -19,7 +19,7 @@
 <%--Top Navigation and branding--%>
 <div id="headercontainer">
     <div id="header">
-        <h1><%=Html.Encode(Html.SiteName()) %></h1>
+        <h1><%: Html.SiteName() %></h1>
         <div class="menucontainer">
             <% Html.Include("menu"); %>
         </div>
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index c5952fce6..11765e677 100644
--- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -5,4 +5,4 @@
 
 <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
 <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
-<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
+<div class="blogdescription"><p><%: Model.Item.Description %></p></div>
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx
index fe247668c..b0c39f539 100644
--- a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx
@@ -19,7 +19,7 @@
 <%--Top Navigation and branding--%>
 <div id="headercontainer">
     <div id="header">
-        <h1><%=Html.Encode(Html.SiteName()) %></h1>
+        <h1><%: Html.SiteName() %></h1>
         <div class="menucontainer">
             <% Html.Include("menu"); %>
         </div>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
index d771324a5..80494c00e 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <div class="footer group">
     <ul class="group">
-        <li>&copy;2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.</li>
+        <li>&copy;2010 <%: Html.SiteName() %>. All rights reserved.</li>
         <li><a href="http://www.orchardproject.net" title="Orchard Project">Powered by Orchard</a></li>
     </ul>
 </div>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Header.ascx b/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
index 8e7dd961d..6010c74ed 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
@@ -2,7 +2,7 @@
 
 <div class="header">
     <div class="brand group">
-        <div class="title"><%=Html.Encode(Html.SiteName()) %></div>
+        <div class="title"><%: Html.SiteName() %></div>
         <% Html.Include("User"); %>
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/ListOfComments.ascx b/src/Orchard.Web/Themes/Contoso/Views/ListOfComments.ascx
index a427c5f79..c86a1eea1 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/ListOfComments.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/ListOfComments.ascx
@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
     <li>
 
 <div class="comment">
-<p><%=Html.Encode(comment.Record.CommentText) %></p>
+<p><%: comment.Record.CommentText %></p>
 </div>
         
 <div class="commentauthor">
diff --git a/src/Orchard.Web/Themes/Contoso/Views/User.ascx b/src/Orchard.Web/Themes/Contoso/Views/User.ascx
index b16c4d2c6..ac334b191 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/User.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/User.ascx
@@ -2,7 +2,7 @@
 <ul class="admin group">
     <% if (Request.IsAuthenticated)
        { %>
-        <li><%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %></li>
+        <li><%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %></li>
         <li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li>
         <li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li>
     <% }
diff --git a/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx b/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx
index 8c8355e4d..5b2eb74e1 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx
@@ -4,7 +4,7 @@
         <div id="footer-content">
             <div id="footernav">
                 <div>
-                    &copy;2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.</div>
+                    &copy;2010 <%: Html.SiteName() %>. All rights reserved.</div>
             </div>
             <div id="disclaimer">
                 *This is perfect for disclaimer content. You can use this content to let people know something important. A good example is if you’re FDIC insured, or the organizations you are part of. Use this space wisely. It shows up on every page. You can even put some legal terms in there. 
diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx
index a01a36abd..773031601 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx
@@ -19,7 +19,7 @@
     <div id="nav">
         <div class="brand group">
             <div class="title">
-                <%=Html.Encode(Html.SiteName()) %></div>
+                <%: Html.SiteName() %></div>
         </div>
         <% Html.Zone("menu"); %>
     </div>
diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx
index fa3f583c9..23f8fa043 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx
@@ -19,7 +19,7 @@
     <div id="nav">
         <div class="brand group">
             <div class="title">
-                <%=Html.Encode(Html.SiteName()) %></div>
+                <%: Html.SiteName() %></div>
         </div>
         <% Html.Zone("menu"); %>
     </div>
diff --git a/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx b/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx
index a427c5f79..c86a1eea1 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx
@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
     <li>
 
 <div class="comment">
-<p><%=Html.Encode(comment.Record.CommentText) %></p>
+<p><%: comment.Record.CommentText %></p>
 </div>
         
 <div class="commentauthor">
diff --git a/src/Orchard.Web/Themes/Corporate/Views/User.ascx b/src/Orchard.Web/Themes/Corporate/Views/User.ascx
index b16c4d2c6..ac334b191 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/User.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/User.ascx
@@ -2,7 +2,7 @@
 <ul class="admin group">
     <% if (Request.IsAuthenticated)
        { %>
-        <li><%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %></li>
+        <li><%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %></li>
         <li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li>
         <li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li>
     <% }
diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index eb7aa6eaf..80b00419b 100644
--- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -4,4 +4,4 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
 <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
-<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
\ No newline at end of file
+<div class="blogdescription"><p><%: Model.Item.Description %></p></div>
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
index a92e4714b..ffe097f8d 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
@@ -24,7 +24,7 @@ return false;
 <div id="hd" role="banner">
     <div class="yui-g" id="branding">
         <div class="yui-u first">
-            <h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1>
+            <h1><a href="/" title="Go to Home"><%: Html.SiteName() %></a></h1>
         </div>
         <div class="yui-u">
             <div id="logIn">
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
index df09db61c..9e5e539e4 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
@@ -22,7 +22,7 @@ return false;
 <div id="hd" role="banner">
     <div class="yui-g" id="branding">
         <div class="yui-u first">
-            <h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1>
+            <h1><a href="/" title="Go to Home"><%: Html.SiteName() %></a></h1>
         </div>
         <div class="yui-u">
             <div id="logIn">
diff --git a/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx b/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx
index a427c5f79..c86a1eea1 100644
--- a/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx
@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
     <li>
 
 <div class="comment">
-<p><%=Html.Encode(comment.Record.CommentText) %></p>
+<p><%: comment.Record.CommentText %></p>
 </div>
         
 <div class="commentauthor">
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
index 279c3c219..3ddcf19cf 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <% if (Model.CurrentUser != null) {
-    %><div id="login"><%=_Encoded("User:")%> <%=Html.Encode(Model.CurrentUser.UserName)%> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
+    %><div id="login"><%=_Encoded("User:")%> <%: Model.CurrentUser.UserName %> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
    } %>
\ No newline at end of file