diff --git a/.gitignore b/.gitignore
index 4af3d7a..e390b45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@
 *.snm
 *.toc
 *.vrb
+*.bcf
+*.xml
 *local
+images/sign.pdf
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9e56ac9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+# Der String 'template' muss angepasst werden zum eigenen Skriptname.
+
+TEXINPUTS = `kpsewhich -var-value TEXINPUTS`:./src
+
+template.pdf:
+	TEXINPUTS=$(TEXINPUTS) latexmk -g -pdf -silent -synctex=1 template
diff --git a/enviromentBeatJaeckle.sty b/enviromentBeatJaeckle.sty
deleted file mode 100644
index 126610c..0000000
--- a/enviromentBeatJaeckle.sty
+++ /dev/null
@@ -1,3 +0,0 @@
-\ProvidesPackage{enviromentBeatJaeckle}
-\usepackage{titlepage}
-\usepackage[parfill]{parskip}
diff --git a/enviromentOliverRietmann.sty b/enviromentOliverRietmann.sty
deleted file mode 100644
index f99a41e..0000000
--- a/enviromentOliverRietmann.sty
+++ /dev/null
@@ -1,152 +0,0 @@
-\ProvidesPackage{enviromentOliverRietmann}
-\usepackage[a4paper,total={160mm,250mm}]{geometry}
-\usepackage[utf8]{inputenc}
-\usepackage[ruled,vlined]{algorithm2e}
-\usepackage{amsmath}
-\usepackage{amsthm}
-\usepackage{amsfonts}
-\usepackage{amssymb}
-\usepackage{amscd}
-\usepackage{array}
-\usepackage{caption}
-\usepackage{dirtree}
-\usepackage{enumitem}
-\usepackage{graphicx}
-\usepackage[colorlinks=true,linkcolor=blue,pdfusetitle]{hyperref}
-\usepackage{listings}
-\usepackage{mathtools}
-\usepackage{mdframed}
-\usepackage{ngerman}
-\usepackage{subcaption}
-\usepackage{tcolorbox}
-\usepackage{tikz}
-\usepackage{xcolor}
-%\usepackage[inline]{showlabels}
-
-\tcbuselibrary{breakable}
-
-\definecolor{shade}{gray}{.5}
-
-\renewcommand*{\thesection}{\arabic{section}}
-\renewcommand{\thesubfigure}{\roman{subfigure}}
-
-%\theoremstyle{definition}
-%\newtheorem{aufgabe}{Aufgabe}
-%\numberwithin{aufgabe}{section}
-%\theoremstyle{definition}
-%\newtheorem*{losung}{Lösung}
-
-\definecolor{mygreen}{rgb}{0,0.6,0}
-\definecolor{mygray}{rgb}{0.5,0.5,0.5}
-\definecolor{mymauve}{rgb}{0.58,0,0.82}
-\definecolor{lightgray}{rgb}{0.9,0.9,0.9}
-
-\lstset{inputpath=./codes}
-\lstdefinestyle{python}{
-	backgroundcolor=\color{lightgray},   % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}; should come as last argument
-	basicstyle=\footnotesize\ttfamily,        % the size of the fonts that are used for the code
-	breakatwhitespace=false,         % sets if automatic breaks should only happen at whitespace
-	breaklines=true,                 % sets automatic line breaking
-	captionpos=b,                    % sets the caption-position to bottom
-	commentstyle=\color{mygreen},    % comment style
-	deletekeywords={...},            % if you want to delete keywords from the given language
-	escapeinside={\\[}{\\]},          % if you want to add LaTeX within your code
-	extendedchars=true,              % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
-	firstnumber=1,                   % start line enumeration with line 1000
-	frame=single,	                 % adds a frame around the code
-	keepspaces=true,                 % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
-	keywordstyle=\color{blue},       % keyword style
-	language=Python,                 % the language of the code
-	literate=%
-	    {ä}{{\"a}}1%
-		{ö}{{\"o}}1%
-		{ü}{{\"u}}1%
-		{ß}{{\ss}}1%
-		{Ä}{{\"A}}1%
-		{Ö}{{\"O}}1%
-		{Ü}{{\"U}}1,%
-	morekeywords={*,...},            % if you want to add more keywords to the set
-	numbers=left,                    % where to put the line-numbers; possible values are (none, left, right)
-	numbersep=5pt,                   % how far the line-numbers are from the code
-	numberstyle=\tiny\color{mygray}, % the style that is used for the line-numbers
-	rulecolor=\color{black},         % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
-	showspaces=false,                % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
-	showstringspaces=false,          % underline spaces within strings only
-	showtabs=false,                  % show tabs within strings adding particular underscores
-	stepnumber=1,                    % the step between two line-numbers. If it's 1, each line will be numbered
-	stringstyle=\color{mymauve},     % string literal style
-	tabsize=4,	                     % sets default tabsize to 2 spaces
-	title=\lstname,                   % show the filename of files included with \lstinputlisting; also try caption instead of title
-	rangeprefix=\#---,
-	rangesuffix=---,
-	includerangemarker=false
-}
-
-\newcounter{taskcounter}
-\numberwithin{taskcounter}{section}
-
-\newenvironment{aufgabe}{%
-	\refstepcounter{taskcounter}
-	\mdfsetup{%
-		frametitle={%
-			\tikz[baseline=(current bounding box.east),outer sep=0pt]
-			\node[anchor=east,rectangle,fill=blue!20]
-			{\strut Aufgabe~\thetaskcounter};
-		}
-	}
-	\mdfsetup{%
-		innertopmargin=5pt,linecolor=blue!20,%
-		linewidth=2pt,topline=true,roundcorner=5pt,%
-		frametitleaboveskip=\dimexpr-\ht\strutbox\relax%
-	}
-	\begin{mdframed}[nobreak=false]\relax
-}{%
-	\end{mdframed}
-}
-
-\newenvironment{losung}{%
-	\mdfsetup{%
-		frametitle={%
-			\tikz[baseline=(current bounding box.east),outer sep=0pt]
-			\node[anchor=east,rectangle,fill=green!20]
-			{\strut Lösung};
-		}
-	}
-	\mdfsetup{%
-		innertopmargin=5pt,linecolor=green!20,%
-		linewidth=2pt,topline=true,roundcorner=5pt,%
-		frametitleaboveskip=\dimexpr-\ht\strutbox\relax%
-	}
-	\begin{mdframed}[nobreak=false]\relax
-}{%
-	\end{mdframed}
-}
-
-%\newtcolorbox{mybox}[3][]
-%{
-%	colframe = #2!25,
-%	colback  = #2!10,
-%	coltitle = #2!20!black,
-%	title    = {#3},
-%	#1,
-%}
-%\newcounter{taskcounter}
-%\numberwithin{taskcounter}{section}
-%\newenvironment{aufgabe}{%
-%	\refstepcounter{taskcounter}
-%	\begin{mybox}{blue}{Aufgabe~\thetaskcounter}\relax
-%	}{%
-%	\end{mybox}
-%}
-%\newenvironment{losung}{%
-%	\begin{mybox}{red}{Lösung}\relax
-%	}{%
-%	\end{mybox}
-%}
-
-%\pagestyle{empty}
-\makeatletter\@addtoreset{section}{part}\makeatother%
-
-\title{TODO TITLE}
-\author{TODO AUTHOR}
-\date{\today}
diff --git a/src/mentorierteArbeit.sty b/src/mentorierteArbeit.sty
new file mode 100644
index 0000000..70499de
--- /dev/null
+++ b/src/mentorierteArbeit.sty
@@ -0,0 +1,27 @@
+%\ProvidesPackage{mentorierteArbeit}
+
+\usepackage{amsthm}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{amscd}
+\usepackage{amsmath}
+\usepackage[total={160mm,250mm}]{geometry}
+\usepackage[colorlinks=true,linkcolor=blue,pdfusetitle]{hyperref}
+\newtheorem{definition}{Definition}[section]
+
+\usepackage{graphicx}
+\usepackage[ngerman]{babel}
+\usepackage{ngerman}
+\usepackage{src/titlepage}
+
+% \usepackage[parfill]{parskip}  % Abstände zwischen den Absätzen
+
+\newtheorem{satz}{Satz}[section]
+\newtheorem{beispiel}{Beispiel}[section]
+\newtheorem{bemerkung}{Bemerkung}[section]
+
+\newtheorem{exercise}{Aufgabe}[section]
+
+\usepackage{xcolor}
+
+\newcommand{\vvec}[1]{\overrightarrow{#1}}
diff --git a/src/titlepage.sty b/src/titlepage.sty
new file mode 100644
index 0000000..389fb15
--- /dev/null
+++ b/src/titlepage.sty
@@ -0,0 +1,68 @@
+\usepackage{titling}
+
+\newcommand*{\project}[1]{\gdef\@project{#1}}
+\newcommand*{\@project}{Final Year Project}
+\newcommand*{\supervisor}[1]{\gdef\@supervisor{#1}}
+\newcommand*{\@supervisor}{\texttt{TODO: Set \string\supervisor\string{...\string}}}
+\newcommand*{\content}[1]{\gdef\@content{#1}}
+\newcommand*{\@content}{\texttt{TODO: Set \string\content\string{...\string}}}
+\newcommand*{\targetaudience}[1]{\gdef\@targetaudience{#1}}
+\newcommand*{\@targetaudience}{\texttt{TODO: Set \string\targetaudience\string{...\string}}}
+\newcommand*{\requirements}[1]{\gdef\@requirements{#1}}
+\newcommand*{\@requirements}{\texttt{TODO: Set \string\requirements\string{...\string}}}
+\newcommand*{\form}[1]{\gdef\@form{#1}}
+\newcommand*{\@form}{\texttt{TODO: Set \string\form\string{...\string}}}
+
+\renewcommand{\maketitle}{%
+{\hspace{-1cm}\includegraphics[width=0.3\textwidth]{images/ETHlogo}\par}
+\vspace{1cm}
+\begin{center}
+{\scshape\@project\par}
+
+\vspace{1cm}
+{\large\bfseries \thetitle\par}
+
+\theauthor
+\vfill
+
+%% Optional kann ein Titelbild eingefügt werden.
+% \includegraphics[width=0.7\linewidth]{images/title}
+
+\vfill
+\end{center}
+
+\textbf{Inhalt}
+
+\@content
+\vspace{1em}
+
+
+\textbf{Zielpublikum}
+
+\@targetaudience
+\vspace{1em}
+
+
+\textbf{Voraussetzungen}
+
+\@requirements
+\vspace{1em}
+
+
+\textbf{Form}
+
+\@form
+\vspace{1em}
+
+
+\textbf{Betreuung}
+
+\@supervisor
+\vspace{1em}
+
+
+\textbf{Datum}
+
+\thedate
+}
+
diff --git a/template.pdf b/template.pdf
index d4e6b03..006c8b3 100644
Binary files a/template.pdf and b/template.pdf differ
diff --git a/template.tex b/template.tex
index 3252b30..7ce1bf7 100644
--- a/template.tex
+++ b/template.tex
@@ -1,6 +1,5 @@
-\documentclass[12pt,a4paper]{article}
-\usepackage{enviromentOliverRietmann}
-\usepackage{enviromentBeatJaeckle}
+\documentclass[12pt,a4paper,ngerman]{article}
+\input{src/mentorierteArbeit.sty}
 
 \title{TODO Titel}
 \author{TODO Autor}