diff --git a/beamerouterthememetropolis.dtx b/beamerouterthememetropolis.dtx
index 362ce66..8ab52f4 100644
--- a/beamerouterthememetropolis.dtx
+++ b/beamerouterthememetropolis.dtx
@@ -63,8 +63,8 @@
 \pgfkeys{
   /metropolis/outer/progressbar/.cd,
     .is choice,
-    none/.code=\setbeamertemplate{progress bar in head/foot}[none],
-    top/.code=\setbeamertemplate{progress bar in head/foot}[top],
+    none/.code=\setbeamertemplate{frametitle}[plain],
+    frametitle/.code=\setbeamertemplate{frametitle}[progressbar],
 }
 %    \end{macrocode}
 % \end{macro}
@@ -195,11 +195,24 @@
 %
 % \begin{macro}{frametitle}
 %
-% Template for the frame title, which is optionally underlined with a
+% Templates for the frame title, which is optionally underlined with a
 % progress bar.
 %
 %    \begin{macrocode}
-\setbeamertemplate{frametitle}{%
+\defbeamertemplate{frametitle}{plain}{%
+  \nointerlineskip
+  \begin{beamercolorbox}[%
+      wd=\paperwidth,
+      leftskip=0.3cm,
+      rightskip=0.3cm,
+      ht=2.5ex,
+      dp=1.5ex
+    ]{frametitle}
+  \insertframetitle%
+  \end{beamercolorbox}%
+  \vspace{\@metropolis@voffset}
+}
+\defbeamertemplate{frametitle}{progressbar}{%
   \nointerlineskip
   \begin{beamercolorbox}[%
       wd=\paperwidth,
@@ -224,8 +237,7 @@
 %
 %    \begin{macrocode}
 \newlength{\metropolis@progressinheadfoot}
-\defbeamertemplate{progress bar in head/foot}{none}{}
-\defbeamertemplate{progress bar in head/foot}{head}{
+\setbeamertemplate{progress bar in head/foot}{
   \nointerlineskip
   \setlength{\metropolis@progressinheadfoot}{%
     \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
diff --git a/beamerthemem.dtx b/beamerthemem.dtx
index 41905c4..606de68 100644
--- a/beamerthemem.dtx
+++ b/beamerthemem.dtx
@@ -44,10 +44,10 @@
 %
 % \subsubsection{Options}
 %
-% \begin{macro}{\metropolisset}
+% \begin{macro}{\metroset}
 % First of all we define a macro for the user to set options.
 %    \begin{macrocode}
-\newcommand{\metropolisset}[1]{\pgfkeys{/metropolis/.cd,#1}}
+\newcommand{\metroset}[1]{\pgfkeys{/metropolis/.cd,#1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -59,7 +59,7 @@
     /metropolis/inner,
     /metropolis/outer,
     /metropolis/color,
-    },
+  },
 %    \end{macrocode}
 %
 % We have to forwarded keys that affect multiple sub-packages manually.
@@ -108,7 +108,7 @@
 %
 %    \begin{macrocode}
 \pgfkeys{/metropolis/.cd,
-  usetitleprogressbar/.code=\pgfkeysalso{outer/progressbar=head},
+  usetitleprogressbar/.code=\pgfkeysalso{outer/progressbar=frametitle},
   noslidenumbers/.code=\pgfkeysalso{outer/numbering=none},
   usetotalslideindicator/.code=\pgfkeysalso{outer/numbering=fraction},
   nosectionslide/.code=\pgfkeysalso{inner/sectionpage=none},
diff --git a/demo-minimal.tex b/demo-minimal.tex
index bc260d0..8326af2 100644
--- a/demo-minimal.tex
+++ b/demo-minimal.tex
@@ -1,7 +1,7 @@
 \documentclass[10pt]{beamer}
 
 \usetheme{m}
-
+\metroset{progressbar=frametitle}
 \title{A modern beamer theme}
 \subtitle{}
 \date{\today}
diff --git a/mtheme.dtx b/mtheme.dtx
index 3f790a7..44b442b 100644
--- a/mtheme.dtx
+++ b/mtheme.dtx
@@ -255,9 +255,9 @@ option on every sub-package accordingly.
   additionally.
 }
 
-\DescribeOption{progressbar}{none, head}{none}{
-  If enabled this option adds a thin progress bar similar to the sections
-  progress bar underneath each frame title.
+\DescribeOption{progressbar}{none, frametitle}{none}{
+  Setting this option to frametitle adds a progress bar underneath each frame
+  title similar to the section progress bar.
 }
 
 \DescribeOption{frametitleformat}{regular, lowercase, uppercase}{lowercase}{
diff --git a/mtheme.pdf b/mtheme.pdf
index af92016..0c91f2d 100644
Binary files a/mtheme.pdf and b/mtheme.pdf differ