diff --git a/templates/2k11/comments.tpl b/templates/2k11/comments.tpl
index a1b1d1b0..5b356fd1 100644
--- a/templates/2k11/comments.tpl
+++ b/templates/2k11/comments.tpl
@@ -1,8 +1,8 @@
 {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} class="short-heading"{/if}>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|@default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}" pubdate>{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
-    {if $comment.spice_twitter_name}
+        <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}" pubdate>{$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}
         </div>
diff --git a/templates/2k11/comments_by_author.tpl b/templates/2k11/comments_by_author.tpl
new file mode 100644
index 00000000..83323bca
--- /dev/null
+++ b/templates/2k11/comments_by_author.tpl
@@ -0,0 +1,19 @@
+<h2 class="visuallyhidden">{$CONST.COMMENTS}</h2>
+{foreach from=$comments_by_authors item="entry_comments"}
+<article class="clearfix serendipity_entry">
+	<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}
+{if $footer_info or $footer_prev_page or $footer_next_page}
+    <nav class="serendipity_pagination block_level comments_by_author_pagination">
+		<ul class="clearfix">
+            {if $footer_info}
+            <li class="info"><span>{$footer_info}</span></li>
+            {/if}
+            <li class="prev">{if $footer_prev_page}<a href="{$footer_prev_page}">{/if}{if $footer_prev_page}&larr; {$CONST.PREVIOUS_PAGE}{else}&nbsp;{/if}{if $footer_prev_page}</a>{/if}</li>
+            <li class="next">{if $footer_next_page}<a href="{$footer_next_page}">{/if}{if $footer_next_page}{$CONST.NEXT_PAGE} &rarr;{else}&nbsp;{/if}{if $footer_next_page}</a>{/if}</li>
+        </ul>
+    </nav>
+{/if}
+{serendipity_hookPlugin hook="comments_by_author_footer" hookAll="true"}
diff --git a/templates/2k11/entries.tpl b/templates/2k11/entries.tpl
index 84cff412..60da5581 100644
--- a/templates/2k11/entries.tpl
+++ b/templates/2k11/entries.tpl
@@ -5,14 +5,14 @@
         <header class="clearfix">
             <h2><a href="{$entry.link}">{$entry.title}</a></h2>
 
-            <span class="serendipity_byline"><span class="single_user">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} </span><time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time>{if $entry.is_entry_owner and not $is_preview} | <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>{/if}</span>
+            <span class="serendipity_byline block_level"><span class="single_user">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} </span><time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time>{if $entry.is_entry_owner and not $is_preview} | <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>{/if}</span>
         </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}
         {$entry.body}
         {if $entry.has_extended and not $is_single_entry and not $entry.is_extended}
-        <a class="read_more" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a>
+        <a class="read_more block_level" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a>
         {/if}
         </div>
         {if $entry.is_extended}
@@ -78,7 +78,7 @@
         <section id="trackbacks" class="serendipity_comments serendipity_section_trackbacks">
             <h3>{$CONST.TRACKBACKS}</h3>
 
-            <div id="trackback_url"><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>
@@ -131,7 +131,7 @@
     {/if}
 {/foreach}
 {if $footer_info or $footer_prev_page or $footer_next_page}
-    <nav class="serendipity_pagination">
+    <nav class="serendipity_pagination block_level">
         <h2 class="visuallyhidden">{$CONST.TWOK11_PAG_TITLE}</h2>
 
         <ul class="clearfix">
diff --git a/templates/2k11/entries_summary.tpl b/templates/2k11/entries_summary.tpl
index 6fb35ca3..ff089bc8 100644
--- a/templates/2k11/entries_summary.tpl
+++ b/templates/2k11/entries_summary.tpl
@@ -6,7 +6,7 @@
     {foreach from=$entries item="sentries"}
         {foreach from=$sentries.entries item="entry"}
         <li><a href="{$entry.link}">{$entry.title}</a>
-            <span class="serendipity_byline"><span class="single_user">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} </span><time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
+            <span class="serendipity_byline block_level"><span class="single_user">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} </span><time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
         </li>
         {/foreach}
     {/foreach}
diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl
index 49770867..44baa670 100644
--- a/templates/2k11/index.tpl
+++ b/templates/2k11/index.tpl
@@ -75,13 +75,13 @@
         </div>
     {if $leftSidebarElements > 0}
         <aside id="sidebar_left">
