diff --git a/crepbook.cls b/crepbook.cls
index 5902f079..d4c760fd 100644
--- a/crepbook.cls
+++ b/crepbook.cls
@@ -11,7 +11,7 @@
 
 \tabsfalse
 \lilypondfalse
-\nodiagramfalse
+\nodiagramtrue
 
 % Options
 \DeclareOption{tabs}{\tabstrue}
diff --git a/templates/minimal.tmpl b/templates/minimal.tmpl
index 74c642fa..bdef6753 100644
--- a/templates/minimal.tmpl
+++ b/templates/minimal.tmpl
@@ -34,7 +34,7 @@
 %%:]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % begin document
-\documentclass[\getbooktype]{crepbook}
+\documentclass[\getbooktype,\getbookoptions,\getmainfontsize]{crepbook}
 \usepackage[utf8]{inputenc}
 \usepackage[english,french]{babel}
 
@@ -45,6 +45,14 @@
   {img/},
 }
 
+\definecolor{SongNumberBgColor}{HTML}{\getsongnumberbgcolor}
+\definecolor{NoteBgColor}{HTML}{\getnotebgcolor}
+\definecolor{IndexBgColor}{HTML}{\getindexbgcolor}
+
+\renewcommand{\snumbgcolor}{SongNumberBgColor}
+\renewcommand{\notebgcolor}{NoteBgColor}
+\renewcommand{\idxbgcolor}{IndexBgColor}
+
 \begin{document}
 
 \begin{songs}{titleidx,authidx}
diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl
index 761aa946..2006f355 100644
--- a/templates/patacrep.tmpl
+++ b/templates/patacrep.tmpl
@@ -44,7 +44,7 @@
 %%:]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % begin document
-\documentclass[\getbooktype]{crepbook}
+\documentclass[\getbooktype,\getbookoptions,\getmainfontsize]{crepbook}
 \usepackage[utf8]{inputenc}
 \usepackage[english,french]{babel}