diff --git a/templates/2k11/commentform.tpl b/templates/2k11/commentform.tpl
index 51f7c8a4..6bfb9fa6 100644
--- a/templates/2k11/commentform.tpl
+++ b/templates/2k11/commentform.tpl
@@ -7,6 +7,10 @@
     <a id="serendipity_CommentForm"></a>
     <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post">
     <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}"/></div>
+    <div class="form_field">
+        <label id="reply-to-hint" for="serendipity_replyTo">{$CONST.IN_REPLY_TO}</label>
+        {$commentform_replyTo}
+    </div>
     <div class="form_field">
         <label for="serendipity_commentform_name">{$CONST.NAME}</label>
         <input id="serendipity_commentform_name" name="serendipity[name]" type="text" value="{$commentform_name}" placeholder="{$placename}"/>
@@ -19,10 +23,6 @@
         <label for="serendipity_commentform_url">{$CONST.HOMEPAGE}</label>
         <input id="serendipity_commentform_url" name="serendipity[url]" type="url" value="{$commentform_url}" placeholder="{$placeurl}"/>
     </div>
-    <div class="form_field">
-        <label for="serendipity_replyTo">{$CONST.IN_REPLY_TO}</label>
-        {$commentform_replyTo}
-    </div>
     <div class="form_tarea">
         <label for="serendipity_commentform_comment">{$CONST.COMMENT}</label>
         <textarea id="serendipity_commentform_comment" name="serendipity[comment]" rows="10" cols="40" placeholder="{$placemess}">{$commentform_data}</textarea>
diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt
index d497c8a5..29f03ce1 100644
--- a/templates/2k11/info.txt
+++ b/templates/2k11/info.txt
@@ -1,4 +1,4 @@
 Name: 2k11
 Author: Matthias Mees, Veit Lehmann
-Date: 2011-11-28
+Date: 2011-11-30
 Require Serendipity: 1.6
diff --git a/templates/2k11/js/2k11.js b/templates/2k11/js/2k11.js
index 8db4817f..bd53eecf 100644
--- a/templates/2k11/js/2k11.js
+++ b/templates/2k11/js/2k11.js
@@ -22,6 +22,15 @@ jQuery(document).ready(function($) {
         var deleteMsg = $(this).attr('title');
         return confirm(deleteMsg);
     });
+    // Move preview comment in the DOM to fix comment preview
+    $('#c').insertAfter('#feedback');
+    // Hide reply-to form element
+    $('.comment_reply').click(function() {
+        $('#reply-to-comment').remove();
+        var replyToPlaceholder = '<p id="reply-to-comment">' + $('#reply-to-hint').text() + ' ' + $('#serendipity_replyTo :selected').text() + '</p>';
+        $('#serendipity_replyTo').after(replyToPlaceholder);
+    });
+    $('#reply-to-hint, #serendipity_replyTo').addClass('visuallyhidden');
     // Cloned primary navigation for small screen
     var $select = $('<select/>');
     $('#primary-nav li').each(function() {
diff --git a/templates/2k11/style.css b/templates/2k11/style.css
index 21fde7cb..5b97f661 100644
--- a/templates/2k11/style.css
+++ b/templates/2k11/style.css
@@ -700,6 +700,14 @@ pre>samp {
 
 .serendipity_freetag_taglist_related { font-size: 1.25em; }
 
+.geshi {
+    font-family: monospace, monospace;
+    _font-family: 'courier new', monospace;
+    font-size: .875em;
+}
+
+pre .geshi { font-size: 1em; }
+
 /* Helper classes  */
 .visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }