diff --git a/.gitignore b/.gitignore
index d87861a6..18d5afed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 *.private
 qutebrowser/qsettings/
+qutebrowser/bookmarks/
+pandoc/templates/assets/fonts/
+bin/aquarius-go
diff --git a/bin/aquarius-go b/bin/aquarius-go
deleted file mode 120000
index 0ed5beac..00000000
--- a/bin/aquarius-go
+++ /dev/null
@@ -1 +0,0 @@
-/home/jonathan/GitRepos/aquariusGo/aquarius-go
\ No newline at end of file
diff --git a/bin/aquarius-plugin b/bin/aquarius-plugin
index 747dc588..f00bb88e 100755
--- a/bin/aquarius-plugin
+++ b/bin/aquarius-plugin
@@ -30,6 +30,7 @@ while test $# -gt 0; do
 			echo ""
 			echo -e "blocks, aquarius-blocks \t\t install aquarius blocks"
 			echo -e "clients, aquarius-clients \t\t install aquarius clients"
+			echo -e "locations, aquarius-locations \t\t install aquarius locations"
 			echo -e "news, aquarius-news \t\t\t install aquarius news"
 			echo -e "people, aquarius-people \t\t install aquarius people"
 			echo -e "permissions, aquarius-permissions \t install aquarius permissions into mu-plugins"
@@ -81,6 +82,21 @@ while test $# -gt 0; do
 			fi
 			shift
 			;;
+		aquarius-locations|locations)
+			if [ "$remove" = true ]; then
+				npm remove wp-content/plugins/aquarius-locations
+				git-delete-submodule "wp-content/plugins/aquarius-locations"
+			else
+				if [ "$ssh" = true ]; then
+					git submodule add git@bitbucket.org:fellowshipproductionsltd/aquarius-locations.git wp-content/plugins/aquarius-locations
+				else
+					git submodule add https://bitbucket.org/fellowshipproductionsltd/aquarius-locations.git wp-content/plugins/aquarius-locations
+				fi
+				npm install --save wp-content/plugins/aquarius-locations
+				doWebpack locations
+			fi
+			shift
+			;;
 		aquarius-news|news)
 			if [ "$remove" = true ]; then
 				npm remove wp-content/plugins/aquarius-news
diff --git a/bin/otf2ttf b/bin/otf2ttf
new file mode 100755
index 00000000..a67ede8f
--- /dev/null
+++ b/bin/otf2ttf
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+import fontforge as ff
+import sys
+
+args = sys.argv[1:]
+
+if args[0] == '--help':
+	print("otf2ttf <font>")
+else:
+	otf = args[0]
+	ttf = otf.replace('otf','ttf')
+	print( otf + ' => ' + ttf )
+	f = ff.open( otf )
+	f.generate( ttf )
diff --git a/bin/siteEnv b/bin/siteEnv
index 41071020..efe4040b 100755
--- a/bin/siteEnv
+++ b/bin/siteEnv
@@ -1,16 +1,22 @@
 #!/usr/bin/env zsh
 
+
 source "$HOME/.dotfiles/shells/functions"
 sitesDir="$HOME/Sites/"
 
+
 chosen="$(ls -d ${sitesDir}*/ | sed "s+$sitesDir++g; s/\/$//" | rofi -dmenu -i -p "Site")"
 
+open="$(echo -n "Yes\nNo" | rofi -dmenu -i -p "Open the local site")"
+
 siteDir="${sitesDir}${chosen}/"
 
+
 cd "$siteDir"
 
 theme
 
+
 setsid "$TERMINAL" &
 setsid "$TERMINAL" &
 setsid "$TERMINAL" &
@@ -24,4 +30,6 @@ i3-msg "split horizontal"
 
 setsid "$TERMINAL" &
 
