diff --git a/cel-thesis.cls b/cel-thesis.cls
index fda17f6..b08d3f9 100644
--- a/cel-thesis.cls
+++ b/cel-thesis.cls
@@ -7,15 +7,16 @@
 \ProvidesClass{cel-thesis/cel-thesis}
 \LoadClass[11pt,	% 11pt
 	    titlepage,
-	    BCOR=8mm, 		% Bindekorrektur
-	    DIV=13,		% Satzspiegel
 	    twoside,		% Doppelseitige Ausgabe
 	    a4paper,		% DIN A4
 	    openright,		% Neue Kapitel auf rechter Seite
-%	    dvips,		% Source Specials ins DVI/PS
 %	    draft,		% Overfull H-Boxen markieren
 	    final,		% Engueltige Version mit Bildern
 ]{scrreprt}
+\areaset[8mm]{150mm}{225mm}
+\RedeclareSectionCommand[
+beforeskip=0pt,
+]{chapter}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % variables
@@ -80,14 +81,6 @@
     \fi
 }
 
-% Print Watermark! CAREFUL: if does not work %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% % \ifx\theThesisPythonWatermark\dictThesisTRUE
-% \usepackage{draftwatermark}
-% \SetWatermarkText{\includegraphics{cel-thesis/logos/watermark_thesis.pdf}}
-% \SetWatermarkScale{1.0}
-% \SetWatermarkAngle{0}
-% % \fi
-
 % Math and Symbols %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage{amssymb, amsfonts, latexsym}
 \usepackage{amsmath}