Index: inc/public/default-templates/currywurst/_sidebar.html
===================================================================
--- inc/public/default-templates/currywurst/_sidebar.html	(revision 2603)
+++ inc/public/default-templates/currywurst/_sidebar.html	(revision 2668)
@@ -1,3 +1,4 @@
 <div id="sidebar" role="complementary">
+	<tpl:Block name="sidebar">
 	<div id="blognav">
 		{{tpl:Widgets type="nav"}}
@@ -6,3 +7,4 @@
 		{{tpl:Widgets type="extra"}}
 	</div> <!-- End #blogextra -->
+	</tpl:Block>	<!-- sidebar -->
 </div>
Index: inc/public/default-templates/currywurst/home.html
===================================================================
--- inc/public/default-templates/currywurst/home.html	(revision 2603)
+++ inc/public/default-templates/currywurst/home.html	(revision 2668)
@@ -1,94 +1,1 @@
-<!DOCTYPE html>
-<html lang="{{tpl:BlogLanguage}}">
-<head>
-	<meta charset="UTF-8" />
-	<meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
-
-	<title>{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf></title>
-	<meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
-	<meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-	<meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
-	<meta name="date" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
-
-	<link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-	<meta property="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
-	<meta property="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />
-	<meta property="dc.language" content="{{tpl:BlogLanguage}}" />
-	<meta property="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
-	<meta property="dc.rights" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-	<meta property="dc.date" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
-	<meta property="dc.type" content="text" />
-	<meta property="dc.format" content="text/html" />
-
-	<link rel="contents" title="{{tpl:lang Archives}}" href="{{tpl:BlogArchiveURL}}" />
-	<tpl:Categories>
-		<link rel="section" href="{{tpl:CategoryURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-	</tpl:Categories>
-
-	<tpl:Entries no_content="1">
-		<tpl:EntriesHeader>
-			<tpl:Pagination>
-				<tpl:PaginationIf end="0">
-					<link rel="prev" title="{{tpl:lang previous entries}}" href="{{tpl:PaginationURL offset="1"}}" />
-				</tpl:PaginationIf>
-
-				<tpl:PaginationIf start="0">
-					<link rel="next" title="{{tpl:lang next entries}}" href="{{tpl:PaginationURL offset="-1"}}" />
-				</tpl:PaginationIf>
-			</tpl:Pagination>
-		</tpl:EntriesHeader>
-
-		<link rel="chapter" href="{{tpl:EntryURL}}" title="{{tpl:EntryTitle encode_html="1"}}" />
-	</tpl:Entries>
-
-	<link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
-	<link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
-	<link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
-
-	{{tpl:include src="_head.html"}}
-</head>
-<body class="dc-home <tpl:SysIf current_mode="default">dc-home-first</tpl:SysIf>">
-	<div id="page">
-		{{tpl:include src="_top.html"}}
-
-		<div id="wrapper">
-
-			<div id="main" role="main">
-				<div id="content">
-
-					<tpl:Entries>
-
-						<!-- First page -->
-						<tpl:SysIf current_mode="default">
-							<tpl:LoopPosition start="1" length="1">
-								{{tpl:include src="_entry-full.html"}}
-							</tpl:LoopPosition>
-
-							<tpl:LoopPosition start="2">
-								{{tpl:include src="_entry-short.html"}}
-							</tpl:LoopPosition>
-						</tpl:SysIf>
-
-						<!-- Next pages -->
-						<tpl:SysIf current_mode="!default">
-							{{tpl:include src="_entry-short.html"}}
-						</tpl:SysIf>
-
-						<!-- Pagination -->
-						<tpl:EntriesFooter>
-							{{tpl:include src="_pagination.html"}}
-						</tpl:EntriesFooter>
-
-					</tpl:Entries>
-
-				</div> <!-- End #content -->
-			</div> <!-- End #main -->
-
-			{{tpl:include src="_sidebar.html"}}
-
-		</div> <!-- End #wrapper -->
-
-		{{tpl:include src="_footer.html"}}
-	</div> <!-- End #page -->
-</body>
-</html>
+{{tpl:extends parent="__layout.html"}}
Index: inc/public/default-templates/currywurst/post.html
===================================================================
--- inc/public/default-templates/currywurst/post.html	(revision 2603)
+++ inc/public/default-templates/currywurst/post.html	(revision 2668)
@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html lang="{{tpl:BlogLanguage}}">
-<head>
-	<meta charset="UTF-8" />
-	<meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
+{{tpl:extends parent="__layout.html"}}
 
-	<title>{{tpl:EntryTitle encode_html="1"}} - {{tpl:BlogName encode_html="1"}}</title>
+<tpl:Block name="head-title">{{tpl:EntryTitle encode_html="1"}} - {{tpl:BlogName encode_html="1"}}</tpl:Block>
+
+<tpl:Block name="head-meta">
 	<meta name="description" lang="{{tpl:EntryLang}}" content="{{tpl:EntryContent full="1" encode_html="1" remove_html="1" cut_string="180"}}" />
 	<meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
 	<meta name="author" content="{{tpl:EntryAuthorCommonName encode_html="1"}}" />
 	<meta name="date" content="{{tpl:EntryDate iso8601="1"}}" />
+</tpl:Block>
 
+<tpl:Block name="head-dc">
 	<link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
 	<meta property="dc.title" content="{{tpl:EntryTitle encode_html="1"}}" />
@@ -21,14 +21,16 @@
 	<meta property="dc.type" content="text" />
 	<meta property="dc.format" content="text/html" />
+</tpl:Block>
 
+<tpl:Block name"head-linkrel">
 	<link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
 	<link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-
 	<tpl:EntryNext><link rel="next" href="{{tpl:EntryURL}}" title="{{tpl:EntryTitle encode_html="1"}}" /></tpl:EntryNext>
 	<tpl:EntryPrevious><link rel="prev" href="{{tpl:EntryURL}}" title="{{tpl:EntryTitle encode_html="1"}}" /></tpl:EntryPrevious>
+	<link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
+</tpl:Block>
 
-	<link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
-
-	{{tpl:include src="_head.html"}}
+<tpl:Block name="html-head">
+	{{tpl:parent}}
 
 	<script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/post.js"></script>
@@ -38,5 +40,7 @@
 		//]]>
 	</script>
-</head>
+</tpl:Block>
+
+<tpl:Block name="html-body">
 <body class="dc-post">
 	<div id="page">
@@ -80,3 +84,3 @@
 	</div> <!-- End #page -->
 </body>
-</html>
+</tpl:Block>
