diff --git a/beamercolorthememetropolis.sty b/beamercolorthememetropolis.sty
index 4641254..9a0fc29 100644
--- a/beamercolorthememetropolis.sty
+++ b/beamercolorthememetropolis.sty
@@ -69,5 +69,4 @@
 
 \fi
 
-\mode
-<all>
+\mode<all>
diff --git a/beamerfontthememetropolis.sty b/beamerfontthememetropolis.sty
index f4d8e5c..07f1030 100644
--- a/beamerfontthememetropolis.sty
+++ b/beamerfontthememetropolis.sty
@@ -9,7 +9,7 @@
 
 \ProvidesPackage{beamerfontthememetropolis}
 
-\usepackage[no-math]{fontspec}
+\RequirePackage[no-math]{fontspec}
 
 
 \defaultfontfeatures{Mapping=tex-text}
diff --git a/beamerthemem.sty b/beamerthemem.sty
index 19e6277..e44e849 100644
--- a/beamerthemem.sty
+++ b/beamerthemem.sty
@@ -12,14 +12,20 @@
 %{{{ --- Options ----------------------
 
 \newif\if@useTitleProgressBar
-\@useTitleProgressBarfalse
-\DeclareOptionBeamer{useTitleProgressBar}{\@useTitleProgressBartrue}
-
 \newif\if@protectFrameTitle
-\@protectFrameTitlefalse
-\DeclareOptionBeamer{protectframetitle}{\@protectFrameTitletrue}
 
-\DeclareOptionBeamer{blockbg}{\PassOptionsToPackage{blockbg}{beamercolorthememetropolis}}
+\@useTitleProgressBarfalse
+\@protectFrameTitlefalse
+
+\newlength{\@mtheme@voffset}
+\setlength{\@mtheme@voffset}{2em}
+
+\DeclareOptionBeamer{useTitleProgressBar}{\@useTitleProgressBartrue}
+\DeclareOptionBeamer{protectframetitle}{\@protectFrameTitletrue}
+\DeclareOptionBeamer{blockbg}{%
+  \PassOptionsToPackage{blockbg}{beamercolorthememetropolis}%
+}
+\DeclareOptionBeamer{nooffset}{\setlength{\@mtheme@voffset}{0em}}
 
 \DeclareOptionBeamer*{%
   \PackageWarning{beamerthemem}{Unknown option `\CurrentOption'}%
@@ -27,14 +33,16 @@
 
 \ProcessOptionsBeamer
 
-
 %}}}
+
+\mode<presentation>
+
 %{{{ --- Packages ---------------------
 
-\usepackage[no-math]{fontspec}
-\usepackage{etoolbox}
-\usepackage{tikz}
-\usepackage{pgfplots}
+\RequirePackage[no-math]{fontspec}
+\RequirePackage{etoolbox}
+\RequirePackage{tikz}
+\RequirePackage{pgfplots}
 
 \usetikzlibrary{backgrounds}
 \usetikzlibrary{calc}
@@ -42,7 +50,6 @@
 \usecolortheme{metropolis}
 \usefonttheme{metropolis}
 
-
 %}}}
 %{{{ --- Titlepage --------------------
 
@@ -145,7 +152,7 @@
   }%
 }
 \fi
-% }}}
+%}}}
 %{{{ --- Commands ---------------------
 
 \newcommand{\insertsectionHEAD}{%
@@ -236,8 +243,9 @@
     \progressbar@titleprogressbar
   \end{beamercolorbox}
 \fi
-\vspace{2em}
+\vspace{\@mtheme@voffset}
 }
+
 %}}}
 %{{{ --- pgfplots ---------------------
 
@@ -355,15 +363,13 @@
 
 %}}}
 
-%}}}
+\mode<all>
 
-\mode
-<all>
-
-% {{{ misc
+%{{{ misc
 \let\otp\titlepage
 \renewcommand{\titlepage}{\otp\addtocounter{framenumber}{-1}}
 \newcommand{\mreducelistspacing}{\vspace{-\topsep}}
 
 \linespread{1.15}
+
 %}}}