diff --git a/eisvogel.tex b/eisvogel.tex
index 4e16c93..42decc1 100644
--- a/eisvogel.tex
+++ b/eisvogel.tex
@@ -204,16 +204,6 @@ $endif$
 $if(beamer)$
 \newif\ifbibliography
 $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(listings)$
 \usepackage{listings}
 \newcommand{\passthrough}[1]{#1}
@@ -253,22 +243,34 @@ $if(beamer)$
 \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{
-  \let\insertpartnumber\relax
-  \let\partname\relax
   \frame{\partpage}
 }
 \AtBeginSection{
   \ifbibliography
   \else
-    \let\insertsectionnumber\relax
-    \let\sectionname\relax
     \frame{\sectionpage}
   \fi
 }
 \AtBeginSubsection{
-  \let\insertsubsectionnumber\relax
-  \let\subsectionname\relax
   \frame{\subsectionpage}
 }
 $endif$
@@ -305,6 +307,9 @@ $else$
 \fi
 $endif$
 $endif$
+$if(pagestyle)$
+\pagestyle{$pagestyle$}
+$endif$
 
 % Make use of float-package and set default placement for figures to H
 \usepackage{float}
@@ -350,6 +355,16 @@ $if(dir)$
   \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$}
diff --git a/examples/green-titlepage/green-titlepage.md b/examples/green-titlepage/green-titlepage.md
index 94fa673..905ee27 100644
--- a/examples/green-titlepage/green-titlepage.md
+++ b/examples/green-titlepage/green-titlepage.md
@@ -6,9 +6,9 @@ subject: "Markdown"
 tags: [Markdown, Example]
 subtitle: "Aesculeae domus vincemur et Veneris adsuetus lapsum"
 titlepage: true
-titlepage-color: d8de2c
-titlepage-text-color: "523c31"
-titlepage-rule-color: "523c31"
+titlepage-color: 3C9F53
+titlepage-text-color: "FFFFFF"
+titlepage-rule-color: "FFFFFF"
 titlepage-rule-height: 2
 ...
 
diff --git a/examples/green-titlepage/green-titlepage.pdf b/examples/green-titlepage/green-titlepage.pdf
index 19a63e7..701c32b 100644
Binary files a/examples/green-titlepage/green-titlepage.pdf and b/examples/green-titlepage/green-titlepage.pdf differ
diff --git a/examples/green-titlepage/green-titlepage.png b/examples/green-titlepage/green-titlepage.png
index 5b01849..5e5125c 100644
Binary files a/examples/green-titlepage/green-titlepage.png and b/examples/green-titlepage/green-titlepage.png differ