diff --git a/pandoc/templates/template-letter.tex b/pandoc/templates/template-letter.tex
index e4e36b68..b1fc988b 100644
--- a/pandoc/templates/template-letter.tex
+++ b/pandoc/templates/template-letter.tex
@@ -1,5 +1,4 @@
-\documentclass[$if(fontsize)$$fontsize$$else$12pt$endif$,stdletter,orderfromtodate,sigleft,$if(papersize)$$papersize$$else$a4$endif$paper,dateleft,addrfromemail,addrfromphone]{newlfm}
-
+\documentclass[$if(fontsize)$$fontsize$$else$12pt$endif$,$if(papersize)$$papersize$$else$a4$endif$paper,$for(classoption)$$classoption$$sep$,$endfor$]{letter}
 $if(fontfamily)$
 \usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
 $else$
@@ -11,6 +10,7 @@ $if(linestretch)$
 $endif$
 \usepackage{amssymb,amsmath}
 \usepackage{ifxetex,ifluatex}
+\usepackage{fixltx2e} % provides \textsubscript
 \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
   \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
   \usepackage[utf8]{inputenc}
@@ -54,9 +54,15 @@ $endif$
 \usepackage{microtype}
 \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
 }{}
-$if(geometry)$
-\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
-$endif$
+\usepackage{geometry}
+\geometry{
+	paper=$if(papersize)$$papersize$$else$a4$endif$paper, % Change to letterpaper for US letter
+	top=2cm, % Top margin
+	bottom=1.5cm, % Bottom margin
+	left=2.5cm, % Left margin
+	right=2.5cm, % Right margin
+	%showframe, % Uncomment to show how the type block is set on the page
+}
 \usepackage[unicode=true]{hyperref}
 $if(colorlinks)$
 \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
@@ -182,40 +188,44 @@ $endif$
 \def\fps@figure{htbp}
 \makeatother
 
-
+$if(signature)$
+\usepackage{graphicx,grffile}
+\signature{$if(signature-before)$\vspace*{$signature-before$}$endif$\includegraphics{$signature$}$if(author)$\\$if(signature-after)$\vspace*{$signature-after$}$endif$$for(author)$$author$$sep$\\$endfor$$endif$}
+$else$
+$if(author)$
+\signature{$for(author)$$author$$sep$\\$endfor$}
+$else$
+\signature{Jonathan Hodgson}
+$endif$
+$endif$
 
 $if(date)$
 \date{$date$}
-$else$
-\date{\today}
 $endif$
 
-
-
-\newlfmP{dateskipbefore=20pt}
-\newlfmP{sigsize=20pt}
-\newlfmP{sigskipbefore=50pt}
- 
-\newlfmP{Headlinewd=0pt,Footlinewd=0pt}
- 
-\namefrom{$if(from-name)$$from-name$$else$Jonathan Hodgson$endif$}
-\addrfrom{$if(return-address)$$for(return-address)$$return-address$$sep$\\$endfor$$else$***REMOVED***$endif$}
-\phonefrom{$if(phone-from)$$phone-from$$else$***REMOVED***$endif$}
-\emailfrom{$if(email-from)$$email-from$$else$jonathan@lunarweb.co.uk$endif$}
- 
-\nameto{$if(to-name)$$to-name$$else$Please enter a name for the top line of the to address in the variable to-name$endif$}
-\addrto{$if(to-address)$$for(to-address)$$to-address$$sep$\\$endfor$$else$Add a to address in variable to-address$endif$ }
-
+$if(email)$
 $if(subject)$
-\regarding{$subject$}
+\newcommand{\email}{\href{mailto:$email$?subject=Re: $subject$}{$email$}}
+$else$
+\newcommand{\email}{\href{mailto:$email$}{$email$}}
+$endif$
+$else$
+$if(subject)$
+\newcommand{\email}{\href{mailto:jonathan@lunarweb.co.uk?subject=Re: $subject$}{jonathan@lunarweb.co.uk}}
+$else$
+\newcommand{\email}{\href{mailto:jonathan@lunarweb.co.uk}{jonathan@lunarweb.co.uk}}
+$endif$
 $endif$
-
-\greetto{$if(greeting)$$greeting$$else$Dear Sir or Madam$endif$}
-\closeline{$if(closeline)$$closeline$$else$Yours Faithfully$endif$}
 
 $for(header-includes)$
 $header-includes$
 $endfor$