-open-local
+if [ "$open" = "Yes" ]; then
+	open-local
+fi
diff --git a/pandoc/templates/assets/footer.png b/pandoc/templates/assets/footer.png
new file mode 100644
index 00000000..b35060f2
Binary files /dev/null and b/pandoc/templates/assets/footer.png differ
diff --git a/pandoc/templates/assets/logo.png b/pandoc/templates/assets/logo.png
new file mode 100755
index 00000000..16aa8699
Binary files /dev/null and b/pandoc/templates/assets/logo.png differ
diff --git a/pandoc/templates/fellowship-productions.latex b/pandoc/templates/fellowship-productions.latex
new file mode 100644
index 00000000..7a40a6e6
--- /dev/null
+++ b/pandoc/templates/fellowship-productions.latex
@@ -0,0 +1,532 @@
+\PassOptionsToPackage{unicode=true$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} % options for packages loaded elsewhere
+\PassOptionsToPackage{hyphens}{url}
+$if(colorlinks)$
+\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor}
+$endif$$if(dir)$$if(latex-dir-rtl)$
+\PassOptionsToPackage{RTLdocument}{bidi}
+$endif$$endif$%
+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$if(beamer)$ignorenonframetext,$if(handout)$handout,$endif$$if(aspectratio)$aspectratio=$aspectratio$,$endif$$endif$$if(titlepage)$titlepage,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
+\usepackage{blindtext}
+$if(beamer)$
+$if(background-image)$
+\usebackgroundtemplate{%
+\includegraphics[width=\paperwidth]{$background-image$}%
+}
+$endif$
+\usepackage{pgfpages}
+\setbeamertemplate{caption}[numbered]
+\setbeamertemplate{caption label separator}{: }
+\setbeamercolor{caption name}{fg=normal text.fg}
+\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
+$for(beameroption)$
+\setbeameroption{$beameroption$}
+$endfor$
+% Prevent slide breaks in the middle of a paragraph:
+\widowpenalties 1 10000
+\raggedbottom
+$if(section-titles)$
+\setbeamertemplate{part page}{
+\centering
+\begin{beamercolorbox}[sep=16pt,center]{part title}
+  \usebeamerfont{part title}\insertpart\par
+\end{beamercolorbox}
+}
+\setbeamertemplate{section page}{
+\centering
+\begin{beamercolorbox}[sep=12pt,center]{part title}
+  \usebeamerfont{section title}\insertsection\par
+\end{beamercolorbox}
+}
+\setbeamertemplate{subsection page}{
+\centering
+\begin{beamercolorbox}[sep=8pt,center]{part title}
+  \usebeamerfont{subsection title}\insertsubsection\par
+\end{beamercolorbox}
+}
+\AtBeginPart{
+  \frame{\partpage}
+}
+\AtBeginSection{
+  \ifbibliography
+  \else
+    \frame{\sectionpage}
+  \fi
+}
+\AtBeginSubsection{
+  \frame{\subsectionpage}
+}
+$endif$
+$endif$
+$if(beamerarticle)$
+\usepackage{beamerarticle} % needs to be loaded first
+$endif$
+$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}
+\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}
+  \usepackage{textcomp} % provides euro and other symbols
+\else % if luatex or xelatex
+$if(mathspec)$
+  \ifxetex
+    \usepackage{mathspec}
+  \else
+    \usepackage{unicode-math}
+  \fi
+$else$
+  \usepackage{unicode-math}
+$endif$
+  \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
+
+\usepackage{url}
+\urlstyle{same}  % don't use monospace font for urls
+\usepackage{ifxetex}
+\ifxetex
+   \usepackage{fontspec}
+   \setmainfont[
+	BoldFont={AvenirNextLTProBold}, 
+   ]{Avenir LT Std}
+\fi
+\makeatletter
+\setlength{\parskip}{1em}
+\renewcommand{\@seccntformat}[1]{}
+\makeatother
+
+$if(mathfont)$
+$if(mathspec)$
+  \ifxetex
+    \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
+  \else
+    \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
+  \fi
+$else$
+  \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
+$endif$
+$endif$
+$if(CJKmainfont)$
+  \ifxetex
+    \usepackage{xeCJK}
+    \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
+  \fi
+$endif$
+$if(luatexjapresetoptions)$
+  \ifluatex
+    \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset}
+  \fi
+$endif$
+$if(CJKmainfont)$
+  \ifluatex
+    \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec}
+    \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
+  \fi
+$endif$
+\fi
+$if(beamer)$
+$if(theme)$
+\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
+$endif$
+$if(colortheme)$
+\usecolortheme{$colortheme$}
+$endif$
+$if(fonttheme)$
+\usefonttheme{$fonttheme$}
+$endif$
+$if(mainfont)$
+\usefonttheme{serif} % use mainfont rather than sansfont for slide text
+$endif$
+$if(innertheme)$
+\useinnertheme{$innertheme$}
+$endif$
+$if(outertheme)$
+\useoutertheme{$outertheme$}
+$endif$
+$endif$
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+% use microtype if available
+\IfFileExists{microtype.sty}{%
+\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype}
+\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
+}{}
+$if(indent)$
+$else$
+\IfFileExists{parskip.sty}{%
+\usepackage{parskip}
+}{% else
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+}
+$endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+$endif$
+\usepackage{xcolor}
+\definecolor{fplgreen}{HTML}{769A8C}
+\usepackage{sectsty}
+\sectionfont{\color{fplgreen}}
+\subsectionfont{\color{fplgreen}}
+\subsubsectionfont{\color{fplgreen}}
+\usepackage{hyperref}
+\hypersetup{
+$if(title-meta)$
+            pdftitle={$title-meta$},
+$endif$
+$if(author-meta)$
+            pdfauthor={$author-meta$},
+$else$
+            pdfauthor={Fellowship Productions Ltd},
+$endif$
+$if(subject)$
+            pdfsubject={$subject$},
+$endif$
+$if(keywords)$
+            pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
+$endif$
+            pdfproducer={Fellowship PDF Creator},
+            pdfcreator={Fellowship PDF Creator},
+$if(colorlinks)$
+            colorlinks=true,
+            linkcolor=$if(linkcolor)$$linkcolor$$else$fplgreen$endif$,
+            citecolor=$if(citecolor)$$citecolor$$else$fplgreen$endif$,
+            urlcolor=$if(urlcolor)$$urlcolor$$else$fplgreen$endif$,
+$else$
+            pdfborder={0 0 0},
+$endif$
+            breaklinks=true}
+\urlstyle{same}  % don't use monospace font for urls
+$if(verbatim-in-note)$
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
+$if(geometry)$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
+$else$
+\usepackage{geometry}
+$endif$
+\geometry{
+	paper=$if(papersize)$$papersize$$else$a4paper$endif$, % Change to a4
+	top=3cm, % Top margin
+	bottom=0cm, % Bottom margin
+	left=2cm, % Left margin
+	right=2cm, % Right margin
+	includefoot
+	%showframe, % Uncomment to show how the type block is set on the page
+}
+$if(beamer)$
+\newif\ifbibliography
+$endif$
+$if(listings)$
+\usepackage{listings}
+\newcommand{\passthrough}[1]{#1}
+$endif$
+$if(lhs)$
+\lstnewenvironment{code}{\lstset{language=Haskell,numbers=left,basicstyle=\small\ttfamily}}{}
+$endif$
+$if(highlighting-macros)$
+$highlighting-macros$
+$endif$
+$if(tables)$
+\usepackage{longtable,booktabs}
+$if(beamer)$
+\usepackage{caption}
+% These lines are needed to make table captions work with longtable:
+\makeatletter
+\def\fnum@table{\tablename~\thetable}
+\makeatother
+$else$
+% Fix footnotes in tables (requires footnote package)
+\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{longtable}}{}
+$endif$
+$endif$
+\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}
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+$if(strikeout)$
+\usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
+$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(beamer)$
+$else$
+$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$
+$endif$
+$if(pagestyle)$
+\pagestyle{$pagestyle$}
+$endif$
+
+% set default figure placement to htbp
+\makeatletter
+\def\fps@figure{htbp}
+\makeatother
+$if(dont-wrap-code)$
+$else$
+ \usepackage{fvextra}
+ \DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,breaksymbol=\indent,commandchars=\\\{\},numbers=left}
+$endif$
+$for(header-includes)$
+$header-includes$
+$endfor$
+$if(lang)$
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
+$if(babel-newcommands)$
+  $babel-newcommands$
+$endif$
+\else
+  % load polyglossia as late as possible as it *could* call bidi if RTL lang (e.g. Hebrew or Arabic)
+  \usepackage{polyglossia}
+  \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$}
+$for(polyglossia-otherlangs)$
+  \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$}
+$endfor$
+\fi
+$endif$
+$if(dir)$
+\ifxetex
+  % load bidi as late as possible as it modifies e.g. graphicx
+  \usepackage{bidi}
+\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$
+$if(natbib)$
+\usepackage[$natbiboptions$]{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(title)$
+\title{$title$$if(thanks)$\thanks{$thanks$}$endif$}
+$endif$
+$if(subtitle)$
+\providecommand{\subtitle}[1]{}
+\subtitle{$subtitle$}
+$endif$
+$if(author)$
+\author{$for(author)$$author$$sep$ \and $endfor$}
+$endif$
+$if(institute)$
+\providecommand{\institute}[1]{}
+\institute{$for(institute)$$institute$$sep$ \and $endfor$}
+$endif$
+\date{$date$}
+$if(beamer)$
+$if(titlegraphic)$
+\titlegraphic{\includegraphics{$titlegraphic$}}
+$endif$
+$if(logo)$
+\logo{\includegraphics{$logo$}}
+$endif$
+$endif$
+
+
+
+% https://tex.stackexchange.com/questions/34040/graphics-logo-in-headers
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+\fancyhf{}
+\lhead{\includegraphics{~/.dotfiles/pandoc/templates/assets/logo.jpg}}
+\rhead{}
+\chead{}
+\renewcommand{\headrulewidth}{0pt}
+\setlength{\headheight}{80pt}    % round to the point
+\setlength{\footskip}{57pt}
+\addtolength{\topmargin}{-4\baselineskip}
+\addtolength{\textheight}{-96pt}
+
+\fancyfoot{}
+%\fancyheadoffset[LE, RO]{1cm}
+%\fancyhead[c]{%
+%This is a test} 
+%\fancyhead[L]{%
+%\small\sffamily\sc \makebox[1cm]{\{\thepage\}}\leftmark}
+
+\usepackage{moresize}
+\fancyfoot[C]{%
+	\vspace{3.5em}
+	\centerline{%
+		\colorbox{fplgreen}{\parbox[b][0.5cm][t]{\paperwidth}{~}}%
+	}
+}
+\fancyfoot[L]{%
+	{\vspace{0.5cm}\parbox{0.8\textwidth}{\tiny Registered Office: Fosters Barn, Shimpling Road, Hartest, Bury St Edmunds, Suffolk, IP29 4ET\\[0.1cm]
+	Registered in England and Wales. Company Registration Number: 4479565}}
+}
+\fancyfoot[R]{%
+	\hspace{1cm}\parbox{0.3\textwidth}{%
+		\begin{center}
+			\scriptsize
+			\textcolor{fplgreen}{\textbf{Fellowship Productions Limited}}\\[0.1cm]
+			Fosters Barn\\
+			Shimpling Road - Hartest\\
+			Bury St Edmunds\\
+			Suffolk IP29 4ET\\[0.1cm]
+			\textcolor{fplgreen}{\textbf{T:}} \href{tel:+441284830888}{\color{black}{01284 830888}}\\
+			\textcolor{fplgreen}{\textbf{E:}} \href{mailto:info@fellowshipproductions.co.uk}{\color{black}{info@fellowshipproductions.co.uk}}\\
+			\textcolor{fplgreen}{\textbf{W:}} \href{https://www.fellowshipproductions.co.uk}{\color{black}{www.fellowshipproductions.co.uk}}\\
+		\end{center}
+	}
+}
+
+\righthyphenmin=5
+\lefthyphenmin=5
+
+\usepackage{framed}
+
+% \let\oldquote\quote
+% \let\oldendquote\endquote
+% \def\quote{\leftbar \oldquote}
+% \def\endquote{\oldendquote\endleftbar}
+
+\newlength{\leftbarwidth}
+\setlength{\leftbarwidth}{3pt}
+\newlength{\leftbarsep}
+\setlength{\leftbarsep}{5pt}
+
+\newcommand*{\leftbarcolorcmd}{\color{leftbarcolor}}% as a command to be more flexible
+\colorlet{leftbarcolor}{fplgreen}
+
+\renewenvironment{leftbar}{%
+    \def\FrameCommand{{\leftbarcolorcmd{\vrule width \leftbarwidth\relax\hspace {\leftbarsep}}}}%
+    \MakeFramed {\advance \hsize -\width \FrameRestore }%
+}{%
+    \endMakeFramed
+}
+
+\renewenvironment{quote}
+{\vspace{7pt} \leftbar\list{}{\rightmargin\leftmargin}%
+\item\vspace{-5pt}\relax}
+	{\endlist\endleftbar}
+
+
+\begin{document}
+$if(title)$
+$if(beamer)$
+\frame{\titlepage}
+$else$
+\maketitle
+$endif$
+$if(abstract)$
+\begin{abstract}
+$abstract$
+\end{abstract}
+$endif$
+$endif$
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+$if(toc-title)$
+\renewcommand*\contentsname{$toc-title$}
+$endif$
+$if(beamer)$
+\begin{frame}
+$if(toc-title)$
+\frametitle{$toc-title$}
+$endif$
+\tableofcontents[hideallsubsections]
+\end{frame}
+$else$
+{
+$if(colorlinks)$
+\hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$$endif$}
+$endif$
+\setcounter{tocdepth}{$toc-depth$}
+\tableofcontents
+}
+$endif$
+$endif$
+$if(lot)$
+\listoftables
+$endif$
+$if(lof)$
+\listoffigures
+$endif$
+$body$
+
+$if(natbib)$
+$if(bibliography)$
+$if(biblio-title)$
+$if(book-class)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+$if(beamer)$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+\bibliographytrue
+$endif$
+\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$}
+$if(beamer)$
+\end{frame}
+$endif$
+
+$endif$
+$endif$
+$if(biblatex)$
+$if(beamer)$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+\bibliographytrue
+\printbibliography[heading=none]
+\end{frame}
+$else$
+\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
+$endif$
+
+$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}
diff --git a/pandoc/templates/fellowship.latex b/pandoc/templates/fellowship.latex
index 7a40a6e6..0e20d540 100644
--- a/pandoc/templates/fellowship.latex
+++ b/pandoc/templates/fellowship.latex
@@ -7,59 +7,6 @@ $endif$$if(dir)$$if(latex-dir-rtl)$
 $endif$$endif$%
 \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$if(beamer)$ignorenonframetext,$if(handout)$handout,$endif$$if(aspectratio)$aspectratio=$aspectratio$,$endif$$endif$$if(titlepage)$titlepage,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
 \usepackage{blindtext}
