diff --git a/header.tex b/header.tex
new file mode 100644
index 0000000000000000000000000000000000000000..5a24dd4f76b3d6b3ae52cd3a74d6ccea7e8f1d9f
--- /dev/null
+++ b/header.tex
@@ -0,0 +1,70 @@
+\usepackage[T1]{fontenc}
+\usepackage{hyphsubst}
+\usepackage{gentium}
+\usepackage{inconsolata}
+\usepackage{babel}
+\usepackage{isodate}
+
+\setkomafont{disposition}{\normalcolor\bfseries\sffamily}
+
+\usepackage[
+    style=numeric-comp,
+    backend=biber,
+    url=false,
+    doi=false,
+    isbn=false,
+    hyperref,
+]{biblatex}
+\addbibresource{bibliography.bib}
+\AtEveryBibitem{%
+    \clearfield{note}%
+}
+
+\usepackage{hyperref} % makes all links clickable
+
+\usepackage[obeyFinal,textwidth=30mm,colorinlistoftodos,prependcaption,textsize=tiny]{todonotes}
+
+\usepackage{graphicx}
+\usepackage{blindtext}  % add blindtext
+\usepackage[babel]{microtype}  % Improve font layout (spacing, hyphenation etc.)
+\usepackage{doi}  % Add links for DOIs, handle "_" in dois
+\usepackage{csquotes}  % provide \enquote
+\usepackage{fnpct}  % punctuation, especially together with footnotes
+\usepackage{ifdraft}  % for detecting draft/final mode
+\usepackage{version}  % conditionally to exclude parts of document
+\usepackage{tcolorbox}  % make colored boxes
+
+\usepackage{caption}
+\usepackage{subcaption}
+
+\usepackage{booktabs}  % must-have for tables
+\usepackage{tabularx}  % tabularx environment
+\usepackage{multirow}  % for combining multiple rows
+\usepackage{makecell}  % enables line breaks in cells
+
+\usepackage{quoting}
+
+\usepackage{xfrac}
+
+\input{lst.tex}
+
+\usepackage[capitalise,nameinlink,noabbrev]{cleveref} % automatically inserts Fig. X in the text with \cref{..}
+
+% if you need mathy stuff
+\newtheorem{lem}{Lemma}
+\crefname{lem}{Lemma}{Lemmas}
+\newtheorem{thm}{Theorem}
+\crefname{thm}{Theorem}{Theorems}
+\newtheorem{defs}{Definition}
+\crefname{defs}{Def.}{Defs.}
+
+\newenvironment{draftcontent}[1][,]{%
+\begin{tcolorbox}[title=Idee vom Inhalt,#1]\begin{itemize}}{%
+\end{itemize}\end{tcolorbox}}
+
+% Exclude draftcontent environment, if "final" is selected
+\ifoptionfinal{
+  \excludeversion{draftcontent}
+}{
+  \includeversion{draftcontent}
+}
diff --git a/sections/eval.tex b/sections/eval.tex
index ad7fe22bf1f1b78c414641b8ff73a5c34e29ca80..193d8d0e1c38d736d4765af912c8669c9b7dc678 100644
--- a/sections/eval.tex
+++ b/sections/eval.tex
@@ -1,3 +1,9 @@
 \chapter{Erprobung der Anwendungsinstallation}\label{ch:evaluation}
 
+\begin{draftcontent}
+\item Ziele der Evaluation beschreiben
+\item Aufbau der Evaluation beschreiben
+\item Ergebnisse darstellen und erklären
+\end{draftcontent}
+
 \blindtext
diff --git a/thesis.tex b/thesis.tex
index f2afab7966e65d65aebe9a860c5e15d93338e265..d6d154e0b84025aeb01a647a6968371908f079f1 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -1,87 +1,20 @@
 \RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
-\documentclass[ngerman,BCOR=1.5cm,twoside]{tudscrreprt}
+\PassOptionsToPackage{dvipsnames}{xcolor}
+\PassOptionsToPackage{hidelinks}{hyperref}
+% to print the document, use the following additional options (after "BCOR=6mm"):
+% ,twoside
+\documentclass[a4paper,ngerman,cdgeometry=no,DIV=10,cdfont=no,cleardoublespecialpage=true,open=right,BCOR=6mm]{tudscrreprt}
 
-\iftutex
-  \usepackage{fontspec}
-\else
-  \usepackage[T1]{fontenc}
-  \usepackage{hyphsubst}
-\fi
-
-\usepackage[utf8]{inputenc}
-\usepackage{babel}
-\usepackage{isodate}
-
-\usepackage[
-    style=numeric-comp,
-    backend=biber,
-    url=false,
-    doi=false,
-    isbn=false,
-    hyperref,
-]{biblatex}
-\addbibresource{bibliography.bib}
-\AtEveryBibitem{%
-    \clearfield{note}%
-}
-
-\usepackage[hidelinks]{hyperref} % makes all links clickable but hides ugly boxes
-
-\usepackage[colorinlistoftodos,prependcaption,textsize=tiny]{todonotes}
-
-\usepackage{graphicx}
-
-\usepackage{blindtext}
-
-%\usepackage{tudscrsupervisor} % if you want to copy the sources of the task description into the thesis
-
-\usepackage{csquotes}
-
-
-
-\usepackage{caption}
-\captionsetup{font=sf,labelfont=bf,labelsep=space}
-\usepackage{floatrow}
-\floatsetup{font=sf}
-\floatsetup[table]{style=plaintop}
-\captionsetup{singlelinecheck=off,format=hang,justification=raggedright}
-\DeclareCaptionSubType[alph]{figure}
-\DeclareCaptionSubType[alph]{table}
-\captionsetup[subfloat]{labelformat=brace,list=off}
-
-\usepackage{booktabs}
-\usepackage{array}
-\usepackage{tabularx}
-\usepackage{longtable}
-
-\usepackage{quoting}
-
-\usepackage[babel]{microtype}
-
-\usepackage{xfrac}
-
-
-
-\input{lst.tex}
-
-\usepackage[capitalise,nameinlink,noabbrev]{cleveref} % automatically inserts Fig. X in the text with \cref{..}
-% if you need mathy stuff
-\newtheorem{lem}{Lemma}
-\crefname{lem}{Lemma}{Lemmas}
-\newtheorem{thm}{Theorem}
-\crefname{thm}{Theorem}{Theorems}
-\newtheorem{defs}{Definition}
-\crefname{defs}{Def.}{Defs.}
+\input{header.tex}
 
 \begin{document}
 
 \faculty{Fakultät Informatik}
-\department{}
-\institute{Institut für Software- und Multimediatechnik}
-\chair{Lehrstuhl für Softwaretechnologie}
+%\department{}
+%\institute{Institut für Software- und Multimediatechnik}
+\chair{Professur Für Softwaretechnologie}
 \title{%
-    Entwicklung eines optimalen Verfahrens zur Eroberung des
-    Geldspeichers in Entenhausen
+    Entwicklung eines optimalen Verfahrens zur Eroberung des Geldspeichers in Entenhausen
 }
 
 %% for a bachelor thesis
@@ -97,7 +30,6 @@
 %\graduation[Dipl.Inf.]{Diplom-Informatiker}
 
 \author{Mickey Mouse}
-\emailaddress[]{mickey.mouse@tu-dresden.de}
 \matriculationnumber{12345678}
 \matriculationyear{2016}
 \dateofbirth{1.1.1990}