diff --git a/beamercolorthememetropolis.sty b/beamercolorthememetropolis.sty
new file mode 100644
index 0000000..925a65a
--- /dev/null
+++ b/beamercolorthememetropolis.sty
@@ -0,0 +1,33 @@
+% Beamer mtheme
+%
+% Copyright 2014 Matthias Vogelgesang
+% Licensed under CC-BY-SA 4.0 International.
+%
+% The initial template comes from the HSRM beamer theme by Benjamin Weiss, which
+% you can find at https://github.com/hsrmbeamertheme/hsrmbeamertheme.
+%
+
+\ProvidesPackage{beamercolorthememetropolis}
+
+% http://paletton.com/#uid=7050t0kkJkJsntwoyp6gYgoddc4
+
+\definecolor{mDarkBrown}{HTML}{604c38}
+\definecolor{mDarkTeal}{HTML}{23373b}
+
+\definecolor{mLightBrown}{HTML}{EB811B}
+\definecolor{mMediumBrown}{HTML}{C87A2F}
+
+\setbeamercolor{background canvas}{bg=black!2}
+\setbeamercolor{normal text}{fg=mDarkTeal}
+\setbeamercolor{alerted text}{fg=mLightBrown}
+\setbeamercolor{structure}{fg=mDarkTeal}
+\setbeamercolor{palette primary}{fg=mDarkBrown}
+\setbeamercolor{palette secondary}{fg=mDarkBrown}
+\setbeamercolor{palette tertiary}{fg=white, bg=mMediumBrown}
+\setbeamercolor{palette quaternary}{fg=white, bg=mDarkTeal}
+\setbeamercolor{frametitle}{parent=palette quaternary}
+
+\setbeamercolor{page number in head/foot}{fg=mDarkTeal}
+
+\mode
+<all>
diff --git a/beamerfontthememetropolis.sty b/beamerfontthememetropolis.sty
new file mode 100644
index 0000000..4125c6c
--- /dev/null
+++ b/beamerfontthememetropolis.sty
@@ -0,0 +1,46 @@
+% Beamer mtheme
+%
+% Copyright 2014 Matthias Vogelgesang
+% Licensed under CC-BY-SA 4.0 International.
+%
+% The initial template comes from the HSRM beamer theme by Benjamin Weiss, which
+% you can find at https://github.com/hsrmbeamertheme/hsrmbeamertheme.
+%
+
+\ProvidesPackage{beamerfontthememetropolis}
+
+\usepackage[no-math]{fontspec}
+\usepackage{etoolbox}
+
+
+\defaultfontfeatures{Mapping=tex-text}
+\setsansfont[BoldFont={Fira Sans}]{Fira Sans Light}
+\setmonofont{Fira Mono}
+\newfontfamily\ExtraLight{Fira Sans ExtraLight}
+\newfontfamily\Light{Fira Sans Light}
+\newfontfamily\Book{Fira Sans}
+\newfontfamily\Medium{Fira Sans Medium}
+
+\AtBeginEnvironment{tabular}{\setsansfont[BoldFont={Fira Sans}, Numbers={Monospaced}]{Fira Sans Light}}
+
+\setbeamerfont{title}{family=\Book, size=\Large}
+\setbeamerfont{author}{family=\ExtraLight, size=\small}
+\setbeamerfont{date}{family=\ExtraLight, size=\small}
+
+\setbeamerfont{section title}{family=\Book, size=\LARGE}
+
+\setbeamerfont{block title}{family=\Book,size=\normalsize}
+\setbeamerfont{block title alerted}{family=\Book,size=\normalsize}
+
+\setbeamerfont{subtitle}{family=\Light, size=\fontsize{12}{14}}
+\setbeamerfont{frametitle}{family=\Book, series=\scshape, size=\large}
+
+\setbeamerfont{alerted text}{family=\Light}
+
+\setbeamerfont{caption}{size=\small}
+\setbeamerfont{caption name}{family=\Book}
+
+\setbeamerfont{description item}{family=\Book}
+
+
+\linespread{1.15}
diff --git a/beamerthemem.sty b/beamerthemem.sty
index 12d5092..8fb13b0 100644
--- a/beamerthemem.sty
+++ b/beamerthemem.sty
@@ -17,6 +17,9 @@
 
 \usetikzlibrary{backgrounds}
 
+\usecolortheme{metropolis}
+\usefonttheme{metropolis}
+
 %}}}
 %{{{ --- Options ----------------------
 
@@ -25,59 +28,6 @@
 \DeclareOption{nosectionpages}{\@doSectionPagetrue}
 \ProcessOptions
 
-%}}}
-%{{{ --- Colors -----------------------
-
-% http://paletton.com/#uid=7050t0kkJkJsntwoyp6gYgoddc4
-
-\definecolor{mDarkBrown}{HTML}{604c38}
-\definecolor{mDarkTeal}{HTML}{23373b}
-
-\definecolor{mLightBrown}{HTML}{EB811B}
-\definecolor{mMediumBrown}{HTML}{C87A2F}
-
-\setbeamercolor{background canvas}{bg=black!2}
-\setbeamercolor{normal text}{fg=mDarkTeal}
-\setbeamercolor{alerted text}{fg=mLightBrown}
-\setbeamercolor{structure}{fg=mDarkTeal}
-\setbeamercolor{palette primary}{fg=mDarkBrown}
-\setbeamercolor{palette secondary}{fg=mDarkBrown}
-\setbeamercolor{palette tertiary}{fg=white, bg=mMediumBrown}
-\setbeamercolor{palette quaternary}{fg=white, bg=mDarkTeal}
-\setbeamercolor{frametitle}{parent=palette quaternary}
-
-\setbeamercolor{page number in head/foot}{fg=mDarkTeal}
-%}}}
-%{{{ --- Fonts ------------------------
-
-\defaultfontfeatures{Mapping=tex-text}
-\setsansfont[BoldFont={Fira Sans}]{Fira Sans Light}
-\setmonofont{Fira Mono}
-\newfontfamily\ExtraLight{Fira Sans ExtraLight}
-\newfontfamily\Light{Fira Sans Light}
-\newfontfamily\Book{Fira Sans}
-\newfontfamily\Medium{Fira Sans Medium}
-
-\AtBeginEnvironment{tabular}{\setsansfont[BoldFont={Fira Sans}, Numbers={Monospaced}]{Fira Sans Light}}
-
-\setbeamerfont{title}{family=\Book, size=\Large}
-\setbeamerfont{author}{family=\ExtraLight, size=\small}
-\setbeamerfont{date}{family=\ExtraLight, size=\small}
-
-\setbeamerfont{section title}{family=\Book, size=\LARGE}
-
-\setbeamerfont{block title}{family=\Book,size=\normalsize}
-\setbeamerfont{block title alerted}{family=\Book,size=\normalsize}
-
-\setbeamerfont{subtitle}{family=\Light, size=\fontsize{12}{14}}
-\setbeamerfont{frametitle}{family=\Book, series=\scshape, size=\large}
-
-\setbeamerfont{alerted text}{family=\Light}
-
-\setbeamerfont{caption}{size=\small}
-\setbeamerfont{caption name}{family=\Book}
-
-\setbeamerfont{description item}{family=\Book}
 %}}}
 %{{{ --- Titlepage --------------------