diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 843c2040e0..837a01bffd 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -1,22 +1,30 @@
-#LyX 2.0.1svn created this file. For more info see http://www.lyx.org/
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
 \begin_document
 \begin_header
 \textclass aa
 \options structabstract
 \use_default_options false
+\maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman times
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -28,24 +36,58 @@
 \use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
-\defskip medskip
+\paragraph_indentation default
 \quotes_language english
 \papercolumns 2
 \papersides 2
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
-\author 1 "" 
-\author 2 "" 
-\use_refstyle 0
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
 
+\begin_layout Title
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+This is a template LyX file for articles to be submitted to the Journal
+ of Astronomy & Astrophysicssing (A&A).
+ How to install the A&A LaTeX class file to your LaTeX system is explained
+ in 
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://wiki.lyx.org/Layouts/Astronomy-Astrophysics
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Title
 This is your Title
 \end_layout
diff --git a/lib/templates/iop-article.lyx b/lib/templates/iop-article.lyx
index 4024940197..3d66214184 100644
--- a/lib/templates/iop-article.lyx
+++ b/lib/templates/iop-article.lyx
@@ -1,8 +1,7 @@
-#LyX 2.0.1svn created this file. For more info see http://www.lyx.org/
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
 \begin_document
 \begin_header
-\use_default_options false
 \textclass iopart
 \begin_preamble
 % sort and compress citations
@@ -13,18 +12,27 @@
 % (normally only needed for the "thebibliography" environment)
 \def\newblock{\hskip .11em plus .33em minus .07em}
 \end_preamble
+\use_default_options false
+\maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -36,20 +44,27 @@
 \use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
-\defskip medskip
+\paragraph_indentation default
 \quotes_language english
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
 \tracking_changes false
 \output_changes false
-\author 1 "" 
-\author 2 "" 
-\use_refstyle 0
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
@@ -58,6 +73,33 @@
 \begin_inset Note Note
 status open
 
+\begin_layout Plain Layout
+This is a template LyX file for articles to be submitted to the Journal
+ of the Institute of Physics (IOP).
+ How to install the IOP LaTeX class file to your LaTeX system is explained
+ in 
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://wiki.lyx.org/Layouts/Iopart
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
 \begin_layout Plain Layout
 
 \series bold
@@ -72,7 +114,11 @@ Use AMS math package
 \family sans
 Math Options
 \family default
- are not used!
+ are 
+\color red
+not
+\color inherit
+ used!
 \end_layout
 
 \end_inset
@@ -362,7 +408,7 @@ Abbreviations for the IOP journals.
 \begin_layout Plain Layout
 \begin_inset Tabular
 <lyxtabular version="3" rows="28" columns="2">
-<features>
+<features tabularvalignment="middle">
 <column alignment="none" valignment="top" width="0" special="@{}l">
 <column alignment="left" valignment="top" width="0">
 <row>
@@ -1041,9 +1087,11 @@ Supercond.
 \end_layout
 
 \begin_layout Standard
-\begin_inset Formula \begin{eqnarray}
+\begin_inset Formula 
+\begin{eqnarray}
 A & = & \prod_{i=1}^{\infty}B\nonumber \\
- & = & C\end{eqnarray}
+ & = & C
+\end{eqnarray}
 
 \end_inset
 
@@ -1152,6 +1200,7 @@ Or plain bibliography:
 \end_layout
 
 \begin_layout Bibliography (plain)
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "key-1"
@@ -1167,6 +1216,7 @@ The LaTeX Companion Second Edition.
 \end_layout
 
 \begin_layout Bibliography (plain)
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "key-2"