diff --git a/serendipity_admin.php b/serendipity_admin.php
index 591cfca5..1957d11a 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -24,7 +24,7 @@ if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModul
 } else {
     if (IS_installed === true) {
         /* Check author token to insure session not hijacked */
-        if (!isset($_SESSION['author_token']) || !isset($serendipity['COOKIE']['author_token']) || 
+        if (!isset($_SESSION['author_token']) || !isset($serendipity['COOKIE']['author_token']) ||
             ($_SESSION['author_token'] !== $serendipity['COOKIE']['author_token'])) {
             $_SESSION['serendipityAuthedUser'] = false;
             serendipity_session_destroy();
@@ -221,7 +221,7 @@ if (!$use_installer && $is_logged_in) {
 
         case 'maintenance':
             include S9Y_INCLUDE_PATH . 'include/admin/maintenance.inc.php';
-            $admin_section = MAINTENANCE;
+            $admin_section = MENU_MAINTENANCE;
             break;
 
         default:
diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index 1184de7b..9be00b66 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -204,7 +204,7 @@
 
                 <ul>
                 {foreach from=$file.references item="ref"}
-                    <li>({$ref.name|escape}) <a rel="nofollow" href="{$ref.link|escape}">{$ref.link|@default:$CONST.NONE|escape}</a></li>
+                    <li>({$ref.name|escape}) <a rel="nofollow" href="{$ref.link|escape}">{$ref.link|default:$CONST.NONE|escape}</a></li>
                 {/foreach}
                 </ul>
             </section>
diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl
index 9d021b33..5b54c2d8 100644
--- a/templates/2k11/admin/overview.inc.tpl
+++ b/templates/2k11/admin/overview.inc.tpl
@@ -42,7 +42,7 @@
                     <div class="comment_summary">{$comment.body|escape|truncate:100:"&hellip;"}</div>
 
                     <div id="c{$comment.id}_full" class="comment_full additional_info">{$comment.fullBody|escape}</div>
-                    
+
                     <ul class="plainList actions">
                         <li><a class="button_link" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;{$urltoken}" title="{$CONST.EDIT}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.EDIT}</span></a></li>
                         <li><a class="button_link comments_reply" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=reply&amp;serendipity[id]={$comment.id}&amp;serendipity[entry_id]={$comment.entry_id}&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;{$urltoken}" title="{$CONST.REPLY}"><span class="icon-chat"></span><span class="visuallyhidden"> {$CONST.REPLY}</span></a></li>
@@ -90,10 +90,10 @@
                                 </form>
                             </li>
                         {/if}
-                        
+
                     </ul>
                 {if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour) && $entry.isdraft == "false"}
-                    <span class="entry_status status_future">{$CONST.SCHEDULED}</span>
+                    <span class="entry_status status_future" title="{$CONST.SCHEDULED}: {$CONST.ENTRY_PUBLISHED_FUTURE}">{$entry.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT}</span>
                 {/if}
                 {if $entry.ep_is_sticky}
                     <span class="entry_status status_sticky">{$CONST.STICKY_POSTINGS}</span>
diff --git a/templates/2k11/comments.tpl b/templates/2k11/comments.tpl
index ca8aa15f..8878d1e1 100644
--- a/templates/2k11/comments.tpl
+++ b/templates/2k11/comments.tpl
@@ -1,7 +1,7 @@
 {foreach from=$comments item=comment name="comments"}
 <article id="c{$comment.id}" class="serendipity_comment{if $entry.author == $comment.author} serendipity_comment_author_self{/if} {cycle values="odd,even"} {if $comment.depth > 8}commentlevel-9{else}commentlevel-{$comment.depth}{/if}">
     <header class="clearfix">
-        <h4{if $comment.spice_twitter_name && $comment.spice_twitter_followme} class="short-heading"{/if}>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|@default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}">{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
+        <h4{if $comment.spice_twitter_name && $comment.spice_twitter_followme} class="short-heading"{/if}>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}">{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
     {if $comment.spice_twitter_name && $comment.spice_twitter_followme}
         <div class="twitter_follow"><a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}><span class="visuallyhidden">@{$comment.spice_twitter_name}</span></a>
         {if $comment.spice_twitter_followme}{$comment.spice_twitter_followme}{/if}
