Index: inc/public/default-templates/currywurst/_entry-content.html
===================================================================
--- inc/public/default-templates/currywurst/_entry-content.html	(revision 2938)
+++ inc/public/default-templates/currywurst/_entry-content.html	(revision 2938)
@@ -0,0 +1,64 @@
+<div class="post simple" id="p{{tpl:EntryID}}" role="article">
+	<h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
+
+	<div class="post-meta">
+		<p class="post-info">
+			<span class="post-author">{{tpl:lang By}} {{tpl:EntryAuthorLink}}, </span>
+			<span class="post-date">{{tpl:EntryDate}}. </span>
+			<span class="post-permalink"><a href="{{tpl:EntryURL}}">{{tpl:lang Permalink}}</a></span>
+			<tpl:EntryIf has_category="1">
+				<span class="post-cat"><tpl:EntryCategoriesBreadcrumb><a
+				href="{{tpl:CategoryURL}}">{{tpl:CategoryTitle encode_html="1"}}</a> › </tpl:EntryCategoriesBreadcrumb><a
+				href="{{tpl:EntryCategoryURL}}">{{tpl:EntryCategory encode_html="1"}}</a></span>
+			</tpl:EntryIf>
+		</p>
+
+		<tpl:EntryTags>
+			<tpl:TagsHeader>
+				<ul class="post-tags-list">
+			</tpl:TagsHeader>
+				<li class="post-tags-item"><a href="{{tpl:TagURL}}">{{tpl:TagID}}</a></li>
+			<tpl:TagsFooter>
+				</ul>
+			</tpl:TagsFooter>
+		</tpl:EntryTags>
+	</div>
+
+	<!-- # --BEHAVIOR-- publicEntryBeforeContent -->
+	{{tpl:SysBehavior behavior="publicEntryBeforeContent"}}
+
+	<!-- # Entry with an excerpt -->
+	<tpl:EntryIf extended="1">
+		<div class="post-excerpt">{{tpl:EntryExcerpt}}</div>
+	</tpl:EntryIf>
+
+	<div class="post-content">{{tpl:EntryContent}}</div>
+
+	<!-- # --BEHAVIOR-- publicEntryAfterContent -->
+	{{tpl:SysBehavior behavior="publicEntryAfterContent"}}
+
+<!-- # Attachments -->
+<tpl:Attachments>
+	<tpl:AttachmentsHeader>
+	<div class="post-attachments" id="attachments">
+		<h3 class="post-attachments-title">{{tpl:lang Attachments}}</h3>
+		<ul class="post-attachments-list">
+	</tpl:AttachmentsHeader>
+				<li class="post-attachments-item {{tpl:AttachmentType}}">
+					<tpl:AttachmentIf is_mp3="1">
+						{{tpl:include src="_mp3_player.html"}} -
+					</tpl:AttachmentIf>
+					<tpl:AttachmentIf is_flv="1">
+						{{tpl:include src="_flv_player.html"}}
+					</tpl:AttachmentIf>
+					<tpl:AttachmentIf is_flv="0">
+						<a href="{{tpl:AttachmentURL}}"
+						 title="{{tpl:AttachmentFileName}} ({{tpl:AttachmentSize}})">{{tpl:AttachmentTitle}}</a>
+					</tpl:AttachmentIf>
+				</li>
+	<tpl:AttachmentsFooter>
+			</ul>
+		</div>
+	</tpl:AttachmentsFooter>
+</tpl:Attachments>
+</div>
Index: inc/public/default-templates/currywurst/_entry-feedback.html
===================================================================
--- inc/public/default-templates/currywurst/_entry-feedback.html	(revision 2938)
+++ inc/public/default-templates/currywurst/_entry-feedback.html	(revision 2938)
@@ -0,0 +1,117 @@
+<tpl:EntryIf operator="or" show_comments="1" show_pings="1">
+	<div class="post-feedback">
+</tpl:EntryIf>
+
+<!-- # Comments -->
+<tpl:EntryIf show_comments="1">
+	<tpl:Comments with_pings="1">
+		<tpl:CommentsHeader>
+			<div class="feedback__comments" id="comments">
+				<h3>{{tpl:EntryCommentCount count_all="1" none="no reactions" one="one reaction" more="%s reactions"}}</h3>
+				<tpl:EntryIf operator="or" comments_active="1" pings_active="1">
+					<p id="comments-feed"><a class="feed" href="{{tpl:BlogFeedURL type="atom"}}/comments/{{tpl:EntryID}}"
+						title="{{tpl:lang This post's comments Atom feed}}">{{tpl:lang This post's comments feed}}</a></p>
+				</tpl:EntryIf>
+				<ul class="comments-list">
+		</tpl:CommentsHeader>
+					<tpl:CommentIf is_ping="0">
+						<li id="c{{tpl:CommentID}}" class="comment {{tpl:CommentIfMe}} {{tpl:CommentIfOdd}} {{tpl:CommentIfFirst}}">
+					</tpl:CommentIf>
+					<tpl:CommentIf is_ping="1">
+						<li id="c{{tpl:PingID}}" class="ping {{tpl:PingIfOdd}} {{tpl:PingIfFirst}}">
+					</tpl:CommentIf>
+							<p class="comment-info"><a href="#c{{tpl:CommentID}}" class="comment-number">{{tpl:CommentOrderNumber}}</a>
+								{{tpl:lang From}} {{tpl:CommentAuthorLink}} - {{tpl:CommentDate format="%d"}}/{{tpl:CommentDate format="%m"}}/{{tpl:CommentDate format="%Y"}}, {{tpl:CommentTime}}
+							</p>
+							<div class="comment-content">
+								<!-- # --BEHAVIOR-- publicCommentBeforeContent -->
+								{{tpl:SysBehavior behavior="publicCommentBeforeContent"}}
+
+								{{tpl:CommentContent}}
+
+								<!-- # --BEHAVIOR-- publicCommentAfterContent -->
+								{{tpl:SysBehavior behavior="publicCommentAfterContent"}}
+							</div>
+						</li>
+		<tpl:CommentsFooter>
+					</ul>
+				</div>
+		</tpl:CommentsFooter>
+	</tpl:Comments>
+</tpl:EntryIf>
+
+<tpl:EntryIf comments_active="1">
+	<tpl:SysIfFormError>
+		<p class="error" id="pr">{{tpl:SysFormError}}</p>
+	</tpl:SysIfFormError>
+
+	<tpl:SysIfCommentPublished>
+		<p class="message" id="pr">{{tpl:lang Your comment has been published.}}</p>
+	</tpl:SysIfCommentPublished>
+
+	<tpl:SysIfCommentPending>
+		<p class="message" id="pr">{{tpl:lang Your comment has been submitted and will be reviewed for publication.}}</p>
+	</tpl:SysIfCommentPending>
+
+	<!-- # Comment form -->
+	<form class="comment-form" action="{{tpl:EntryURL}}#pr" method="post" id="comment-form" role="form">
+		<tpl:IfCommentPreview>
+			<div id="pr">
+				<h3>{{tpl:lang Your comment}}</h3>
+				<div class="comment-preview">{{tpl:CommentPreviewContent}}</div>
+				<p class="buttons"><button type="submit" class="submit" value="{{tpl:lang Send}}">{{tpl:lang Send}}</button></p>
+			</div>
+		</tpl:IfCommentPreview>
+
+		<h3>{{tpl:lang Add a comment}}</h3>
+			<!-- # --BEHAVIOR-- publicCommentFormBeforeContent -->
+			{{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}}
+
+			<p class="field name-field"><label for="c_name">{{tpl:lang Name or nickname}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
+				<input name="c_name" id="c_name" type="text" size="30" maxlength="255"
+				 value="{{tpl:CommentPreviewName encode_html="1"}}" required />
+			</p>
+
+			<p class="field mail-field"><label for="c_mail">{{tpl:lang Email address}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
+				<input name="c_mail" id="c_mail" type="email" size="30" maxlength="255"
+				 value="{{tpl:CommentPreviewEmail encode_html="1"}}" required />
+			</p>
+
+			<p class="field site-field"><label for="c_site">{{tpl:lang Website}}&nbsp;:</label>
+				<input name="c_site" id="c_site" type="url" size="30" maxlength="255"
+				 value="{{tpl:CommentPreviewSite encode_html="1"}}" />
+			</p>
+
+			<p style="display:none">
+				<input name="f_mail" type="text" size="30" maxlength="255" value="" />
+			</p>
+
+			<p class="field field-content"><label for="c_content" aria-describedby="c_help">{{tpl:lang Comment}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
+				<textarea name="c_content" id="c_content" cols="35"
+				 rows="7" required>{{tpl:CommentPreviewContent raw="1" encode_html="1"}}</textarea>
+			</p>
+
+			<p class="form-help" id="c_help">{{tpl:CommentHelp}}</p>
+
+			<!-- # --BEHAVIOR-- publicCommentFormAfterContent -->
+			{{tpl:SysBehavior behavior="publicCommentFormAfterContent"}}
+
+			<p class="buttons">
+				<button type="submit" class="preview" name="preview" value="{{tpl:lang Preview}}">{{tpl:lang Preview}}</button>
+		        <tpl:IfCommentPreviewOptional>
+		        	<button type="submit" class="submit" value="{{tpl:lang Send}}">{{tpl:lang Send}}</button>
+		        </tpl:IfCommentPreviewOptional>
+			</p>
+	</form>
+</tpl:EntryIf>
+
+<tpl:EntryIf pings_active="1">
+	<div class="send-ping">
+		<h3>{{tpl:lang Add ping}}</h3>
+		<p id="ping-url">{{tpl:lang Trackback URL}}&nbsp;: {{tpl:EntryPingLink}}</p>
+	</div>
+</tpl:EntryIf>
+
+<tpl:EntryIf operator="or" show_comments="1" show_pings="1">
+	</div> <!-- end post-feedback -->
+</tpl:EntryIf>
Index: inc/public/default-templates/currywurst/_simple-entry.html
===================================================================
--- inc/public/default-templates/currywurst/_simple-entry.html	(revision 2935)
+++ inc/public/default-templates/currywurst/_simple-entry.html	(revision 2938)
@@ -1,182 +1,5 @@
-<div class="post simple" id="p{{tpl:EntryID}}" role="article">
-	<h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
+<!-- # Post content and attachments -->
+{{tpl:include src="_entry-content.html"}}
 
-	<div class="post-meta">
-		<p class="post-info">
-			<span class="post-author">{{tpl:lang By}} {{tpl:EntryAuthorLink}}, </span>
-			<span class="post-date">{{tpl:EntryDate}}. </span>
-			<span class="post-permalink"><a href="{{tpl:EntryURL}}">{{tpl:lang Permalink}}</a></span>
-			<tpl:EntryIf has_category="1">
-				<span class="post-cat"><tpl:EntryCategoriesBreadcrumb><a
-				href="{{tpl:CategoryURL}}">{{tpl:CategoryTitle encode_html="1"}}</a> › </tpl:EntryCategoriesBreadcrumb><a
-				href="{{tpl:EntryCategoryURL}}">{{tpl:EntryCategory encode_html="1"}}</a></span>
-			</tpl:EntryIf>
-		</p>
-
-		<tpl:EntryTags>
-			<tpl:TagsHeader>
-				<ul class="post-tags-list">
-			</tpl:TagsHeader>
-				<li class="post-tags-item"><a href="{{tpl:TagURL}}">{{tpl:TagID}}</a></li>
-			<tpl:TagsFooter>
-				</ul>
-			</tpl:TagsFooter>
-		</tpl:EntryTags>
-	</div>
-
-	<!-- # --BEHAVIOR-- publicEntryBeforeContent -->
-	{{tpl:SysBehavior behavior="publicEntryBeforeContent"}}
-
-	<!-- # Entry with an excerpt -->
-	<tpl:EntryIf extended="1">
-		<div class="post-excerpt">{{tpl:EntryExcerpt}}</div>
-	</tpl:EntryIf>
-
-	<div class="post-content">{{tpl:EntryContent}}</div>
-
-	<!-- # --BEHAVIOR-- publicEntryAfterContent -->
-	{{tpl:SysBehavior behavior="publicEntryAfterContent"}}
-
-<!-- # Attachments -->
-<tpl:Attachments>
-	<tpl:AttachmentsHeader>
-	<div class="post-attachments" id="attachments">
-		<h3 class="post-attachments-title">{{tpl:lang Attachments}}</h3>
-		<ul class="post-attachments-list">
-	</tpl:AttachmentsHeader>
-				<li class="post-attachments-item {{tpl:AttachmentType}}">
-					<tpl:AttachmentIf is_mp3="1">
-						{{tpl:include src="_mp3_player.html"}} -
-					</tpl:AttachmentIf>
-					<tpl:AttachmentIf is_flv="1">
-						{{tpl:include src="_flv_player.html"}}
-					</tpl:AttachmentIf>
-					<tpl:AttachmentIf is_flv="0">
-						<a href="{{tpl:AttachmentURL}}"
-						 title="{{tpl:AttachmentFileName}} ({{tpl:AttachmentSize}})">{{tpl:AttachmentTitle}}</a>
-					</tpl:AttachmentIf>
-				</li>
-	<tpl:AttachmentsFooter>
-			</ul>
-		</div>
-	</tpl:AttachmentsFooter>
-</tpl:Attachments>
-</div>
-
-<tpl:EntryIf operator="or" show_comments="1" show_pings="1">
-	<div class="post-feedback">
-</tpl:EntryIf>
-
-<!-- # Comments -->
-<tpl:EntryIf show_comments="1">
-	<tpl:Comments with_pings="1">
-		<tpl:CommentsHeader>
-			<div class="feedback__comments" id="comments">
-				<h3>{{tpl:EntryCommentCount count_all="1" none="no reactions" one="one reaction" more="%s reactions"}}</h3>
-				<tpl:EntryIf operator="or" comments_active="1" pings_active="1">
-					<p id="comments-feed"><a class="feed" href="{{tpl:BlogFeedURL type="atom"}}/comments/{{tpl:EntryID}}"
-						title="{{tpl:lang This post's comments Atom feed}}">{{tpl:lang This post's comments feed}}</a></p>
-				</tpl:EntryIf>
-				<ul class="comments-list">
-		</tpl:CommentsHeader>
-					<tpl:CommentIf is_ping="0">
-						<li id="c{{tpl:CommentID}}" class="comment {{tpl:CommentIfMe}} {{tpl:CommentIfOdd}} {{tpl:CommentIfFirst}}">
-					</tpl:CommentIf>
-					<tpl:CommentIf is_ping="1">
-						<li id="c{{tpl:PingID}}" class="ping {{tpl:PingIfOdd}} {{tpl:PingIfFirst}}">
-					</tpl:CommentIf>
-							<p class="comment-info"><a href="#c{{tpl:CommentID}}" class="comment-number">{{tpl:CommentOrderNumber}}</a>
-								{{tpl:lang From}} {{tpl:CommentAuthorLink}} - {{tpl:CommentDate format="%d"}}/{{tpl:CommentDate format="%m"}}/{{tpl:CommentDate format="%Y"}}, {{tpl:CommentTime}}
-							</p>
-							<div class="comment-content">
-								<!-- # --BEHAVIOR-- publicCommentBeforeContent -->
-								{{tpl:SysBehavior behavior="publicCommentBeforeContent"}}
-
-								{{tpl:CommentContent}}
-
-								<!-- # --BEHAVIOR-- publicCommentAfterContent -->
-								{{tpl:SysBehavior behavior="publicCommentAfterContent"}}
-							</div>
-						</li>
-		<tpl:CommentsFooter>
-					</ul>
-				</div>
-		</tpl:CommentsFooter>
-	</tpl:Comments>
-</tpl:EntryIf>
-
-<tpl:EntryIf comments_active="1">
-	<tpl:SysIfFormError>
-		<p class="error" id="pr">{{tpl:SysFormError}}</p>
-	</tpl:SysIfFormError>
-
-	<tpl:SysIfCommentPublished>
-		<p class="message" id="pr">{{tpl:lang Your comment has been published.}}</p>
-	</tpl:SysIfCommentPublished>
-
-	<tpl:SysIfCommentPending>
-		<p class="message" id="pr">{{tpl:lang Your comment has been submitted and will be reviewed for publication.}}</p>
-	</tpl:SysIfCommentPending>
-
-	<!-- # Comment form -->
-	<form class="comment-form" action="{{tpl:EntryURL}}#pr" method="post" id="comment-form" role="form">
-		<tpl:IfCommentPreview>
-			<div id="pr">
-				<h3>{{tpl:lang Your comment}}</h3>
-				<div class="comment-preview">{{tpl:CommentPreviewContent}}</div>
-				<p class="buttons"><button type="submit" class="submit" value="{{tpl:lang Send}}">{{tpl:lang Send}}</button></p>
-			</div>
-		</tpl:IfCommentPreview>
-
-		<h3>{{tpl:lang Add a comment}}</h3>
-			<!-- # --BEHAVIOR-- publicCommentFormBeforeContent -->
-			{{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}}
-
-			<p class="field name-field"><label for="c_name">{{tpl:lang Name or nickname}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
-				<input name="c_name" id="c_name" type="text" size="30" maxlength="255"
-				 value="{{tpl:CommentPreviewName encode_html="1"}}" required />
-			</p>
-
-			<p class="field mail-field"><label for="c_mail">{{tpl:lang Email address}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
-				<input name="c_mail" id="c_mail" type="email" size="30" maxlength="255"
-				 value="{{tpl:CommentPreviewEmail encode_html="1"}}" required />
-			</p>
-
-			<p class="field site-field"><label for="c_site">{{tpl:lang Website}}&nbsp;:</label>
-				<input name="c_site" id="c_site" type="url" size="30" maxlength="255"
-				 value="{{tpl:CommentPreviewSite encode_html="1"}}" />
-			</p>
-
-			<p style="display:none">
-				<input name="f_mail" type="text" size="30" maxlength="255" value="" />
-			</p>
-
-			<p class="field field-content"><label for="c_content" aria-describedby="c_help">{{tpl:lang Comment}}<abbr title="{{tpl:lang Required field}}">*</abbr>&nbsp;:</label>
-				<textarea name="c_content" id="c_content" cols="35"
-				 rows="7" required>{{tpl:CommentPreviewContent raw="1" encode_html="1"}}</textarea>
-			</p>
-
-			<p class="form-help" id="c_help">{{tpl:CommentHelp}}</p>
-
-			<!-- # --BEHAVIOR-- publicCommentFormAfterContent -->
-			{{tpl:SysBehavior behavior="publicCommentFormAfterContent"}}
-
-			<p class="buttons">
-				<button type="submit" class="preview" name="preview" value="{{tpl:lang Preview}}">{{tpl:lang Preview}}</button>
-		        <tpl:IfCommentPreviewOptional>
-		        	<button type="submit" class="submit" value="{{tpl:lang Send}}">{{tpl:lang Send}}</button>
-		        </tpl:IfCommentPreviewOptional>
-			</p>
-	</form>
-</tpl:EntryIf>
-
-<tpl:EntryIf pings_active="1">
-	<div class="send-ping">
-		<h3>{{tpl:lang Add ping}}</h3>
-		<p id="ping-url">{{tpl:lang Trackback URL}}&nbsp;: {{tpl:EntryPingLink}}</p>
-	</div>
-</tpl:EntryIf>
-
-<tpl:EntryIf operator="or" show_comments="1" show_pings="1">
-	</div> <!-- end post-feedback -->
-</tpl:EntryIf>
+<!-- # Comments, pings and comment form -->
+{{tpl:include src="_entry-feedback.html"}}