-$if(beamer)$
-$if(background-image)$
-\usebackgroundtemplate{%
-\includegraphics[width=\paperwidth]{$background-image$}%
-}
-$endif$
-\usepackage{pgfpages}
-\setbeamertemplate{caption}[numbered]
-\setbeamertemplate{caption label separator}{: }
-\setbeamercolor{caption name}{fg=normal text.fg}
-\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
-$for(beameroption)$
-\setbeameroption{$beameroption$}
-$endfor$
-% Prevent slide breaks in the middle of a paragraph:
-\widowpenalties 1 10000
-\raggedbottom
-$if(section-titles)$
-\setbeamertemplate{part page}{
-\centering
-\begin{beamercolorbox}[sep=16pt,center]{part title}
-  \usebeamerfont{part title}\insertpart\par
-\end{beamercolorbox}
-}
-\setbeamertemplate{section page}{
-\centering
-\begin{beamercolorbox}[sep=12pt,center]{part title}
-  \usebeamerfont{section title}\insertsection\par
-\end{beamercolorbox}
-}
-\setbeamertemplate{subsection page}{
-\centering
-\begin{beamercolorbox}[sep=8pt,center]{part title}
-  \usebeamerfont{subsection title}\insertsubsection\par
-\end{beamercolorbox}
-}
-\AtBeginPart{
-  \frame{\partpage}
-}
-\AtBeginSection{
-  \ifbibliography
-  \else
-    \frame{\sectionpage}
-  \fi
-}
-\AtBeginSubsection{
-  \frame{\subsectionpage}
-}
-$endif$
-$endif$
-$if(beamerarticle)$
-\usepackage{beamerarticle} % needs to be loaded first
-$endif$
 $if(fontfamily)$
 \usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
 $else$