diff --git a/templates/2k11/comments_by_author.tpl b/templates/2k11/comments_by_author.tpl
index d6894d6c..944abe72 100644
--- a/templates/2k11/comments_by_author.tpl
+++ b/templates/2k11/comments_by_author.tpl
@@ -1,7 +1,7 @@
 <h2 class="visuallyhidden">{$CONST.COMMENTS}</h2>
 {foreach from=$comments_by_authors item="entry_comments"}
 <article class="clearfix serendipity_entry{if $entry_comments.entryauthor == $entry_comments.author} serendipity_comment_author_self{/if}">
-    <h3><a href="{$entry_comments.link}">{$entry_comments.title|@default:$entry_comments.link}</a></h3>
+    <h3><a href="{$entry_comments.link}">{$entry_comments.title|default:$entry_comments.link}</a></h3>
     <div class="comments_for_entry">{$entry_comments.tpl_comments}</div>
 </article>
 {/foreach}
diff --git a/templates/2k11/entries.tpl b/templates/2k11/entries.tpl
index 8d037058..c9130106 100644
--- a/templates/2k11/entries.tpl
+++ b/templates/2k11/entries.tpl
@@ -10,7 +10,7 @@
         </header>
 
         <div class="clearfix content serendipity_entry_body">
-        {if $entry.categories}{foreach from=$entry.categories item="entry_category"}{if $entry_category.category_icon}<a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}"></a>{/if}{/foreach}{/if}
+        {if $entry.categories}{foreach from=$entry.categories item="entry_category"}{if $entry_category.category_icon}<a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|escape}" src="{$entry_category.category_icon}"></a>{/if}{/foreach}{/if}
         {$entry.body}
         {if $entry.has_extended and not $is_single_entry and not $entry.is_extended}
         <a class="read_more block_level" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a>
@@ -27,7 +27,7 @@
 
         <footer class="clearfix">
         {if $entry.categories}
-            <span class="visuallyhidden">{$CONST.CATEGORIES}: </span>{foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+            <span class="visuallyhidden">{$CONST.CATEGORIES}: </span>{foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
         {/if}
         {if $entry.categories and ($entry.has_comments or $entry.has_disqus)} | {/if}
         {if ($entry.has_comments or $entry.has_disqus)}
@@ -56,7 +56,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title_rdf|@default:$entry.title}"
+                 dc:title="{$entry.title_rdf|default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->
@@ -81,7 +81,7 @@
         <section id="trackbacks" class="serendipity_comments serendipity_section_trackbacks">
             <h3>{$CONST.TRACKBACKS}</h3>
 
-            <div id="trackback_url" class="block_level"><a rel="nofollow" href="{$entry.link_trackback}" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a></div>
+            <div id="trackback_url" class="block_level"><a rel="nofollow" href="{$entry.link_trackback}" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape}">{$CONST.TRACKBACK_SPECIFIC}</a></div>
 
             {serendipity_printTrackbacks entry=$entry.id}
         </section>
diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl
index 9bf338ad..11ee2035 100644
--- a/templates/2k11/index.tpl
+++ b/templates/2k11/index.tpl
@@ -6,7 +6,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
 <head>
     <meta charset="{$head_charset}">
