diff --git a/Template/disso.latex b/Template/disso.latex
index de35d11..110ba6f 100644
--- a/Template/disso.latex
+++ b/Template/disso.latex
@@ -5,15 +5,15 @@ $if(colorlinks)$
 $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$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
-$if(beamer)$
-\setbeamertemplate{caption}[numbered]
-\setbeamertemplate{caption label separator}{: }
-\setbeamercolor{caption name}{fg=normal text.fg}
-\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
-$endif$
-$if(beamerarticle)$
-\usepackage{beamerarticle} % needs to be loaded first
-$endif$
+% $if(beamer)$
+% \setbeamertemplate{caption}[numbered]
+% \setbeamertemplate{caption label separator}{: }
+% \setbeamercolor{caption name}{fg=normal text.fg}
+% \beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
+% $endif$
+% $if(beamerarticle)$
+% \usepackage{beamerarticle} % needs to be loaded first
+% $endif$
 
 %DG - Remove font familty stuff
 $if(fontfamily)$
@@ -85,26 +85,7 @@ $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
@@ -154,9 +135,7 @@ $endif$
 $if(geometry)$
 \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
 $endif$
-$if(beamer)$
-\newif\ifbibliography
-$endif$
+
 $if(listings)$
 \usepackage{listings}
 \newcommand{\passthrough}[1]{#1}
@@ -191,43 +170,43 @@ $if(graphics)$
 % using explicit options in \includegraphics[width, height, ...]{}
 \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
 $endif$
-$if(beamer)$
-% 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(beamer)$
+%% % 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(links-as-notes)$
 % Make links footnotes instead of hotlinks:
 \DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}}
@@ -309,6 +288,7 @@ $if(natbib)$
 \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
 $endif$
 $if(biblatex)$
+BibLaTex
 \usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
 $for(bibliography)$
 \addbibresource{$bibliography$}