diff --git a/examples/demo/demo.tex b/examples/demo/demo.tex
index 1ee11db..0595c21 100644
--- a/examples/demo/demo.tex
+++ b/examples/demo/demo.tex
@@ -132,7 +132,9 @@
       \href{http://www.texample.net/tikz/examples/rotated-polygons/}{texample.net}.}
   \end{figure}
 \end{frame}
+
 \begin{frame}{Tables}
+  \framesubtitle{Largest cities in the world}
   \begin{table}
     \caption{Largest cities in the world (source: Wikipedia)}
     \begin{tabular}{@{} lr @{}}
diff --git a/src/beamerfontthememoloch.dtx b/src/beamerfontthememoloch.dtx
index 216c326..9317092 100644
--- a/src/beamerfontthememoloch.dtx
+++ b/src/beamerfontthememoloch.dtx
@@ -44,6 +44,7 @@
 \setbeamerfont{block title alerted}{size=\normalsize, series=\bfseries}
 \setbeamerfont*{subtitle}{size=\large}
 \setbeamerfont{frametitle}{size=\large, series=\bfseries}
+\setbeamerfont{framesubtitle}{size=\small}
 \setbeamerfont{caption}{size=\small}
 \setbeamerfont{caption name}{series=\bfseries}
 \setbeamerfont{description item}{series=\bfseries}
diff --git a/src/beamerouterthememoloch.dtx b/src/beamerouterthememoloch.dtx
index e5f0720..4ba9418 100644
--- a/src/beamerouterthememoloch.dtx
+++ b/src/beamerouterthememoloch.dtx
@@ -124,26 +124,23 @@
 %    Templates for the frame title, which is optionally underlined with a
 %    progress bar.
 %    \begin{macrocode}
-\newlength{\moloch@frametitle@padding}
-\setlength{\moloch@frametitle@padding}{2.2ex}
-\newcommand{\moloch@frametitlestrut@start}{%
-  \rule{0pt}{\moloch@frametitle@padding + \totalheightof{X}}%
-}
-\newcommand{\moloch@frametitlestrut@end}{%
-  \rule[-\moloch@frametitle@padding]{0pt}{\moloch@frametitle@padding}
-}
 \defbeamertemplate{frametitle}{plain}{%
   \nointerlineskip%
   \begin{beamercolorbox}[%
       wd=\paperwidth,%
-      sep=0pt,%
-      leftskip=\moloch@frametitle@padding,%
-      rightskip=\the\glueexpr \moloch@frametitle@padding plus 1fill\relax,%
+      sep=0.9ex,%
+      leftskip=0.9ex,%
+      rightskip=\the\glueexpr 0.9ex plus 1fill\relax,%
     ]{frametitle}%
-    \moloch@frametitlestrut@start%
-    \insertframetitle%
-    \nolinebreak%
-    \moloch@frametitlestrut@end%
+    \usebeamerfont{frametitle}%
+    \vbox{}\vskip-0.5ex%
+    \strut\insertframetitle\nolinebreak\strut\par%
+    {%
+      \ifx\insertframesubtitle\@empty%
+        \else%
+        {\usebeamerfont{framesubtitle}\vspace{-0.8ex}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}%
+      \fi
+    }%
   \end{beamercolorbox}%
 }
 \setbeamertemplate{frametitle continuation}{\romannumeral\insertcontinuationcount}