-    <title>{$head_title|@default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
+    <title>{$head_title|default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
     <meta name="generator" content="Serendipity v.{$serendipityVersion}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 {if $template_option.webfonts == 'droid'}
diff --git a/templates/2k11/media_showitem.tpl b/templates/2k11/media_showitem.tpl
index c0dc5b99..1feec034 100644
--- a/templates/2k11/media_showitem.tpl
+++ b/templates/2k11/media_showitem.tpl
@@ -6,7 +6,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
 <head>
     <meta charset="{$head_charset}">
-    <title>{$media.file.props.base_property.TITLE|@default:$media.file.realname}</title>
+    <title>{$media.file.props.base_property.TITLE|default:$media.file.realname}</title>
     <meta name="generator" content="Serendipity v.{$serendipityVersion}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 {if $template_option.webfonts == 'droid'}
@@ -48,7 +48,7 @@
     <div class="clearfix col2r">
         <main id="content" {if $template_option.imgstyle != 'none'} class="{$template_option.imgstyle}"{/if}>
             <article class="clearfix serendipity_entry">
-                <h2>{$media.file.props.base_property.TITLE|@default:$media.file.realname}</h2>
+                <h2>{$media.file.props.base_property.TITLE|default:$media.file.realname}</h2>
             {if $perm_denied}
                 <p class="msg_important">{$CONST.PERM_DENIED}</p>
             {else}
@@ -121,7 +121,7 @@
 
                 <ul class="plainList">
                 {foreach from=$media.file.references item="ref"}
-                    <li><a rel="nofollow" href="{$ref.link|escape}">{$ref.link|@default:$CONST.NONE|escape}</a> ({$ref.name|escape})</li>
+                    <li><a rel="nofollow" href="{$ref.link|escape}">{$ref.link|default:$CONST.NONE|escape}</a> ({$ref.name|escape})</li>
                 {/foreach}
                 </ul>
             </section>
diff --git a/templates/2k11/plugin_calendar.tpl b/templates/2k11/plugin_calendar.tpl
index e89e84f6..332b584d 100644
--- a/templates/2k11/plugin_calendar.tpl
+++ b/templates/2k11/plugin_calendar.tpl
@@ -27,7 +27,7 @@
 {foreach from=$plugin_calendar_weeks item="week"}
     <tr>
     {foreach from=$week.days item="day"}
-        <td class="{$day.classes}"{if isset($day.properties.Title)} title="{$day.properties.Title}"{/if}>{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&#160;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
+        <td class="{$day.classes}"{if isset($day.properties.Title)} title="{$day.properties.Title}"{/if}>{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|default:"&#160;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
     {/foreach}
     </tr>
 {/foreach}
diff --git a/templates/2k11/plugin_commentsearch_searchresults.tpl b/templates/2k11/plugin_commentsearch_searchresults.tpl
index 83b2df15..69700035 100644
--- a/templates/2k11/plugin_commentsearch_searchresults.tpl
+++ b/templates/2k11/plugin_commentsearch_searchresults.tpl
@@ -3,7 +3,7 @@
     {if $comment_results}
     <ul class="plainList">
     {foreach from=$comment_results item="result"}
-        <li><span class="block_level">{if $result.type == 'TRACKBACK'}<a href="{$result.url|@escape}">{else}<b>{/if}{$result.author|@escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|@escape}">{$result.title|@escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|@serendipity_html5time}">{$result.ctimestamp|@formatTime:$template_option.date_format}</time>:</span>
+        <li><span class="block_level">{if $result.type == 'TRACKBACK'}<a href="{$result.url|escape}">{else}<b>{/if}{$result.author|escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|escape}">{$result.title|escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|@serendipity_html5time}">{$result.ctimestamp|@formatTime:$template_option.date_format}</time>:</span>
         {$result.comment|@strip_tags|@truncate:200:" ... "}
     </li>
     {/foreach}
diff --git a/templates/2k11/plugin_findmore.tpl b/templates/2k11/plugin_findmore.tpl
index 3aeb3950..6e21c7f6 100644
--- a/templates/2k11/plugin_findmore.tpl
+++ b/templates/2k11/plugin_findmore.tpl
@@ -1,78 +1,78 @@
 <ul class="serendipity_findmore clearfix">
 {if NOT $findmore_disabled_services.twitter}
-    <li><a rel="nofollow" href="http://twitter.com/intent/tweet?text={$entrydata.title|escape}%20-%20{$entrydata.url|escape:url}"><img src="{$entrydata.path}twitter.png" alt="Twitter"></a></li>
+    <li><a rel="nofollow" href="http://twitter.com/intent/tweet?text={$entrydata.title|escape}%20-%20{$entrydata.url|escape:'url'}"><img src="{$entrydata.path}twitter.png" alt="Twitter"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.delicious}
-    <li><a rel="nofollow" href="http://del.icio.us/post?url={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}delicious.png" alt="Bookmark {$entrydata.title|escape} at del.icio.us"></a></li>
+    <li><a rel="nofollow" href="http://del.icio.us/post?url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}delicious.png" alt="Bookmark {$entrydata.title|escape} at del.icio.us"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.facebook}
-    <li><a rel="nofollow" href="http://www.facebook.com/share.php?u={$entrydata.url|escape:url}&amp;t={$entrydata.title|escape}"><img src="{$entrydata.path}facebook.png" alt="Facebook"></a></li>
+    <li><a rel="nofollow" href="http://www.facebook.com/share.php?u={$entrydata.url|escape:'url'}&amp;t={$entrydata.title|escape}"><img src="{$entrydata.path}facebook.png" alt="Facebook"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.google}
-    <li><a rel="nofollow" href="http://www.google.com/bookmarks/mark?op=edit&amp;bkmk={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape}"><img src="{$entrydata.path}googlebookmark.png" alt="Google Bookmarks"></a></li>
+    <li><a rel="nofollow" href="http://www.google.com/bookmarks/mark?op=edit&amp;bkmk={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape}"><img src="{$entrydata.path}googlebookmark.png" alt="Google Bookmarks"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.friendfeed}
-    <li><a rel="nofollow" href="http://www.friendfeed.com/share?title={$entrydata.title|escape}&amp;link={$entrydata.url|escape:url}"><img src="{$entrydata.path}friendfeed.png" alt="FriendFeed"></a></li>
+    <li><a rel="nofollow" href="http://www.friendfeed.com/share?title={$entrydata.title|escape}&amp;link={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}friendfeed.png" alt="FriendFeed"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.digg}
-    <li><a rel="nofollow" href="http://digg.com/submit?phase=2&amp;url={$entrydata.url|escape:url}"><img src="{$entrydata.path}diggman.png" alt="Digg {$entrydata.title|escape}"></a></li>
+    <li><a rel="nofollow" href="http://digg.com/submit?phase=2&amp;url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}diggman.png" alt="Digg {$entrydata.title|escape}"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.mixx}
-    <li><a rel="nofollow" href="http://www.mixx.com/submit?page_url={$entrydata.url|escape:url}"><img src="{$entrydata.path}mixx-button4.png" alt="Mixx {$entrydata.title|escape}"></a></li>
+    <li><a rel="nofollow" href="http://www.mixx.com/submit?page_url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}mixx-button4.png" alt="Mixx {$entrydata.title|escape}"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.bloglines}
-    <li><a rel="nofollow" href="http://www.bloglines.com/citations?url={$entrydata.url|escape:url}"><img src="{$entrydata.path}bloglines.png" alt="Bloglines {$entrydata.title|escape}"></a></li>
+    <li><a rel="nofollow" href="http://www.bloglines.com/citations?url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}bloglines.png" alt="Bloglines {$entrydata.title|escape}"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.technorati}
-    <li><a rel="nofollow" href="http://technorati.com/search/{$entrydata.url|escape:url}" title="Technorati {$entrydata.title|escape}"><img src="{$entrydata.path}technorati.png" alt="Technorati {$entrydata.title|escape}"></a></li>
+    <li><a rel="nofollow" href="http://technorati.com/search/{$entrydata.url|escape:'url'}" title="Technorati {$entrydata.title|escape}"><img src="{$entrydata.path}technorati.png" alt="Technorati {$entrydata.title|escape}"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.fark}
-    <li><a rel="nofollow" href="http://cgi.fark.com/cgi/fark/edit.pl?new_url={$entrydata.url|escape:url}&amp;new_comment={$entrydata.title|escape:url}&amp;new_link_other=&amp;linktype=Misc"><img src="{$entrydata.path}fark.png" alt="Fark this: {$entrydata.title|escape}"></a></li>
+    <li><a rel="nofollow" href="http://cgi.fark.com/cgi/fark/edit.pl?new_url={$entrydata.url|escape:'url'}&amp;new_comment={$entrydata.title|escape:'url'}&amp;new_link_other=&amp;linktype=Misc"><img src="{$entrydata.path}fark.png" alt="Fark this: {$entrydata.title|escape}"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.yahoo}
-    <li><a rel="nofollow" href="http://myweb2.search.yahoo.com/myresults/bookmarklet?t={$entrydata.title|escape:url}&amp;u={$entrydata.url|escape:url}"><img src="{$entrydata.path}yahoomyweb.png" alt="Bookmark {$entrydata.title|escape} at YahooMyWeb"></a></li>
+    <li><a rel="nofollow" href="http://myweb2.search.yahoo.com/myresults/bookmarklet?t={$entrydata.title|escape:'url'}&amp;u={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}yahoomyweb.png" alt="Bookmark {$entrydata.title|escape} at YahooMyWeb"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.furl}
-    <li><a rel="nofollow" href="http://www.furl.net/storeIt.jsp?t={$entrydata.title|escape:url}&amp;u={$entrydata.url|escape:url}"><img src="{$entrydata.path}furl.png" alt="Bookmark {$entrydata.title|escape} at Furl.net"></a></li>
+    <li><a rel="nofollow" href="http://www.furl.net/storeIt.jsp?t={$entrydata.title|escape:'url'}&amp;u={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}furl.png" alt="Bookmark {$entrydata.title|escape} at Furl.net"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.reddit}
-    <li><a rel="nofollow" href="http://reddit.com/submit?url={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}reddit.png" alt="Bookmark {$entrydata.title|escape} at reddit.com"></a></li>
+    <li><a rel="nofollow" href="http://reddit.com/submit?url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}reddit.png" alt="Bookmark {$entrydata.title|escape} at reddit.com"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.blinklist}
-    <li><a rel="nofollow" href="http://www.blinklist.com/index.php?Action=Blink/addblink.php&amp;Description=&amp;Url={$entrydata.url|escape:url}&amp;Title={$entrydata.title|escape:url}"><img src="{$entrydata.path}blinklist.png" alt="Bookmark {$entrydata.title|escape} at blinklist.com"></a></li>
+    <li><a rel="nofollow" href="http://www.blinklist.com/index.php?Action=Blink/addblink.php&amp;Description=&amp;Url={$entrydata.url|escape:'url'}&amp;Title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}blinklist.png" alt="Bookmark {$entrydata.title|escape} at blinklist.com"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.spurl}
-    <li><a rel="nofollow" href="http://www.spurl.net/spurl.php?title={$entrydata.title|escape:url}&amp;url={$entrydata.url|escape:url}"><img src="{$entrydata.path}spurl.png" alt="Bookmark {$entrydata.title|escape} at Spurl.net"></a></li>
+    <li><a rel="nofollow" href="http://www.spurl.net/spurl.php?title={$entrydata.title|escape:'url'}&amp;url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}spurl.png" alt="Bookmark {$entrydata.title|escape} at Spurl.net"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.newsvine}
-    <li><a rel="nofollow" href="http://www.newsvine.com/_tools/seed&amp;save?u={$entrydata.url|escape:url}&amp;h={$entrydata.title|escape:url}" title="Bookmark {$entrydata.title|escape} at NewsVine"><img src="{$entrydata.path}newsvine.png" alt="Bookmark {$entrydata.title|escape} at NewsVine"></a></li>
+    <li><a rel="nofollow" href="http://www.newsvine.com/_tools/seed&amp;save?u={$entrydata.url|escape:'url'}&amp;h={$entrydata.title|escape:'url'}" title="Bookmark {$entrydata.title|escape} at NewsVine"><img src="{$entrydata.path}newsvine.png" alt="Bookmark {$entrydata.title|escape} at NewsVine"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.simpy}
-    <li><a rel="nofollow" href="http://www.simpy.com/simpy/LinkAdd.do?href={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}simpy.png" alt="Bookmark {$entrydata.title|escape} at Simpy.com"></a></li>
+    <li><a rel="nofollow" href="http://www.simpy.com/simpy/LinkAdd.do?href={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}simpy.png" alt="Bookmark {$entrydata.title|escape} at Simpy.com"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.blogmarks}
-    <li><a rel="nofollow" href="http://blogmarks.net/my/new.php?mini=1&amp;simple=1&amp;url={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}blogmarks.png" alt="Bookmark {$entrydata.title|escape} at blogmarks"></a></li>
+    <li><a rel="nofollow" href="http://blogmarks.net/my/new.php?mini=1&amp;simple=1&amp;url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}blogmarks.png" alt="Bookmark {$entrydata.title|escape} at blogmarks"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.wists}
-    <li><a rel="nofollow" href="http://wists.com/r.php?c=&amp;r={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}wists.png" alt="Bookmark {$entrydata.title|escape} with wists"></a></li>
+    <li><a rel="nofollow" href="http://wists.com/r.php?c=&amp;r={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}wists.png" alt="Bookmark {$entrydata.title|escape} with wists"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.misterwong}
-    <li><a rel="nofollow" href="http://www.mister-wong.de/index.php?action=addurl&amp;bm_url={$entrydata.url|escape:url}&amp;bm_description={$entrydata.title|escape:url}"><img src="{$entrydata.path}wong18.gif" alt="wong it!"></a></li>
+    <li><a rel="nofollow" href="http://www.mister-wong.de/index.php?action=addurl&amp;bm_url={$entrydata.url|escape:'url'}&amp;bm_description={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}wong18.gif" alt="wong it!"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.addthis}
-    <li><a rel="nofollow" href="http://www.addthis.com/bookmark.php?pub=&amp;url={$entrydata.url|escape:url}&amp;title={$entrydata.title|escape:url}"><img src="{$entrydata.path}button0-bm.gif" alt="Bookmark using any bookmark manager!"></a></li>
+    <li><a rel="nofollow" href="http://www.addthis.com/bookmark.php?pub=&amp;url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}"><img src="{$entrydata.path}button0-bm.gif" alt="Bookmark using any bookmark manager!"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.stumbleupon}
-    <li><a rel="nofollow" href="http://www.stumbleupon.com/submit?url={$entrydata.url|escape:url}"><img src="{$entrydata.path}stumbleupon.gif" alt="Stumble It!"></a></li>
+    <li><a rel="nofollow" href="http://www.stumbleupon.com/submit?url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}stumbleupon.gif" alt="Stumble It!"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.printthis}
-    <li><a rel="nofollow" href="http://www.printfriendly.com/print?url={$entrydata.url|escape:url}"><img src="{$entrydata.path}printfriendly.png" alt="Print this article!"></a></li>
+    <li><a rel="nofollow" href="http://www.printfriendly.com/print?url={$entrydata.url|escape:'url'}"><img src="{$entrydata.path}printfriendly.png" alt="Print this article!"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.tellafriend}
-    <li><a rel="nofollow" href="mailto:?subject={$entrydata.title|escape}&amp;body={$entrydata.url|escape:url}';"><img src="{$entrydata.path}email_link.png" alt="E-mail this story to a friend!"></a></li>
+    <li><a rel="nofollow" href="mailto:?subject={$entrydata.title|escape}&amp;body={$entrydata.url|escape:'url'}';"><img src="{$entrydata.path}email_link.png" alt="E-mail this story to a friend!"></a></li>
 {/if}
 {if NOT $findmore_disabled_services.identica}
