diff --git a/beamercolorthememetropolis.dtx b/beamercolorthememetropolis.dtx
index 0547796..d1f7791 100644
--- a/beamercolorthememetropolis.dtx
+++ b/beamercolorthememetropolis.dtx
@@ -10,31 +10,23 @@
 % International License (https://creativecommons.org/licenses/by-sa/4.0/).
 % ------------------------------------------------------------------------- \fi
 % \iffalse
-%<*driver>
-\ProvidesFile{beamercolorthememetropolis.dtx}
-%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{beamercolorthememetropolis}
+%<driver> \ProvidesFile{beamercolorthememetropolis.dtx}
 %<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamercolorthememetropolis}
     [2015/06/12 1.0.0 A Modern Beamer Color Theme]
 %</package>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage{beamercolorthememetropolis}
-\begin{document}
-  \DocInput{beamercolorthememetropolis.dtx}
-\end{document}
-%</driver>
+%<driver> \documentclass{ltxdoc}
+%<driver> \usepackage{beamercolorthememetropolis}
+%<driver> \begin{document}
+%<driver> \DocInput{beamercolorthememetropolis.dtx}
+%<driver> \end{document}
 % \fi
 % \CheckSum{0}
 % \StopEventually{}
-%
-% \subsection{Color Theme}
-%
 % \iffalse
 %<*package>
-% \fi
+% ------------------------------------------------------------------------- \fi
 %
 % Options
 %
@@ -176,6 +168,5 @@
 % \iffalse
 %</package>
 % \fi
-%
 % \Finale
 \endinput
diff --git a/beamerfontthememetropolis.dtx b/beamerfontthememetropolis.dtx
index 570d690..fd697f7 100644
--- a/beamerfontthememetropolis.dtx
+++ b/beamerfontthememetropolis.dtx
@@ -10,31 +10,23 @@
 % International License (https://creativecommons.org/licenses/by-sa/4.0/).
 % ------------------------------------------------------------------------- \fi
 % \iffalse
-%<*driver>
-\ProvidesFile{beamerfontthememetropolis.dtx}
-%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{beamerfontthememetropolis}
+%<driver> \ProvidesFile{beamerfontthememetropolis.dtx}
 %<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerfontthememetropolis}
     [2015/06/12 1.0.0 A Modern Beamer Font Theme]
 %</package>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage{beamerfontthememetropolis}
-\begin{document}
-  \DocInput{beamerfontthememetropolis.dtx}
-\end{document}
-%</driver>
+%<driver> \documentclass{ltxdoc}
+%<driver> \usepackage{beamerfontthememetropolis}
+%<driver> \begin{document}
+%<driver> \DocInput{beamerfontthememetropolis.dtx}
+%<driver> \end{document}
 % \fi
 % \CheckSum{0}
 % \StopEventually{}
-%
-% \subsection{Font Theme}
-%
 % \iffalse
 %<*package>
-% \fi
+% ------------------------------------------------------------------------- \fi
 %
 % Font Definitions
 %
@@ -86,6 +78,5 @@
 % \iffalse
 %</package>
 % \fi
-%
 % \Finale
 \endinput
diff --git a/beamerthemem.dtx b/beamerthemem.dtx
index ab8ad33..ce970d9 100644
--- a/beamerthemem.dtx
+++ b/beamerthemem.dtx
@@ -10,32 +10,24 @@
 % International License (https://creativecommons.org/licenses/by-sa/4.0/).
 % ------------------------------------------------------------------------- \fi
 % \iffalse
-%<*driver>
-\ProvidesFile{beamerthemem.dtx}
-%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{beamerthemem}
+%<driver> \ProvidesFile{beamerthemem.dtx}
 %<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerthemem}
     [2015/06/12 1.0.0 A Modern Beamer Theme]
 %</package>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage{beamerthemem}
-\begin{document}
-  \DocInput{beamerthemem.dtx}
-\end{document}
-%</driver>
+%<driver> \documentclass{ltxdoc}
+%<driver> \usepackage{beamerthemem}
+%<driver> \begin{document}
+%<driver> \DocInput{beamerthemem.dtx}
+%<driver> \end{document}
 % \fi
-%
 % \CheckSum{0}
 % \StopEventually{}
-%
-% \subsection{Main Theme}
-%
 % \iffalse
 %<*package>
-% \fi
+% ------------------------------------------------------------------------- \fi
+%
 %
 %
 % Options
@@ -673,6 +665,5 @@
 % \iffalse
 %</package>
 % \fi
-%
 % \Finale
 \endinput
diff --git a/mtheme.ins b/mtheme.ins
index dc60e5c..1da83a6 100644
--- a/mtheme.ins
+++ b/mtheme.ins
@@ -10,7 +10,7 @@
 %% International License (https://creativecommons.org/licenses/by-sa/4.0/).
 %% ---------------------------------------------------------------------------
 
-\input docstrip.tex
+\input{docstrip.tex}
 \keepsilent
 \askforoverwritefalse
 \usedir{tex/latex/mtheme}