diff --git a/src/coloredThese.sty b/src/coloredThese.sty
new file mode 100644
index 0000000..5c42087
--- /dev/null
+++ b/src/coloredThese.sty
@@ -0,0 +1,56 @@
+\usepackage[many]{tcolorbox}           % for COLORED BOXES (tikz and xcolor included)
+\usepackage{setspace}
+\definecolor{black}{rgb}{0.0, 0.0, 0.0}    % setting main color to be used
+\definecolor{lightgray}{rgb}{0.95, 0.95, 0.95}     % setting sub color to be used
+\definecolor{white}{rgb}{1.0, 1.0, 1.0}
+\definecolor{lightblue}{HTML}{40A5FF}
+\definecolor{verylightblue}{HTML}{E4F6F8}
+\definecolor{orange}{HTML}{FE8D01}
+\definecolor{lightorange}{HTML}{FFF0E0}
+
+\newtcolorbox{boxB}{
+	fontupper = \color{black}, % font color
+	boxrule = 1.5pt,
+	colframe = black,
+	rounded corners,
+	arc = 5pt   % corners roundness
+}
+
+\newtcolorbox{boxL}{
+	fontupper = \color{black}, % font color
+	boxrule = 1.5pt,
+	colframe = black,
+	colback = white,
+	rounded corners,
+	arc = 5pt   % corners roundness
+}
+
+\newtcolorbox{boxBeispiel}{
+	colback = lightorange,
+	colframe = orange,
+	boxrule = 0pt,
+	toprule = 6pt % top rule weight
+}
+
+\newtcolorbox{boxAufgabe}{
+	colback = verylightblue,
+	colframe = lightblue,
+	boxrule = 0pt,
+	toprule = 6pt % top rule weight
+}
+\newenvironment{exmp}{\begin{boxBeispiel}\begin{ZZexmp}}{\end{ZZexmp}\end{boxBeispiel}}
+% \newenvironment{beispiel}{\begin{boxBeispiel}\begin{ZZexmp}}{\end{ZZexmp}\end{boxBeispiel}}
+\newenvironment{task}{\begin{boxAufgabe}\begin{ZZexercise}}{\end{ZZexercise}\end{boxAufgabe}}
+% \newenvironment{exercise}{\begin{boxAufgabe}\begin{ZZexercise}}{\end{ZZexercise}\end{boxAufgabe}}
+\newtheorem{ZZexercise}{Aufgabe}[section]
+
+\definecolor{lightgreen}{HTML}{cff6c6}
+\definecolor{darkgreen}{HTML}{55f699}
+\newenvironment{definition}{\begin{boxDefinition}\begin{ZZdefinition}}{\end{ZZdefinition}\end{boxDefinition}}
+\newtcolorbox{boxDefinition}{
+	colback = lightgreen,
+	colframe = darkgreen,
+	boxrule = 0pt,
+	toprule = 6pt % top rule weight
+}\theoremstyle{definition}
+\newtheorem{ZZexmp}{Beispiel}[section]
diff --git a/src/mentorierteArbeit.sty b/src/mentorierteArbeit.sty
index 70499de..e960c93 100644
--- a/src/mentorierteArbeit.sty
+++ b/src/mentorierteArbeit.sty
@@ -7,21 +7,22 @@
 \usepackage{amsmath}
 \usepackage[total={160mm,250mm}]{geometry}
 \usepackage[colorlinks=true,linkcolor=blue,pdfusetitle]{hyperref}
-\newtheorem{definition}{Definition}[section]
+\newtheorem{ZZdefinition}{Definition}[section]
 
 \usepackage{graphicx}
 \usepackage[ngerman]{babel}
 \usepackage{ngerman}
-\usepackage{src/titlepage}
+%\usepackage{src/titlepage}
 
-% \usepackage[parfill]{parskip}  % Abstände zwischen den Absätzen
+\usepackage[parfill]{parskip}  % Abstände zwischen den Absätzen
 
 \newtheorem{satz}{Satz}[section]
-\newtheorem{beispiel}{Beispiel}[section]
+%\newtheorem{beispiel}{Beispiel}[section]
 \newtheorem{bemerkung}{Bemerkung}[section]
 