-    <li><a rel="nofollow" href="http://identi.ca/notice/new?status_textarea={$entrydata.title|escape:url}%20-%20{$entrydata.url|escape:url}"><img src="{$entrydata.path}identica.png" alt="Identi.ca"></a></li>
+    <li><a rel="nofollow" href="http://identi.ca/notice/new?status_textarea={$entrydata.title|escape:'url'}%20-%20{$entrydata.url|escape:'url'}"><img src="{$entrydata.path}identica.png" alt="Identi.ca"></a></li>
 {/if}
 </ul>
 {if NOT $findmore_disabled_services.facebook OR NOT $findmore_disabled_services.gplus OR NOT $findmore_disabled_services.spreadly}
@@ -81,11 +81,11 @@
     <li class="facebook_like findmore_like_button">
     {if $findmore_lazyload}
         <script>
-            var fb_like = '<iframe src="http://www.facebook.com/plugins/like.php?href={$entrydata.url|@escape:url}&amp;layout=standard&amp;show-faces=true&amp;width=300&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:300px; height:30px"></iframe>';
+            var fb_like = '<iframe src="http://www.facebook.com/plugins/like.php?href={$entrydata.url|escape:'url'}&amp;layout=standard&amp;show-faces=true&amp;width=300&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:300px; height:30px"></iframe>';
             insertLazyLoadButton(fb_like, "facebook", '{$entrydata.path}', '{$findmore_lazyload_text}');
         </script>
     {else}
