diff --git a/beamerthemetuhh.sty b/beamerthemetuhh.sty
index 1f48fee9ae476540c7b38bf09e5684e630a92d86..cb0f25b2455abb359d872df134895cc87b4d9b74 100644
--- a/beamerthemetuhh.sty
+++ b/beamerthemetuhh.sty
@@ -2,6 +2,7 @@
 
 % Requirement
 \RequirePackage{tikz}
+\RequirePackage{enumitem}
 
 % Settings
 \useinnertheme{tuhh}
@@ -15,13 +16,15 @@
 
 \setbeamertemplate{navigation symbols}{}
 
-\setbeamertemplate{itemize items}{\raisebox{0.4ex}{\footnotesize$\bullet$}}
-\setbeamertemplate{itemize/enumerate subbody beginn}{\vspace{2mm}}
-\setbeamertemplate{itemize/enumerate subbody end}{\vspace{-2mm}}
+\let\oldItemize\itemize
+\let\oldItemizeEnd\enditemize
+\renewenvironment{itemize}{\oldItemize\addtolength{\itemsep}{1.5mm}}{\oldItemizeEnd}
 
-\let\tempone\itemize
-\let\temptwo\enditemize
-\renewenvironment{itemize}{\tempone\addtolength{\itemsep}{1.5mm}}{\temptwo}
+\let\oldEnumerate\enumerate
+\let\oldEnumerateEnd\endenumerate
+\renewenvironment{enumerate}{\oldEnumerate\addtolength{\itemsep}{1.5mm}}{\oldEnumerateEnd}
 
+\setlist[enumerate]{leftmargin=\leftmargini, label=\makebox[0.5em][c]{\arabic*}.}
+\setlist[itemize]{leftmargin=\leftmargini, label=\raisebox{0.375ex}{\footnotesize$\bullet$}}
 
 \mode<all>
\ No newline at end of file
diff --git a/demo_tuhh_presentation.tex b/demo_tuhh_presentation.tex
index 41953b01786c147249e8be0da7d6128bcc411226..4f88be31f8e4de4bacea24479a3f7261312c5cd6 100644
--- a/demo_tuhh_presentation.tex
+++ b/demo_tuhh_presentation.tex
@@ -16,25 +16,21 @@
 \begin{frame}{This is a presentation slide!}
     \begin{minipage}{0.49\textwidth}
         \begin{itemize}
-            \item This is a bullet list.
-            \item This is a bullet list.
-            \item This is a bullet list.
-            \item This is a bullet list.
-            % This free line is necessary for correct spacing, we are working on it ...
-
+            \item This is an item.
+            \item This is a second item.
             \begin{itemize}
-                \item This is a sub bullet list.
-                \item This is a sub bullet list.
-                \item This is a sub bullet list.
+                \item This is a sub item.
+                \item This is a second sub item.
             \end{itemize}
-            \item This is a bullet list.
-            \item This is a bullet list.
+            \item This is a third item.
         \end{itemize}
     \end{minipage}
     \begin{minipage}{0.49\textwidth}
-        \begin{itemize}
-            \item This is a second bullet list.
-        \end{itemize}
+        \begin{enumerate}
+            \item This is an item in an enumeration.
+            \item This is a second item in an enumeration.
+            \item This is a third item in an enumeration.
+        \end{enumerate}
     \end{minipage}
 \end{frame}
 
diff --git a/tuhh_presentation.cls b/tuhh_presentation.cls
index 410c931a0d5851e76bda6a1064e7f6095420d936..ba42fb5de6922ae5eaacdf6801d89d22f7fa4679 100644
--- a/tuhh_presentation.cls
+++ b/tuhh_presentation.cls
@@ -18,8 +18,6 @@
     \usebeamertemplate{endpage}
 }
 
-\settowidth{\leftmargini}{\usebeamertemplate{itemize item}}
-
 \def\telephonenumber{\@dblarg\beamer@telephonenumber}
 \long\def\beamer@telephonenumber[#1]#2{%
   \def\inserttelephonenumber{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}#2}%