-\newtheorem{exercise}{Aufgabe}[section]
+%\newtheorem{exercise}{Aufgabe}[section]
 
 \usepackage{xcolor}
+\usepackage[title]{appendix}
 
 \newcommand{\vvec}[1]{\overrightarrow{#1}}
diff --git a/src/titlepage.sty b/src/titlepage.sty
index 389fb15..fac1d88 100644
--- a/src/titlepage.sty
+++ b/src/titlepage.sty
@@ -1,17 +1,21 @@
+\makeatletter
 \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}}}
+\newcommand*{\@project}{Arbeit}
+\newif\if@supervisor
+\newcommand*{\supervisor}[1]{\@supervisortrue\gdef\@supervisor{#1}}
+\newif\if@content
+\newcommand*{\content}[1]{\@contenttrue\gdef\@content{#1}}
+\newif\if@targetaudience
+\newcommand*{\targetaudience}[1]{\@targetaudiencetrue\gdef\@targetaudience{#1}}
+\newif\if@requirements
+\newcommand*{\requirements}[1]{\@requirementstrue\gdef\@requirements{#1}}
+\newif\if@form
+\newcommand*{\form}[1]{\@formtrue\gdef\@form{#1}}
+\newif\if@license
+\newcommand{\license}[1]{\@licensetrue\gdef\@license{#1}}
 
 \renewcommand{\maketitle}{%
 {\hspace{-1cm}\includegraphics[width=0.3\textwidth]{images/ETHlogo}\par}
@@ -30,39 +34,53 @@
 
 \vfill
 \end{center}
+\if@content
+	\textbf{Inhalt}
 
-\textbf{Inhalt}
+	\@content
+	\vspace{1em}
+\fi
 
-\@content
-\vspace{1em}
+\if@targetaudience
+	\textbf{Zielpublikum}
 
+	\@targetaudience
+	\vspace{1em}
+\fi
 
-\textbf{Zielpublikum}
+\if@requirements
+	\textbf{Voraussetzungen}
 
-\@targetaudience
-\vspace{1em}
+	\@requirements
+	\vspace{1em}
+\fi
 
+\if@form
+	\textbf{Form}
 
-\textbf{Voraussetzungen}
+	\@form
+	\vspace{1em}
+\fi
 
-\@requirements
-\vspace{1em}
-
-
-\textbf{Form}
-
-\@form
-\vspace{1em}
-
-
-\textbf{Betreuung}
-
-\@supervisor
-\vspace{1em}
+\if@supervisor
+	\textbf{Betreuung}
 
+	\@supervisor
+	\vspace{1em}
+\fi
 
 \textbf{Datum}
 
 \thedate
+\vspace{1em}
+
+\if@license
+% \textbf{Copyright:}
+
+\@license
+
+© 2025 \theauthor
+\fi
+
 }
 
diff --git a/template.pdf b/template.pdf
index 006c8b3..6f0e64a 100644
Binary files a/template.pdf and b/template.pdf differ
diff --git a/template.tex b/template.tex
index 7ce1bf7..4e5dd20 100644
--- a/template.tex
+++ b/template.tex
@@ -1,17 +1,23 @@
 \documentclass[12pt,a4paper,ngerman]{article}
 \input{src/mentorierteArbeit.sty}
+\input{src/coloredThese.sty}
+\input{src/titlepage.sty}
+%\hypersetup{pdfusetitle}
 
 \title{TODO Titel}
 \author{TODO Autor}
 \date{\today}
-\supervisor{Dr. Pr. TODO}
 \project{Mentorierte Arbeit in Fachdidaktik Mathematik}
 %\project{Mentorierte  Arbeit in fachwissenschaftlicher Vertiefung mit pädagogischem Fokus in Mathematik}
+%\project{Semesterbegleitende Übung}
+
+%% Folgende Tags können auskommentiert werden:
+\supervisor{Dr. Pr. TODO}
 \content{TOOD Inhalt}
 \targetaudience{TODO Zielpublikum}
 \requirements{TODO Voraussetzungen}
 \form{TODO Form}
-\hypersetup{pdfusetitle}
+\license{CC BY-NC-SA 4.0}
 
 \begin{document}
 \begin{titlepage}