-        <iframe src="http://www.facebook.com/plugins/like.php?href={$entrydata.url|@escape:url}&amp;layout=standard&amp;show-faces=true&amp;width=300&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:100%; height:30px"></iframe>
+        <iframe src="http://www.facebook.com/plugins/like.php?href={$entrydata.url|escape:'url'}&amp;layout=standard&amp;show-faces=true&amp;width=300&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:100%; height:30px"></iframe>
     {/if}
     </li>
 {/if}
@@ -105,9 +105,9 @@
 {if NOT $findmore_disabled_services.spreadly}
     <li class="spreadly_like findmore_like_button">
     {if $findmore_lazyload}
-        <a href="http://spread.ly/?url={$entrydata.url|@escape:url}&amp;title={$entrydata.title|@escape:url}&amp;tags={$entrydata.properties.freetag_tagList|@escape:url}&amp;social={if $findmore_spreadly_social}1{else}0{/if}" rel="like"><img src="http://spread.ly/img/like-button.jpg" alt="Like"></a>
+        <a href="http://spread.ly/?url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}&amp;tags={$entrydata.properties.freetag_tagList|escape:'url'}&amp;social={if $findmore_spreadly_social}1{else}0{/if}" rel="like"><img src="http://spread.ly/img/like-button.jpg" alt="Like"></a>
     {else}
