diff --git a/beamerinnerthememetropolis.dtx b/beamerinnerthememetropolis.dtx
index 163c2f9..3cc6ee6 100644
--- a/beamerinnerthememetropolis.dtx
+++ b/beamerinnerthememetropolis.dtx
@@ -328,6 +328,40 @@
   \vspace*{0.2ex}
 }
 %    \end{macrocode}
+%
+%
+%
+% \subsection{Itemize/enumerate environments}
+%    \begin{macrocode}
+\setlength{\leftmargini}{1em}
+\setlength{\leftmarginii}{1em}
+\setlength{\leftmarginiii}{1em}
+\setbeamertemplate{itemize item}{\textbullet}
+\setbeamertemplate{itemize subitem}{\textbullet}
+\setbeamertemplate{itemize subsubitem}{\textbullet}
+%    \end{macrocode}
+%
+% \subsection{Figures and tables}
+%    \begin{macrocode}
+\setbeamertemplate{caption label separator}{: }
+\setbeamertemplate{caption}[numbered]
+%    \end{macrocode}
+%
+% \subsection{Footnotes}
+%    \begin{macrocode}
+\setbeamertemplate{footnote}{%
+  \parindent 0em\noindent%
+  \raggedright
+  \usebeamercolor{footnote}\hbox to 0.8em{\hfil\insertfootnotemark}\insertfootnotetext\par%
+}
+%    \end{macrocode}
+%
+% \subsection{General text}
+%    \begin{macrocode}
+\mode<all>
+\setlength{\parskip}{0.5em}
+\linespread{1.15}
+%    \end{macrocode}
 % \iffalse
 %</package>
 % \fi
diff --git a/beamerthemem.dtx b/beamerthemem.dtx
index 78b3a11..1f52b50 100644
--- a/beamerthemem.dtx
+++ b/beamerthemem.dtx
@@ -184,34 +184,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% Itemize tweaks
-%
-%    \begin{macrocode}
-\setlength{\leftmargini}{1em}
-\setlength{\leftmarginii}{1em}
-\setlength{\leftmarginiii}{1em}
-%    \end{macrocode}
-%
-% \begin{macro}{\itemBullet}
-%    \begin{macrocode}
-\newcommand{\itemBullet}{∙}
-%    \end{macrocode}
-% \end{macro}
-%
-%    \begin{macrocode}
-\setbeamertemplate{itemize item}{\itemBullet}
-\setbeamertemplate{itemize subitem}{\itemBullet}
-\setbeamertemplate{itemize subsubitem}{\itemBullet}
-\setlength{\parskip}{0.5em}
-%    \end{macrocode}
 %
 %
-% Captions
-%
-%    \begin{macrocode}
-\setbeamertemplate{caption label separator}{: }
-\setbeamertemplate{caption}[numbered]
-%    \end{macrocode}
 %
 % Footline/footnote
 %
@@ -232,12 +206,6 @@
   \fi%
 \end{beamercolorbox}%
 }
-\setbeamertemplate{footnote}
-{%
-  \parindent 0em\noindent%
-  \raggedright
-  \usebeamercolor{footnote}\hbox to 0.8em{\hfil\insertfootnotemark}\insertfootnotetext\par%
-}
 %    \end{macrocode}
 %
 % Frametitle
@@ -264,9 +232,6 @@
 %    \end{macrocode}
 %
 %
-%    \begin{macrocode}
-\mode<all>
-%    \end{macrocode}
 %
 % misc
 %
@@ -277,10 +242,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%    \begin{macrocode}
-\linespread{1.15}
-%    \end{macrocode}
-%
 % \iffalse
 %</package>
 % \fi