diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh
index 71fd95c171..3d12faff65 100644
--- a/development/Win32/packaging/AltInstaller/Updated.nsh
+++ b/development/Win32/packaging/AltInstaller/Updated.nsh
@@ -68,7 +68,6 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\scripts\legacy_lyxpreview2ppm.py"
  SetOutPath "$INSTDIR\Resources\templates"
  File "${PRODUCT_SOURCEDIR}\Resources\templates\ACM-sigplan.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\templates\biblioExample.bib"
  File "${PRODUCT_SOURCEDIR}\Resources\templates\elsarticle.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\templates\hollywood.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\templates\iop-article.lyx"
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 98d09e50f4..11d695342f 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -1495,7 +1495,6 @@ lib_templates_files = Split('''
     agu_article.lyx
     apa.lyx
     beamer-conference-ornate-20min.lyx
-    biblioExample.bib
     de_beamer-conference-ornate-20min.lyx
     dinbrief.lyx
     docbook_article.lyx
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5d097a4a6b..7fb7552b6b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1054,7 +1054,6 @@ dist_templates_DATA = \
 	templates/agu_article.lyx \
 	templates/apa.lyx \
 	templates/beamer-conference-ornate-20min.lyx \
-	templates/biblioExample.bib \
 	templates/de_beamer-conference-ornate-20min.lyx \
 	templates/dinbrief.lyx \
 	templates/docbook_article.lyx \
diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index 581b8b97fc..5b94eee5a5 100644
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@@ -38,8 +38,9 @@ Style Standard
 	LabelType		No_Label
 End
 
-
-Input stdtitle.inc
+Input stdfloats.inc
+Input stdcounters.inc
+Input amsmaths.inc
 Input stdlists.inc
 Input stdsections.inc
 Input stdstarsections.inc
@@ -47,10 +48,24 @@ Input stdstarsections.inc
 NoStyle Chapter
 NoStyle Chapter*
 
+
 Style Title
-	CopyStyle		Title
+	Margin			Static
+	LatexType		Command
+	InTitle			1
 	OptionalArgs		0
+	LatexName		title
+	ParSkip			0.4
+	ItemSep			0
+	TopSep			0
+	BottomSep		1
+	ParSep			1
+	Align			Center
 	AlignPossible		None
+	LabelType		No_Label
+	Font
+	  Size			Largest
+	EndFont
 End
 
 
@@ -202,8 +217,3 @@ Style Bibliography
 	EndFont
 End
 
-
-Input stdfloats.inc
-Input stdcounters.inc
-Input amsmaths.inc
-
diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout
index 547679220c..c0c01b6ab0 100644
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@@ -43,6 +43,9 @@ Style Standard
 End
 
 
+Input stdcounters.inc
+Input stdfloats.inc
+Input amsmaths.inc
 Input stdlists.inc
 Input stdsections.inc
 Input stdstarsections.inc
@@ -279,6 +282,3 @@ Style "Bibliography heading"
 End
 
 
-Input stdfloats.inc
-Input stdcounters.inc
-
diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout
index ffeabe5840..26b001cfb6 100644
--- a/lib/layouts/sigplanconf.layout
+++ b/lib/layouts/sigplanconf.layout
@@ -46,6 +46,9 @@ Style Standard
 End
 
 
+Input stdcounters.inc
+Input stdfloats.inc
+Input amsmaths.inc
 Input stdlists.inc
 Input stdsections.inc
 Input stdstarsections.inc
@@ -180,9 +183,3 @@ Style Acknowledgments
 	LabelString		"Acknowledgments"
 End
 
-
-Input stdlayouts.inc
-Input stdfloats.inc
-Input stdcounters.inc
-Input amsmaths.inc
-
diff --git a/lib/templates/ACM-sigplan.lyx b/lib/templates/ACM-sigplan.lyx
index c3756766f1..e0a243e461 100644
--- a/lib/templates/ACM-sigplan.lyx
+++ b/lib/templates/ACM-sigplan.lyx
@@ -3,6 +3,7 @@
 \begin_document
 \begin_header
 \textclass sigplanconf
+\options natbib
 \language english
 \inputencoding default
 \font_roman default
@@ -247,6 +248,22 @@ ed into hardware]
 \end_inset
 
 
+\begin_inset Note Note
+status open
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+category
+\series default
+ has 3 mandatory + 1 optional arguments
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Terms
@@ -263,7 +280,33 @@ Introduction
 \end_layout
 
 \begin_layout Standard
-This is the introduction to this paper.
+Bla bla, as listed in 
+\begin_inset LatexCommand cite
+key "Parkin2005,LComp2004"
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
+Subsection
+\end_layout
+
+\begin_layout Enumerate
+test
+\end_layout
+
+\begin_layout Enumerate
+test
+\end_layout
+
+\begin_layout Subsubsection
+Subsubsection
+\end_layout
+
+\begin_layout Standard
+Bla, bla
 \end_layout
 
 \begin_layout Acknowledgments
@@ -279,6 +322,55 @@ First appendix
 Appendix, only when needed, can also be started behind the bibliography.
 \end_layout
 
+\begin_layout Section*
+-----------------
+\end_layout
+
+\begin_layout Standard
+You can use either BibTeX:
+\begin_inset Note Note
+status open
+
+\begin_layout Standard
+The following bibliography styles are allowed: 
+\family sans
+none
+\family default
+ or 
+\family sans
+plainnat
+\family default
+ (use then the document class option 
+\family sans
+natbib
+\family default
+)
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset LatexCommand bibtex
+options "bibtotoc,plainnat"
+bibfiles "../examples/biblioExample"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section*
+---------------------
+\end_layout
+
+\begin_layout Standard
+\noindent
+Or plain bibliography:
+\end_layout
+
 \begin_layout Bibliography
 \begin_inset LatexCommand bibitem
 key "ahmed02"
@@ -322,6 +414,22 @@ n Proceedings of the 17th Annual IEEE Symposium on Logic in Computer Science
  (LICS 2002)
 \emph default
 , July 2002.
+\begin_inset Note Note
+status open
+
+\begin_layout Standard
+Reference parts have to be separated by 
+\series bold
+
+\backslash
+newblock
+\series default
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Bibliography
diff --git a/lib/templates/biblioExample.bib b/lib/templates/biblioExample.bib
deleted file mode 100644
index f1be181d12..0000000000
--- a/lib/templates/biblioExample.bib
+++ /dev/null
@@ -1,16 +0,0 @@
-This file was created with JabRef 2.2.
-Encoding: Cp1252
-
-@BOOK{LComp2004,
-  title = {The LaTeX Companion Second Edition},
-  publisher = {Addison-Wesley},
-  year = {2004},
-  author = {Frank Mittelbach and Michael Goossens}
-}
-
-@MISC{Parkin2005,
-  author = {Scott Pakin},
-  title = {The Comprehensive {\LaTeX{}} Symbol List},
-  year = {2005}
-}
-
diff --git a/lib/templates/elsarticle.lyx b/lib/templates/elsarticle.lyx
index dfad5dfff4..331bff4f0f 100644
--- a/lib/templates/elsarticle.lyx
+++ b/lib/templates/elsarticle.lyx
@@ -88,7 +88,7 @@ tnoteref{t1,t2}
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Standard
 
@@ -775,7 +775,7 @@ elsarticle-harv
 \family sans
 elsarticle-num-names
 \family default
-, 
+, or 
 \family sans
 elsarticle-num
 \end_layout
@@ -788,7 +788,7 @@ elsarticle-num
 \begin_layout Standard
 \begin_inset LatexCommand bibtex
 options "bibtotoc,elsarticle-harv"
-bibfiles "biblioExample"
+bibfiles "../examples/biblioExample"
 
 \end_inset
 
diff --git a/lib/templates/iop-article.lyx b/lib/templates/iop-article.lyx
index ac48bbdbad..519ac881fd 100644
--- a/lib/templates/iop-article.lyx
+++ b/lib/templates/iop-article.lyx
@@ -1038,6 +1038,26 @@ A & = & \prod_{i=1}^{\infty}B\nonumber \\
 
 \end_layout
 
+\begin_layout Subsection
+Subsection
+\end_layout
+
+\begin_layout Enumerate
+test
+\end_layout
+
+\begin_layout Enumerate
+test
+\end_layout
+
+\begin_layout Subsubsection
+Subsubsection
+\end_layout
+
+\begin_layout Standard
+Bla, bla
+\end_layout
+
 \begin_layout Standard
 
 \end_layout
@@ -1075,12 +1095,34 @@ Appendix, only when needed, inserted behind the acknowledgments but before
 
 \begin_layout Standard
 You can use either BibTeX:
+\begin_inset Note Note
+status open
+
+\begin_layout Standard
+The following bibliography styles are allowed: 
+\family sans
+unsrt
+\family default
+ or 
+\family sans
+jphysicsB
+\family default
+ (part of the LaTeX-package 
+\series bold
+harvard
+\series default
+)
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
 \begin_inset LatexCommand bibtex
 options "bibtotoc,unsrt"
-bibfiles "biblioExample"
+bibfiles "../examples/biblioExample"
 
 \end_inset