diff --git a/.gitignore b/.gitignore
index 573ed382fd2a049c6f29c3031857d62f76c08f9a..77ac1f924c69faafc54aae741fa14ff8551244e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 *.log
 *.out
 *.toc
+*.dvi
+*.nav
+*.snm
diff --git a/avoe-question.png b/avoe-question.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9734016f8f9006fdfb665b588d0cc46e924c3ab
Binary files /dev/null and b/avoe-question.png differ
diff --git a/avoe_theme_title1.jpg b/avoe_theme_title1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5041d02960c9f539bd4424df265b8c6e30b7163d
Binary files /dev/null and b/avoe_theme_title1.jpg differ
diff --git a/avoe_theme_title2.jpg b/avoe_theme_title2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a37ddb739e58b34702109b157a8c7d95bc9fb56b
Binary files /dev/null and b/avoe_theme_title2.jpg differ
diff --git a/avoe_theme_title3.jpg b/avoe_theme_title3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..133f49ce7293e3d083a300f8ccac325d19cc52c7
Binary files /dev/null and b/avoe_theme_title3.jpg differ
diff --git a/avoelogo-small.orig.png b/avoelogo-small.orig.png
new file mode 100644
index 0000000000000000000000000000000000000000..b24956eb7b826ce24e1bcc2ee99c56677d18e9ce
Binary files /dev/null and b/avoelogo-small.orig.png differ
diff --git a/avoelogo-small.png b/avoelogo-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ea00554c448851bb5e1ca66b12eae5dc3e3579d
Binary files /dev/null and b/avoelogo-small.png differ
diff --git a/avoereport.cls b/avoereport.cls
index 5196bc05faba85d09c2270a92152f88ff3545d34..103408cfcc9d37da8da4a1fe63213cf1b261aa87 100644
--- a/avoereport.cls
+++ b/avoereport.cls
@@ -155,7 +155,7 @@
     {\quad\includegraphics[width=8cm]{avoelogo.png}\par}
   \null\vfil
 %   \vskip 60\p@
-  {\Huge \@title \par}%
+  {\Huge\raggedright \@title \par}%
   \ifdefined\@themengebiet{\vskip 10\p@\Large\scshape \@themengebiet \par}\fi%
   \null\vfil
   \null\vfil
