diff --git a/templates/2k11/entries.tpl b/templates/2k11/entries.tpl
index 3adf7ed5..9e273756 100644
--- a/templates/2k11/entries.tpl
+++ b/templates/2k11/entries.tpl
@@ -7,16 +7,10 @@
             <h2><a href="{$entry.link}">{$entry.title}</a></h2>
             
             <span class="serendipity_byline">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_smarty_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
-        {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}
         </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>
diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl
index cdef8709..7a554e3c 100644
--- a/templates/2k11/index.tpl
+++ b/templates/2k11/index.tpl
@@ -40,7 +40,7 @@
 {assign var="navtitle" value=$CONST.TWOK11_NAV_TITLE}
 <a class="visuallyhidden" href="#content"><span lang="en">Skip to content</span></a>
 <div id="page" class="clearfix">
-    <header id="banner" class="clearfix{if $leftSidebarElements > 0 && $rightSidebarElements > 0} col3{elseif $leftSidebarElements > 0 && $rightSidebarElements == 0} col2l{else} col2r{/if}" role="banner">
+    <header id="banner" class="clearfix{if $leftSidebarElements > 0 && $rightSidebarElements > 0} col3{elseif $leftSidebarElements > 0 && $rightSidebarElements == 0} col2l{else} col2r{/if}{if not $template_option.use_corenav} no-nav{/if}" role="banner">
         <div id="identity">
             <h1><a href="{$serendipityBaseURL}">{$blogTitle}</a></h1>
             <p>{$blogDescription}</p>
diff --git a/templates/2k11/js/2k11.js b/templates/2k11/js/2k11.js
index eaa0db43..8db4817f 100644
--- a/templates/2k11/js/2k11.js
+++ b/templates/2k11/js/2k11.js
@@ -39,7 +39,9 @@ jQuery(document).ready(function($) {
             }).appendTo($select);
         }
     });
+    if($select.children().size() > 0) {
     $select.appendTo('#primary-nav').change(function() {
         window.location = $(this).find('option:selected').val();
     });
+    }
 });
diff --git a/templates/2k11/style.css b/templates/2k11/style.css
index 7aee6a7e..21fde7cb 100644
--- a/templates/2k11/style.css
+++ b/templates/2k11/style.css
@@ -134,14 +134,13 @@ q q:after  { content: '’'; content: close-quote; }
 :lang(de) q:after    { content: '“'; content: close-quote; }
 :lang(de) q q:before { content: '‚'; content: open-quote;  }
 :lang(de) q q:after  { content: '‘'; content: close-quote; }
-
-blockquote { quotes: '“' '”'; }
+blockquote p { quotes: '“' '”'; }
 blockquote p:before { content: ''; content: no-open-quote; }
 blockquote p:after  { content: ''; content: no-close-quote; }
 blockquote p:first-child:before { content: '“'; content: open-quote;  }
 blockquote p:last-child:after   { content: '”'; content: close-quote; }
-:lang(de) blockquote,
-blockquote:lang(de) { quotes: '„' '“'; }
+:lang(de) blockquote p,
+blockquote:lang(de) p { quotes: '„' '“'; }
 :lang(de) blockquote p:before,
 blockquote:lang(de)  p:before { content: ''; content: no-open-quote; }
 :lang(de) blockquote p:after,
@@ -248,11 +247,16 @@ li ul, li ol,
 blockquote,
 blockquote + cite {
     display: block;
-    margin: 0 0 1em 40px;
+    margin: 0 2.5em 1em;
 }
 
 blockquote + cite:before { content: "–\202F"; }
 
+.content blockquote {
+    border-left: 4px solid #aaa;
+    padding-left: .75em;
+}
+
 dt,
 .serendipity_calendar tfoot a,
 .serendipity_calendar tfoot a:active,
@@ -319,6 +323,11 @@ fieldset,
 #banner>img,
 .serendipity_entry footer { clear: both; }
 
+.no-nav {
+    border-bottom: 2px solid #294564;
+    margin-bottom: 2.1429em;
+}
+
 #search div { padding: 0 1em; }
 
 #primary-nav {
@@ -409,6 +418,11 @@ fieldset,
 .serendipity_entry li ul,
 .serendipity_entry li ol { margin: 0 0 0 2em; }
 
+.serendipity_entryIcon {
+    float: left;
+    margin: 0 .625em .625em 0;
+}
+
 .serendipity_entry table {
     border: 1px solid #aaa;
     max-width: 100%;
@@ -436,11 +450,25 @@ fieldset,
 .serendipity_entry pre {
     background: #eee;
     border: 1px solid #aaa;
-    font-size: .8125em;
+    font-size: .875em;
     margin: 0 0 1.2308em;
     padding: .5385em;
 }
 
+.serendipity_entry code,
+.serendipity_entry kbd,
+.serendipity_entry samp {
+    font-size: .875em;
+    line-height: 1.7143;
+}
+
+pre>code,
+pre>kbd,
+pre>samp {
+    font-size: 1em;
+    line-height: 1.5;
+}
+
 .serendipity_byline { margin: 0 0 1.2308em; }
 
 .serendipity_pagination { margin: 0 1.2308em 1.2308em; }
@@ -474,6 +502,8 @@ fieldset,
 
 .serendipity_comment { margin: 0 0 2em; }
 
+.serendipity_comment h4 { margin: 0 0 .25em; }
+
 .form_tarea,
 .form_toolbar { margin-bottom: 1em; }
 
@@ -494,9 +524,15 @@ fieldset,
 
 #serendipity_commentform_comment { max-width: 97%; }
 
+#c,
 .serendipity_commentDirection {
     background: #eee;
     border: 1px solid #aaa;
+}
+
+#c { padding: .625em; }
+
+.serendipity_commentDirection {
     color: #222;
     font-size: .8125em;
     line-height: 1.8462;