diff --git a/tpl/__layout.html b/tpl/__layout.html
index b3211a7..65ae1c5 100644
--- a/tpl/__layout.html
+++ b/tpl/__layout.html
@@ -36,96 +36,92 @@
 		{{tpl:include src="_head.html"}}
 	</tpl:Block>	<!-- html-head -->
 </head>
-<tpl:Block name="body-tag">
-	<body class="dc-home">
-</tpl:Block>
-	<tpl:Block name="html-body">
+<tpl:Block name="body-page">
+	<body>
+
+	
 		
-			<tpl:Block name="body-page">
+			
 				<tpl:Block name="page-top">
 					{{tpl:include src="_top.html"}}
 				</tpl:Block>
 
-				
-				<tpl:Block name="page-wrapper">
-						<tpl:Block name="wrapper-main">
-							
-								<tpl:Block name="main-content">
-									<section>
-									<tpl:Entries>
-										<a href="{{tpl:EntryURL}}" class="wholearticlelink">
-										<article>
-										<h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
-										<!-- # --BEHAVIOR-- publicEntryBeforeContent -->
-										{{tpl:SysBehavior behavior="publicEntryBeforeContent"}}
-										<!-- # Entry with an excerpt -->
-										<tpl:EntryIf extended="1">
-												{{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}}
-											<p> 
-													
-													{{tpl:EntryExcerpt remove_html="1" encode_html="1"}}
-											</p>
-											<p class="readmore-ellipsis">Lire la suite...</p>
-										</tpl:EntryIf>
-										
-										<!-- # Entry without excerpt -->
-										<tpl:EntryIf extended="0">
-												{{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}}
-											<p>
-													
-													{{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}}
-													
-											</p>
-											<p class="readmore-ellipsis">Lire la suite...</p>
-										</tpl:EntryIf>
-										
-											<!-- # --BEHAVIOR-- publicEntryAfterContent -->
-											{{tpl:SysBehavior behavior="publicEntryAfterContent"}}
-											
-											
-											
-												
-										</article>
-										</a>
-										<nav>
-										<tpl:EntriesFooter>
-											<tpl:Pagination>
-											<ul>
-												<li><tpl:PaginationIf end="0">
-														<a href="{{tpl:PaginationURL offset="+1"}}" class="prev">{{tpl:lang previous entries}}</a>
-												</tpl:PaginationIf></li>
-												<li>{{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}}</li>
-												<li><tpl:PaginationIf start="0"><a href="{{tpl:PaginationURL offset="-1"}}" class="next">{{tpl:lang next entries}}</a></tpl:PaginationIf></li>
-											</ul>
-											</tpl:Pagination>
-										</tpl:EntriesFooter>
-										</nav>
+				<tpl:Block name="main-content">
+					<section>
+					<h3>main(){</h3>
+					<tpl:Entries>
+						<a href="{{tpl:EntryURL}}" class="wholearticlelink">
+						<article>
+						<h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
+						<!-- # --BEHAVIOR-- publicEntryBeforeContent -->
+						{{tpl:SysBehavior behavior="publicEntryBeforeContent"}}
+						<!-- # Entry with an excerpt -->
+						<tpl:EntryIf extended="1">
+								{{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}}
+							<p> 
+									
+									{{tpl:EntryExcerpt remove_html="1" encode_html="1"}}
+							</p>
+							<p class="readmore-ellipsis">Lire la suite...</p>
+						</tpl:EntryIf>
+						
+						<!-- # Entry without excerpt -->
+						<tpl:EntryIf extended="0">
+								{{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}}
+							<p>
+									
+									{{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}}
+									
+							</p>
+							<p class="readmore-ellipsis">Lire la suite...</p>
+						</tpl:EntryIf>
+						
+							<!-- # --BEHAVIOR-- publicEntryAfterContent -->
+							{{tpl:SysBehavior behavior="publicEntryAfterContent"}}
 
+						</article>
+						</a>
+						<nav>
+						<tpl:EntriesFooter>
+							<tpl:Pagination>
+							<ul>
+								<li><tpl:PaginationIf end="0">
+										<a href="{{tpl:PaginationURL offset="+1"}}" class="prev">{{tpl:lang previous entries}}</a>
+								</tpl:PaginationIf></li>
+								<li>{{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}}</li>
+								<li><tpl:PaginationIf start="0"><a href="{{tpl:PaginationURL offset="-1"}}" class="next">{{tpl:lang next entries}}</a></tpl:PaginationIf></li>
+							</ul>
+							</tpl:Pagination>
+						</tpl:EntriesFooter>
+						</nav>
 
-									</tpl:Entries>
-								</tpl:Block>	<!-- main-content -->		
-						</tpl:Block>
+
+					</tpl:Entries>
 					</section> 
+				</tpl:Block>	<!-- main-content -->		
+					
+					
 
-					<tpl:Block name="wrapper-sidebar">
-						<aside>
-							
-								{{tpl:Widgets type="nav"}}
+				<tpl:Block name="wrapper-sidebar">
+					<aside>
+							<h3>aside(){</h3>
+							{{tpl:Widgets type="nav"}}
+					
+						
+							{{tpl:Widgets type="extra"}}
 						
-							
-								{{tpl:Widgets type="extra"}}
-							
-						</aside>
-					</tpl:Block>	<!-- wrapper-sidebar -->
+					</aside>
+				</tpl:Block>	<!-- wrapper-sidebar -->
 				
-				</tpl:Block>	<!-- page-wrapper -->
+
 			
 
-				<tpl:Block name="page-footer">
-					{{tpl:include src="_footer.html"}}
-				</tpl:Block>	<!-- page-footer -->
-			</tpl:Block>	<!-- body-page -->
+			<tpl:Block name="page-footer">
+				{{tpl:include src="_footer.html"}}
+			</tpl:Block>	<!-- page-footer -->
+			
 	
-	</tpl:Block>	<!-- html-body -->
+
 </body>
+</tpl:Block>	<!-- body-page -->
 </html>
diff --git a/tpl/post.html b/tpl/post.html
index 09d9ccd..2053fbc 100644
--- a/tpl/post.html
+++ b/tpl/post.html
@@ -35,27 +35,29 @@
 <tpl:Block name="html-head">
 	{{tpl:parent}}
 
-	<script type="text/javascript" src="{{tpl:BlogQmarkURL}}pf=post.js"></script>
-	<script type="text/javascript">
+	<script src="{{tpl:BlogQmarkURL}}pf=post.js"></script>
+	<script>
 		//<![CDATA[
 		var post_remember_str = '{{tpl:lang Remember me on this blog}}';
 		//]]>
 	</script>
 </tpl:Block>
 
-<tpl:Block name="body-tag"><body class="dc-post"></tpl:Block>
+
 
 <tpl:Block name="page-top">
 		<header>
-				<h1><a href="/" class="homelink" title="Revenir à l'accueil">Retour à la page d'accueil</a>{{tpl:EntryTitle encode_html="1"}}</h1>			  
+				<h1><a href="/" class="homelink" title="Revenir à l'accueil">Retour à la page d'accueil</a>{{tpl:BlogName encode_html="1"}}</h1>			  
 				<!-- # --BEHAVIOR-- publicTopAfterContent -->
 				{{tpl:SysBehavior behavior="publicTopAfterContent"}}
 			  </header>
 </tpl:Block>
 
 <tpl:Block name="main-content">
-	<article>
-		
+	<section>
+		<h3>main(){</h3>
+		<article>
+		<h2>{{tpl:EntryTitle encode_html="1"}}</h2>
 
 		<p class="post-info">{{tpl:lang By}} {{tpl:EntryAuthorLink}}
 		{{tpl:lang on}} {{tpl:EntryDate}}
@@ -157,7 +159,7 @@
 		</tpl:SysIfCommentPending>
 
 		<!-- # Comment form -->
-		<form action="{{tpl:EntryURL}}#pr" method="post" id="comment-form" role="form">
+		<form action="{{tpl:EntryURL}}#pr" method="post" id="comment-form">
 			<tpl:IfCommentPreview>
 				<div id="pr">
 					<h3>{{tpl:lang Your comment}}</h3>
@@ -170,7 +172,6 @@
 
 			<h3>{{tpl:lang Add a comment}}</h3>
 				<fieldset>
-					<!-- # --BEHAVIOR-- publicCommentFormBeforeContent -->
 					{{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}}
 
 					<p class="field">
@@ -196,11 +197,9 @@
 					rows="7" placeholder="{{tpl:lang Comment}}">{{tpl:CommentPreviewContent raw="1" encode_html="1"}}</textarea>
 					</p>
 					<p class="form-help">{{tpl:CommentHelp}}</p>
-
-					<!-- # --BEHAVIOR-- publicCommentFormAfterContent -->
 					{{tpl:SysBehavior behavior="publicCommentFormAfterContent"}}
                 </fieldset>
-
+				<fieldset>
 <p class="buttons"><input type="submit" class="preview" name="preview" value="{{tpl:lang preview}}" />
 				<tpl:IfCommentPreviewOptional><input type="submit" class="submit" value="{{tpl:lang send}}" /></tpl:IfCommentPreviewOptional></p>
 			</fieldset>
@@ -257,6 +256,6 @@
 			cut_string="50"}} &#187;</a></tpl:EntryNext></li>
 		</ul>
 	</nav>
-
+</section>
 
 </tpl:Block>