-            <h2 class="visuallyhidden">Sidebar</h2>
+            <h2 class="visuallyhidden">{$CONST.TWOK11_SIDEBAR}</h2>
             {serendipity_printSidebar side="left"}
         </aside>
     {/if}
     {if $rightSidebarElements > 0}
         <aside id="sidebar_right">
-            <h2 class="visuallyhidden">Sidebar</h2>
+            <h2 class="visuallyhidden">{$CONST.TWOK11_SIDEBAR}</h2>
             {serendipity_printSidebar side="right"}
         </aside>
     {/if}
diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt
index e9db17d4..a30d7084 100644
--- a/templates/2k11/info.txt
+++ b/templates/2k11/info.txt
@@ -1,4 +1,4 @@
 Name: 2k11
 Author: Matthias Mees, Veit Lehmann
-Date: 2012-10-03
+Date: 2012-10-15
 Require Serendipity: 1.6
diff --git a/templates/2k11/js/2k11.min.js b/templates/2k11/js/2k11.min.js
index 11957901..691021b8 100644
--- a/templates/2k11/js/2k11.min.js
+++ b/templates/2k11/js/2k11.min.js
@@ -22,11 +22,11 @@ if(!f){return;}function j(){f.setAttribute("content",h);k=true;}function c(){f.s
 n=Math.abs(e.x);m=Math.abs(e.y);l=Math.abs(e.z);if((!d.orientation||d.orientation===180)&&(n>7||((l>6&&m<8||l<8&&m>6)&&n>5))){if(k){c();}}else{if(!k){j();
 }}}d.addEventListener("orientationchange",j,false);d.addEventListener("devicemotion",i,false);})(this);(function(a){a.fn.fitVids=function(b){var c={customSelector:null};
 var e=document.createElement("div"),d=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];e.className="fit-vids-style";
-e.innerHTML="&shy;<style>.fluid-width-video-wrapper {width: 100%;position: relative;padding: 0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position: absolute;top: 0;left: 0;width: 100%;height: 100%;}</style>";
+e.innerHTML="&shy;<style>               .fluid-width-video-wrapper {                 width: 100%;                              position: relative;                       padding: 0;                            }                                                                                   .fluid-width-video-wrapper iframe,        .fluid-width-video-wrapper object,        .fluid-width-video-wrapper embed {           position: absolute;                       top: 0;                                   left: 0;                                  width: 100%;                              height: 100%;                          }                                       </style>";
 d.parentNode.insertBefore(e,d);if(b){a.extend(c,b);}return this.each(function(){var f=["iframe[src*='player.vimeo.com']","iframe[src*='www.youtube.com']","iframe[src*='www.kickstarter.com']","object","embed"];
-if(c.customSelector){f.push(c.customSelector);}var g=a(this).find(f.join(","));g.each(function(){var j=a(this);if(this.tagName.toLowerCase()=="embed"&&j.parent("object").length||j.parent(".fluid-width-video-wrapper").length){return;
-}var k=this.tagName.toLowerCase()=="object"?j.attr("height"):j.height(),h=k/j.width();if(!j.attr("id")){var i="fitvid"+Math.floor(Math.random()*999999);
-j.attr("id",i);}j.wrap('<div class="fluid-width-video-wrapper"></div>').parent(".fluid-width-video-wrapper").css("padding-top",(h*100)+"%");j.removeAttr("height").removeAttr("width");
+if(c.customSelector){f.push(c.customSelector);}var g=a(this).find(f.join(","));g.each(function(){var l=a(this);if(this.tagName.toLowerCase()=="embed"&&l.parent("object").length||l.parent(".fluid-width-video-wrapper").length){return;
+}var h=(this.tagName.toLowerCase()=="object"||l.attr("height"))?l.attr("height"):l.height(),i=l.attr("width")?l.attr("width"):l.width(),j=h/i;if(!l.attr("id")){var k="fitvid"+Math.floor(Math.random()*999999);
+l.attr("id",k);}l.wrap('<div class="fluid-width-video-wrapper"></div>').parent(".fluid-width-video-wrapper").css("padding-top",(j*100)+"%");l.removeAttr("height").removeAttr("width");
 });});};})(jQuery);jQuery(function(a){(function(){var b=this;this.hideDetailChildren=function(e){var f=e instanceof jQuery?e[0].childNodes:e.childNodes,g=f.length;
 a(e).attr("open",!1);if(a.browser.safari==!0){for(var m=0;m<g;m++){if(f[m].nodeType==3&&f[m].textContent!=""){var n=a("<span />");n.text(f[m].textContent).hide(),a(f[m]).after(n),f[m].textContent="",g++;
 }}}a.each(f,function(i,k){if(a(k)[0].nodeType==1&&k==a(k).parent().find("> summary:first-of-type")[0]){a(k).data("processed")!=!0&&(a(k).css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){b.toggleDetailChildren(a(this));
diff --git a/templates/2k11/lang_de.inc.php b/templates/2k11/lang_de.inc.php
index 7a8a53e5..6320198c 100644
--- a/templates/2k11/lang_de.inc.php
+++ b/templates/2k11/lang_de.inc.php
@@ -9,6 +9,7 @@
 // Sprachkonstanten
 @define('TWOK11_NAV_TITLE', 'Navigation');
 @define('TWOK11_PAG_TITLE', 'Pagination');
+@define('TWOK11_SIDEBAR', 'Seitenleiste');
 @define('TWOK11_PLINK_TEXT', 'Link');
 @define('TWOK11_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
 @define('TWOK11_PLACE_SEARCH', 'Suchbegriff(e)');
diff --git a/templates/2k11/lang_en.inc.php b/templates/2k11/lang_en.inc.php
index b5b15ede..8a7a52d5 100644
--- a/templates/2k11/lang_en.inc.php
+++ b/templates/2k11/lang_en.inc.php
@@ -9,6 +9,7 @@
 // Lang constants
 @define('TWOK11_NAV_TITLE', 'Navigation');
 @define('TWOK11_PAG_TITLE', 'Pagination');
+@define('TWOK11_SIDEBAR', 'Sidebar');
 @define('TWOK11_PLINK_TEXT', 'Link');
 @define('TWOK11_PLINK_TITLE', 'Permanent link for this comment');
 @define('TWOK11_PLACE_SEARCH', 'Search term(s)');
diff --git a/templates/2k11/plugin_commentsearch_searchresults.tpl b/templates/2k11/plugin_commentsearch_searchresults.tpl
index 22776d03..83b2df15 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>{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_staticpage.tpl b/templates/2k11/plugin_staticpage.tpl
index 59470323..dd5c0b21 100644
--- a/templates/2k11/plugin_staticpage.tpl
+++ b/templates/2k11/plugin_staticpage.tpl
@@ -1,4 +1,4 @@
-<article id="staticpage_{$staticpage_pagetitle|@makeFilename}" class="clearfix serendipity_staticpage {if $staticpage_articleformat} serendipity_entry{/if}">
+<article id="staticpage_{$staticpage_pagetitle|@makeFilename}" class="clearfix serendipity_staticpage{if $staticpage_articleformat} serendipity_entry{/if}">
     <header>
         <h2>{if $staticpage_articleformat}{if $staticpage_articleformattitle}{$staticpage_articleformattitle|@escape}{else}{$staticpage_pagetitle}{/if}{else}{if $staticpage_headline}{$staticpage_headline|@escape}{else}{$staticpage_pagetitle}{/if}{/if}</h2>
     {if is_array($staticpage_childpages)}
@@ -24,7 +24,7 @@
     </div>
     {/if}
     {if $staticpage_content}
-    <div class="clearfix content staticpage_content">
+    <div class="clearfix content {if $staticpage_articleformat}serendipity_entry_body{else}staticpage_content{/if}">
     {$staticpage_content}
     </div>
     {/if}
diff --git a/templates/2k11/plugin_staticpage_searchresults.tpl b/templates/2k11/plugin_staticpage_searchresults.tpl
index cdd3de25..3f484c3b 100644
--- a/templates/2k11/plugin_staticpage_searchresults.tpl
+++ b/templates/2k11/plugin_staticpage_searchresults.tpl
@@ -3,7 +3,7 @@
     {if $staticpage_results}
     <ul class="plainList">
     {foreach from=$staticpage_results item="result"}
-        <li><span><a href="{$result.permalink|@escape}" title="{$result.pagetitle|@escape}">{$result.headline}</a> ({$result.realname})</span>
+        <li><span class="block_level"><a href="{$result.permalink|@escape}" title="{$result.pagetitle|@escape}">{$result.headline}</a> ({$result.realname})</span>
             {$result.content|@strip_tags|@strip|@truncate:200:" ... "}</li>
     {/foreach}
     </ul>
diff --git a/templates/2k11/style.css b/templates/2k11/style.css
index cadc28f4..64ec98b4 100644
--- a/templates/2k11/style.css
+++ b/templates/2k11/style.css
@@ -72,8 +72,6 @@ input:invalid, textarea:invalid { background-color: #eee; }
 table { border-collapse: collapse; border-spacing: 0; }
 td { vertical-align: top; }
 
-
-/* Primary styles */
 input[type="checkbox"] {
     margin: 0 .25em 0 0;
     vertical-align: baseline;
@@ -129,8 +127,6 @@ img, video { height: auto; }
 
 q { quotes: '“' '”' '‘' '’'; }
 :lang(de) q { quotes: '„' '“' '‚' '‘'; }
-/*:lang(de) q { quotes: '»' '«' '›' '‹'; }*/
-/* pre-2011 WebKit */
 q:before   { content: '“'; content: open-quote;  }
 q:after    { content: '”'; content: close-quote; }
 q q:before { content: '‘'; content: open-quote;  }
@@ -282,7 +278,7 @@ dt,
 .serendipity_calendar .Today,
 .serendipity_freetag_taglist_related { font-weight: bold; }
 
-caption, th, prev,
+caption, th, .prev,
 .serendipity_freeTag { text-align: left; }
 
 #page {
@@ -296,21 +292,16 @@ caption, th, prev,
     margin: 0 auto;
 }
 
+.block_level,
 fieldset,
 .no-js #primary-nav ul,
-.archives_summary .serendipity_byline,
 .form_field label,
 .form_tarea label,
 .podcastdownload,
 #primary-nav select,
-.read_more, .trackback_url,
-.serendipity_byline,
-.serendipity_pagination,
 .serendipity_comment_captcha .captcha,
 .serendipity_comment_captcha label,
-.serendipity_freeTag,
-.staticpage_results li>span,
-.comment_results li>span { display: block; }
+.serendipity_freeTag { display: block; }
 
 #primary-nav select {
     margin: .5em 1em;
@@ -321,6 +312,7 @@ fieldset,
 #primary-nav li,
 .archives_date { display: inline-block; }
 
+.lt-ie8 #identity a,
 .lt-ie8 #primary-nav li,
 .lt-ie8 .archives_date {
     display: inline;
@@ -451,12 +443,12 @@ fieldset,
 }
 
 #staticpage_childpages,
-.serendipity_entry_body ul,
-.serendipity_entry_body ol { margin: 0 0 1em 2em; }
+.content ul,
+.content ol { margin: 0 0 1em 2em; }
 
 #staticpage_childpages li ul,
-.serendipity_entry_body li ul,
-.serendipity_entry_body li ol { margin: 0 0 0 2em; }
+.content li ul,
+.content li ol { margin: 0 0 0 2em; }
 
 .serendipity_entryIcon {
     float: left;
@@ -849,7 +841,6 @@ pre .geshi {
     top: 6px!important;
 }
 
-/* Comment Spice */
 .serendipity_comment_spice { background: #eee; }
 
 .commentspice_rss_input {
@@ -883,7 +874,6 @@ pre .geshi {
     width: 34%;
 }
 
-/* Helper classes  */
 .visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 
 .visuallyhidden.focusable:active,
@@ -893,8 +883,6 @@ pre .geshi {
 .clearfix:after { clear: both; }
 .clearfix { zoom: 1; }
 
-
-/* Media queries  */
 @media only screen and (min-width: 481px) {
     #serendipityQuickSearchTermField { max-width: 15em; }
 
@@ -1126,7 +1114,6 @@ pre .geshi {
     #serendipity_comment textarea { width: 30em; }
 }
 
-/* Print styles */
 @media print {
     * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; }
     a, a:visited { text-decoration: underline; }