+$if(return-address)$
+\address{$for(return-address)$$return-address$$sep$\\$endfor$}
+$else$
+\address{***REMOVED***, ***REMOVED***,\\***REMOVED***,\\***REMOVED***,\\***REMOVED***,\\ ***REMOVED*** \\ Tel: \href{tel:***REMOVED***}{***REMOVED***} \\ Email: \email}
+$endif$
+
 
 $if(blockquote)$
 \usepackage{mdframed} % color is loaded by mdframed
@@ -231,6 +241,7 @@ $if(letterhead)$
 \usepackage{wallpaper}
 \ThisULCornerWallPaper{1}{$letterhead$}
 $endif$
+\usepackage{blindtext}
 
 \begin{document}
 
@@ -247,13 +258,47 @@ $endif$
 \tableofcontents
 }
 $endif$
+$if(address)$
+\begin{letter}{$for(address)$$address$$sep$\\$endfor$}
+$else$
+\begin{letter}{You need to specify address}
+$endif$
+
+$if(opening)$
+\opening{$opening$}
+$else$
+\opening{Dear Sir or Madam}
+$endif$
 
-\begin{newlfm}
+$if(subject)$
+\vspace{0.5cm}
+{\large\bf Re: $subject$}
+\vspace{0.5cm}
+$endif$
 
 $body$
 
+$if(closing-indentation)$
+\longindentation=$closing-indentation$
+$else$
+\longindentation=1cm
+$endif$
+$if(closing)$
+\closing{$closing$}
+$else$
+\closing{Yours faithfully,}
+$endif$
+$if(encl)$
+\encl{$for(encl)$$encl$$sep$\\$endfor$}
+$endif$
+$if(cc)$
+\cc{$for(cc)$$cc$$sep$\\$endfor$}
+$endif$
+$if(ps)$
+\ps{$ps$}
+$endif$
 
-\end{newlfm}
+\end{letter}
 
 $if(natbib)$
 $if(bibliography)$
