diff --git a/.gitignore b/.gitignore
index 4b455d28e6ea5ceb328435d85933d988397bd537..6eb00b8ee85c162f1df6a898711f4b42d1f959ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 *.nav
 *.snm
 .Rproj.user
+.kile
+*.kilepr
diff --git a/beamercolorthemeavoe.sty b/beamercolorthemeavoe.sty
index d2050671bdd9f1bcdc9dbda3a3a99a040768486d..4f8a58afa3025c7e2218e148be19587ce5ea0338 100644
--- a/beamercolorthemeavoe.sty
+++ b/beamercolorthemeavoe.sty
@@ -52,7 +52,8 @@
 \setbeamerfont{date}{size=\normalfont\normalsize}
 \setbeamercolor{date}{fg=AVOesubtitle}
 
-
+\setbeamercolor{block title}{bg=AVOeblue, fg=white}
+\setbeamercolor{block body}{bg=AVOegrey}
 
 
 
diff --git a/beamerouterthemeavoe.sty b/beamerouterthemeavoe.sty
index 3de1c210e75035a18342cd5156f40bbbbc2488d4..d0dafbe8f97e8ead28a1a276e134a6b6233febf1 100644
--- a/beamerouterthemeavoe.sty
+++ b/beamerouterthemeavoe.sty
@@ -61,48 +61,62 @@
 % by default, don't show any image
 \noHeaderImage
 
-
+\newlength{\avoe@frametitle@paddingright}
+\setlength{\avoe@frametitle@paddingright}{0.2em}
+\newlength{\avoe@frametitle@paddingleft}
+\setlength{\avoe@frametitle@paddingleft}{0em}
+\setlength{\fboxsep}{0pt}
+\newlength{\headerheight}
+\setlength{\headerheight}{1.3cm}
+
+% \definecolor{greyone}{RGB}{77,77,77}
+% \setbeamercolor{palette quaternary}{fg=white,bg=greyone}
+% \setbeamercolor{titlelike}{parent=palette quaternary}
 \defbeamertemplate*{frametitle}{avoe}[1][left]%
 {%
-\nointerlineskip% 
+\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}
+    \begin{beamercolorbox}[wd=\paperwidth,ht=\headerheight,sep=0pt,dp=3pt,leftskip=\avoe@frametitle@paddingleft,rightskip=\avoe@frametitle@paddingright]{frametitle}%
+      \leavevmode%
+%         \vbox to\headerheight{\vfil\insertsectionnavigationhorizontal{\paperwidth}{\hskip0pt plus1filll}{}\vfil}%
+      \begin{beamercolorbox}[wd=0.19\paperwidth,leftskip=5pt]{frametitle logo}%
+        {\insertlogo}%
+      \end{beamercolorbox}%
+      %
+      \begin{beamercolorbox}[sep=0cm,wd=0.78\paperwidth,ht=\headerheight]{frametitle text}
+        \usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}%
+        \vspace{-2pt}%
+        \vbox to \headerheight{\vfil%
+        {\strut\insertframetitle\strut}\par%
+        {%
+          \ifx\insertframesubtitle\@empty%
+          \else%
+          {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle\strut\par}%
+          \fi
+        }%
+        \vfil%
+        }
+      \end{beamercolorbox}\hfill%
+    \end{beamercolorbox}
+    \vskip-2.1ex%
+    \begin{beamercolorbox}[ht=0.1cm,wd=\paperwidth,sep=0pt,leftskip=0pt,rightskip=0pt]{lower separation line head}
     \end{beamercolorbox}
   %
   \else%
-   \begin{beamercolorbox}[wd=1.0\paperwidth,sep=0pt,left,leftskip=0ex]{frametitlebg}%
+   \begin{beamercolorbox}[wd=1.0\paperwidth,sep=0pt,rightskip=0pt,leftskip=0pt]{frametitlebg}%
        \hspace{-0.065cm}%
       \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-margin.png}};%
         \draw [line width=0.1cm, color=AVOegrey] (avoelogo.south west) -- (avoelogo.south east);%
       \end{tikzpicture}%
-    \end{beamercolorbox}
+    \end{beamercolorbox} 
     \vspace{-0.05cm}%
     %
     \@tempdima=\textwidth%
     \advance\@tempdima by\beamer@leftmargin%
-    \advance\@tempdima by\beamer@rightmargin%
+    \advance\@tempdima by\beamer@rightmargin% 
     \begin{beamercolorbox}[sep=0.3cm,#1,wd=\the\@tempdima]{frametitlebg}
       \usebeamerfont{frametitle}%
       \vbox{}\vskip-1ex%
@@ -117,7 +131,8 @@
       \vskip-1ex%
       \if@tempswa\else\vskip-.3cm\fi% set inside beamercolorbox... evil here...
     \end{beamercolorbox}%
-  \fi
+  \fi%
+%   \end{beamercolorbox}}%
   \global\let\@hdrImg\@empty
 }
 
diff --git a/examples/example-avoeslides-beamer.tex b/examples/example-avoeslides-beamer.tex
index 36c2c3efca3f6d61772d0679c539626cfdf2d677..de5ffed84db4274aabe6af0f03c0b84796094132 100644
--- a/examples/example-avoeslides-beamer.tex
+++ b/examples/example-avoeslides-beamer.tex
@@ -1,4 +1,4 @@
-\documentclass[9pt]{beamer}
+\documentclass[10pt]{beamer}
 \mode<presentation>
 
 
@@ -62,6 +62,10 @@ Test ohne Titel
 Test ohne Titel
 \end{frame}
 
+\begin{frame}{This is the long, long, long, long, long, long, long, long, long, long, long title}
+Test ohne Titel
+\end{frame}
+
 \begin{frame}
 \showHeaderImageNumbers
 \frametitle{Überblick}
@@ -110,7 +114,7 @@ Test ohne Titel
 
 \subsection{Aktivensterblichkeit}
 
-\subsection{Invalidisierung}
+\subsection{Invalidisierung} 
 
 \subsection{Invalidensterblichkeit}
 
diff --git a/images/avoelogo-margin.png b/images/avoelogo-margin.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ec5c6722169880cb423aa000e4512aaed3694c3
Binary files /dev/null and b/images/avoelogo-margin.png differ