-        <iframe scrolling="no" frameborder="0" marginwidth="0" marginheight="0" style="overflow: hidden; width: 100px; height: {if $findmore_spreadly_social}24px;{else}24px{/if}" src="http://button.spread.ly/?url={$entrydata.url|@escape:url}&amp;title={$entrydata.title|@escape:url}&amp;tags={$entrydata.properties.freetag_tagList|@escape:url}&amp;social={if $findmore_spreadly_social}1{else}0{/if}" allowtransparency="true"></iframe>
+        <iframe scrolling="no" frameborder="0" marginwidth="0" marginheight="0" style="overflow: hidden; width: 100px; height: {if $findmore_spreadly_social}24px;{else}24px{/if}" src="http://button.spread.ly/?url={$entrydata.url|escape:'url'}&amp;title={$entrydata.title|escape:'url'}&amp;tags={$entrydata.properties.freetag_tagList|escape:'url'}&amp;social={if $findmore_spreadly_social}1{else}0{/if}" allowtransparency="true"></iframe>
     {/if}
     </li>
 {/if}
diff --git a/templates/2k11/trackbacks.tpl b/templates/2k11/trackbacks.tpl
index 3212494c..6f8d93b7 100644
--- a/templates/2k11/trackbacks.tpl
+++ b/templates/2k11/trackbacks.tpl
@@ -1,12 +1,12 @@
 {foreach from=$trackbacks item=trackback}
 <article id="c{$trackback.id}" class="clearfix serendipity_comment {cycle values="odd,even"}">
-    <h4><cite>{$trackback.author|@default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|@serendipity_html5time}">{$trackback.timestamp|@formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|@strip_tags}">{$trackback.title}</a></h4>
+    <h4><cite>{$trackback.author|default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|@serendipity_html5time}">{$trackback.timestamp|@formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|strip_tags}">{$trackback.title}</a></h4>
 {if $trackback.body == ''}
 	<span class="visuallyhidden">{$CONST.TWOK11_EMPTYTRACKBACK}</span>
 {else}
     <details>
         <summary>{$CONST.TWOK11_TRACKBACKPREVIEW}</summary>
-        <div class="content serendipity_commentBody">{$trackback.body|@strip_tags|@escape:all}</div>
+        <div class="content serendipity_commentBody">{$trackback.body|strip_tags|escape:'htmlall'}</div>
     </details>
 {/if}
 {if $entry.is_entry_owner}