@@ -88,14 +35,28 @@ $else$
 $endif$
   \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
 
+
 \usepackage{url}
 \urlstyle{same}  % don't use monospace font for urls
 \usepackage{ifxetex}
 \ifxetex
    \usepackage{fontspec}
    \setmainfont[
-	BoldFont={AvenirNextLTProBold}, 
-   ]{Avenir LT Std}
+		Path = /home/jonathan/.dotfiles/pandoc/templates/assets/fonts/lexia/,
+		Extension = .ttf,
+		UprightFont = lexia_Std_Rg,
+		BoldFont =  lexia_Std_Bd,
+		ItalicFont = lexia_Std_It,
+		BoldItalicFont = lexia_Std_BdIt
+   ]{Lexia}
+   \setsansfont[
+		Path = /home/jonathan/.dotfiles/pandoc/templates/assets/fonts/trenda/,
+		Extension = .ttf,
+		UprightFont = Trenda_Regular,
+		BoldFont =  Trenda_Bold,
+		ItalicFont = Trenda_Regular_It,
+		BoldItalicFont = Trenda_BoldIt
+   ]{Trenda}
 \fi
 \makeatletter
 \setlength{\parskip}{1em}
@@ -131,26 +92,6 @@ $if(CJKmainfont)$
   \fi
 $endif$
 \fi
