diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex
index e6d07747..bb016c54 100644
--- a/songbook_core/data/templates/default.tex
+++ b/songbook_core/data/templates/default.tex
@@ -26,7 +26,9 @@
 %%:]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 (% endcomment %)
+
 (* extends "layout.tex" *)
+
 (* block extrapackages *)
    \usepackage[
      a4paper % paper size
@@ -39,8 +41,7 @@
   \usepackage{chords}
 (* endblock extrapackages *)
 
-(* block header *)
-
+(* block songbookpreambule *)
    \title{((title))}
    \author{((author))}
    \subtitle{((subtitle))}
@@ -72,9 +73,7 @@
 
    \graphicspath{{((datadir))/img/}}
    \pagestyle{empty}
-(* endblock header *)
 
-(* block preface *)
    \definecolor{SongNumberBgColor}{HTML}{((songnumberbgcolor))}
    \definecolor{NoteBgColor}{HTML}{((notebgcolor))}
    \definecolor{IndexBgColor}{HTML}{((indexbgcolor))}
@@ -82,7 +81,9 @@
    \renewcommand{\snumbgcolor}{SongNumberBgColor}
    \renewcommand{\notebgcolor}{NoteBgColor}
    \renewcommand{\idxbgcolor}{IndexBgColor}
+(* endblock *)
 
+(* block index *)
    (* if mainlang==english *)
      \showindex{Songs Index}{titleidx}
      \showindex{Authors Index}{authidx}
@@ -94,7 +95,9 @@
       \notenamesin{A}{B}{C}{D}{E}{F}{G}
       \notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol}
    (* endif *)
+(* endblock *)
 
+(* block chords *)
    % list of chords
    \ifchorded
    \phantomsection
@@ -103,7 +106,7 @@
    (* else *)
      \addcontentsline{toc}{section}{Liste des accords}
    (* endif *)
-%   \chords
+   \chords
    \fi
 (* endblock *)
 
diff --git a/songbook_core/data/templates/layout.tex b/songbook_core/data/templates/layout.tex
index d046cfd8..112fa233 100644
--- a/songbook_core/data/templates/layout.tex
+++ b/songbook_core/data/templates/layout.tex
@@ -24,11 +24,12 @@
 % Copyright (C) 2014 The Songbook team (www.patacrep.com)
 
 \documentclass[((booktype)),
-				(* for option in bookoptions *)((option)),
-				(* endfor *)
-				(* for instrument in instruments *)((instrument)),
-				(* endfor *)
-				((mainfontsize))pt]{crepbook}
+    (* for option in bookoptions *)((option)),
+    (* endfor *)
+    (* for instrument in instruments *)((instrument)),
+    (* endfor *)
+    ((mainfontsize))pt]{crepbook}
+
 (* block packages *)
    \usepackage[utf8]{inputenc}
    \usepackage[T1]{fontenc}
@@ -37,22 +38,37 @@
    \PassOptionsToPackage{((lang))}{babel}
    (* endfor *)
    \usepackage{babel}
+
    (* block extrapackages *)
    (* endblock extrapackages *)
 (* endblock packages *)
 
-(* block header *)
-(* endblock header *)
+(* block songbookpreambule *)
+(* endblock songbookpreambule *)
+
+(* block preambule *)
+(* endblock preambule *)
 
 \begin{document}
+
+(* block title *)
 \maketitle
+(* endblock *)
+
 (* block preface *)
 (* endblock *)
 
+(* block index *)
+(* endblock *)
+
+(* block chords *)
+(* endblock *)
+
 (* block content *)
 (* endblock *)
 
 (* block postface *)
 (* endblock *)
+
 \end{document}
 % End of file