diff --git a/beamercolorthemeavoe.sty b/beamercolorthemeavoe.sty
new file mode 100644
index 0000000000000000000000000000000000000000..d2050671bdd9f1bcdc9dbda3a3a99a040768486d
--- /dev/null
+++ b/beamercolorthemeavoe.sty
@@ -0,0 +1,61 @@
+% Copyright 2018 by Reinhold Kainhofer <reinhold@kainhofer.com> modified for AVOe colors
+% Copyright 2012 by Alan Munn <amunn@msu.edu>  Modified for MSU colours 
+% Copyright 2004 by Madhusudan Singh <madhusudan.singh@gmail.com>
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
+%
+\mode<presentation>
+
+% Settings
+% \setbeamercolor*{title page header}{fg=white}
+% \setbeamercolor*{author}{fg=white}
+% \setbeamercolor*{date}{fg=white}
+
+\definecolor{AVOeblue}{RGB}{15,112,183} 
+\definecolor{AVOegrey}{RGB}{217,217,217}
+\definecolor{AVOesubtitle}{RGB}{89,89,89}
+
+\setbeamercolor{upper separation line head}{bg=AVOeblue,fg=white}
+\setbeamercolor{lower separation line head}{bg=AVOegrey,fg=white}
+
+
+\setbeamercolor*{palette primary}{bg=AVOeblue,fg=white}
+\setbeamercolor*{palette secondary}{bg=AVOegrey}
+\setbeamercolor*{palette tertiary}{bg=AVOegrey}
+
+
+
+\setbeamerfont{frametitle}{size=\Large,series=\bfseries}
+\setbeamercolor{frametitle}{fg=black}
+\setbeamercolor{frametitlebg}{bg=AVOegrey}
+
+\setbeamerfont{framesubtitle}{size=\normalfont\large}
+\setbeamercolor{framesubtitle}{fg=AVOesubtitle}
+
+\setbeamerfont{title}{size=\normalfont\Large, series=\bfseries}
+\setbeamercolor{title}{fg=AVOeblue}
+
+\setbeamerfont{subtitle}{size=\fontsize{11}{13}\selectfont\normalfont}
+\setbeamercolor{subtitle}{fg=AVOesubtitle}
+
+\setbeamerfont{author}{size=\normalfont\large}
+\setbeamercolor{author}{fg=AVOesubtitle}
+
+\setbeamerfont{institute}{size=\normalfont\scriptsize}
+\setbeamercolor{institute}{fg=AVOesubtitle}
+
+\setbeamerfont{date}{size=\normalfont\normalsize}
+\setbeamercolor{date}{fg=AVOesubtitle}
+
+
+
+
+
+
+\mode
+<all>
diff --git a/beamerinnerthemeavoe.sty b/beamerinnerthemeavoe.sty
new file mode 100644
index 0000000000000000000000000000000000000000..6d949e7deda7f0794a906a7c8bfa2c44c3fe31d5
--- /dev/null
+++ b/beamerinnerthemeavoe.sty
@@ -0,0 +1,55 @@
+\mode<presentation>
+
+
+% Title page
+\defbeamertemplate*{title page}{avoe theme}[1][]
+{
+\nointerlineskip%
+  \ifx\@hdrImg\@empty%
+  \else
+    \vskip-1em%
+    \vskip0.05cm%
+   \begin{beamercolorbox}[wd=1.0\paperwidth,sep=0pt,left,leftskip=0ex]{frametitlebg}%
+      \begin{tikzpicture}%
+      	\node[anchor=north west,inner sep=0pt] (main) at (0,0) {\includegraphics[width=1.0\paperwidth]{\@hdrImg}};%
+      	\node[anchor=north west,inner sep=0pt] (avoelogo) at(0,0) {\includegraphics[width=6cm]{avoelogo.png}};%
+      \end{tikzpicture}%
+    \end{beamercolorbox}
+    \vskip-1em%
+    \begin{beamercolorbox}[ht=0.1cm,wd=\paperwidth]{lower separation line head}
+    \end{beamercolorbox}
+    \global\let\@hdrImg\@empty
+  \fi
+
+ \vfill%
+ \vfill%
+ \vfill%
+    \begin{beamercolorbox}[wd=12cm,leftskip=0.3cm,sep=0pt,#1]{title page header}
+      \usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle\par%
+    \end{beamercolorbox}%
+    \begin{beamercolorbox}[wd=12cm,leftskip=0.3cm,sep=0pt,#1]{subtitle page header}
+      \usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par%
+    \end{beamercolorbox}%
+ \vfill%
+    \vfill%
+    \begin{beamercolorbox}[wd=12cm,leftskip=0.3cm,sep=0pt,#1]{author}
+      \usebeamerfont{author}\usebeamercolor[fg]{author}\insertauthor%
+    \end{beamercolorbox}
+    \ifx\insertinstitute\@empty%
+      \else%
+      \begin{beamercolorbox}[wd=12cm,leftskip=0.3cm,sep=0pt,#1]{institute}
+      \usebeamerfont{institute}\usebeamercolor[fg]{institute}\insertinstitute\par%
+      \end{beamercolorbox}
+    \fi
+ \vfill%
+    \vfill%
+    \begin{beamercolorbox}[wd=12cm,leftskip=0.3cm,sep=0pt,#1]{date}
+      \usebeamerfont{date}\usebeamercolor[fg]{date}\insertdate%
+    \end{beamercolorbox}
+ % \vfill
+}
+
+
+
+\mode
+<all>
diff --git a/beamerouterthemeavoe.sty b/beamerouterthemeavoe.sty
new file mode 100644
index 0000000000000000000000000000000000000000..659c98006c1652e8250634105e773f01e88f7d68
--- /dev/null
+++ b/beamerouterthemeavoe.sty
@@ -0,0 +1,128 @@
+% Copyright 2007 by Till Tantau
+% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2018 by Reinhold Kainhofer
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
+% 
+% This file is derivedfrom beamerouterthemetree.sty
+
+\mode<presentation>
+
+
+\setbeamercolor*{author in head/foot}{parent=palette tertiary}
+\setbeamercolor*{title in head/foot}{parent=palette secondary}
+\setbeamercolor*{date in head/foot}{parent=palette tertiary}
+
+\setbeamercolor*{section in head/foot}{parent=palette tertiary}
+\setbeamercolor*{subsection in head/foot}{parent=palette primary}
+
+
+\defbeamertemplate*{headline}{avoe theme}
+{%
+  \begin{beamercolorbox}[ht=0.1cm,wd=\paperwidth]{upper separation line head}
+  \end{beamercolorbox}
+}
+
+
+\defbeamertemplate*{footline}{avoe theme}
+{
+  \leavevmode%
+  \hbox{%
+  \begin{beamercolorbox}[wd=.25\paperwidth,ht=2.25ex,dp=1ex,center]{author in head/foot}%
+    \usebeamerfont{author in head/foot}\insertshortauthor\expandafter\beamer@ifempty\expandafter{\beamer@shortinstitute}{}{~~(\insertshortinstitute)}
+  \end{beamercolorbox}%
+  \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
+    \usebeamerfont{title in head/foot}\insertshorttitle
+  \end{beamercolorbox}%
+  \begin{beamercolorbox}[wd=.25\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}%
+    \usebeamerfont{date in head/foot}\insertshortdate{}\hspace*{2em}
+    \insertframenumber{} / \inserttotalframenumber\hspace*{2ex} 
+  \end{beamercolorbox}}%
+  \vskip0pt%
+}
+
+
+
+
+
+% Images in the frame title
+\gdef\@hdrImg{\@empty}
+\def\@showHeaderImg#1{\gdef\@hdrImg{#1}}
+\def\showHeaderImageAnalysis{\@showHeaderImg{avoe_theme_title1.jpg}}
+\def\showHeaderImagePen{\@showHeaderImg{avoe_theme_title2.jpg}}
+\def\showHeaderImageNumbers{\@showHeaderImg{avoe_theme_title3.jpg}}
+\def\showHeaderImage{\showHeaderImageAnalysis}
+\def\noHeaderImage{\global\let\@hdrImg\@empty}
+% by default, don't show any image
+\noHeaderImage
+
+
+\defbeamertemplate*{frametitle}{avoe}[1][left]%
+{%
+\nointerlineskip% 
+%  \ifbeamercolorempty[bg]{frametitle}{}{\nointerlineskip}%
+  \ifx\@hdrImg\@empty%
+    \leavevmode\hbox{
+    \begin{beamercolorbox}[wd=0.13\paperwidth,ht=1.3cm,sep=0pt]{frametitle}%
+      \advance\leftskip-0.8cm\insertlogo%
+    \end{beamercolorbox}%
+    %
+    \begin{beamercolorbox}[sep=0cm,wd=0.86\paperwidth,ht=1.3cm]{frametitle}
+      \usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}%
+      \strut\insertframetitle\strut\par%
+      {%
+        \ifx\insertframesubtitle\@empty%
+        \else%
+        {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle\strut\par}%
+        \fi
+      }%
+      \vskip0ex%
+      % \if@tempswa\else\vskip-.3cm\fi% set inside beamercolorbox... evil here...
+    \end{beamercolorbox}%
+    }
+    \vskip-2ex%
+    \begin{beamercolorbox}[ht=0.1cm,wd=\paperwidth]{lower separation line head}
+    \end{beamercolorbox}
+  %
+  \else%
+   \begin{beamercolorbox}[wd=1.0\paperwidth,sep=0pt,left,leftskip=0ex]{frametitlebg}%
+      \begin{tikzpicture}%
+      	\node[anchor=north west,inner sep=0pt] (main) at (0,0) {\includegraphics[width=1.0\paperwidth]{\@hdrImg}};%
+      	\node[anchor=north west,inner sep=0pt,outer sep=15pt] (avoelogo) at(0,0) {\includegraphics[width=6cm]{avoelogo.png}};%
+      \end{tikzpicture}%
+    \end{beamercolorbox}
+    \vspace{-0.05cm}%
+    %
+    \@tempdima=\textwidth%
+    \advance\@tempdima by\beamer@leftmargin%
+    \advance\@tempdima by\beamer@rightmargin%
+    \begin{beamercolorbox}[sep=0.3cm,#1,wd=\the\@tempdima]{frametitlebg}
+      \usebeamerfont{frametitle}%
+      \vbox{}\vskip-1ex%
+      \if@tempswa\else\csname beamer@fte#1\endcsname\fi%
+      \strut\insertframetitle\strut\par%
+      {%
+        \ifx\insertframesubtitle\@empty%
+        \else%
+        {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle\strut\par}%
+        \fi
+      }%
+      \vskip-1ex%
+      \if@tempswa\else\vskip-.3cm\fi% set inside beamercolorbox... evil here...
+    \end{beamercolorbox}%
+  \fi
+  \global\let\@hdrImg\@empty
+}
+
+
+
+\defbeamertemplate*{sidebar right}{avoe}{}
+
+
+\mode
+<all>
diff --git a/beamerthemeavoe.sty b/beamerthemeavoe.sty
new file mode 100644
index 0000000000000000000000000000000000000000..cb2bbd4c19c3782b46db14990e3a7030675696c0
--- /dev/null
+++ b/beamerthemeavoe.sty
@@ -0,0 +1,21 @@
+\mode<presentation>
+
+% Requirement
+\RequirePackage{tikz}
+
+% Settings
+\useinnertheme{avoe}
+\useoutertheme{avoe}
+\usecolortheme{avoe}
+
+\setbeamertemplate{navigation symbols}{}
+\setbeamertemplate{blocks}[rounded][shadow=true]  
+
+\pgfdeclareimage[interpolate=true,width=4cm]{logo}{avoelogo.png}
+\pgfdeclareimage[interpolate=true,width=1.5cm]{logosmall}{avoelogo-small.png}
+\logo{\includegraphics[height=1.25cm]{avoelogo-small.png}}
+
+\mode<all>
+
+
+
diff --git a/example-avoearticle.tex b/example-avoearticle.tex
index 3cdf78b7c47abdad2ebcce2a9d5e4315979ddddc..6468db21c9d67d50bc3c9826c37fa30e4e92d44f 100644
--- a/example-avoearticle.tex
+++ b/example-avoearticle.tex
@@ -1,5 +1,6 @@
 % \documentclass[a4paper,10pt,titlepage]{avoearticle}
-\documentclass[a4paper,10pt]{avoearticle}
+% \documentclass[a4paper,10pt]{avoearticle}
+\documentclass[10pt,ngerman,a4paper,table]{avoereport}
 
 \usepackage{ucs}
 \usepackage[utf8]{inputenc}
@@ -8,6 +9,7 @@
 \usepackage{graphicx}
 
 \usepackage{layout}
+\setlength{\parindent}{0pt}
 
 \author{Reinhold Kainhofer}
 \title{AVÖ \LaTeX{} Document Class}
diff --git a/example-avoeslides-beamer.pdf b/example-avoeslides-beamer.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..2a776ca9637045bb418c1ef572567d9630396463
Binary files /dev/null and b/example-avoeslides-beamer.pdf differ
diff --git a/example-avoeslides-beamer.tex b/example-avoeslides-beamer.tex
new file mode 100644
index 0000000000000000000000000000000000000000..36c2c3efca3f6d61772d0679c539626cfdf2d677
--- /dev/null
+++ b/example-avoeslides-beamer.tex
@@ -0,0 +1,132 @@
+\documentclass[9pt]{beamer}
+\mode<presentation>
+
+
+\usepackage{amssymb,amsmath}
+\usepackage{fontenc}
+\usepackage[utf8]{inputenc}
+
+
+\hypersetup{unicode=true,
+            pdftitle={Die Pensionstafel AVÖ 2018-P},
+            pdfauthor={Reinhold Kainhofer, AVÖ-Arbeitskreis Rechnungsgrundlagen},
+            pdfborder={0 0 0},
+            breaklinks=true}
+\urlstyle{same}  % don't use monospace font for urls
+
+\usepackage[shorthands=off,main=ngerman]{babel}
+
+
+\usetheme{avoe}
+
+
+\title{Die Pensionstafel AVÖ 2018-P -- Eine Vorschau}
+\subtitle{Aktueller Stand der Entwicklung}
+\author[R. Kainhofer]{Reinhold Kainhofer}
+\institute[AVÖ AK RG]{AVÖ Arbeitskreis Rechnungsgrundlagen}
+\date[AVÖ GV, 17.5.2018]{Generalversammlung der AVÖ\\\footnotesize 17. Mai 2018}
+
+
+\begin{document}
+
+
+\begin{frame}
+\showHeaderImageAnalysis
+\titlepage
+\end{frame}
+
+\begin{frame}
+Test ohne Titel
+\end{frame}
+\begin{frame}{This is the long title}
+Test ohne Titel
+\end{frame}
+
+\begin{frame}
+\frametitle{Frame title}
+\framesubtitle{Frame subtitle}
+\begin{itemize}
+\item Test ohne Titel
+\item item
+\item item
+\begin{itemize}
+\item item
+\item item
+\end{itemize}
+\item item
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}{This is the long title}
+Test ohne Titel
+\end{frame}
+
+\begin{frame}
+\showHeaderImageNumbers
+\frametitle{Überblick}
+\tableofcontents
+\end{frame}
+
+\section{Notwendigkeit einer neuen Tafel}
+
+\begin{frame}
+
+\frametitle{Ist eine neue Tafel nötig?}
+\framesubtitle{Oder gehts noch???}
+\showHeaderImagePen
+\begin{itemize}
+\item Einführung des Rehabilitationsgeldes per 1.1.2014 $=>$ deutliche Änderung des Invaliditätsbegriffs
+\item Traditionell 10-Jahresrythmus der Überarbeitung
+\item Beobachtung von Sterblichkeitsverlusten bei Alterspensionisten
+\item Anhaltender Bevölkerungstrend
+\end{itemize}
+\end{frame}
+
+
+
+    
+
+    \begin{frame}
+\showHeaderImageAnalysis
+      \frametitle{AA}
+      BBdsfsdf 
+    \end{frame}
+
+\section{Struktur der Tafel}
+
+\subsection{Basisgrößen}
+
+\subsection{Zeitabhängigkeit -- Trend}
+
+
+\section{Problemzonen}
+
+
+\section{Datenmaterial}
+
+
+\section{Die Wahrscheinlichkeiten der Tafel}
+
+\subsection{Aktivensterblichkeit}
+
+\subsection{Invalidisierung}
+
+\subsection{Invalidensterblichkeit}
+
+\subsection{Alterspensionistensterblichkeit}
+
+\subsection{Partnerwahrscheinlichkeit im Todeszeitpunkt}
+
+\subsection{Mittleres Alter des hinterbliebenen Partners}
+
+\subsection{Witwen(r)sterblichkeit}
+
+\subsection{Trend}
+
+
+
+
+
+
+\end{document}