diff --git a/pandoc/templates/template-letter.tex.old b/pandoc/templates/template-letter.tex.old
new file mode 100644
index 00000000..e4e36b68
--- /dev/null
+++ b/pandoc/templates/template-letter.tex.old
@@ -0,0 +1,279 @@
+\documentclass[$if(fontsize)$$fontsize$$else$12pt$endif$,stdletter,orderfromtodate,sigleft,$if(papersize)$$papersize$$else$a4$endif$paper,dateleft,addrfromemail,addrfromphone]{newlfm}
+
+$if(fontfamily)$
+\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
+$else$
+\usepackage{lmodern}
+$endif$
+$if(linestretch)$
+\usepackage{setspace}
+\setstretch{$linestretch$}
+$endif$
+\usepackage{amssymb,amsmath}
+\usepackage{ifxetex,ifluatex}
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
+  \usepackage[utf8]{inputenc}
+$if(euro)$
+  \usepackage{eurosym}
+$endif$
+\else % if luatex or xelatex
+  \ifxetex
+    \usepackage{mathspec}
+  \else
+    \usepackage{fontspec}
+  \fi
+  \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
+$for(fontfamilies)$
+  \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
+$endfor$
+$if(euro)$
+  \newcommand{\euro}{€}
+$endif$
+$if(mainfont)$
+    \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$}
+$endif$
+$if(sansfont)$
+    \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$}
+$endif$
+$if(monofont)$
+    \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$}
+$endif$
+$if(mathfont)$
+    \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
+$endif$
+$if(CJKmainfont)$
+    \usepackage{xeCJK}
+    \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
+$endif$
+\fi
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+% use microtype if available
+\IfFileExists{microtype.sty}{%
+\usepackage{microtype}
+\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
+}{}
+$if(geometry)$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
+$endif$
+\usepackage[unicode=true]{hyperref}
+$if(colorlinks)$
+\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
+$endif$
+\hypersetup{
+$if(title-meta)$
+            pdftitle={$title-meta$},
+$endif$
+$if(author-meta)$
+            pdfauthor={$author-meta$},
+$endif$
+$if(keywords)$
+            pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
+$endif$
+$if(colorlinks)$
+            colorlinks=true,
+            linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
+            citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
+            urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
+$else$
+            pdfborder={0 0 0},
+$endif$
+            breaklinks=true}
+\urlstyle{same}  % don't use monospace font for urls
+\usepackage[UKenglish]{babel}
+$if(natbib)$
+\usepackage{natbib}
+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
+$endif$
+$if(biblatex)$
+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
+$for(bibliography)$
+\addbibresource{$bibliography$}
+$endfor$
+$endif$
+$if(listings)$
+\usepackage{listings}
+$endif$
+$if(lhs)$
+\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
+$endif$
+$if(highlighting-macros)$
+$highlighting-macros$
+$endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
+$if(tables)$
+\usepackage{longtable,booktabs}
+% Fix footnotes in tables (requires footnote package)
+\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{long table}}{}
+$endif$
+$if(graphics)$
+\usepackage{graphicx,grffile}
+\makeatletter
+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
+\makeatother
+% Scale images if necessary, so that they will not overflow the page
+% margins by default, and it is still possible to overwrite the defaults
+% using explicit options in \includegraphics[width, height, ...]{}
+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
+$endif$
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\renewcommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+$if(strikeout)$
+\usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
+$endif$
+$if(indent)$
+$else$
+\IfFileExists{parskip.sty}{%
+\usepackage{parskip}
+}{% else
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+}
+$endif$
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
+\providecommand{\tightlist}{%
+  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
+$if(numbersections)$
+\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$}
+$else$
+\setcounter{secnumdepth}{0}
+$endif$
+$if(subparagraph)$
+$else$
+% Redefines (sub)paragraphs to behave more like sections
+\ifx\paragraph\undefined\else
+\let\oldparagraph\paragraph
+\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}}
+\fi
+\ifx\subparagraph\undefined\else
+\let\oldsubparagraph\subparagraph
+\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}}
+\fi
+$endif$
+$if(dir)$
+\ifxetex
+  % load bidi as late as possible as it modifies e.g. graphicx
+  $if(latex-dir-rtl)$
+  \usepackage[RTLdocument]{bidi}
+  $else$
+  \usepackage{bidi}
+  $endif$
+\fi
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \TeXXeTstate=1
+  \newcommand{\RL}[1]{\beginR #1\endR}
+  \newcommand{\LR}[1]{\beginL #1\endL}
+  \newenvironment{RTL}{\beginR}{\endR}
+  \newenvironment{LTR}{\beginL}{\endL}
+\fi
+$endif$
+
+% set default figure placement to htbp
+\makeatletter
+\def\fps@figure{htbp}
+\makeatother
+
+
+
+$if(date)$
+\date{$date$}
+$else$
+\date{\today}
+$endif$
+
+
+
+\newlfmP{dateskipbefore=20pt}
+\newlfmP{sigsize=20pt}
+\newlfmP{sigskipbefore=50pt}
+ 
+\newlfmP{Headlinewd=0pt,Footlinewd=0pt}
+ 
+\namefrom{$if(from-name)$$from-name$$else$Jonathan Hodgson$endif$}
+\addrfrom{$if(return-address)$$for(return-address)$$return-address$$sep$\\$endfor$$else$***REMOVED***$endif$}
+\phonefrom{$if(phone-from)$$phone-from$$else$***REMOVED***$endif$}
+\emailfrom{$if(email-from)$$email-from$$else$jonathan@lunarweb.co.uk$endif$}
+ 
+\nameto{$if(to-name)$$to-name$$else$Please enter a name for the top line of the to address in the variable to-name$endif$}
+\addrto{$if(to-address)$$for(to-address)$$to-address$$sep$\\$endfor$$else$Add a to address in variable to-address$endif$ }
+
+$if(subject)$
+\regarding{$subject$}
+$endif$
+
+\greetto{$if(greeting)$$greeting$$else$Dear Sir or Madam$endif$}
+\closeline{$if(closeline)$$closeline$$else$Yours Faithfully$endif$}
+
+$for(header-includes)$
+$header-includes$
+$endfor$
+
+$if(blockquote)$
+\usepackage{mdframed} % color is loaded by mdframed
+\definecolor{greyborder}{RGB}{221,221,221}
+\definecolor{greytext}{RGB}{119,119,119}
+\newmdenv[rightline=false,bottomline=false,topline=false,linewidth=3pt,linecolor=greyborder,skipabove=\parskip]{blockquote}
+\renewenvironment{quote}{\begin{blockquote}\list{}{\rightmargin=0em\leftmargin=0em}%
+\item\relax\color{greytext}\ignorespaces}{\unskip\unskip\endlist\end{blockquote}}
+$endif$
+
+$if(letterhead)$
+\usepackage[dvipsnames]{color}
+\usepackage{wallpaper}
+\ThisULCornerWallPaper{1}{$letterhead$}
+$endif$
+
+\begin{document}
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+{
+$if(colorlinks)$
+\hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$black$endif$}
+$endif$
+\setcounter{tocdepth}{$toc-depth$}
+\tableofcontents
+}
+$endif$
+
+\begin{newlfm}
+
+$body$
+
+
+\end{newlfm}
+
+$if(natbib)$
+$if(bibliography)$
+$if(biblio-title)$
+$if(book-class)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$}
+
+$endif$
+$endif$
+$if(biblatex)$
+\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
+
+$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}