-$if(beamer)$
-$if(theme)$
-\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
-$endif$
-$if(colortheme)$
-\usecolortheme{$colortheme$}
-$endif$
-$if(fonttheme)$
-\usefonttheme{$fonttheme$}
-$endif$
-$if(mainfont)$
-\usefonttheme{serif} % use mainfont rather than sansfont for slide text
-$endif$
-$if(innertheme)$
-\useinnertheme{$innertheme$}
-$endif$
-$if(outertheme)$
-\useoutertheme{$outertheme$}
-$endif$
-$endif$
 % use upquote if available, for straight quotes in verbatim environments
 \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
 % use microtype if available
@@ -170,14 +111,21 @@ $endif$
 $if(verbatim-in-note)$
 \usepackage{fancyvrb}
 $endif$
+\usepackage{fancyhdr}
 \usepackage{xcolor}
-\definecolor{fplgreen}{HTML}{769A8C}
+\definecolor{fplteal}{HTML}{00bfb3}
+\definecolor{fplgreen}{HTML}{cedc00}
+\definecolor{fplyellow}{HTML}{ffd100}
+\definecolor{fplpink}{HTML}{e8927c}
+\definecolor{fplgrey}{HTML}{d1e0d7}
 \usepackage{sectsty}
-\sectionfont{\color{fplgreen}}
-\subsectionfont{\color{fplgreen}}
-\subsubsectionfont{\color{fplgreen}}
-\usepackage{hyperref}
-\hypersetup{
+\colorlet{primary}{fplteal}
+\sectionfont{\color{primary}\sffamily}
+\subsectionfont{\sffamily}
+\subsubsectionfont{\color{primary}\sffamily}
+
+
+\usepackage{hyperref} \hypersetup{
 $if(title-meta)$
             pdftitle={$title-meta$},
 $endif$
@@ -214,16 +162,13 @@ $else$
 $endif$
 \geometry{
 	paper=$if(papersize)$$papersize$$else$a4paper$endif$, % Change to a4
-	top=3cm, % Top margin
-	bottom=0cm, % Bottom margin
-	left=2cm, % Left margin
-	right=2cm, % Right margin
-	includefoot
 	%showframe, % Uncomment to show how the type block is set on the page
+	top=1in, % Top margin
+	bottom=1in, % Bottom margin
+	left=1in, % Left margin
+	right=1in, % Right margin
+	includefoot%,
 }
-$if(beamer)$
-\newif\ifbibliography
-$endif$
 $if(listings)$
 \usepackage{listings}
 \newcommand{\passthrough}[1]{#1}
@@ -239,8 +184,7 @@ $if(tables)$
 $if(beamer)$
 \usepackage{caption}
 % These lines are needed to make table captions work with longtable:
-\makeatletter
-\def\fnum@table{\tablename~\thetable}
+\makeatletter \def\fnum@table{\tablename~\thetable}
 \makeatother
 $else$
 % Fix footnotes in tables (requires footnote package)
@@ -248,6 +192,7 @@ $else$
 $endif$
 $endif$
 \usepackage{graphicx,grffile}
+\graphicspath{{/home/jonathan/.dotfiles/pandoc/templates/assets/}}
 \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}
@@ -290,6 +235,51 @@ $endif$
 $endif$
 $if(pagestyle)$
 \pagestyle{$pagestyle$}
+$else$
+\pagestyle{fancy}
+\fancyhf{}
+\rhead{
+	\vspace*{-.5in}
+	\includegraphics[width=2.2cm]{logo.png}
+}
+\setlength{\headheight}{50pt}    % round to the point
+\addtolength{\textheight}{-50pt}
+\lhead{}
+\renewcommand{\headrulewidth}{0pt}
+\setlength{\footskip}{150pt}
+
+\fancyfoot{}
+%
+\fancyfoot[C]{%
+	\vspace{-6cm}
+	\centerline{%
+		\includegraphics[width=\paperwidth]{footer.png}
+		%\colorbox{fplteal}{\parbox[b][5cm][t]{\paperwidth}{~}}%
+	}
+}
+\fancyfoot[L]{%
+	\vspace{-4cm}
+	{
+	\color{primary}
+	\thepage
+	}
+}
+%\fancyfoot[R]{%
+%	\hspace{-10cm}\parbox{0.3\textwidth}{%
+%		\begin{center}
+%			\scriptsize
+%			\textcolor{fplgreen}{\textbf{Fellowship Productions Limited}}\\[0.1cm]
+%			Fosters Barn\\
+%			Shimpling Road - Hartest\\
+%			Bury St Edmunds\\
+%			Suffolk IP29 4ET\\[0.1cm]
+%			\textcolor{fplgreen}{\textbf{T:}} \href{tel:+441284830888}{\color{black}{01284 830888}}\\
+%			\textcolor{fplgreen}{\textbf{E:}} \href{mailto:info@fellowshipproductions.co.uk}{\color{black}{info@fellowshipproductions.co.uk}}\\
+%			\textcolor{fplgreen}{\textbf{W:}} \href{https://www.fellowshipproductions.co.uk}{\color{black}{www.fellowshipproductions.co.uk}}\\
+%		\end{center}
+%	}
+%}
+
 $endif$
 
 % set default figure placement to htbp
@@ -369,53 +359,6 @@ $endif$
 
 
 
-% https://tex.stackexchange.com/questions/34040/graphics-logo-in-headers
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-\fancyhf{}
-\lhead{\includegraphics{~/.dotfiles/pandoc/templates/assets/logo.jpg}}
-\rhead{}
-\chead{}
-\renewcommand{\headrulewidth}{0pt}
-\setlength{\headheight}{80pt}    % round to the point
-\setlength{\footskip}{57pt}
-\addtolength{\topmargin}{-4\baselineskip}
-\addtolength{\textheight}{-96pt}
-
-\fancyfoot{}
-%\fancyheadoffset[LE, RO]{1cm}
-%\fancyhead[c]{%
-%This is a test} 
-%\fancyhead[L]{%
-%\small\sffamily\sc \makebox[1cm]{\{\thepage\}}\leftmark}
-
-\usepackage{moresize}
-\fancyfoot[C]{%
-	\vspace{3.5em}
-	\centerline{%
-		\colorbox{fplgreen}{\parbox[b][0.5cm][t]{\paperwidth}{~}}%
-	}
-}
-\fancyfoot[L]{%
-	{\vspace{0.5cm}\parbox{0.8\textwidth}{\tiny Registered Office: Fosters Barn, Shimpling Road, Hartest, Bury St Edmunds, Suffolk, IP29 4ET\\[0.1cm]
-	Registered in England and Wales. Company Registration Number: 4479565}}
-}
-\fancyfoot[R]{%
-	\hspace{1cm}\parbox{0.3\textwidth}{%
-		\begin{center}
-			\scriptsize
-			\textcolor{fplgreen}{\textbf{Fellowship Productions Limited}}\\[0.1cm]
-			Fosters Barn\\
-			Shimpling Road - Hartest\\
-			Bury St Edmunds\\
-			Suffolk IP29 4ET\\[0.1cm]
-			\textcolor{fplgreen}{\textbf{T:}} \href{tel:+441284830888}{\color{black}{01284 830888}}\\
-			\textcolor{fplgreen}{\textbf{E:}} \href{mailto:info@fellowshipproductions.co.uk}{\color{black}{info@fellowshipproductions.co.uk}}\\
-			\textcolor{fplgreen}{\textbf{W:}} \href{https://www.fellowshipproductions.co.uk}{\color{black}{www.fellowshipproductions.co.uk}}\\
-		\end{center}
-	}
-}
-
 \righthyphenmin=5
 \lefthyphenmin=5
 
@@ -432,7 +375,7 @@ $endif$
 \setlength{\leftbarsep}{5pt}
 
 \newcommand*{\leftbarcolorcmd}{\color{leftbarcolor}}% as a command to be more flexible
-\colorlet{leftbarcolor}{fplgreen}
+\colorlet{leftbarcolor}{primary}
 
 \renewenvironment{leftbar}{%
     \def\FrameCommand{{\leftbarcolorcmd{\vrule width \leftbarwidth\relax\hspace {\leftbarsep}}}}%
@@ -453,6 +396,7 @@ $if(beamer)$
 \frame{\titlepage}
 $else$
 \maketitle
+\thispagestyle{fancy}
 $endif$
 $if(abstract)$
 \begin{abstract}
diff --git a/vim b/vim
index 4ba04740..8b012330 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit 4ba0474052b4aed5d1af9de781e48fa5b7e5f4b6
+Subproject commit 8b012330898306d1dd40260487082b5e27c41312
diff --git a/x/xinitrc b/x/xinitrc
index a65ff560..e67d6a04 100644
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -6,7 +6,7 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 #exec xrdb .Xresources
-xbindkeys
+#xbindkeys
 exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
 #exec sh /home/jonathan/.conky/conky-startup.sh
-xcape
+#xcape