diff --git a/agse-thesis.cls b/agse-thesis.cls
index 80d4693478b22169bef37344952f8aacb825f150..1a4f982d55cbf5f897f2dfc3df6be2701fdb4b94 100644
--- a/agse-thesis.cls
+++ b/agse-thesis.cls
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{agse-thesis}[2017/05/23 v0.1 AGSE Thesis]
+\ProvidesClass{agse-thesis}[2018/10/17 v0.1.1 AGSE Thesis]
 
 %%% Read options
 % Language: Default is German
@@ -166,32 +166,6 @@
         {\endquotation}%
     }{}
 
-% (Re)define frontmatter and mainmatter
-\ifthenelse{\equal{\baseClass}{book}}{
-    \let\frontmatterOrig\frontmatter
-    \renewcommand{\frontmatter}{
-        \frontmatterOrig
-        \pagestyle{plain}
-    }
-    \let\mainmatterOrig\mainmatter
-    \renewcommand{\mainmatter}{
-        \mainmatterOrig
-        \pagestyle{fancy}
-        \setcounter{page}{1}
-    }
-}{
-    \newcommand{\frontmatter}{
-        \pagestyle{plain}
-        \pagenumbering{roman}
-        \setcounter{page}{1}
-    }
-    \newcommand{\mainmatter}{
-        \pagestyle{fancy}
-        \pagenumbering{arabic}
-        \setcounter{page}{1}
-    }
-}
-
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \newcommand{\coverpage}[2][]{
@@ -246,10 +220,19 @@
         Berlin, \thesisDate
     \end{center}
 
-    \ifcsdef{separateAbstract}{\cleardoublepage\frontmatter}{\vfill}
-    \begin{abstract}
-        #2
-    \end{abstract}
-    \cleardoublepage
-    \ifcsdef{separateAbstract}{}{\frontmatter}
+    \ifcsdef{separateAbstract}{% abstract on separate page
+        \cleardoublepage
+        \pagestyle{plain}
+        \begin{abstract}
+            #2
+        \end{abstract}
+        \cleardoublepage
+    }{% abstract on title page
+        \vfill
+        \begin{abstract}
+            #2
+        \end{abstract}
+        \cleardoublepage
+        \pagestyle{plain}
+    }
 }
diff --git a/thesis.tex b/thesis.tex
index a0e52481ccf9cbcae1837f3cd080583c276eca13..565a4856c755d70c8328e2dc3fdaa45eeffc0df2 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -57,7 +57,9 @@
 
 \cleardoublepage
 
-\mainmatter
+\pagestyle{fancy}
+
+% Actual content starts here
 
 \input{1_introduction}
 \input{2_fundamentals}