diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..41a9c12e9aeb5443a531216e58e09240be02d870
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,56 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+*.fmt
+*.fot
+*.cb
+*.cb2
+.*.lb
+
+## Intermediate documents:
+*.dvi
+*.xdv
+*-converted-to.*
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+*.tdo
+
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex
+*.synctex.gz
+*.pdfsync
+
+## Build tool directories for auxiliary files
+# latexrun
+latex.out
+main.pdf
+*WZLstyle.xml
+# *.pdf
+*.bbl-SAVE-ERROR
+*.bcf-SAVE-ERROR
+*.glo
+*.ist
+*.slo
+*.sls
+*.slg
+*.gls
+*.glg
+main.synctex(busy)
+main-embed.pdf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3a79a4e4341593c3f5e117e44e92b9413cc938fa
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,41 @@
+stages:
+  - build
+  - drawio
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+Build:
+  image:
+    name: "markpsanders/tinytex-build:latest"
+  stage: build
+  timeout: 20m
+  script:
+    - cat /etc/os-release
+    - uname -r
+    - echo $PATH
+
+    - cd format/fonts/Fira/
+
+    - unzip Fira_Sans.zip
+    - mkdir -p /usr/share/fonts/truetype/FiraSans/
+    - cp *.ttf /usr/share/fonts/truetype/FiraSans/
+
+    - mkdir -p /usr/share/fonts/opentype/FiraMath/
+    - cp *.otf /usr/share/fonts/opentype/FiraMath/
+
+    - fc-cache -fv
+    - cd ../../..
+
+    # - tlmgr update --self --all
+    - tlmgr install `cat texlive_packages.txt`
+    - ls -al
+    - latexmk -synctex=1 --shell-escape --interaction=nonstopmode -file-line-error -xelatex main
+    - latexmk -synctex=1 --shell-escape --interaction=nonstopmode -file-line-error -xelatex 02_documents/topic_description.tex
+  tags:
+    - docker
+    - amd64
+  artifacts:
+    paths:
+      - ./main.pdf
+      - ./topic_description.pdf
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..8060b092d66959c009a8badea50d1bcd56ae6374
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "format/rwthcolors"]
+	path = format/rwthcolors
+	url = https://git.rwth-aachen.de/philipp.leibner/rwthcolors
diff --git a/.latexmkrc b/.latexmkrc
new file mode 100644
index 0000000000000000000000000000000000000000..436b9fc3ac886a57ccf833b3617dcc2bbbd7dc8f
--- /dev/null
+++ b/.latexmkrc
@@ -0,0 +1 @@
+$xelatex='xelatex --shell-escape %O %S ; ps2pdf14 -dPDFSETTINGS=/prepress %B.pdf %B-embed.pdf; mv %B-embed.pdf %B.pdf';
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..8863ce57f217ec5f73a525b9e1f7bf00e45146f4
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,21 @@
+{
+    "files.exclude": {
+        "**/*.aux": true,
+        "**/*.bbl": true,
+        "**/*.bcf": true,
+        "**/*.blg": true,
+        "**/*.fls": true,
+        "**/*.fdb_latexmk": true,
+        "**/*.lof": true,
+        "**/*.lot": true,
+        "**/*.out": true,
+        "**/*.tdo": true,
+        "**/*.run.xml": true,
+        "**/*.toc": true,
+        "**/*.synctex.gz": true,
+        "**/*.xdv": true
+    },
+    "cSpell.words": [
+        "usefiramath"
+    ]
+}
\ No newline at end of file
diff --git a/01_chapters/ch1-intro.tex b/01_chapters/ch1-intro.tex
index baea75174108b8ede3ccef1e41d5656c125c50e1..d41e7fcd9846f2003abc0f995fbd96c8bbcd5102 100644
--- a/01_chapters/ch1-intro.tex
+++ b/01_chapters/ch1-intro.tex
@@ -16,16 +16,16 @@ To add a new chapter, right-click on 01-chapters and add a new document. In orde
 
 \section{Including figures}
 
-The command to include a graphic is "\textbackslash includegraphics". To add a description use the following command "\textbackslash caption\{your Text\}". However this command can only be used in a specific surrounding (marked by "\textbackslash begin\{figure\}" and "\textbackslash end\{figure\}".
+The command to include a graphic is "\\textbackslash includegraphics". To add a description use the following command "\textbackslash caption\{your Text\}". However this command can only be used in a specific surrounding (marked by "\textbackslash begin\{figure\}" and "\textbackslash end\{figure\}".
 
 The surrounding has also other functions, which you can use; for futher information look up the following website: \url{https://de.overleaf.com/learn/latex/Inserting_Images}
 
 
 \begin{figure}[ht]
-	\centering
-	\includegraphics[width=1\textwidth]{DSR}
-	\caption{TMP: Design science research framework original image \cite[based on][p. 80]{HEVN04}.}
-	\label{fig:DSR}
+    \centering
+    \includegraphics[width=1\textwidth]{DSR}
+    \caption{TMP: Design science research framework original image \cite[based on][p. 80]{HEVN04}.}
+    \label{fig:DSR}
 \end{figure}
 
 
@@ -40,20 +40,29 @@ The "label"-command is for referencing the table or graphic in your text: Table
 \begin{table}[H]
     \caption{Comparison of different desserts.}
     \label{desserts}
-    \centering
-    \begin{tabular}{@{}lllll@{}}
-        \toprule
-        hier soll was stehen & gut & neutral & schlecht & k.A. \\ \midrule
+    \center
+    \begin{tblrrwth}{}
+        hier soll was stehen & gut & neutral & schlecht & k.A. \\
         Käsekuchen           &     &         &          &      \\
         Schokotorte          &     &         &          &      \\
-        Brombeereis          &     &         &          &      \\ \bottomrule
-    \end{tabular}
+        Brombeereis          &     &         &          &      \\
+    \end{tblrrwth}
+\end{table}
+
+\begin{table}[H]
+    \caption{Here are Harvey Balls}
+    \label{harveyballs}
+    \center
+    \begin{tblrrwth}{cccccc}
+        Description & full & 3/4 & 1/2 & 1/4 & 0 & custom \\
+        Harvey ball & \harveyBallFull & \harveyBallThreeQuarter & \harveyBallHalf & \harveyBallQuarter & \harveyBallNone & \harveyBallCustom{225}{pink} \\
+    \end{tblrrwth}
 \end{table}
 
 
 
 \section{Citation}
-
+%
 In order to cite a reference, it first has to be included to the Bib. To do so, follow the instructions of the following link: \url{https://www.youtube.com/watch?v=kbvf01ExKVU}
 
 \cite[based on][p. 80]{HEVN04}
@@ -61,5 +70,13 @@ In order to cite a reference, it first has to be included to the Bib. To do so,
 \\\cite{LAMP86}
 
 \section{Acronyms}
+%
+For adding something to the Acronyms, go to "acronyms.tex". In this document you will find the table of Acronyms. E.g., \ac{nfdi4ing}.
+\\
+Acronyms are automatically added to the \textit{Table of Acronmys}.
+%
+\section{List of symbols, Glossary}
+%
+There are other automatically created lists, namely the list of symbols and the glossary. E.g., \gls{opc_ua}, or $ \gls{symb:C} $.
+\\
 
-For adding something to the Acronyms, go to "en" or "de" (depending on you using german or english) and select "frontmatter.tex". In this document you will find the table of Acronyms.
diff --git a/01_chapters/ch2-theory.tex b/01_chapters/ch2-theory.tex
index 1e3117372f746783cf041b30adab845dd2608516..37c94ceb2265072c3875720222fc648d98744bf7 100644
--- a/01_chapters/ch2-theory.tex
+++ b/01_chapters/ch2-theory.tex
@@ -1,11 +1,43 @@
 % !TeX root = main.tex
 \chapter{Theoretical Background}
 
+
+\begin{sectionabstract}{
+        \Blindtext[1]
+    }
+\end{sectionabstract}
+%
+\Blindtext[3]
+
+
+
 To achieve rigorousness... \cite[80]{HEVN04}
 
 
-\Blindtext[10]
+\Blindtext[1]
+
+\section{test-section}
+
+\blindmathpaper
 
 \section{test-section}
 
-\Blindtext[4]
\ No newline at end of file
+\Blindtext[2]
+\clearpage
+\renewcommand{\chaptercolor}{RWTHTuerkis100}
+\chapter{Another Test}
+
+\begin{sectionabstract}{
+
+        \Blindtext[1]
+    }
+
+    asdfasdfasdf & The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.\\
+    asdfasdf & The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.\\
+    asdfasdfasdfasdf & The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.\\
+    asdfasdfasdf & The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.\\
+\end{sectionabstract}
+%
+\blindmathtrue
+\Blindtext[2]
+\blindmathpaper
diff --git a/02_documents/Formular_Logo_Verwendung.pdf b/02_documents/Formular_Logo_Verwendung.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e86ad9a187604f44b932876158322a394fc7a9d4
Binary files /dev/null and b/02_documents/Formular_Logo_Verwendung.pdf differ
diff --git a/02_documents/deckblattundformularlogoverwendung.pdf b/02_documents/deckblattundformularlogoverwendung.pdf
deleted file mode 100644
index da88f16424c3840a2a5a2efa86e462f4af803fa7..0000000000000000000000000000000000000000
Binary files a/02_documents/deckblattundformularlogoverwendung.pdf and /dev/null differ
diff --git a/02_documents/formular_eidesstattliche+versicherung_neu_declaration+of+academic+integrity.pdf b/02_documents/formular_eidesstattliche+versicherung_neu_declaration+of+academic+integrity.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..70e0fff5e9ba2f660878ddeff901cf56d8f78da8
Binary files /dev/null and b/02_documents/formular_eidesstattliche+versicherung_neu_declaration+of+academic+integrity.pdf differ
diff --git a/02_documents/Themenstellung.tex b/02_documents/topic_description.tex
similarity index 72%
rename from 02_documents/Themenstellung.tex
rename to 02_documents/topic_description.tex
index 7d9fdb8fa0f8a32e2985ed04080342ca49fea0a2..953e753429440af5ef19b9c0b33bf2d73cc0ab80 100644
--- a/02_documents/Themenstellung.tex
+++ b/02_documents/topic_description.tex
@@ -1,13 +1,32 @@
-% !TeX root = main.tex
+\documentclass[
+    a4paper,        % a4paper/a5paper
+    11pt,           % 11pt for A4, 8pt for A5
+    en,             % Language [DE|EN]
+    usefiramath,    % use fira math for equations
+    sans,           % Font without serif (like Arial),
+    % twoside,
+    openright
+    ]{format/WZLTemplate}
+
+\begin{document}
+\graphicspath{{./03_figures/}}
 % Themenstellung / Topic short description
 \pagestyle{empty}
-~
-\newpage
-\begin{tikzpicture}[remember picture,overlay]
-	\node[opacity=0.4, anchor=north east,inner sep=0pt]%
-	at ($(current page.north west)+(20.5cm,-0.5cm)$)
-	{\includegraphics[width=7.67cm]{DIGITAL_WZL-Logo-Blau.jpg}};
-\end{tikzpicture}
+\addtocounter{page}{-1}
+\ifnum\papersize=4
+	\begin{tikzpicture}[remember picture,overlay]
+		\node[opacity=0.4, anchor=north east,inner sep=0pt]%
+		at ($(current page.north west)+(20.5cm,-0.5cm)$)
+		{\includegraphics[width=7.67cm]{wzl_eps_hks44.pdf}};
+	\end{tikzpicture}
+\else
+	\begin{tikzpicture}[remember picture,overlay]
+		\node[opacity=0.4, anchor=north east]%
+		at (current page.north east)%
+		{\includegraphics[width=5.4cm]{wzl_eps_hks44.pdf}};
+	\end{tikzpicture}
+\fi
+
 \parindent=0em
 
 Aachen, \verbosedate\today\\
@@ -18,20 +37,20 @@ V. Name - Tel. 0241-80 xxxxx\\[2cm]
 % {\huge \bf Masterarbeit}\\[1cm] %% DE
 
 \begin{tabbing}
-%% EN
-for Ms./Mrs. Cand.-Ing. \quad \= Erika Mustermann\\
-\> Matriculation number: 081511\\
-
-%% DE 
-%für Frau/Herrn Cand.-Ing. \quad \= Erika Mustermann\\
-%\> Matrikelnummer: 081511\\
-	
+	%% EN
+	for Ms./Mrs. Cand.-Ing. \quad \= Erika Mustermann\\
+	\> Matriculation number: 081511\\
+
+	%% DE 
+	%für Frau/Herrn Cand.-Ing. \quad \= Erika Mustermann\\
+	%\> Matrikelnummer: 081511\\
+
 \end{tabbing}
 
 \begin{minipage}[t]{0.1\textwidth}
-Topic: %% EN
-%Thema: %% DE
-\quad
+	Topic: %% EN
+	%Thema: %% DE
+	\quad
 \end{minipage}
 \begin{minipage}[t]{0.9\textwidth}
 	Entwicklung eines Werkzeugs zur Abbildung des Kommunikationsverhaltens und zur Wiederherstellung diskreter Systemzustände der Leitsoftware cosmos4.\\
@@ -41,7 +60,7 @@ The start of production for series production represents a major uncertainty and
 
 Within the scope of the work, concepts and tools are to be developed which enable the testing of the functionality of a production control software. In particular, the following questions are to be dealt with: which test cases can occur, how errors/tests can be reproduced, which data are necessary for the clear diagnosis of an error and to what extent tools can be used for error correction. Based on these considerations, a concept for information visualization is to be developed and realized exemplarily. The information content as well as the temporal sequence of the information flow within the production control software should be mapped and the possibility should be provided to reset the system into a freely defined state (time). The developed concepts are to be realized exemplarily on the basis of the control software cosmos4. The functionality and performance of the developed tools will be verified using an example scenario in the Integrated Manufacturing and Assembly System (IFMS) of the WZL.\\
 
-In detail, the following subtasks have to be solved:\\[-1cm]
+In detail, the following subtasks have to be solved:\\
 \begin{itemize}
 	\item Introduction with the leading software cosmos4
 	\item Development of a comprehensive concept for error diagnosis and correction
@@ -52,3 +71,6 @@ In detail, the following subtasks have to be solved:\\[-1cm]
 
 Prof. Dr.-Ing. Robert Schmitt
 
+
+
+\end{document}
\ No newline at end of file
diff --git a/03_figures/DIGITAL_WZL-Logo-Blau.jpg b/03_figures/DIGITAL_WZL-Logo-Blau.jpg
deleted file mode 100644
index 8ee1ad50f690841a6854e87f1ef0d4485157dc39..0000000000000000000000000000000000000000
Binary files a/03_figures/DIGITAL_WZL-Logo-Blau.jpg and /dev/null differ
diff --git a/03_figures/wzl-latex-logo.png b/03_figures/wzl-latex-logo.png
deleted file mode 100644
index f4239b829e90d8b1ac9e3754ddf06291d152edbb..0000000000000000000000000000000000000000
Binary files a/03_figures/wzl-latex-logo.png and /dev/null differ
diff --git a/03_figures/wzl.svg b/03_figures/wzl.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d93d65a5a0553a1465aadd3188f5b117232d1ca1
--- /dev/null
+++ b/03_figures/wzl.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="443.07358"
+   height="61.1744"
+   viewBox="0 0 443.07358 61.1744"
+   sodipodi:docname="wzl_eps_hks44.svg"
+   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath52">
+      <path
+         d="M 141.73,227.906 H 1485.79 V 681.449 H 141.73 Z"
+         id="path50" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="namedview4"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="2.5456159"
+     inkscape:cx="208.20109"
+     inkscape:cy="30.640915"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10" />
+  <g
+     id="g8"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.3333333,0,0,-1.3333333,-18.8984,91.086398)">
+    <g
+       id="g10"
+       transform="scale(0.1)">
+      <g
+         id="g5295">
+        <path
+           d="m 2901.8,412.035 h 20.52 c 19.61,0 30.18,-9.957 30.18,-29.875 0,-23.238 -11.78,-32.285 -32.6,-32.285 h -18.1 z m -43.45,-183.469 h 43.45 v 91.129 h 23.23 c 17.5,0 25.05,-10.254 25.66,-27.156 l 1.2,-41.344 c 0.3,-8.445 1.21,-16.59 5.43,-22.629 h 47.07 v 1.813 c -8.14,4.226 -9.35,15.992 -9.65,38.621 -0.6,45.566 -5.13,61.863 -34.71,65.781 v 0.61 c 24.44,5.129 35.92,24.437 35.92,53.105 0,36.817 -21.73,55.524 -57.34,55.524 h -80.26 V 228.566"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path12" />
+        <path
+           d="M 2217.72,444.02 V 293.75 c 0,-57.637 33.49,-69.41 68.79,-69.41 35.31,0 68.8,14.484 68.8,69.41 v 150.27 h -43.45 V 293.75 c 0,-21.43 -5.13,-37.426 -25.35,-37.426 -20.22,0 -25.34,15.996 -25.34,37.426 v 150.27 h -43.45"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path14" />
+        <path
+           d="M 2365.95,444.02 V 228.566 h 39.83 v 150.875 h 0.61 l 53.11,-150.875 h 49.48 V 444.02 h -39.83 V 296.461 h -0.6 l -52.51,147.559 h -50.09"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path16" />
+        <path
+           d="M 2563.6,228.566 V 444.02 h -43.45 V 228.566 h 43.45"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path18" />
+        <path
+           d="m 2566.59,444.02 49.48,-215.454 h 55.82 l 49.49,215.454 h -44.96 l -31.98,-159.329 h -0.9 l -30.48,159.329 h -46.47"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path20" />
+        <path
+           d="M 2725.25,444.02 V 228.566 h 123.42 v 35.606 h -79.96 v 57.937 h 72.42 v 35.61 h -72.42 v 50.691 h 76.94 v 35.61 h -120.4"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path22" />
+        <path
+           d="m 2999.55,295.859 v -8.75 c 0,-39.839 19.31,-62.769 68.5,-62.769 47.07,0 74.83,20.519 74.83,66.09 0,26.25 -8.45,42.843 -41.03,57.027 l -33.5,14.484 c -18.41,7.844 -22.33,15.993 -22.33,29.266 0,12.676 5.13,25.047 24.74,25.047 16.6,0 23.54,-11.766 23.54,-31.984 h 41.64 v 6.035 c 0,41.343 -28.06,57.937 -66.69,57.937 -41.04,0 -66.68,-21.422 -66.68,-63.363 0,-35.914 17.8,-51.906 56.43,-65.184 28.66,-9.953 38.62,-17.199 38.62,-36.812 0,-18.102 -12.67,-26.559 -25.95,-26.559 -22.94,0 -28.67,12.977 -28.67,33.196 v 6.339 h -43.45"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path24" />
+        <path
+           d="M 3192.01,228.566 V 444.02 h -43.45 V 228.566 h 43.45"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path26" />
+        <path
+           d="m 3417.71,444.02 -30.18,-83.282 h -0.6 l -28.36,83.282 h -160.86 v -35.61 h 47.07 V 228.566 h 43.46 V 408.41 h 36.65 l 40.61,-95.051 v -84.793 h 43.46 v 84.793 l 55.83,130.661 h -47.08"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path28" />
+        <path
+           d="m 1836,463.617 h -72 v 214.817 c 0,0.293 0,1.593 0,1.593 v 0 h 69.1 0.15 48.82 c 32.03,0.008 59.63,-20.718 68.64,-48.199 8.35,-25.457 1.21,-53.125 -17.61,-72.812 2.5,-6.786 4.94,-12.086 7.26,-18.18 5.23,-12.051 10.02,-24.098 15.24,-35.996 l 17.13,-41.223 h -0.44 -72.57 c 0,-0.039 -0.58,1.742 -1.16,2.469 -2.9,6.383 -5.51,13.207 -8.42,19.594 l -17.56,41.656 c -6.97,16.836 -13.93,32.746 -20.9,49.582 8.69,0.238 15.2,-1.391 23.59,2.465 5.89,2.902 14.83,10.117 15.06,23.941 -0.23,6.856 -2.13,12.043 -6.66,17.442 -4.55,5.019 -11.12,8.738 -19.7,8.859 0,0 -27.98,0.016 -27.97,0 V 463.617"
+           style="fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path30" />
+        <path
+           d="m 2588.06,680.027 v -216.41 h -72 v 88.246 h -6.72 -43.11 -0.58 v -88.246 c -13.06,0 -27.14,0.145 -40.2,0 h -31.8 v 166.336 h -50.36 c 0,-1.598 0,-3.191 0,-5.223 v -15.675 -71.27 -74.168 h -0.58 -71.42 v 89.699 3.481 73.156 H 2220.5 V 551.43 463.617 h -74.17 c -12.92,31.207 -26.56,62.699 -39.19,93.766 -1.45,6.527 -2.9,13.062 -4.79,19.449 v 0 -113.215 h -74.32 c -14.73,34.25 -28.88,67.821 -43.57,102.578 -5.1,12.043 -9.26,21.848 -14.52,34.364 l -0.73,1.636 -11.43,26.852 -16.38,38.351 c -1.44,4.356 -3.77,8.278 -5.22,12.629 h 74.15 c 15.24,-37.011 30.62,-73.589 46.59,-110.019 l 0.44,-0.871 c -0.58,4.211 -1.9,9.582 -2.62,13.644 v 64.59 c 0.14,10.305 0,22.063 0,32.656 h 74.31 c 0.94,-2.355 1.46,-3.629 2.18,-5.515 8.71,-20.461 16.99,-40.785 25.7,-61.106 l 19.44,-44.269 v 0 c -0.43,4.648 -1.45,9.144 -2.03,13.644 v 97.246 h 5.95 50.52 182.88 51.96 v -13.5 -64.589 c 0,0 2.33,0 3.49,0 h 46.92 v 78.089 c 0,0 25.07,0 37.55,0 h 34.45"
+           style="fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path32" />
+        <path
+           d="m 2845.11,680.051 h -53.96 l -45.16,-170.594 -45.16,170.594 h -53.96 l -57.29,-216.434 h 45.47 l 9.99,45.774 h 57.61 l 10,-45.774 h 66.67 l 10,45.774 h 57.61 l 10,-45.774 h 45.46 z m -192.48,-134.895 20.92,97.305 h 0.6 l 20.92,-97.305 z m 144.28,0 20.92,97.305 h 0.6 l 20.91,-97.305 h -42.43"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path34" />
+        <path
+           d="m 3032.39,606.199 c 0,31.383 -4.52,76.949 -66.69,76.949 -65.17,0 -73.33,-46.468 -73.33,-111.953 0,-65.476 8.16,-111.949 73.33,-111.949 57.04,0 68.5,40.137 68.5,86.606 h -43.45 c 0,-46.469 -11.47,-54.618 -27.16,-54.618 -18.71,0 -27.76,11.766 -27.76,76.946 0,60.957 5.13,82.98 27.16,82.98 19.61,0 25.95,-13.578 25.95,-44.961 h 43.45 v 0"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path36" />
+        <path
+           d="m 3042.78,463.617 h 43.65 v 96.078 h 50.92 V 463.617 H 3181 v 216.41 h -43.65 v -82.75 h -50.92 v 82.75 h -43.65 v -216.41"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path38" />
+        <path
+           d="M 3190.46,680.066 V 463.617 h 123.99 v 35.774 h -80.33 v 58.203 h 72.75 v 35.773 h -72.75 v 50.93 h 77.3 v 35.769 h -120.96"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path40" />
+        <path
+           d="m 3320.93,680.027 v -216.41 h 40.01 v 151.551 h 0.6 l 53.36,-151.551 h 49.7 v 216.41 h -40.01 V 531.813 h -0.6 l -52.75,148.214 h -50.31"
+           style="opacity:0.5;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path42" />
+        <path
+           d="M 1617.27,680.316 V 226.773 h 10 v 453.543 h -10"
+           style="fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path44" />
+        <g
+           id="g46"
+           style="fill:#00549f;fill-opacity:1">
+          <g
+             id="g48"
+             clip-path="url(#clipPath52)"
+             style="fill:#00549f;fill-opacity:1">
+            <path
+               d="M 1375.85,228.793 H 709.066 L 850.258,484.34 H 753.559 L 613.867,229.023 H 394.793 v 93.579 L 344.09,229.023 H 141.738 v 451.536 h 184.5 V 553.961 l 69.313,126.598 H 576.316 V 555.516 l 69.356,125.043 H 1317.23 V 417.836 h 163.26 z m -218.64,25.293 h 203.73 l 76.63,138.457 h -145.65 v 262.715 h -134.71 z m -405.265,0 H 1131.9 V 394.555 H 986.32 l 142,260.703 H 847.074 L 767.402,509.641 h 125.735 z m -331.847,0.23 H 598.867 L 818.23,655.258 H 660.574 L 551.016,457.742 V 655.258 H 410.539 L 300.938,455.074 V 655.258 H 167.039 V 254.316 h 161.984 l 91.075,168.071 z m 608.812,165.532 h 102.99 v 189.097 z"
+               style="fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               id="path54" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/03_figures/wzl_eps_hks44.pdf b/03_figures/wzl_eps_hks44.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1db4984ae0371a0469cbccc1b52c0310fbb64637
Binary files /dev/null and b/03_figures/wzl_eps_hks44.pdf differ
diff --git a/JabRef-prefs-WZLstyle.xml b/JabRef-prefs-WZLstyle.xml
deleted file mode 100644
index e2a432c9650418f1957905b5e7a26347f8da0c11..0000000000000000000000000000000000000000
--- a/JabRef-prefs-WZLstyle.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<preferences EXTERNAL_XML_VERSION="1.0">
-  <root type="user">
-    <map/>
-    <node name="org">
-      <map/>
-      <node name="jabref">
-        <map>
-          <entry key="askedCollectTelemetry" value="true"/>
-          <entry key="exportTerSort" value="title"/>
-          <entry key="mainWindowSizeX" value="1440.0"/>
-          <entry key="collectTelemetry" value="false"/>
-          <entry key="emailSubject" value="References"/>
-          <entry key="citeCommand" value="\cite"/>
-          <entry key="exportSecSort" value="author"/>
-          <entry key="resolveStringsAllFields" value="false"/>
-          <entry key="lastFocused" value="/Users/amongoeppert/diss/lit/refs_gpp.bib"/>
-          <entry key="confirmDelete" value="true"/>
-          <entry key="exportInOriginalOrder" value="false"/>
-          <entry key="mainWindowPosY" value="23.0"/>
-          <entry key="columnSortOrder" value="field:author/editor"/>
-          <entry key="fxTheme" value="Base.css"/>
-          <entry key="namesAsIs" value="false"/>
-          <entry key="avoidOverwritingKey" value="false"/>
-          <entry key="proxyPort" value="80"/>
-          <entry key="openLastEdited" value="true"/>
-          <entry key="updateTimestamp" value="false"/>
-          <entry key="columnWidths" value="28.0;28.0;28.0;225.0451180375575;612.986734800758;33.74342609359852;175.59162191866878"/>
-          <entry key="autoResizeMode" value="true"/>
-          <entry key="specialFieldsEnabled" value="true"/>
-          <entry key="remoteServerPort" value="6050"/>
-          <entry key="nameFormatterNames" value=""/>
-          <entry key="biblatexMode" value="false"/>
-          <entry key="useRemoteServer" value="true"/>
-          <entry key="timeStampField" value="timestamp"/>
-          <entry key="newline" value="&#10;"/>
-          <entry key="useUnitFormatterOnSearch" value="true"/>
-          <entry key="bibLocAsPrimaryDir" value="false"/>
-          <entry key="backup" value="true"/>
-          <entry key="timeStampFormat" value="yyyy-MM-dd"/>
-          <entry key="groupsDefaultField" value="keywords"/>
-          <entry key="defaultBibtexKeyPattern" value="[auth4:upper][shortyear]"/>
-          <entry key="showRecommendations" value="true"/>
-          <entry key="mainFontSize" value="12"/>
-          <entry key="importFileDirPattern" value=""/>
-          <entry key="doNotResolveStringsFor" value="url"/>
-          <entry key="cyclePreviewPos" value="0"/>
-          <entry key="cyclePreview" value="Preview;/ieee.csl"/>
-          <entry key="autolinkExactKeyOnly" value="false"/>
-          <entry key="previewStyle" value="&lt;font face=&quot;sans-serif&quot;&gt;&lt;b&gt;&lt;i&gt;\bibtextype&lt;/i&gt;&lt;a name=&quot;\bibtexkey&quot;&gt;\begin{bibtexkey} (\bibtexkey)&lt;/a&gt;\end{bibtexkey}&lt;/b&gt;&lt;br&gt;__NEWLINE__\begin{author} \format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\author}&lt;BR&gt;\end{author}__NEWLINE__\begin{editor} \format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\editor} &lt;i&gt;(\format[IfPlural(Eds.,Ed.)]{\editor})&lt;/i&gt;&lt;BR&gt;\end{editor}__NEWLINE__\begin{title} \format[HTMLChars]{\title} \end{title}&lt;BR&gt;__NEWLINE__\begin{chapter} \format[HTMLChars]{\chapter}&lt;BR&gt;\end{chapter}__NEWLINE__\begin{journal} &lt;em&gt;\format[HTMLChars]{\journal}, &lt;/em&gt;\end{journal}__NEWLINE__\begin{booktitle} &lt;em&gt;\format[HTMLChars]{\booktitle}, &lt;/em&gt;\end{booktitle}__NEWLINE__\begin{school} &lt;em&gt;\format[HTMLChars]{\school}, &lt;/em&gt;\end{school}__NEWLINE__\begin{institution} &lt;em&gt;\format[HTMLChars]{\institution}, &lt;/em&gt;\end{institution}__NEWLINE__\begin{publisher} &lt;em&gt;\format[HTMLChars]{\publisher}, &lt;/em&gt;\end{publisher}__NEWLINE__\begin{year}&lt;b&gt;\year&lt;/b&gt;\end{year}\begin{volume}&lt;i&gt;, \volume&lt;/i&gt;\end{volume}\begin{pages}, \format[FormatPagesForHTML]{\pages} \end{pages}__NEWLINE__\begin{abstract}&lt;BR&gt;&lt;BR&gt;&lt;b&gt;Abstract: &lt;/b&gt; \format[HTMLChars]{\abstract} \end{abstract}__NEWLINE__\begin{comment}&lt;BR&gt;&lt;BR&gt;&lt;b&gt;Comment: &lt;/b&gt; \format[HTMLChars]{\comment} \end{comment}&lt;/dd&gt;__NEWLINE__&lt;p&gt;&lt;/p&gt;&lt;/font&gt;"/>
-          <entry key="abbrAuthorNames" value="true"/>
-          <entry key="exportInSpecifiedOrder" value="false"/>
-          <entry key="useProxyAuthentication" value="false"/>
-          <entry key="exportTerDescending" value="true"/>
-          <entry key="sidePaneWidthFX" value="0.2076388888888889"/>
-          <entry key="defaultEncoding" value="UTF-8"/>
-          <entry key="KeyPatternReplacement" value=""/>
-          <entry key="recentDatabases" value="/Users/amongoeppert/diss/lit/refs_gpp.bib"/>
-          <entry key="groupSidepaneVisible" value="false"/>
-          <entry key="showLatexCitations" value="true"/>
-          <entry key="validateInEntryEditor" value="true"/>
-          <entry key="groupKeywordSeparator" value=", "/>
-          <entry key="useTimeStamp" value="false"/>
-          <entry key="adobeAcrobatCommand" value=""/>
-          <entry key="columnNames" value="groups;files;linked_id;field:author/editor;field:title;field:year;field:comment"/>
-          <entry key="allowIntegerEditionBibtex" value="false"/>
-          <entry key="reformatFileOnSaveAndExport" value="false"/>
-          <entry key="warnAboutDuplicatesInInspection" value="true"/>
-          <entry key="generateKeysBeforeSaving" value="true"/>
-          <entry key="mainWindowSizeY" value="825.0"/>
-          <entry key="useCaseKeeperOnSearch" value="true"/>
-          <entry key="overwriteTimeStamp" value="false"/>
-          <entry key="autoOpenForm" value="true"/>
-          <entry key="webSearchVisible" value="true"/>
-          <entry key="proxyUsername" value=""/>
-          <entry key="enforceLegalBibtexKey" value="true"/>
-          <entry key="fileDirectory" value=""/>
-          <entry key="exportPriDescending" value="false"/>
-          <entry key="selectedFetcherIndex" value="9"/>
-          <entry key="entryEditorHeightFX" value="0.5658263305322129"/>
-          <entry key="useRegExpSearch" value="false"/>
-          <entry key="previewPanelHeightFX" value="0.65"/>
-          <entry key="groupIntersectUnionViewModes" value="UNION"/>
-          <entry key="windowMaximised" value="true"/>
-          <entry key="defaultShowSource" value="false"/>
-          <entry key="autoCompleteFields" value="related;journal;author;editor;title;entryset;keywords;crossref;publisher"/>
-          <entry key="useProxy" value="false"/>
-          <entry key="userDefaultFileBrowserApplication" value="true"/>
-          <entry key="sendLanguageData" value="false"/>
-          <entry key="sendOSData" value="false"/>
-          <entry key="namesNatbib" value="true"/>
-          <entry key="warnBeforeOverwritingKey" value="false"/>
-          <entry key="useOwner" value="false"/>
-          <entry key="workingDirectory" value="/Users/amongoeppert/WZL/wzl-latex/lit"/>
-          <entry key="consoleCommand" value=""/>
-          <entry key="autoCompFirstNameMode" value="BOTH"/>
-          <entry key="columnSortTypes" value="ASCENDING;DESCENDING;ASCENDING;ASCENDING;ASCENDING;DESCENDING;ASCENDING"/>
-          <entry key="memoryStickMode" value="false"/>
-          <entry key="keyGenAlwaysAddLetter" value="false"/>
-          <entry key="proxyPassword" value=""/>
-          <entry key="autoSyncSpecialFieldsToKeywords" value="true"/>
-          <entry key="autoComplete" value="false"/>
-          <entry key="exportPriSort" value="bibtexkey"/>
-          <entry key="autoCompFF" value="false"/>
-          <entry key="runAutomaticFileSearch" value="false"/>
-          <entry key="mainWindowPosX" value="0.0"/>
-          <entry key="extraFileColumns" value="false"/>
-          <entry key="proxyHostname" value=""/>
-          <entry key="useXmpPrivacyFilter" value="false"/>
-          <entry key="autoCompLF" value="false"/>
-          <entry key="keyGenFirstLetterA" value="true"/>
-          <entry key="openFoldersOfAttachedFiles" value="false"/>
-          <entry key="defaultOwner" value="amongoeppert"/>
-          <entry key="useDefaultConsoleApplication" value="true"/>
-          <entry key="overwriteOwner" value="false"/>
-          <entry key="lastEdited" value="/Users/amongoeppert/diss/lit/refs_gpp.bib"/>
-          <entry key="exportSecDescending" value="false"/>
-          <entry key="overrideDefaultFontSize" value="false"/>
-          <entry key="bindings" value=""/>
-          <entry key="autoAssignGroup" value="true"/>
-          <entry key="KeyPatternRegex" value=""/>
-          <entry key="namesLastOnly" value="false"/>
-          <entry key="namesFf" value="false"/>
-          <entry key="importFileNamePattern" value="[bibtexkey] - [title]"/>
-          <entry key="sendTimezoneData" value="false"/>
-          <entry key="grayOutNonHits" value="true"/>
-          <entry key="previewAsTab" value="false"/>
-          <entry key="acceptRecommendations" value="true"/>
-          <entry key="showAdvancedHints" value="true"/>
-          <entry key="serializeSpecialFields" value="false"/>
-          <entry key="nameFormatterFormats" value=""/>
-          <entry key="localAutoSave" value="false"/>
-          <entry key="allowFileAutoOpenBrowse" value="true"/>
-          <entry key="xmpPrivacyFilters" value="pdf;timestamp;keywords;owner;note;review"/>
-        </map>
-        <node name="bibtexkeypatterns">
-          <map/>
-        </node>
-        <node name="customizedBiblatexTypes">
-          <map>
-            <entry key="thesis" value="jabref-entrytype: thesis: req[author;date;institution;title;type] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;isbn;language;location;note;pages;pagetotal;pubstate;subtitle;titleaddon;url;urldate]"/>
-            <entry key="mvreference" value="jabref-entrytype: mvreference: req[date;editor;title] opt[addendum;afterword;annotator;commentator;doi;edition;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;note;number;origlanguage;pagetotal;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volumes]"/>
-            <entry key="manual" value="jabref-entrytype: manual: req[author/editor;date;title] opt[addendum;chapter;doi;edition;eprint;eprintclass;eprinttype;isbn;language;location;note;number;organization;pages;pagetotal;publisher;pubstate;series;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="electronic" value="jabref-entrytype: electronic: req[author/editor;date;title;url] opt[addendum;language;note;organization;pubstate;subtitle;titleaddon;urldate;version]"/>
-            <entry key="proceedings" value="jabref-entrytype: proceedings: req[date;title] opt[addendum;chapter;doi;editor;eprint;eprintclass;eprinttype;eventdate;eventtitle;eventtitleaddon;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;organization;pages;pagetotal;part;publisher;pubstate;series;subtitle;titleaddon;url;urldate;venue;volume;volumes]"/>
-            <entry key="software" value="jabref-entrytype: software: req[author/editor;date;title] opt[addendum;doi;eprint;eprintclass;eprinttype;howpublished;language;location;note;organization;pubstate;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="suppperiodical" value="jabref-entrytype: suppperiodical: req[author;date;journaltitle;title] opt[addendum;annotator;commentator;doi;editor;editora;editorb;editorc;eid;eprint;eprintclass;eprinttype;issn;issue;issuesubtitle;issuetitle;journalsubtitle;language;note;number;origlanguage;pages;pubstate;series;subtitle;titleaddon;translator;url;urldate;version;volume]"/>
-            <entry key="inbook" value="jabref-entrytype: inbook: req[author;booktitle;date;title] opt[addendum;afterword;annotator;bookauthor;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="dataset" value="jabref-entrytype: dataset: req[author/editor;date;title] opt[addendum;doi;edition;eprint;eprintclass;eprinttype;howpublished;language;location;note;organization;pubstate;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="mvcollection" value="jabref-entrytype: mvcollection: req[date;editor;title] opt[addendum;afterword;annotator;commentator;doi;edition;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;note;number;origlanguage;pagetotal;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volumes]"/>
-            <entry key="inproceedings" value="jabref-entrytype: inproceedings: req[author;booktitle;date;title] opt[addendum;booksubtitle;booktitleaddon;chapter;doi;editor;eprint;eprintclass;eprinttype;eventdate;eventtitle;eventtitleaddon;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;organization;pages;part;publisher;pubstate;series;subtitle;titleaddon;url;urldate;venue;volume;volumes]"/>
-            <entry key="booklet" value="jabref-entrytype: booklet: req[author/editor;date;title] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;howpublished;language;location;note;pages;pagetotal;pubstate;subtitle;titleaddon;type;url;urldate]"/>
-            <entry key="www" value="jabref-entrytype: www: req[author/editor;date;title;url] opt[addendum;language;note;organization;pubstate;subtitle;titleaddon;urldate;version]"/>
-            <entry key="inreference" value="jabref-entrytype: inreference: req[author;booktitle;date;title] opt[addendum;afterword;annotator;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="techreport" value="jabref-entrytype: techreport: req[author;date;institution;title] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;isrn;language;location;note;number;pages;pagetotal;pubstate;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="suppbook" value="jabref-entrytype: suppbook: req[author;booktitle;date;title] opt[addendum;afterword;annotator;bookauthor;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="article" value="jabref-entrytype: article: req[author;date;journaltitle;title] opt[addendum;annotator;commentator;doi;editor;editora;editorb;editorc;eid;eprint;eprintclass;eprinttype;issn;issue;issuesubtitle;issuetitle;journalsubtitle;language;note;number;origlanguage;pages;pubstate;series;subtitle;titleaddon;translator;url;urldate;version;volume]"/>
-            <entry key="misc" value="jabref-entrytype: misc: req[author/editor;date;title] opt[addendum;doi;eprint;eprintclass;eprinttype;howpublished;language;location;note;organization;pubstate;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="mvproceedings" value="jabref-entrytype: mvproceedings: req[date;title] opt[addendum;chapter;doi;editor;eprint;eprintclass;eprinttype;eventdate;eventtitle;eventtitleaddon;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;organization;pages;pagetotal;publisher;pubstate;series;subtitle;titleaddon;url;urldate;venue;volume;volumes]"/>
-            <entry key="online" value="jabref-entrytype: online: req[author/editor;date;title;url] opt[addendum;language;note;organization;pubstate;subtitle;titleaddon;urldate;version]"/>
-            <entry key="bookinbook" value="jabref-entrytype: bookinbook: req[author;booktitle;date;title] opt[addendum;afterword;annotator;bookauthor;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="book" value="jabref-entrytype: book: req[author;date;title] opt[addendum;afterword;annotator;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;pagetotal;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="incollection" value="jabref-entrytype: incollection: req[author;booktitle;date;title] opt[addendum;afterword;annotator;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="phdthesis" value="jabref-entrytype: phdthesis: req[author;date;institution;title] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;isbn;language;location;note;pages;pagetotal;pubstate;subtitle;titleaddon;type;url;urldate]"/>
-            <entry key="collection" value="jabref-entrytype: collection: req[date;editor;title] opt[addendum;afterword;annotator;chapter;commentator;doi;edition;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;pagetotal;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="mvbook" value="jabref-entrytype: mvbook: req[author;date;title] opt[addendum;afterword;annotator;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;note;number;origlanguage;pagetotal;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volumes]"/>
-            <entry key="patent" value="jabref-entrytype: patent: req[author;date;number;title] opt[addendum;doi;eprint;eprintclass;eprinttype;holder;location;note;pubstate;subtitle;titleaddon;type;url;urldate;version]"/>
-            <entry key="report" value="jabref-entrytype: report: req[author;date;institution;title;type] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;isrn;language;location;note;number;pages;pagetotal;pubstate;subtitle;titleaddon;url;urldate;version]"/>
-            <entry key="mastersthesis" value="jabref-entrytype: mastersthesis: req[author;date;institution;title] opt[addendum;chapter;doi;eprint;eprintclass;eprinttype;isbn;language;location;note;pages;pagetotal;pubstate;subtitle;titleaddon;type;url;urldate]"/>
-            <entry key="reference" value="jabref-entrytype: reference: req[date;editor;title] opt[addendum;afterword;annotator;chapter;commentator;doi;edition;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;pagetotal;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="set" value="jabref-entrytype: set: req[crossref;entryset] opt[]"/>
-            <entry key="periodical" value="jabref-entrytype: periodical: req[date;editor;title] opt[addendum;doi;editora;editorb;editorc;eprint;eprintclass;eprinttype;issn;issue;issuesubtitle;issuetitle;language;note;number;pubstate;series;subtitle;url;urldate;volume]"/>
-            <entry key="unpublished" value="jabref-entrytype: unpublished: req[author;date;title] opt[addendum;eventdate;eventtitle;howpublished;language;location;note;pubstate;subtitle;titleaddon;url;urldate;venue]"/>
-            <entry key="suppcollection" value="jabref-entrytype: suppcollection: req[author;booktitle;date;title] opt[addendum;afterword;annotator;booksubtitle;booktitleaddon;chapter;commentator;doi;edition;editor;editora;editorb;editorc;eprint;eprintclass;eprinttype;foreword;introduction;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;origlanguage;pages;part;publisher;pubstate;series;subtitle;titleaddon;translator;url;urldate;volume;volumes]"/>
-            <entry key="conference" value="jabref-entrytype: conference: req[author;booktitle;date;title] opt[addendum;booksubtitle;booktitleaddon;chapter;doi;editor;eprint;eprintclass;eprinttype;eventdate;eventtitle;eventtitleaddon;isbn;language;location;mainsubtitle;maintitle;maintitleaddon;note;number;organization;pages;part;publisher;pubstate;series;subtitle;titleaddon;url;urldate;venue;volume;volumes]"/>
-          </map>
-        </node>
-        <node name="customizedBibtexTypes">
-          <map>
-            <entry key="manual" value="jabref-entrytype: manual: req[title] opt[address;author;edition;isbn;month;note;organization;year]"/>
-            <entry key="patent" value="jabref-entrytype: patent: req[nationality;number;year/yearfiled] opt[address;assignee;author;day;dayfiled;language;month;monthfiled;note;title;type;url]"/>
-            <entry key="inproceedings" value="jabref-entrytype: inproceedings: req[author;booktitle;title;year] opt[address;editor;month;note;number;organization;pages;publisher;series;volume]"/>
-            <entry key="book" value="jabref-entrytype: book: req[author/editor;publisher;title;year] opt[address;edition;isbn;month;note;number;series;volume]"/>
-            <entry key="booklet" value="jabref-entrytype: booklet: req[title] opt[address;author;howpublished;month;note;year]"/>
-            <entry key="inbook" value="jabref-entrytype: inbook: req[author/editor;chapter/pages;publisher;title;year] opt[address;edition;isbn;month;note;number;series;type;volume]"/>
-            <entry key="mastersthesis" value="jabref-entrytype: mastersthesis: req[author;school;title;year] opt[address;month;note;type]"/>
-            <entry key="proceedings" value="jabref-entrytype: proceedings: req[title;year] opt[address;editor;isbn;month;note;number;organization;publisher;series;volume]"/>
-            <entry key="article" value="jabref-entrytype: article: req[author;journal;title;year] opt[issn;month;note;number;pages;volume]"/>
-            <entry key="ieeetranbstctl" value="jabref-entrytype: ieeetranbstctl: req[] opt[ctlalt_stretch_factor;ctldash_repeated_names;ctlmax_names_forced_etal;ctlname_format_string;ctlname_latex_cmd;ctlname_url_prefix;ctlnames_show_etal;ctluse_alt_spacing;ctluse_article_number;ctluse_forced_etal;ctluse_paper;ctluse_url]"/>
-            <entry key="misc" value="jabref-entrytype: misc: req[] opt[author;howpublished;month;note;title;year]"/>
-            <entry key="periodical" value="jabref-entrytype: periodical: req[title;year] opt[editor;language;month;note;number;organization;series;url;volume]"/>
-            <entry key="phdthesis" value="jabref-entrytype: phdthesis: req[author;school;title;year] opt[address;month;note;type]"/>
-            <entry key="standard" value="jabref-entrytype: standard: req[institution/organization;title] opt[address;author;howpublished;language;month;note;number;revision;type;url;year]"/>
-            <entry key="conference" value="jabref-entrytype: conference: req[author;booktitle;title;year] opt[address;editor;month;note;number;organization;pages;publisher;series;volume]"/>
-            <entry key="incollection" value="jabref-entrytype: incollection: req[author;booktitle;publisher;title;year] opt[address;chapter;edition;editor;isbn;month;note;number;pages;series;type;volume]"/>
-            <entry key="electronic" value="jabref-entrytype: electronic: req[] opt[address;author;howpublished;language;month;note;organization;title;url;year]"/>
-            <entry key="unpublished" value="jabref-entrytype: unpublished: req[author;note;title] opt[month;year]"/>
-            <entry key="techreport" value="jabref-entrytype: techreport: req[author;institution;title;year] opt[address;month;note;number;type]"/>
-          </map>
-        </node>
-      </node>
-    </node>
-  </root>
-</preferences>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..a4715202b3cbe87ad1a48c76e888631a0d89dec0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
\ No newline at end of file
diff --git a/README.md b/README.md
index a150b9a4daa113b2fb4ff01cbd578bf8c22af5d1..3f55d32981be847dfc2085377055ef79090f8b55 100644
--- a/README.md
+++ b/README.md
@@ -1,62 +1,218 @@
+
 # WZL Latex 
 *Template, requirements, tools & tricks*  
-*Contact:* Amon Göppert (gpp)
+*Contact:* Mark Sanders (sdr) or Tobias Hamann (hmt)
+
 
 **Info**  
 This is an examplary LaTeX project with .tex and .bib files as a template for writing final reports, theses or dissertations in WZL style.
-The formatting rules and parameters are located in the  `WZLtemplate.cls` file, which is designed according to the
-[WZL Word template](https://wzl-lotus3.wzl.rwth-aachen.de/cms/handbuch/de/216cfa733631c02ac1257c20003627df/ma_vorlage_wzl_deutsch_duplex.docx) from  this [Handbuch page](https://wzl-lotus3.wzl.rwth-aachen.de/cms/handbuch/de/216cfa733631c02ac1257c20003627df.htm). Also, the [RWTH/WZL-Deckblatt](https://wzl-lotus3.wzl.rwth-aachen.de/cms/handbuch/de/216cfa733631c02ac1257c20003627df/deckblattundformularlogoverwendung.pdf) and the [Themenstellung](https://wzl-lotus3.wzl.rwth-aachen.de/cms/handbuch/de/216cfa733631c02ac1257c20003627df/ma_themenstellung_de.docx) are integrated as PDF and .tex file, respectively.
+The formatting rules and parameters are located in the  `format/WZLtemplate.cls` file.
+
+NOTE: Use PDFLatex as compiler
+NOTE: Use biber as Standardbibliographieprogramm
+NOTE: Export bibliography from Citavi as BibLatex Export.
 
 ## Getting started
 
-### Requirements
-**Online TeX-System & IDE**  
-For a fully integrated web-based TeX and IDE system check-out: [Overleaf](https://www.overleaf.com/)  
-The master branch of this repository is pushed to this public Overleaf project: [wzl-latex project](https://www.overleaf.com/read/ydwhkjfbhksc)  
+<details><summary>With VS Code and Latex Workshop</summary>
+by Mark
 
-Disadvantages of overleaf are the necessary figure and literature uploads.  
-Advantages are the out-of-the-box usage withouth required software installations described in the following.
+## Editing locally
+### Requirements
 
 **TeX system**  
-For compiling .tex-files locally, a TeX-System is required. Install one of the following, based on your OS:  
-* Windows/Linux: [TeX Live](https://www.tug.org/texlive/)
-* Mac: [MacTeX](http://www.tug.org/mactex/)
+For compiling .tex-files locally, a TeX-System is required. I recommend [TinyTeX](https://yihui.org/tinytex/).
 
 
 **IDE**  
-For proper .tex-files editing an IDE is needed. Install one of the following:  
-* [Texstudio](https://www.texstudio.org/) (recommended)
-* [Texmaker](https://www.xm1math.net/texmaker/)
+For proper .tex-files editing an IDE is needed. I recommend [VSCode](https://code.visualstudio.com/) with [LaTeX Workshop](https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop) installed.
 
-Make sure that in the configurations of the IDE 'biber' is selected as backend.
 
 ### First steps
 
 When working with a local TeX System and IDE, download or clone this repository to your empty project directory:  
 Clone with tls/https (requires your Gitlab login):  
-`git clone https://git-ce.rwth-aachen.de/wzl-mq-ms/forschung-lehre/wzl-latex.git`  
+`git clone https://git-ce.rwth-aachen.de/wzl-mq-public/templates/wzl-latex.git --recurse-submodules`  
+
+### Install all necessary packages
 
-Clone with tls/https (requires an ssh-configuration for the connection of your local machine and Gitlab. Explanation [here](https://docs.gitlab.com/ee/ssh/)):  
-`git clone git@git-ce.rwth-aachen.de:wzl-mq-ms/forschung-lehre/wzl-latex.git`
+```  tlmgr install `cat texlive_packages.txt`  ```
 
 
 Compile the main.tex-file with your IDE and consider the resulting PDF for further explanations.
 
 The Deckblattundformularlogoverwendung PDF might not be included properly. Please print the PDF after filling your data as a PDF with a common PDF printer. Afterwards include this new PDF.
 
-## Helpful tools
-### Literature management
-For managing your bibliography this tool is recommended:
+## Overleaf (ShareLaTeX)
+
+**Online TeX-System & IDE**  
+For a fully integrated web-based TeX and IDE system check-out the RWTH/TU Darmstadt Overleaf instance: [Overleaf](https://sharelatex.tu-darmstadt.de)  
+The sdr branch of this repository is pushed to this public Overleaf project: [wzl-latex project](https://sharelatex.tu-darmstadt.de/read/nsckfdbnghdm#c0967b)  
+
+Disadvantages of overleaf are the necessary figure and literature uploads.  
+Advantages are the out-of-the-box usage without aforementioned software installations.
+
+
+</details>
+
+<details><summary>With Texstudio</summary>
+by Tobias
+
+## Editing locally
+### Requirements
+
+**TeX system**  
+For compiling .tex-files locally, a TeX-System is required. I recommend [MikTeX](https://miktex.org/).
+
 
-* [JabRef](https://www.jabref.org/)
+## Setup 
 
-It works directly on your .bib-database and comes with useful features such as DOI-import, integrated Google Scholar search and discovery of related articles with [Mr. DLib](http://mr-dlib.org/).
+- Clone this repo
+- Follow the **Installation** below
+- Search for MikTex Updates
+- Citavi 6 installieren
 
-For the automatic Bibtexkey generation according to the WZL style (e.g. MUST13) change the following:  
-Options > Preferences > BibTeX key generator  >  Change the key pattern of the default pattern to:  
-`[auth4:upper][shortyear]`
+## Installation
 
-### Fonts
+In your Command line, run the following:
+
+    winget install -e --id Microsoft.VisualStudioCode
+    winget install -e --id TeXstudio.TeXstudio
+    winget install -e --id MiKTeX.MiKTeX
+    winget install -e --id StrawberryPerl.StrawberryPerl
+
+## Setup Texstudio
+
+#### Darkmode
+
+- Optionen --> TexStudio konfigurieren --> Allgemein
+- Stil: Adwaita Dark (txs) auswählen
+- Farbschema: Modern - dunkel
+
+#### Line Numbers
+
+- Optionen --> TexStudio konfigurieren 
+- "Erweiterte Optionen" anhaken (ganz unten)
+- --> Editor 
+- Zeilennummern anzeigen: Alle Zeilennummern
+
+</details>
+
+
+## Fonts
+
+The Fira Sans font files are zipped in the format folder.
 
 CMU Serif can be installed and used e.g. for creating figures in ppt with a font that is very similar to the standard Tex font, if the serif font is used.
 https://fontlibrary.org/en/font/cmu-serif
+
+
+## Backups
+
+### Backup Citavi
+
+Private backup:
+- In Citavi use Datei --> Dieses Projekt --> Archivkopie lokal speichern
+
+
+## Troubleshooting:
+
+
+### Latex
+
+NOTE: If you have trouble getting this document to compile, try renaming or deleting pdflatex.fmt, main.bbl and main.aux
+
+
+
+####  ERROR - BibTeX subsystem line 834, syntax error: found "23", expected ",":
+The line equals the line in the bibliography file. 
+
+Fix: Bibtex Key MUST NOT contain spaces! 
+
+
+#### --> pdflatex.exe (file ...): PDF inclusion: found PDF version <1.7>, but at most version <1.5> allowed<...
+
+See: https://tex.stackexchange.com/questions/52317/pdftex-warning-version-allowed 
+
+Fix:
+'''
+% Fix a bug with PDF Images included
+\pdfminorversion=7
+'''
+
+#### --> pdfTeX warning (ext4): destination with the same identifier (nam e{page.1}) has been already used, duplicate ignored
+
+See: https://tex.stackexchange.com/questions/18924/pdftex-warning-ext4-destination-with-the-same-identifier-nam-epage-1-has
+
+Fix:
+
+Include `\include{titlepage}` and `	\include{frontmatter}` into anoter `\hypersetup` as shown below:
+
+    % To avoid bugs with page numbering
+	\hypersetup{pageanchor=false}
+	
+	\include{titlepage}	
+	
+	% -- FRONTMATTER -- 
+	\include{frontmatter}	
+	
+	% To avoid bugs with page numbering
+	\hypersetup{pageanchor=true}
+
+#### TexStudio: This is BibTeX, Version 0.99d (MiKTeX 24.3) I found no \citation commands---while reading file main.aux .... (There were 3 error messages)
+
+Fix: Change standard compiler to Biber.
+
+#### TexStudio: Synchronisation zwischen Text und Cursor Position ist defekt
+
+In der Datei vor der Datei in der es nicht mehr funktioniert ist irgendwo, vermutlich in einem Bild, ein Problem.
+
+
+Dies kann sein:
+- Nicht genug Text nach einem Bild: Bild, neue Section, Ende der Datei bevor neue Seite anfängt
+  
+
+Mögliche Fixes:  
+- `\clearpage` direkt nach der Abbildung einfügen --> Blöd wenn noch Text kommt
+- Mehr Text nach Abbildung einfügen, sodass das Kapitel noch bis auf die nächste Seite geht. WTF am i even writing here. Das is so dumm, wieso ist das so? \afterpage{\clearpage} funktioniert deshalb auch nicht, weil es keine afterapge gibt, wenn nicht genug text vorhanden ist. WTF!
+
+#### Linebreaks in Literaturverzeichnis klappen nicht
+
+Problem: Journaltitel etc. ragen über die Ränder hinaus und generell sieht das Literaturverzeichnis einfahc beschissen aus.
+
+Fix:
+- \usepackage[normalem]{ulem} nutzen statt \usepackage{ulem}
+
+Quelle: https://tex.stackexchange.com/questions/17557/biblatex-removing-underlining-of-journal-title-and-enabling-line-break-of-it 
+
+### Schriftarten müssen eingebettet sein
+
+Problem: Unibib will eingebettete Schriftarten. Ist ggf. in PDF exporten aus PPT nicht der fall.
+
+Fix:
+- Ale Schriftarten, die nicht eingebettet sind, ersetzen durch Schriftarten erstetzen in PPT.
+- Bilder neu in PDF exportieren.
+- Done.
+
+-------------------------------------
+
+
+
+
+### Acronyms 
+
+WZLtemplate.cls, Zeile 197 "nolist" auskommentiert, wenn Liste weg soll, auskommentieren
+
+% NOTE: Use LuaLatex as compiler
+% NOTE: Use biber as Standardbibliographieprogramm
+% NOTE: If you have trouble getting this document to compile, try renaming or deleting pdflatex.fmt, main.bbl and main.aux
+
+% Error/Bug Fixing
+
+% NOTE: 
+% For the ERROR - BibTeX subsystem line 834, syntax error: found "23", expected ",":
+% The line equals the line in the bibliography file. 
+
+% NOTE: Bibtex Key MUST NOT contain spaces! 
+
+% NOTE: LaTex Workshop in VSCode might interfere with compilation. Disable LaTex Workshop in VSCode is you have problems with your view disappearing.
\ No newline at end of file
diff --git a/Usercustomised_Content/acronyms.tex b/Usercustomised_Content/acronyms.tex
new file mode 100644
index 0000000000000000000000000000000000000000..5217c4ca8ebbff81365728cb43a1f8a6f3a7f8dd
--- /dev/null
+++ b/Usercustomised_Content/acronyms.tex
@@ -0,0 +1,141 @@
+% !TeX root = main.tex
+
+% Documentation: https://ctan.org/pkg/acronym
+% Good example: https://ramibaddour.com/2017/01/18/latex-working-with-acronyms/
+
+% Define your acronyms here. 
+% We already did some for you to make it easier for you!
+% What can I say except you're welcome?
+
+\begin{acronym}[Abbreviations]\itemsep0pt
+%\begin{acronym}[JSONP]\itemsep0pt
+    \acro{aas}[AAS]{Asset Administration Shell}
+    \acro{Abbreviation}[Abbreviation]{\textbf{Explanation}}
+    \acro{aims}[AIMS]{Applying interoperable metadata standards}
+    \acro{ai}[AI]{artificial intelligence}
+    \acro{aims}[AIMS]{Applying Interoperable Metadata Standards}
+    \acro{apb}[APB model]{Abstracted Physical Body model}
+    \acro{api}[API]{Application Programming Interface}
+    \acro{ardc}[ARDC]{Australian Research Data Commons}
+	\acro{bmbf}[BMBF]{Bundesministerium für Bildung und Forschung}
+    \acro{bmbf-en}[BMBF]{Federal Ministry of Education and Research}
+	\acro{bmbf-en}[BMBF]{Federal Ministry of Education and Research}
+    \acro{caesar}[CAESAR]{CollAborative Environment for Scientific Analysis with Reproducibility}
+    \acro{cc}[CC]{Creative Commons}
+    \acro{cd}[CD]{Continuous Deployment}
+    \acro{cern}[CERN]{Conseil Européen pour la Recherche Nucléaire}
+    \acro{ci}[CI]{Continuous Integration}
+    \acro{ckan}[CKAN]{Comprehensive Knowledge Archive Network}
+    \acro{csv}[CSV]{Comma-Separated Values}
+    \acro{coscine}[Coscine]{Coscine}
+    \acro{cpms}[CPMS]{Cyber-Physical Measurement System}
+    \acro{cpps}[CPPS]{Cyber-Physical Production System}
+    \acro{cps}[CPS]{Cyber-Physical System}
+    \acro{csv}[CSV]{Comma-Separated Values}
+    \acro{cwfr}[CWFR]{Canonical Workflow Framework for Research}
+	\acro{cv}[CV]{Computer Vision}
+    \acro{cwl}[CWL]{Common Workflow Language}
+    \acro{dcc}[DCC]{Digital Curation Centre}
+	\acro{dfg}[DFG]{Deutsche Forschungsgemeinschaft}
+	\acro{dfg-en}[DFG]{German Research Foundation}
+    \acro{dias}[DIAS]{dynamically interconnected assembly system}
+    \acro{dlc}[DLC]{Data life cycle}
+	\acro{dlz}[DLZ]{Datenlebenszyklus}
+	\acro{dmp}[DMP]{Datenmanagementplan}
+	\acro{dmp-en}[DMP]{Data management plan}
+    \acro{do}[DO]{Digital Object}
+    \acro{doi}[DOI]{Digital Object Identifier}
+	\acro{dsl}[DSL]{Domain-Specific Language}
+	\acro{dsr}[DSR]{Design Science Research}
+    \acro{dz}[DZ]{Digitaler Zwilling}
+    \acro{eln}[ELN]{Elektronic Laboratory Notebook}
+    \acro{eosc}[EOSC]{European Open Science Cloud}
+    \acro{fact}[FACT]{Fairness, Accuracy, Confidentiality, and Transparency}
+    \acro{fair}[FAIR]{Findable, Accessible, Interoperable, Re-usable}
+    \acro{fairp}[FAIR-Prinzipien]{FAIR-Prinzipien}
+    \acro{fairdo}[FAIR-DO]{FAIR Digital Object}
+    \acro{fairse}[FAIR-SE]{FAIR Sensor Ecosystem}
+    \acro{fairsi}[FAIR-SI]{FAIR Sensor Infrastructure}
+    \acro{fairss}[FAIR-SS]{FAIR Sensor Service}
+	\acro{fdg}[FDG]{Fördergeber}
+	\acro{fdm}[FDM]{Forschungsdatenmanagement}
+	\acro{fdms}[FDMS]{Forschungsdatenmanagementsystem}
+	\acro{fdm-alt}[FDM]{Fused Deposition Modeling}
+    \acro{fdm-alt}[FDM]{Fused Deposition Modeling}
+	\acro{fdo}[FDO]{FAIR Digital Objects}
+	\acro{ff}[FF]{Forschungsfrage}
+    \acro{fjsp}[FJSP]{flexible job-shop scheduling problem}
+	\acro{gki}[GKI]{Generative künstliche Intelligenz}
+    \acro{heliport}[HELIPORT]{HELmholtz ScIentific Project WORkflow PlaTform}
+    \acro{htm}[HTM]{homogeneous transformation matrix}
+	\acro{idef}[IDEF]{Integrations-Definition}
+	\acro{idef-en}[IDEF]{Integration Definition}
+	\acro{idef3}[IDEF3]{Prozessbeschreibungserfassung}
+	\acro{idef3-en}[IDEF3]{Process Description Capture}
+    \acro{iiot}[IIoT]{Industrial Internet of Things}
+    \acro{iira}[IIRA]{Industrial Internet Reference Architecture}
+    \acro{iop}[IoP]{Internet of Production}
+    \acro{iot}[IoT]{Internet of Things}
+	\acro{ipeg}[iPeG]{Institut für Produktentwicklung und Gerätebau}
+    \acro{jarves}[Jarves]{Joint Assistant for Research in Versatile Engineering Sciences}
+    \acro{jsp}[JSP]{job-shop scheduling problem}
+	\acro{ki}[KI]{künstliche Intelligenz}
+    \acro{kms}[KMS]{Knowledge Management System}
+	\acro{kpi}[KPI]{Key Performance Indicator}
+    \acro{lsm}[LSM]{large-scale metrology}
+	\acro{luh}[LUH]{Leibniz Universität Hannover}
+    \acro{mde}[MDE]{model-driven software engineering}
+    \acro{mint}[MINT]{Mathematik, Informatik, Naturwissenschaft und Technik}
+    \acro{ml}[ML]{machine learning}
+    \acro{mtc}[MTC]{machine tool calibration}
+	\acro{nfdi}[NFDI]{Nationale Forschungsdateninfrastruktur}
+	\acro{nfdi-en}[NFDI]{National Research Data Infrastructure}
+	\acro{nfdi4ing}[NFDI4Ing]{Nationale Forschungsdateninfrastruktur für die \mbox{Ingenieurwissenschaften}}
+	\acro{nfdi4ing-en}[NFDI4Ing]{National Research Data Infrastructure for the Engineering Sciences}
+    \acro{nist}[NIST]{National Institute of Standards and Technology}
+	\acro{nlp}[NLP]{Natural Language Processing}
+    \acro{oecd}[OECD]{Organization for Economic Cooperation and Development}
+    \acro{omm}[OMM]{On-Machine Measurement}
+    \acro{opcua}[OPC UA]{Open Platform Communications Unified Architecture}
+    \acro{openaire}[OpenAIRE]{Open Access Infrastructure for Research in Europe}
+    \acro{orcid}[ORCiD]{Open Researcher and Contributor ID}
+    \acro{otf}[OTF \acs*{mtc}]{On-the-fly \acl*{mtc}}
+    \acro{pid}[PID]{Persistent Identifier}
+    \acro{poc}[POC]{proof-of-concept} 
+	\acro{pzi}[PZI]{problemzentrierte Interview}
+    \acro{rami}[RAMI 4.0]{Reference Architecture Model Industry 4.0}
+    \acro{rbm}[RBM]{Rigid Body Model}
+    \acro{rda}[RDA]{Research Data Alliance}
+    \acro{rdaf}[RDaF]{Research Data Framework}
+    \acro{rdf}[RDF]{Resource Description Framework}
+    \acro{rdm}[RDM]{research data management}
+    \acro{rdms}[RDMS]{research data management system}
+    \acro{rdmo}[RDMO]{Research Data Management Organizer}
+    \acro{rrpw}[RRPW]{Reproducible Research Publication Workflow}
+    %\acro{rwth}[RWTH]{Rheinisch-Westfälische Technische Hochschule}
+    \acro{rwth}[RWTH]{Rheinisch-Westfälische Technische Hochschule Aachen University}
+    \acro{slr}[SLR]{systematische Literaturrecherche}
+    \acro{smr}[SMR]{Spherically Mounted Retroreflector}
+    \acro{soe}[SoE]{System of Equations}
+    \acro{soil}[SOIL]{SensOr Interfacing Language}
+    \acro{smw}[SMW]{Semantic MediaWiki}
+    \acro{sota}[SotA]{State of the Art}
+    \acro{ssn}[SSN]{Semantic Sensor Network Ontology}
+    \acro{sso}[SSO]{Single Sign-on}
+    \acro{stem}[STEM]{Science, Technology, Engineering and Mathematics}
+    \acro{tcp}[TCP]{Tool Centre Point}
+	\acro{tu9}[TU9]{TU9 – German Universities of Technology e.V.}
+	\acro{uff}[UFF]{Unterforschungsfrage}
+    \acro{umdisw}[UMDISW]{universal multi-domain intelligent scientific data processing workflow framework}
+    \acro{uri}[URI]{Uniform Resource Identifier}
+    \acro{url}[URL]{Uniform Resource Locator}
+	\acro{wgp}[WGP]{Wissenschaftliche Gesellschaft für Produktionstechnik}
+	\acro{wigep}[WiGeP]{Wissenschaftliche Gesellschaft für Produktentwicklung}
+    \acro{wot}[WoT]{Web of Things}
+	\acro{wzl}[WZL]{Werkzeugmaschinenlabor WZL der RWTH Aachen}
+	\acro{wzl_en}[WZL]{Laboratory for Machine Tools and Production Engineering of RWTH Aachen University}
+	\acro{wzl-iqs}[WZL-IQS]{Lehrstuhl für Informations-, Qualitäts- und Sensorsysteme
+	in der Produktion 
+	}
+    \acrodefplural{dias}[DIAS]{dynamically interconnected assembly systems}
+    \end{acronym}
diff --git a/Usercustomised_Content/custom_packages.tex b/Usercustomised_Content/custom_packages.tex
new file mode 100644
index 0000000000000000000000000000000000000000..7ad02b9be76dd11de741ae74cb9201f79157b5c6
--- /dev/null
+++ b/Usercustomised_Content/custom_packages.tex
@@ -0,0 +1,8 @@
+% !TeX root = ./main.tex
+% Use this file to load custom packages you have added yourself.
+
+
+% Draft Watermark to be deleted by the end of your dissertation
+\usepackage{draftwatermark}
+
+
diff --git a/Usercustomised_Content/functions.tex b/Usercustomised_Content/functions.tex
new file mode 100644
index 0000000000000000000000000000000000000000..0cebe5a776390c27685f667bf4061a0a5eeaf006
--- /dev/null
+++ b/Usercustomised_Content/functions.tex
@@ -0,0 +1,5 @@
+% !TeX root = ./main.tex
+
+%% let there be functions
+
+%% Here, you can create your own functions as needed.
diff --git a/Usercustomised_Content/glossary.tex b/Usercustomised_Content/glossary.tex
new file mode 100644
index 0000000000000000000000000000000000000000..b2e982391b28f040c2de480544f9d63ddde9b131
--- /dev/null
+++ b/Usercustomised_Content/glossary.tex
@@ -0,0 +1,44 @@
+% !TeX root = main.tex
+% Documentation: https://www.ctan.org/pkg/glossaries
+
+% Create your glossary entries here
+
+\newglossaryentry{latex}
+{
+    type=main,
+    name=latex,
+    description={Is a markup language specially suited
+            for scientific documents, but this time with a description that is way too long to fit in just one line. I mean... what were i thinking making it so long? Ieserve this to fail but hopefully it wont.}
+}
+
+\newglossaryentry{maths}
+{
+    type=main,
+    name=mathematics,
+    description={Mathematics is what mathematicians do}
+}
+
+\newglossaryentry{Forschungsdaten}
+{
+    type=main,
+    name=Forschungsdaten,
+    description={
+            \enquote{
+                Zu Forschungsdaten zählen u.a. Messdaten, Laborwerte, audiovisuelle Informationen, Texte, Surveydaten, Objekte aus Sammlungen oder Proben, die in der wissenschaftlichen Arbeit entstehen, entwickelt oder ausgewertet werden. Methodische Testverfahren, wie Fragebögen, Software und Simulationen können ebenfalls zentrale Ergebnisse wissenschaftlicher Forschung darstellen und sollten daher ebenfalls unter den Begriff Forschungsdaten gefasst werden.
+            } \cite{SENA15}
+        }
+}
+
+\newglossaryentry{Forschungsdatenmanagement}
+{
+    name=Forschungsdatenmanagement,
+    description={
+            Beschreibt das Management von \Gls{Forschungsdaten}.
+        }
+}
+\newglossaryentry{opc_ua}{
+    type=main,
+    name={OPC UA},
+    description={Open Platform Communications Unified Architecture
+        },
+}
diff --git a/Usercustomised_Content/keyphrases.tex b/Usercustomised_Content/keyphrases.tex
new file mode 100644
index 0000000000000000000000000000000000000000..7bd05cc2b42a7191efb70e4256611c394ac901db
--- /dev/null
+++ b/Usercustomised_Content/keyphrases.tex
@@ -0,0 +1,9 @@
+% !TeX root = main.tex
+
+% Enter your recurring Keyphrases like research questions here
+
+%%%%% ----- 
+%%%%% ----- FORSCHUNGSFRAGEN -----
+%%%%% ----- 
+
+\newcommand{\Hauptforschungsfrage}{?}
diff --git a/Usercustomised_Content/symbols.tex b/Usercustomised_Content/symbols.tex
new file mode 100644
index 0000000000000000000000000000000000000000..91e1daee8a8a50415635adddeea37cc4d9b64efc
--- /dev/null
+++ b/Usercustomised_Content/symbols.tex
@@ -0,0 +1,10 @@
+% !TeX root = main.tex
+
+% Enter your Symbols here
+
+\newglossaryentry{symb:C}{
+    type=symbols,
+    name={\ensuremath{\hat{C}}},
+    symbol={\ensuremath{\hat{C}}},
+    description={Covariance matrices in block diagonal form},
+}
\ No newline at end of file
diff --git a/WZLtemplate.cls b/WZLtemplate.cls
deleted file mode 100644
index 00f2cc95ef0b5fb037a2355579c263c6ed041f54..0000000000000000000000000000000000000000
--- a/WZLtemplate.cls
+++ /dev/null
@@ -1,335 +0,0 @@
-% !TeX root = main.tex
-%%==============================================================================
-%%                            WZL LaTex Class
-%%                                 V1.2
-%%             project reports, bachelor theses, master theses
-%%
-%%------------------------------------------------------------------------------
-%%
-%% Class developed by:
-%%
-%% Amon Göppert (gpp)
-%% Laboratory for Machine Tools and Production Engineering WZL | RWTH Aachen
-%% Chair of Production Metrology and Quality Management
-%% Department Model-based Systems
-%% Group Metrology Assisted Assembly
-%%
-%% Production Engineering Cluster
-%% Campus-Boulevard 30, 52074 Aachen | GERMANY
-%% Phone: +49 241 80-20599
-%% mailto: a.goeppert@wzl.rwth-aachen.de
-%%
-%%------------------------------------------------------------------------------
-%%
-%% Aachen, October 2019
-%% based on LaTeX `book.cls'
-%% This specific file is the class file, which is needs to be specified in the command \documentclass{}
-%%
-%%==============================================================================
-
-%% ====== Class commands ======
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{WZLtemplate}[2019/08/15 Example LaTeX class]
-
-%% 'sans' option
-\DeclareOption{sans}{
-	\renewcommand{\familydefault}{\sfdefault}	
-}
-
-
-%\ExecuteOptions{EN}
-
-%% 'german' option
-\DeclareOption{de}{
-	\newcommand{\longlang}{ngerman}
-	\newcommand{\shortlang}{de}
-}
-\DeclareOption{en}{
-	\newcommand{\longlang}{english}
-	\newcommand{\shortlang}{en}
-}
-\def\input@path{{\shortlang/}}
-
-
-%\PassOptionsToClass{11pt}{book}
-
-%\DeclareOption{de}{\PassOptionsToPackage{ngerman}{babel}}
-
-%% Pass all unrecognized options to the base class
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
-
-\ProcessOptions\relax
-\LoadClass[twoside]{report}
-
-\RequirePackage[\longlang]{babel}
-
-%TODO pass options to class
-
-%\DeclareOption{en}{\PassOptionsToPackage{english}{babel}}
-%\ProcessOptions\relax
-
-
-%% Input encoding (enabling special characters)
-\RequirePackage[utf8]{inputenc}
-
-%% Font encoding (specifically for fonts)
-\RequirePackage[T1]{fontenc}
-%% Font type: Latin modern
-\RequirePackage{lmodern}
-
-%% Set page geometry
-\RequirePackage[a4paper,
-	left=2.5cm,
-	right=2.5cm,
-	top=2.5cm,
-	bottom=2cm]
-	{geometry}
-
-%% Context sensitive quoting
-\RequirePackage{csquotes}
-
-%% Standard math packages
-\RequirePackage[intlimits]{amsmath}
-\RequirePackage{amsfonts}
-\RequirePackage{amssymb}
-
-%% Enable bold font within math environments
-\RequirePackage{bm}
-
-
-%% Package for creating listing with \enumerate
-\RequirePackage{enumerate}
-
-%% Adjust line spacing
-\linespread{1.5}
-
-%% Header configurations:
-%% Odd pages:
-%%     left chapter name; right page number
-%% Even pages:
-%%     left page number; right section name
-%% If no section is defined, the chapter name
-%% is placed on even pages as well with markboth{}
-\RequirePackage{fancyhdr}
-\pagestyle{fancy}
-\fancyhf{}
-\renewcommand{\chaptermark}[1]{\markboth{\thechapter\ #1}{\thechapter\ #1}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
-\addtolength{\headheight}{\baselineskip}
-
-\lhead[\fancyplain{}{\bfseries\thepage}]{\fancyplain{}{\bfseries\nouppercase\leftmark}}
-\rhead[\fancyplain{}{\bfseries\nouppercase\rightmark}]{\fancyplain{}{\bfseries\thepage}}
-
-%% To overwrite plain style evoked by chapter to get headers on pages where chapters start
-\RequirePackage{etoolbox}
-\patchcmd{\chapter}{\thispagestyle{plain}}{\thispagestyle{fancy}}{}{}
-
-%% Adjust spacings and formats of titles, sections, etc:
-%% \titlespacing*{<command>}{<left>}{<before>}{<after>}[<right>]
-\RequirePackage[bf]{titlesec}
-\titlespacing*{\chapter}{0pt}{-30pt}{0pt}
-\titlespacing*{\section}{0pt}{11pt}{0pt}
-\titlespacing*{\subsection}{0pt}{6pt}{0pt}
-\titleformat{\paragraph}{\normalfont\normalsize\bfseries}{\theparagraph}{0em}{}
-\titlespacing*{\paragraph}{0pt}{11pt}{0pt}
-\titleformat{\chapter}{\normalfont\huge\bfseries\raggedright}{\thechapter}{1em}{} 
-
-%% Avoid inserting blank pages for making sure that a new chapter starts on an odd page
-\renewcommand{\cleardoublepage}{\clearpage}
-
-%% Set distance after paragraph
-\setlength{\parskip}{8pt}
-
-%% Remove indentation of footnotes
-\usepackage[
-    hang,
-    flushmargin,
-    ]{footmisc} 
-
-%% Make links, cites, toc, etc. clickable
-%% Adjust colors if desired
-\RequirePackage[colorlinks=false,
-linkcolor=black,
-citecolor=black
-]{hyperref}\RequirePackage{hyperref}
-\renewcommand{\theHchapter}{\arabic{chapter}\thechapter}
-
-%% Add acronyms
-%TODO comment nolist
-\RequirePackage[
-	printonlyused,
-	%			withpage,
-	%			smaller,
-	%			nohyperlinks,
-	nolist
-	]{acronym}
-
-%% Required for including any kind of graphical images
-\RequirePackage{graphicx}
-
-%% For absolute placement of figures and creation of vector graphics
-\RequirePackage{tikz}
-\usetikzlibrary{calc}
-
-%% Strict placement of figures, tables, etc. referring to the tex source code
-%% Usage: \begin{figure}[H]
-\RequirePackage{float}
-
-%% Alternative style of tables
-\RequirePackage{booktabs}
-
-%% Advanced table package for use-defined width definitions
-\RequirePackage{tabularx}
-
-%% Defines a \FloatBarrier command, beyond which floats may not pass; useful, for example, to ensure all floats for a section appear before the next \section command. 
-\RequirePackage[section]{placeins}
-
-%% Placing captions within figure or table environments
-%% Usage: \caption{Place your caption here.}
-\RequirePackage{caption}
-\captionsetup[figure]{
-	labelfont=bf,
-	justification=raggedright,
-	singlelinecheck=false
-}
-%TODO \captionsetup[table]{labelfont=bf}
-
-
-%% Set custom colours
-%% RWTH colours 100 / 50 / 25 %
-\RequirePackage{xcolor}
-\definecolor{rwthblue100}{rgb}{0,84,159}
-\definecolor{rwthblue75}{rgb}{65,127,183}
-\definecolor{rwthblue50}{rgb}{142,186,229}
-\definecolor{rwthblue25}{rgb}{199,221,242}
-\definecolor{rwthblack100}{rgb}{0,0,0}
-\definecolor{rwthblack75}{rgb}{100,101,103}
-\definecolor{rwthblack50}{rgb}{156,158,159}
-\definecolor{rwthblack25}{rgb}{207,209,210}
-
-\definecolor{aliceblue}{HTML}{F0F8FF}
-
-
-%% Use \todo{} for inline-todo notes
-\RequirePackage[color=aliceblue]{todonotes}
-\RequirePackage{regexpatch}
-\makeatletter
-\xpatchcmd{\@todo}{\setkeys{todonotes}{#1}}{\setkeys{todonotes}{inline,#1}}{}{}
-\makeatother
-
-%% Placement of table of contents, list of figures and list of tables
-\RequirePackage[titles]{tocloft}
-\renewcommand{\cfttoctitlefont}{}
-
-
-%% Style for tableofcontents
-\setlength{\cftbeforesecskip}{5pt}
-
-%% Subliminal refinements towards typographical perfection 
-\RequirePackage{microtype}
-
-%% bibliography for defining macros in .tex-documents
-%% processing backend: biber
-%% further explanations: https://tex.stackexchange.com/a/299286
-\RequirePackage[
-	backend=biber,
-	style=alphabetic,
-	maxalphanames=1,
-	isbn=true,
-	url=false,
-	giveninits=true,
-	maxnames=10,
-	%firstinits=true
-	]{biblatex}
-%% WZL citation style: 4 capital letters & short year
-\DeclareLabelalphaTemplate{
-	\labelelement{
-		\field[final]{shorthand}
-		\field{label}
-		\field[strwidth=4,strside=left,uppercase=true]{labelname}
-	}
-	\labelelement{
-		\field[strwidth=2,strside=right]{year}
-	}
-}
-
-%% Bibliograph tweak: remove "+"-sign as an abbrevation for et. al
-\renewcommand*{\labelalphaothers}{}
-
-%% Avoid overfull hbox in bibliography
-\emergencystretch=1em
-
-%% No identation when a new paragraph starts
-\setlength{\parindent}{0pt}
-
-%% Sans serif font (comparable with Arial)
-%\renewcommand{\familydefault}{\sfdefault}
-
-
-%% @deprecated (reason=idx files not used)
-% \makeindex
-
-%% Insert current date and time
-\usepackage{datetime}
-\newdateformat{verbosedate}{\the\day. \monthname[\THEMONTH] \THEYEAR}
-
-%% For inserting external PDFs
-\RequirePackage{pdfpages}
-
-%% For inserting tabulator environments
-\RequirePackage{Tabbing}
-
-%% TOC
-\newcommand{\toc}{
-	\pagenumbering{roman}
-	\pagestyle{fancy}
-	\renewcommand{\thechapter}{\Roman{chapter}}
-	\newcounter{romancounter}
-	\stepcounter{romancounter}
-	\setlength{\cftchapnumwidth}{2em}
-	\let\tmpcontentsname\contentsname
-	\renewcommand{\contentsname}{\Roman{romancounter}\hspace{1.5em}\tmpcontentsname}
-	\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\contentsname}
-	\renewcommand{\cftchapdotsep}{\cftdotsep}
-	\tableofcontents
-	\stepcounter{romancounter}
-	\stepcounter{chapter}
-	\newpage
-}
-%% LOFLOT - List of figures & list of tables
-\newcommand{\loflot}{
-	%% List of figures
-	\stepcounter{romancounter}
-	\let\tmplistfigurename\listfigurename
-	\renewcommand{\listfigurename}{\Roman{romancounter}\hspace{1em}\tmplistfigurename}
-	\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listfigurename}
-	\listoffigures
-	\newpage
-	%% List of tables
-	\stepcounter{romancounter}
-	\let\tmplisttablename\listtablename
-	\renewcommand{\listtablename}{\Roman{romancounter}\hspace{1em}\tmplisttablename}
-	\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listtablename}
-	\listoftables
-	\newpage
-	
-	%% Start of main text
-	\pagenumbering{arabic}
-	\setcounter{page}{1}
-	\setcounter{chapter}{0}
-	\renewcommand{\thechapter}{\arabic{chapter}}
-	
-}
-
-
-
-%% Reduce error messages for horz. & vert. overstretching of text
-\hbadness=10001
-\vbadness=10001
-
-
- 
- \usepackage{blindtext}
- 
-\endinput
-%% End of file
\ No newline at end of file
diff --git a/acronyms.tex b/acronyms.tex
deleted file mode 100644
index 2b8b678d5998af810eee73bc233a6aea70c937fb..0000000000000000000000000000000000000000
--- a/acronyms.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\acrodef{pots}[POTS]{Poverty of the Stimulus}
-
-
-%TODO
-\begin{acronym}[Abbreviation]
- \acro{Abbreviation}[Abbreviation]{\textbf{Explanation}} 
- \acro{dias}[DIAS]{dynamically interconnected assembly system}
- \acrodefplural{dias}[DIAS]{dynamically interconnected assembly systems}
- \acro{rwth}[RWTH]{Rheinisch-Westfälische Technische Hochschule}
- \acro{jsp}[JSP]{job-shop scheduling problem}
- \acro{fjsp}[FJSP]{flexible job-shop scheduling problem}
-\end{acronym}
diff --git a/de/frontmatter.tex b/de/frontmatter.tex
deleted file mode 100644
index c21dbfe232ad0a7adddcf226e2fe9b79aadf91e4..0000000000000000000000000000000000000000
--- a/de/frontmatter.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-% !TeX root = main.tex
-
-\toc % Table of contents
-
-\chapter{Formelzeichen und Abkürzungen} 
-\newcommand{\rowheight}{3ex}
-\begin{table}[ht!]
-	\begin{tabularx}{\dimexpr\textwidth}{p{3cm} p{3cm} X}
-		\textbf{Formelzeichen} & \textbf{Einheit} & \textbf{Beschreibung}   \\ \midrule
-		a\_e                   & mm               & Eingriffsweite 			\\[\rowheight]
-		a\_p                   & mm               & Schnitttiefe 			\\[\rowheight]
-		t            		   &                  & Zähnezahl [Anmerkung: Sortiert wird alphabetisch] \\[\rowheight]
-		$\alpha$               &                  & Einfallswinkel \\[\rowheight]
-	\end{tabularx}
-\end{table}
-
-\begin{table}[ht!]
-	\begin{tabularx}{\dimexpr\textwidth}{p{6cm}p{0cm} X}
-		\textbf{Abkürzung} && \textbf{Beschreibung}   \\ \midrule
-		DP                    && Polykristalliner Diamant \\[\rowheight]
-	\end{tabularx}
-\end{table}
-
-\loflot % List of figures & tables
diff --git a/en/frontmatter.tex b/en/frontmatter.tex
deleted file mode 100644
index da16bd9695c05539075616a186d7967bf54e8d5b..0000000000000000000000000000000000000000
--- a/en/frontmatter.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-% !TeX root = main.tex
-
-\toc % Table of contents
-
-\chapter{Acronyms} 
-\newcommand{\rowheight}{3ex}
-\begin{table}[ht!]
-	\begin{tabularx}{\dimexpr\textwidth}{p{3cm} p{3cm} X}
-		\textbf{Symbol} & \textbf{Unit} & \textbf{Description}   \\ \midrule
-		a\_e                   & mm               & Width \\[\rowheight]
-		a\_p                   & mm               & Cutting depth \\[\rowheight]
-		t            		   &                  & Number of teeth [Note: Sorting is alphabetical] \\[\rowheight]
-		$\alpha$               &                  & angle \\[\rowheight]
-	\end{tabularx}
-\end{table}
-
-\begin{table}[ht!]
-	\begin{tabularx}{\dimexpr\textwidth}{p{6cm}p{0cm} X}
-		\textbf{Abbreviation} && \textbf{Description}   \\ \midrule
-		DP                    && Polycrystalline diamond \\[\rowheight]
-	\end{tabularx}
-\end{table}
-
-\loflot % List of figures & tables
diff --git a/en/literature.tex b/en/literature.tex
deleted file mode 100644
index fb80c8f438640564514fc2313426bfc55046b172..0000000000000000000000000000000000000000
--- a/en/literature.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-% !TeX root = main.tex
-
-\printbibliography[heading=bibintoc,title=References]
diff --git a/format/WZLTemplate.cls b/format/WZLTemplate.cls
new file mode 100644
index 0000000000000000000000000000000000000000..96336098b5e477c1706c4751a0e3c0e0b386ce78
--- /dev/null
+++ b/format/WZLTemplate.cls
@@ -0,0 +1,199 @@
+% !TeX root = main.tex
+%%==============================================================================
+%%                            WZL LaTex Class
+%%                                 V2.0
+%%             Dissertations, project reports, bachelor theses, master theses
+%%
+%%------------------------------------------------------------------------------
+%%
+%% Class developed by:
+%%
+%% Amon Göppert (gpp)
+%% Laboratory for Machine Tools and Production Engineering WZL | RWTH Aachen
+%% Chair of Production Metrology and Quality Management
+%% Department Model-based Systems
+%% Group Metrology Assisted Assembly
+%%
+%% Production Engineering Cluster
+%% Campus-Boulevard 30, 52074 Aachen | GERMANY
+%% Phone: +49 241 80-20599
+%% mailto: a.goeppert@wzl.rwth-aachen.de
+%%
+%%
+%%------------------------------------------------------------------------------
+%%
+%% Aachen, October 2019
+%% based on LaTeX `book.cls'
+%% This specific file is the class file, which is needs to be specified in the command \documentclass{}
+%%
+%------------------------------------------------------------------
+%%
+%%
+%% Class edited by:
+%%
+%% Tobias Hamann (hmt)
+%% Group Leader
+%% 
+%% Laboratory for Machine Tools and Production 
+%% Engineering WZL of RWTH Aachen
+%% Chair of Production Metrology and Quality Management
+%% Department for Organizational Development | Industrial Capabilities
+%% Production Engineering Cluster
+%% Campus-Boulevard 30
+%% 52074 Aachen | GERMANY
+%% Phone: +49 151 72921981
+%% mailto: t.hamann@wzl-mq.rwth-aachen.de
+%%
+%%
+%%------------------------------------------------------------------------------
+%%
+%% Aachen, May 2022
+%% Changed the file to be working with MiKTeX, TexStudio and Citavi 6 on a local machine rather than on an online plattform. Also cleaned up the code from development artifacts and added comments for understanding.
+%%
+%%
+%------------------------------------------------------------------
+%%
+%%
+%% Class edited by:
+%%
+%% Mark Sanders (sdr)
+%% 
+%% Laboratory for Machine Tools and Production 
+%% Engineering WZL of RWTH Aachen
+%% Chair of Production Metrology and Quality Management
+%% Department for Organizational Development | Industrial Capabilities
+%% Production Engineering Cluster
+%% Campus-Boulevard 30
+%% 52074 Aachen | GERMANY
+%% Phone: 
+%% mailto: 
+%%
+%%
+%%------------------------------------------------------------------------------
+%%
+%% Aachen, 
+%% 
+%%
+
+%==============================================================================
+%%
+%------------------------------------------------------------------
+%%
+%%
+%% Class edited by: Mark Sanders and Tobias Hamann
+%%------------------------------------------------------------------------------
+%%
+%% Aachen, Feburary 2025
+%% Complete Rework and merging of previous works to create a common template.
+%% What else can we say except you're welcome!
+%%
+
+%==============================================================================
+
+%% ====== Class commands ======
+\NeedsTeXFormat{LaTeX2e}
+% \ProvidesClass{WZLtemplate}[2019/08/15 Example LaTeX class]
+\ProvidesClass{format/WZLTemplate}[WZL Thesis]
+
+%%----OPTIONS----
+
+%% 'sans' option
+\DeclareOption{sans}{
+    \renewcommand{\familydefault}{\sfdefault}
+}
+
+%% 'de' option
+\DeclareOption{de}{
+    \newcommand{\longlang}{ngerman}
+    \newcommand{\shortlang}{de}
+    \newcommand{\tmpacronymname}{Abkürzungsverzeichnis}
+    \newcommand{\tmpreferencename}{Literaturverzeichnis}
+    \newcommand{\tmpsymbolname}{Symbolverzeichnis}
+    \newcommand{\tmpglossaryname}{Glossar}
+    \PassOptionsToPackage{ngerman}{babel}
+    \newcommand{\Autoref}[1]{{\autoref{#1}}}
+}
+
+%% 'en' option
+\DeclareOption{en}{
+    \newcommand{\longlang}{english}
+    \newcommand{\shortlang}{en}
+    \newcommand{\tmpacronymname}{Table of Acronyms}
+    \newcommand{\tmpreferencename}{References}
+    \newcommand{\tmpsymbolname}{List of Symbols}
+    \newcommand{\tmpglossaryname}{Glossary}
+    \PassOptionsToPackage{english}{babel}
+    \AtBeginDocument{
+        \renewcommand{\figureautorefname}{figure} % is otherwise capitalized
+        \renewcommand{\subfigureautorefname}{figure}
+        % \renewcommand{\subsubsectionautorefname}{section}
+    }
+    \newcommand{\Autoref}[1]{\capitalisewords{\autoref{#1}}}
+}
+
+%%----PROCESSING OPTIONS----
+
+%% Declare, where language specific documents can be found, such as frontmatter etc. The path corresponds to the short name of the language choosen via the language option.
+\def\input@path{{format/\shortlang/}}
+
+\def\usefiramath{0}
+\DeclareOption{usefiramath}{\def\usefiramath{1}}
+
+\def\papersize{4}
+\DeclareOption{a5paper}{\def\papersize{5}}
+\DeclareOption{a4paper}{\def\papersize{4}}
+
+%% Pass all unrecognized options to the base class
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{extreport}}
+
+% Process all given options
+\ProcessOptions\relax
+
+%%----SET DOCUMENT PROPERTIES----
+\input{format/WZLTemplate_files/SET_DocumentProperties.tex}
+
+%%----IMPORT USEFULL PACKAGES----
+\input{format/WZLTemplate_files/SET_UsefulPackages.tex}
+
+%%----SET UP TABLE OF CONTENTS, LIST OF FIGURES & LIST OF TABLES----
+\input{format/WZLTemplate_files/SET_TablesOfThings.tex}
+
+%%----SET UP Acronyms----
+\input{format/WZLTemplate_files/SET_Acronyms.tex}
+
+%%----SET UP Glossaries----
+\input{format/WZLTemplate_files/SET_Glossaries.tex}
+
+%%----SET UP FIGURES AND TABLES
+\input{format/WZLTemplate_files/SET_FiguresAndTables.tex}
+
+%%----SET UP TIKZ----
+\input{format/WZLTemplate_files/SET_Tikz.tex}
+
+%%----SET UP FOOTNOTES----
+\input{format/WZLTemplate_files/SET_Footnotes.tex}
+
+%%----SET UP HYPERLINKS----
+\input{format/WZLTemplate_files/SET_Hyperlinks.tex}
+
+%%----SET UP Abstracts, Definitions and Theorems----
+\input{format/WZLTemplate_files/SET_SpecialBoxes.tex}
+
+%%----SET UP BIBLIOGRAPHY----
+\input{format/WZLTemplate_files/SET_Bibliography.tex}
+
+%%----SET UP APPENDIX----
+\input{format/WZLTemplate_files/SET_Appendix.tex}
+
+%%----MISCELLANEOUS----
+\input{format/WZLTemplate_files/SET_Miscellaneous.tex}
+
+
+
+%% ----SET UP Unused packages----
+% \input{format/WZLTemplate_files/Unused.tex}    
+
+% TODO \RequirePackage{ulem} Probleme ohne [normalem]
+
+\endinput
+%%----END OF FILE----
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_Acronyms.tex b/format/WZLTemplate_files/SET_Acronyms.tex
new file mode 100644
index 0000000000000000000000000000000000000000..cbfebd84ef1d3b269c73f0ce28a91b214b62880b
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Acronyms.tex
@@ -0,0 +1,17 @@
+
+\RequirePackage[
+    printonlyused,
+    withpage,
+    %			smaller,
+    %			nohyperlinks,
+    % nolist
+]{acronym}
+
+
+% commands for italic acronyms
+\newcommand{\aci}[1]{\emph{\ac{#1}}}
+\newcommand{\Aci}[1]{\emph{\Ac{#1}}}
+\newcommand{\acli}[1]{\emph{\acl{#1}}}
+\newcommand{\Acli}[1]{\emph{\Acl{#1}}}
+\newcommand{\aclpi}[1]{\emph{\aclp{#1}}}
+\newcommand{\Aclpi}[1]{\emph{\Aclp{#1}}}
diff --git a/format/WZLTemplate_files/SET_Appendix.tex b/format/WZLTemplate_files/SET_Appendix.tex
new file mode 100644
index 0000000000000000000000000000000000000000..087fcdc084a613fd766ac3ae647e17b307f4596a
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Appendix.tex
@@ -0,0 +1,21 @@
+
+% TODO
+\newcommand{\appendixheadline}{
+    \cleardoublepage
+    \stepcounter{romancounter}
+    \newcommand{\appendixhead}{\Roman{romancounter}\hspace{1em}Appendix}
+    \phantomsection\addcontentsline{toc}{chapter}{\appendixhead}
+    \thispagestyle{plain}
+    % \setcounter{section}{0} % Reset section counter
+    % \setcounter{subsection}{0} % Reset subsection counter
+    % \setcounter{subsubsection}{0} % Reset subsubsection counter
+    {\cftlottitlefont\appendixhead}{\cftafterlottitle}
+    % Redefine section numbering to include the Roman numeral
+    \renewcommand{\thesection}{\Roman{romancounter}.\arabic{section}}
+    % Redefine subsection numbering to include the new section number
+    \renewcommand{\thesubsection}{\thesection.\arabic{subsection}}
+    % Redefine subsubsection numbering accordingly
+    \renewcommand{\thesubsubsection}{\thesubsection.\arabic{subsubsection}}
+    % Redefine figure numbering if needed
+    \renewcommand{\thefigure}{\Roman{romancounter}.\arabic{figure}}
+}
diff --git a/format/WZLTemplate_files/SET_Bibliography.tex b/format/WZLTemplate_files/SET_Bibliography.tex
new file mode 100644
index 0000000000000000000000000000000000000000..bd8de93f164c79a0b2b55e5e77509bc4552e6312
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Bibliography.tex
@@ -0,0 +1,89 @@
+
+%% bibliography for defining macros in .tex-documents
+%% processing backend: biber
+%% further explanations: https://tex.stackexchange.com/a/299286
+\RequirePackage[
+    backend=biber,
+    style=alphabetic,
+    maxalphanames=1,
+    isbn=true,
+    url=true,
+    urldate=iso,
+    giveninits=true,
+    maxnames=10,
+    date=iso,
+    seconds=true,
+    %firstinits=true
+]{biblatex}
+
+%% WZL citation style: 4 capital letters & short year
+\DeclareLabelalphaTemplate{
+    \labelelement{
+        \field[final]{shorthand}
+        \field{label}
+        \field[strwidth=4,strside=left,uppercase=true]{labelname}
+    }
+    \labelelement{
+        \field[strwidth=2,strside=right]{year}
+    }
+}
+\setlength{\biblabelsep}{2pt}
+% \RequirePackage{pdfcomment}
+% % Redefine \cite to include tooltips
+% \let\oldcite\cite
+% \renewcommand{\cite}[1]{
+% \pdftooltip{\oldcite{#1}}{\fullcite{#1}}
+% % \oldcite{#1}
+% }
+
+%% Bibliograph tweak: remove "+"-sign as an abbrevation for et. al
+\renewcommand*{\labelalphaothers}{} 
+
+%% Avoid overfull hbox in bibliography
+\emergencystretch=1em 
+
+
+
+% sourcemap configuration for lovely Citavi...
+\DeclareSourcemap{
+    \maps[
+        datatype = bibtex,
+        overwrite = true
+    ]{
+        \map{
+            \step[
+                fieldsource=doi,
+                match=\regexp{\{\\textunderscore\}|\{\\textunderscore\s+\}|\{\\_\}|\{\\_\s+\}},
+                replace=_,
+            ]}
+    }
+}
+\DeclareSourcemap{
+    \maps[datatype=bibtex]{
+        \map{
+            \step[fieldsource=url, final=true]
+            \step[fieldset=verba, origfieldval, final=true]
+            \step[fieldsource=verba, match=\regexp{\A(ht|f)tp(s)?:\/\/(www\.)?}, replace={}]
+        }
+    }
+}
+
+\DeclareFieldFormat{url}{%
+    \mkbibacro{URL}\addcolon\space
+    \href{#1}{\nolinkurl{\thefield{verba}}}
+}
+
+
+% TODO
+\newcommand{\references}{
+    \cleardoublepage
+    \sloppy
+    \stepcounter{romancounter}
+    \newcommand{\listreferencename}{\Roman{romancounter}\hspace{1em}\tmpreferencename}
+    \phantomsection\addcontentsline{toc}{chapter}{\listreferencename}
+    \thispagestyle{plain}
+    {\cftlottitlefont\listreferencename}{\cftafterlottitle}
+    \printbibliography[heading=none,title=\tmpreferencename]
+    % \printbibliography[heading=bibintoc,title=References]
+}
+
diff --git a/format/WZLTemplate_files/SET_DocumentProperties.tex b/format/WZLTemplate_files/SET_DocumentProperties.tex
new file mode 100644
index 0000000000000000000000000000000000000000..7911da24119daa8b1f8cea095f2a27f48006256f
--- /dev/null
+++ b/format/WZLTemplate_files/SET_DocumentProperties.tex
@@ -0,0 +1,172 @@
+
+% Declares the document as a twosided report document
+% The WZL Template is based on the report document template
+\LoadClass{extreport}
+
+% Choose spell check language based on language option
+\RequirePackage[\longlang]{babel}
+
+%% Input encoding (enabling special characters)
+\RequirePackage[utf8]{inputenc}
+
+%% Font encoding (specifically for fonts), makes umlauts (yes this is a real english word) searchable in the final PDF file
+\RequirePackage[T1]{fontenc}
+
+%% Font type: Latin modern
+\RequirePackage{lmodern}
+
+%% Set page geometry for A5 and A4
+\ifnum\papersize=5
+    % A5
+    \RequirePackage[
+        % showframe,
+        a5paper,
+        left=2cm,
+        right=2cm,
+        top=2cm,
+        bottom=2cm
+    ]
+    {geometry}
+    %% Adjust line spacing
+    \linespread{1.0} 
+\else
+    % A4
+    \RequirePackage[
+        % showframe,
+        a4paper,
+        left=2.5cm,
+        right=2.5cm,
+        top=2.5cm,
+        bottom=2cm
+    ]
+    {geometry}
+    %% Adjust line spacing
+    \linespread{1.5} 
+\fi
+
+%% HEADERS
+    %% Header configurations:
+    %% Odd pages:
+    %%     left chapter name; right page number
+    %% Even pages:
+    %%     left page number; right section name
+    %% If no section is defined, the chapter name
+    %% is placed on even pages as well with markboth{}
+    \RequirePackage{fancyhdr}
+    \pagestyle{fancy}
+    \fancyheadinit{\normalsize\color{\chaptercolor}}
+    \fancyhf{}
+    \renewcommand{\chaptermark}[1]{\markboth{\thechapter\ #1}{\thechapter\ #1}}
+    \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
+    \addtolength{\headheight}{\baselineskip}
+
+    \lhead[\fancyplain{}{\bfseries\thepage}]{\fancyplain{}{\bfseries\nouppercase\leftmark}}
+    \rhead[\fancyplain{}{\bfseries\nouppercase\rightmark}]{\fancyplain{}{\bfseries\thepage}}
+
+    %% To overwrite plain style evoked by chapter to get headers on pages where chapters start
+    \RequirePackage{etoolbox}
+
+
+    % TODO: Wird das noch gebraucht? \patchcmd{\chapter}{\thispagestyle{plain}}{\thispagestyle{fancy}}{}{}
+
+    % TODO: Was macht das hier?
+    \fancypagestyle{plain}{%
+        \renewcommand{\headrulewidth}{0pt}%
+        \fancyhf{}%
+        \fancyhead[L]{\thepage}%
+    }
+
+
+    %% Adjust spacings and formats of titles, sections, etc:
+    %% Explanation: \titlespacing*{<command>}{<left>}{<before>}{<after>}[<right>]
+    \RequirePackage[bf]{titlesec}
+    \RequirePackage[titles]{tocloft} % Placement of table of contents, list of figures and list of tables
+    \usepackage{mfirstuc}
+
+    % Format Chapters
+    \titlespacing*{\chapter}{0pt}{-20pt}{10pt}
+    % TODO: Bei A4 anders? \titlespacing*{\chapter}{0pt}{-30pt}{0pt}
+    \setlength{\cftbeforechapskip}{3pt}
+    \renewcommand{\theHchapter}{\arabic{chapter}\thechapter}
+    \newcommand{\chaptercolor}{RWTHBlau100}
+
+    % Format Sections
+    \titlespacing*{\section}{0pt}{11pt}{0pt}
+    \setlength{\cftsecnumwidth}{3em}
+    \setlength{\cftbeforesecskip}{3pt}
+
+    % Format Subsections
+    \titlespacing*{\subsection}{0pt}{6pt}{0pt}
+    \setlength{\cftsubsecnumwidth}{4em}
+
+    % Format Subsubsections
+    \setlength{\cftsubsubsecnumwidth}{4em}
+    \setlength{\cftbeforesubsubsecskip}{2pt}
+
+    % Format Paragrpahs
+    \titleformat{\paragraph}{\normalfont\normalsize\bfseries}{\theparagraph}{0em}{}
+    \titlespacing*{\paragraph}{0pt}{11pt}{0pt}
+    
+    %% No identation when a new paragraph starts
+    \setlength{\parindent}{0pt} 
+
+    %% Set distance after paragraph
+    \setlength{\parskip}{8pt}
+
+    % Create huge Numbers at the beginning of Chapters
+    \newcommand\HUGEE{\@setfontsize\Huge{40}{40}}
+    \titleformat{\chapter}[display]{
+        \HUGEE\bfseries}{
+            \raggedleft\vspace{-3cm}\colorbox{\chaptercolor}{\color{white}\rule[-0.2\baselineskip]{0pt}{3\baselineskip}\hspace{5pt}\thechapter\hspace{5pt}}}{20pt}{\Huge}
+
+
+
+    %% TODO: Wird das noch gebraucht? Avoid inserting blank pages for making sure that a new chapter starts on an odd page
+    % \renewcommand{\cleardoublepage}{\clearpage}
+
+%% FONTS
+
+    %% Subliminal refinements towards typographical perfection 
+    \RequirePackage{microtype}
+    \RequirePackage{fontspec}
+    \newfontfamily\arialfont[NFSSFamily=arial]{Arial}
+    \RequirePackage{anyfontsize} 
+    % Draconic
+    \newfontfamily\Iokharic[Path=./format/fonts/Iokharic/]{Iokharic.ttf}
+
+    % English ordinal numbers
+    \usepackage[super]{nth}
+
+    % Roman numbers with with "bars" at the top and bottom
+    \usepackage{romanbar}
+
+%% HYPHENATION
+    \usepackage[normalem]{ulem}
+    % TODO
+    \righthyphenmin=4
+    \lefthyphenmin=4
+
+    
+%% DOCUMENT STARTUP 
+    %% Start frontmatter --> roman page numbers and chapter numbers
+    \newcommand{\startfront}{
+        \pagenumbering{roman}
+        \pagestyle{fancy}
+        \renewcommand{\thechapter}{\Roman{chapter}}
+        \newcounter{romancounter}
+        \stepcounter{romancounter}
+        \setlength{\cftchapnumwidth}{2em}
+    }
+
+    %% Start of main text
+    \newcommand{\startmain}
+    {
+        \pagenumbering{arabic}
+        \setcounter{page}{1}
+        \setcounter{chapter}{0}
+        \setcounter{section}{0}
+        \renewcommand{\thechapter}{\arabic{chapter}}
+    }
+
+
+
diff --git a/format/WZLTemplate_files/SET_FiguresAndTables.tex b/format/WZLTemplate_files/SET_FiguresAndTables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..2d6a76474d20926f9881f30d227d73778fc6d21c
--- /dev/null
+++ b/format/WZLTemplate_files/SET_FiguresAndTables.tex
@@ -0,0 +1,168 @@
+% Settings for pictures and tables
+
+%% GENERAL
+
+    %% FLOATS aka Figures, Tables, ToDoNotes and whatsoever
+
+    %% Strict placement of figures, tables, etc. referring to the tex source code
+    %% Usage: \begin{figure}[H]
+    \RequirePackage{float}
+
+    % Allow to insert images and tables surrounded by text
+    \RequirePackage{wrapfig}
+
+    % Allow to integrate graphics or images into LATEX
+    \RequirePackage{graphicx}
+
+    %% Placing captions within figure or table environments
+    %% Usage: \caption{Place your caption here.}
+    \RequirePackage{caption}
+    \RequirePackage{subcaption}
+
+    %% Defines a \FloatBarrier command, beyond which floats may not pass; useful, for example, to ensure all floats for a section appear before the next \section command. 
+    \RequirePackage[section]{placeins}
+
+    % minimum fraction of page for text
+    % See: https://robjhyndman.com/hyndsight/latex-floats/
+    \renewcommand{\textfraction}{0.10}
+
+    % minimum fraction of floatpage that should have floats	
+    % See: https://robjhyndman.com/hyndsight/latex-floats/
+    \renewcommand{\floatpagefraction}{0.90}
+
+    % supplement the standard graphics package, which defines the macros \resizebox, \scalebox and \rotatebox , with the macros\trimbox and \clipbox.
+    \RequirePackage{adjustbox} % For limiting table width
+
+
+%% FIGURES
+    \cftsetindents{figure}{0em}{3.5em}
+
+    % Setting up cations for figures
+    \captionsetup[figure]{
+        labelfont=bf,
+        % TODO justification=raggedright,
+        justification=justified,
+        singlelinecheck=false
+    }
+
+    
+    % automated integration of SVG graphics into LaTeX documents
+    \RequirePackage[inkscapelatex=false, inkscapepath=svgsubdir, pretex=\fontfamily{arial}\selectfont]{svg}
+
+%% TABLES
+    \cftsetindents{table}{0em}{3.5em}
+
+    %% Alternative style of tables
+    \RequirePackage{booktabs}
+
+    % 
+    \RequirePackage{tabularray}
+
+    %% Advanced table package for use-defined width definitions
+    \RequirePackage{tabularx}
+
+    % Have Tabluarx in Longtables
+    \usepackage{xltabular}
+
+    % Setting up cations for tables
+    \captionsetup[table]{
+        labelfont=bf,
+        justification=raggedright,
+        singlelinecheck=false
+    }   
+
+    % Itemize in Table
+    \newcommand{\tableitemize}{def}
+
+    % % Better cell formatting in tables
+    \usepackage{makecell} % Tabular column heads and multilined cells
+    \usepackage{diagbox} % Table heads with diagonal lines
+
+    % Have labels for tables
+    \makeatletter
+    \newcommand{\tablelabel}[2]{% \speciallabel{<stuff>}{<label>}
+        \edef\@currentlabel{#1}\label{#2}%
+    }
+    \makeatother
+
+    % Rotate tables
+    \usepackage{pdflscape}
+    \usepackage{rotating}
+    \usepackage{afterpage}
+
+
+
+%% RWTH-TABLES
+    % TODO
+    \newlength{\myleftsep}
+    \setlength{\myleftsep}{3pt}
+    \newlength{\myrightsep}
+    \setlength{\myrightsep}{3pt}
+
+    % TODO
+    \NewTblrEnviron{tblrrwth}
+    \SetTblrOuter[tblrrwth]{}
+    \SetTblrInner[tblrrwth]{
+        width = \textwidth,
+        hspan=minimal,
+        rows = {valign=m},
+        row{odd} = {RWTHBlau10},
+        row{even} = {RWTHBlau25},
+        row{1} = {c, bg=RWTHBlau100, font=\bfseries, fg=white},
+        column{1} = {font=\bfseries},
+        rowhead = 1,
+        leftsep = \myleftsep,
+        rightsep= \myrightsep,
+        baseline=t,
+        % % toprule and bottomrule
+        % hline{1,Z} = {0.08em, white},
+        % midrule 
+        hlines = {0.05em, white},
+        vlines = {0.02em, white},
+    }
+
+
+    % TODO
+    \NewTblrEnviron{tblrrwthnorowtitle}
+    \SetTblrOuter[tblrrwthnorowtitle]{}
+    \SetTblrInner[tblrrwthnorowtitle]{
+        width = \textwidth,
+        hspan=minimal,
+        rows = {valign=t},
+        row{odd} = {RWTHBlau10},
+        row{even} = {RWTHBlau25},
+        row{1} = {c, bg=RWTHBlau100, font=\bfseries, fg=white},
+        rowhead = 1,
+        leftsep = \myleftsep,
+        rightsep= \myrightsep,
+        baseline=t,
+        % % toprule and bottomrule
+        % hline{1,Z} = {0.08em, white},
+        % midrule 
+        hlines = {0.05em, white},
+        vlines = {0.02em, white},
+    }
+
+
+    % TODO
+    \NewTblrEnviron{tblrrwthz}
+    \SetTblrOuter[tblrrwthz]{}
+    \SetTblrInner[tblrrwthz]{
+        width = \textwidth,
+        hspan=minimal,
+        rows = {valign=m},
+        row{odd} = {RWTHBlau10},
+        row{even} = {RWTHBlau25},
+        row{1} = {c, bg=RWTHBlau100, font=\bfseries, fg=white},
+        row{Z} = {bg=RWTHBlau50, font=\bfseries},
+        column{1} = {font=\bfseries},
+        rowhead = 1,
+        leftsep = \myleftsep,
+        rightsep= \myrightsep,
+        baseline=t,
+        % % toprule and bottomrule
+        % hline{1,Z} = {0.08em, white},
+        % midrule 
+        hlines = {0.05em, white},
+        vlines = {0.02em, white},
+    }
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_Footnotes.tex b/format/WZLTemplate_files/SET_Footnotes.tex
new file mode 100644
index 0000000000000000000000000000000000000000..818cb44ebc14557882a1a52be59dbe8aa78c2c38
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Footnotes.tex
@@ -0,0 +1,19 @@
+
+
+
+%% FOOTNOTES
+\usepackage[hang,flushmargin,]{footmisc} %% Remove indentation of footnotes
+
+\setlength{\skip\footins}{1cm} % footnote margin
+\renewcommand{\footnoterule}{{\color{\chaptercolor}
+            \noindent\rule[3pt]{\textwidth}{0.4pt}
+        }
+}
+
+% disclaimer footnote
+\newcommand\disclaimer[1]{
+    \begingroup
+    \renewcommand\thefootnote{}\footnote{#1}
+    \addtocounter{footnote}{-1}
+    \endgroup
+}
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_Glossaries.tex b/format/WZLTemplate_files/SET_Glossaries.tex
new file mode 100644
index 0000000000000000000000000000000000000000..29debc41d87a16f2e4465652b28a4a481e4eb953
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Glossaries.tex
@@ -0,0 +1,59 @@
+
+\usepackage[
+    hyperfirst=true,
+    automake=immediate,
+    symbols,
+    section=chapter,
+]
+{glossaries-extra}
+% Define a custom dotfill for glossaries
+\def\Dotfill{\leavevmode\xleaders\hbox to .8em{\hss.\hss}\hfill\kern0pt}
+\makeglossaries
+
+
+%% List of symbols
+\newglossarystyle{symbols_style}{
+    \setglossarystyle{long3col}
+    \renewenvironment{theglossary}%
+    {\begin{longtable}{
+            @{}p{0.15\textwidth}
+            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth}<{\Dotfill}
+            @{\hspace{6pt}}p{0.05\textwidth}
+            @{}
+            }
+            }%
+            {\end{longtable}}%
+    \renewcommand*{\glossentry}[2]{
+        \glstarget{##1}{\glossentryname{##1}}% the entry name
+        % & (\glossentrysymbol{##1})% the symbol in brackets
+        & \glossentrydesc{##1}% the description 
+        & ##2% the number list in square brackets
+        \\
+    }% 
+}
+\input{Usercustomised_Content/symbols}
+
+
+%% Glossary
+\newglossarystyle{glossary_style}{
+    % \setglossarystyle{long3col}
+    \setglossarystyle{long}
+    \renewenvironment{theglossary}%
+    {\begin{longtable}
+            {
+            @{}>{\raggedright\arraybackslash}p{0.2\textwidth}
+            @{\hspace{6pt}}p{\dimexpr 0.8\textwidth-6pt}
+            % @{\hspace{6pt}}p{\dimexpr 0.7\textwidth-12pt}
+            % @{\hspace{6pt}}p{0.1\textwidth}
+            @{}
+            }}%
+            {\end{longtable}}%
+    \renewcommand*{\glossentry}[2]{
+        \glstarget{##1}{\glossentryname{##1}}% the entry name
+        % & (\glossentrysymbol{##1})% the symbol in brackets
+        & \glossentrydesc{##1}% the description 
+        % & ##2% the number list in square brackets
+        \\
+    }% 
+}
+\input{Usercustomised_Content/glossary}
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_Hyperlinks.tex b/format/WZLTemplate_files/SET_Hyperlinks.tex
new file mode 100644
index 0000000000000000000000000000000000000000..0fdf020ecc133f37f4df1637cd8ffc2478829bcb
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Hyperlinks.tex
@@ -0,0 +1,20 @@
+
+%% Hyperlinks
+\RequirePackage{url}
+
+% Namerefenrencing
+\usepackage{nameref}
+
+% Make links, cites, toc, etc. clickable
+\RequirePackage[
+    colorlinks=true,
+    linkcolor=linkcolor,
+    citecolor=linkcolor,
+    filecolor=linkcolor,
+    urlcolor=linkcolor,
+    pdfborderstyle={/S/U/W 1}, % underline links
+    linktoc=all,
+    bookmarksdepth=2,
+]{hyperref} 
+
+\colorlet{linkcolor}{RWTHBlau100}    
diff --git a/format/WZLTemplate_files/SET_Miscellaneous.tex b/format/WZLTemplate_files/SET_Miscellaneous.tex
new file mode 100644
index 0000000000000000000000000000000000000000..b9dfd67e11eb10fc4ed434a1f3df1c7b3c35ee58
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Miscellaneous.tex
@@ -0,0 +1,18 @@
+
+%% Reduce error messages for horz. & vert. overstretching of text
+\hbadness=10001
+\vbadness=10001
+\widowpenalty=10000
+\clubpenalty=10000
+\brokenpenalty=10000
+\predisplaypenalty=10000
+\postdisplaypenalty=10000
+\displaywidowpenalty=10000
+\raggedbottom
+
+
+% Gendern
+\newcommand{\genderpl}[1]{#1Innen}
+
+% Comment blocks
+\usepackage{verbatim}
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_SpecialBoxes.tex b/format/WZLTemplate_files/SET_SpecialBoxes.tex
new file mode 100644
index 0000000000000000000000000000000000000000..b7a25286651be2aad6231dbf7f5384286fe144b0
--- /dev/null
+++ b/format/WZLTemplate_files/SET_SpecialBoxes.tex
@@ -0,0 +1,57 @@
+
+
+% TODO
+\newcommand{\infocolorbox}[2][\chaptercolor]{%
+    \begin{tcolorbox}[colback=#1!5!white, colframe=#1!50!white]
+        #2
+    \end{tcolorbox}
+}
+
+% TODO
+\newenvironment{sectionabstract}[1]{
+    \infocolorbox{#1}
+    \renewcommand{\arraystretch}{1.25}
+    \begin{adjustbox}{max width=\textwidth}
+        \begin{tabular}{@{}>{\bfseries}p{0.25\linewidth}>{\arraybackslash}p{0.75\linewidth}@{}}  % Two columns in the table with no inter-column space at the end
+            }
+            {
+        \end{tabular}
+    \end{adjustbox}\\[8pt] % Adjust the default vertical spacing here
+}
+
+
+% Summary Boxes
+\usepackage{tcolorbox}
+\tcbuselibrary{theorems}
+% Exkursboxen:
+\usepackage{framed}
+
+\makeatletter
+\newtcbtheorem{Summary}{\bfseries Zusammenfassung}{
+	code={\edef\@currentlabelname{#2}}
+	%enhanced,
+	%drop shadow={black!50!white},
+	%coltitle=black,
+	%top=0.3in,
+	%attach boxed title to top left=
+	%	{xshift=1.5em,
+	%	yshift=-\tcboxedtitleheight/2},
+	%boxed title style={size=small,colback=pink}
+}{summary}
+\makeatother
+
+\makeatletter
+\newtcbtheorem{Definition}{\bfseries Definition}{
+	code={\edef\@currentlabelname{#2}},
+	% enhanced,
+	sharp corners,
+	%drop shadow={black!50!white},
+	coltitle=black,
+	colframe=black!20!white,
+	%top=0.3in,
+	%attach boxed title to top left=
+	%	{xshift=1.5em,
+		%	yshift=-\tcboxedtitleheight/2},
+	colback=white
+}{definition}
+\makeatother
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_TablesOfThings.tex b/format/WZLTemplate_files/SET_TablesOfThings.tex
new file mode 100644
index 0000000000000000000000000000000000000000..909205513777513ffbf651fde743527b118d97ae
--- /dev/null
+++ b/format/WZLTemplate_files/SET_TablesOfThings.tex
@@ -0,0 +1,119 @@
+
+
+
+%% Placement of table of contents, list of figures and list of tables
+\renewcommand{\cfttoctitlefont}{}
+\makeatletter
+% \pretocmd{\l@subsubsection}{\vspace{5pt}}{}{} % Increase space after subsubsections
+\makeatother
+
+
+%% LOFLOT - List of figures & list of tables
+\newcommand{\loflot}{
+	%% List of figures
+	\stepcounter{romancounter}
+	\let\tmplistfigurename\listfigurename
+	\renewcommand{\listfigurename}{\Roman{romancounter}\hspace{1em}\tmplistfigurename}
+	\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listfigurename}
+	\listoffigures
+	\newpage
+	%% List of tables
+	\stepcounter{romancounter}
+	\let\tmplisttablename\listtablename
+	\renewcommand{\listtablename}{\Roman{romancounter}\hspace{1em}\tmplisttablename}
+	\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listtablename}
+	\listoftables
+	\newpage
+	
+	%% Start of main text
+	\pagenumbering{arabic}
+	\setcounter{page}{1}
+	\setcounter{chapter}{0}
+	\renewcommand{\thechapter}{\arabic{chapter}}
+	
+}
+
+
+%% TOC - Table of Contents
+\newcommand{\toc}{
+	\let\tmpcontentsname\contentsname
+	\renewcommand{\contentsname}{\Roman{romancounter}\hspace{1.5em}\tmpcontentsname}
+	\cleardoublepage
+    \phantomsection
+    \addcontentsline{toc}{chapter}{\contentsname}
+	\renewcommand{\cftchapdotsep}{\cftdotsep}
+	\tableofcontents
+	% \stepcounter{romancounter}
+	\stepcounter{chapter}
+}
+\setcounter{tocdepth}{1}
+
+
+%% List of figures
+\newcommand{\lof}{
+    %% List of figures
+    \stepcounter{romancounter}
+    \let\tmplistfigurename\listfigurename
+    \renewcommand{\listfigurename}{\Roman{romancounter}\hspace{1em}\tmplistfigurename}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listfigurename}
+    \listoffigures
+}
+
+
+%% List of tables
+\newcommand{\lot}{
+    \stepcounter{romancounter}
+    \let\tmplisttablename\listtablename
+    \renewcommand{\listtablename}{\Roman{romancounter}\hspace{1em}\tmplisttablename}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listtablename}
+    \listoftables
+}
+
+
+
+
+%% List of Symbols
+\newcommand{\los}{
+    \stepcounter{romancounter}
+    \newcommand{\listsymbolname}{\Roman{romancounter}\hspace{1em}\tmpsymbolname}
+    \label{ch:symbols}
+    \cleardoublepage\phantomsection
+    \thispagestyle{plain}
+    \par\nobreak
+    \printglossary[
+        title=\listsymbolname,
+        type=symbols,
+        style=symbols_style,
+    ]
+}
+
+
+%% List of Glossary
+\newcommand{\glossarylist}{
+    \stepcounter{romancounter}
+    \newcommand{\theglossaryname}{\Roman{romancounter}\hspace{1em}\tmpglossaryname}
+    \label{ch:glossary}
+    \cleardoublepage\phantomsection
+    \thispagestyle{plain}
+    \par\nobreak
+    \printglossary[
+        title=\theglossaryname,
+        type=main,
+        style=glossary_style,
+    ]
+    \newpage
+}
+
+
+%% List of acronyms
+\newcommand{\loa}{
+    \stepcounter{romancounter}
+    \newcommand{\listacronymname}{\Roman{romancounter}\hspace{1em}\tmpacronymname}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listacronymname}
+    \label{ch:acronyms}
+    \thispagestyle{plain}
+    {\cftlottitlefont\listacronymname}{\cftafterlottitle}
+    \par\nobreak
+    \input{Usercustomised_Content/acronyms}
+    \newpage
+}
diff --git a/format/WZLTemplate_files/SET_Tikz.tex b/format/WZLTemplate_files/SET_Tikz.tex
new file mode 100644
index 0000000000000000000000000000000000000000..db6e5853ab3feaf127ab9c1fb7c78f96d4de4a95
--- /dev/null
+++ b/format/WZLTemplate_files/SET_Tikz.tex
@@ -0,0 +1,12 @@
+%% TIKZ
+
+%% For absolute placement of figures and creation of vector graphics
+\RequirePackage{tikz}
+\usetikzlibrary{calc}
+
+% Packages for titlepage
+\usepackage{tikzpagenodes}
+
+%% Init Tikz
+\usetikzlibrary{arrows,positioning,shapes.geometric,backgrounds}
+\usetikzlibrary{arrows.meta}
\ No newline at end of file
diff --git a/format/WZLTemplate_files/SET_UsefulPackages.tex b/format/WZLTemplate_files/SET_UsefulPackages.tex
new file mode 100644
index 0000000000000000000000000000000000000000..0defcc756200f4c7688e2cabd15c9b92f118091d
--- /dev/null
+++ b/format/WZLTemplate_files/SET_UsefulPackages.tex
@@ -0,0 +1,126 @@
+
+
+%% COLORS
+
+    % Setup Colors
+    \RequirePackage{xcolor}
+    \input{format/rwthcolors/LaTeX/rwthcolors}
+
+%% MAFFS
+
+    %% Standard math packages
+    \RequirePackage[intlimits]{amsmath}
+    \RequirePackage{amsfonts}
+    \RequirePackage{amssymb}
+    \RequirePackage{enumitem}
+
+
+    %% Enable bold font within math environments
+    \RequirePackage{bm}
+
+    %% Listings
+
+    %% Package for creating listing with \enumerate
+    \RequirePackage{enumerate}
+
+    
+    \RequirePackage{unicode-math}
+    \ifnum\usefiramath=1
+        \message{usefiramath: Fira Math selected}
+        \usepackage{firamath-otf}
+        \setmathfont{Fira Math}
+        \setmathfont[range={"22EF, "22EE, "22F1, "2700-"27BF,"1F600-"1F64F}]{Latin Modern Math}
+    \else
+        \message{usefiramath: Default math font selected}
+    \fi
+
+    % The maximum number of columns in a matrix is determined by the counter MaxMatrixCols
+    \setcounter{MaxMatrixCols}{32}
+
+    % Set Referencename for equations
+    \def\equationautorefname{eq.}
+
+
+%% TODO-Notes
+    %% Use \todo{} for inline-todo notes
+    \RequirePackage[color=RWTHBlau25]{todonotes} %% Use \todo{} for inline-todo notes
+
+    % Make all todonotes inline
+    \RequirePackage{regexpatch}
+    \makeatletter
+    \xpatchcmd{\@todo}{\setkeys{todonotes}{#1}}{\setkeys{todonotes}{inline,#1}}{}{}
+    \makeatother
+
+%% HARVEY-BALLS
+    \def\harveyBallsSize{0.85ex}%size of the harvey balls
+    \def\harveyBallsAngle{120}%size of the harvey balls
+    \def\harveyBallsLineWidth{0.2pt}%line width of the harvey balls
+    \def\harveyBallsColor{RWTHBlau100}
+    \def\harveyBallsLineColor{RWTHBlau100}
+
+    \DeclareRobustCommand{\harveyBallNone}[1][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \draw[draw=black,line width=\harveyBallsLineWidth] (0,0) circle (#1);%
+        \end{tikzpicture}\xspace%
+    }%
+    \DeclareRobustCommand{\harveyBallQuarter}[1][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \draw[draw=RWTHBordeaux100,line width=\harveyBallsLineWidth](0,0) circle (#1);%
+            \fill[fill=RWTHBordeaux100] (0,0) -- (#1,0mm) arc (0:90:#1) -- cycle;%
+        \end{tikzpicture}\xspace%
+    }%
+    \DeclareRobustCommand{\harveyBallHalf}[1][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \draw[draw=RWTHOrange100,line width=\harveyBallsLineWidth](0,0) circle (#1);%
+            \fill [fill=RWTHOrange100] (0,0) -- (0mm,#1) arc (90:-90:#1) -- cycle;%
+        \end{tikzpicture}\xspace%
+    }%
+    \DeclareRobustCommand{\harveyBallThreeQuarter}[1][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \draw[draw=RWTHMaigruen100,line width=\harveyBallsLineWidth](0,0) circle (#1);%
+            \fill [fill=RWTHMaigruen100] (0,0) -- (0mm,#1) arc (90:-180:#1) -- cycle;%
+        \end{tikzpicture}\xspace%
+    }%
+    \DeclareRobustCommand{\harveyBallFull}[1][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \filldraw[draw=RWTHGruen100,fill=RWTHGruen100,line width=\harveyBallsLineWidth] (0,0) circle (#1);%
+        \end{tikzpicture}\xspace%
+    }%
+
+    \DeclareRobustCommand{\harveyBallCustom}[3][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \draw[draw=#3,line width=\harveyBallsLineWidth](0,0) circle (#1);%
+            \fill [fill=#3] (0,0) -- (0mm,#1) arc (90:-#2:#1) -- cycle;%
+        \end{tikzpicture}\xspace%
+    }%
+    \DeclareRobustCommand{\harveyBallCustomWhite}[3][\harveyBallsSize]{%
+        \begin{tikzpicture}%
+            \filldraw[draw=White,fill=White,line width=\harveyBallsLineWidth*2](0,0) circle (#1);%
+            \draw[draw=#3,line width=\harveyBallsLineWidth](0,0) circle (#1);%
+            \fill [fill=#3] (0,0) -- (0mm,#1) arc (90:-#2:#1) -- cycle;%
+        \end{tikzpicture}\xspace%
+    }%
+
+%%% MISC
+
+    %% Context sensitive quoting
+    \RequirePackage{csquotes}
+
+    %% Insert current date and time
+    \usepackage{datetime}
+    \newdateformat{verbosedate}{\the\day. \monthname[\THEMONTH] \THEYEAR}
+    
+    % Package to create a dummy text with \blindtext
+    \RequirePackage{blindtext}
+
+    %% For inserting external PDFs
+    \RequirePackage{pdfpages}
+
+
+
+
+
+
+
+
+
diff --git a/format/WZLTemplate_files/Unused.tex b/format/WZLTemplate_files/Unused.tex
new file mode 100644
index 0000000000000000000000000000000000000000..33c0f3f7cea8bdf182aaea6510f482591d57d974
--- /dev/null
+++ b/format/WZLTemplate_files/Unused.tex
@@ -0,0 +1,111 @@
+%% Deletable?
+
+
+    %% For inserting tabulator environments
+    \RequirePackage{Tabbing}
+
+    
+\RequirePackage{chronosys}
+\setupchronology{color=RWTHBlau25,dates=false, height=20pt}
+\setupchronoperiode{color=RWTHBlau100, textstyle=\footnotesize,dates=false,datestyle=\footnotesize\centering}
+\setupchronoevent{textstyle=\footnotesize,datestyle=\footnotesize\centering, textwidth=20ex, colorbox=white}
+
+
+
+% \RequirePackage[autoplay,loop,controls=true]{animate}
+
+\newcommand\ctformatchapter[1]{\parbox[t]{\dimexpr\textwidth-4em\relax}{\raggedright#1}}
+
+
+\renewcommand\mkbibacro[1]{{\footnotesize\MakeUppercase{#1}}}
+
+
+% coloured and framed text boxes with a heading line
+\RequirePackage{tcolorbox}
+
+\setlength{\fboxsep}{1pt}
+
+% TODO
+\newcommand{\markerbox}[2]{%
+    \begingroup%
+    \setlength{\fboxrule}{2pt}%
+    \setlength{\fboxsep}{0.5pt}%
+    \fcolorbox{#1}{white}{\textbf{#2}}%
+    \endgroup%
+}
+
+
+% -------------------- brauchen wir folgendes noch?
+
+% Create custom lengths
+\newcommand{\deflen}[2]{%      
+	\expandafter\newlength\csname #1\endcsname
+	\expandafter\setlength\csname #1\endcsname{#2}%
+}
+
+% Römische Zahlen
+\newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}}
+\newcommand{\lowroman}[1]{\romannumeral#1\relax}
+
+
+
+\newif\ifrevision
+\newif\ifdeletion
+
+\revisiontrue
+\deletiontrue
+
+\ifrevision
+\newcommand\revOne[1]{\textcolor{BrickRed}{#1}}
+\newcommand\revTwo[1]{\textcolor{NavyBlue}{#1}}
+\newcommand\rev[1]{\textcolor{Green}{#1}}
+\ifdeletion
+\newcommand\del[1]{\textcolor{Red}{\sout{#1}}}
+\else 
+\newcommand\del[1]{}
+\fi
+\else
+\newcommand\revOne[1]{#1}
+\newcommand\revTwo[1]{#1}
+\newcommand\rev[1]{#1}
+\newcommand\del[1]{}
+\fi
+
+\newcommand\todoRevOne[1]{\todo[author=Review 1,color=BrickRed]{#1}}
+\newcommand\todoRevTwo[1]{\todo[author=Review 2,color=NavyBlue]{#1}}
+\newcommand\todohmt[1]{\todo[author=hmt,color=red]{#1}}
+
+
+\newcounter{hmtcomment}
+\newcommand{\hmtcomment}[1]{%
+	     \refstepcounter{hmtcomment}%
+	     {%
+		         \setstretch{0.7}% spacing
+		         \todo[color={red!60!},size=\small]{%
+		         \textbf{Comment~[Tobias~\thehmtcomment]:} #1}%
+		 }}
+
+
+		 
+% for table footnote
+% \usepackage{tablefootnote}
+%\newcolumntype{b}{X}
+%\newcolumntype{s}{>{\hsize=.7\hsize}X}
+% \usepackage{tabu}
+
+%\usepackage{footnote}
+% \usepackage{footnotehyper}
+%\usepackage[textwidth=20mm]{todonotes}
+% \reversemarginpar
+
+
+
+% \usepackage{lipsum}
+
+
+
+% Vor den Kapiteln
+% \renewcommand{\chaptercolor}{RWTHPetrol100}
+
+% Nach den Kapiteln
+% \renewcommand{\chaptercolor}{RWTHBlau100}
\ No newline at end of file
diff --git a/format/de/frontmatter.tex b/format/de/frontmatter.tex
new file mode 100644
index 0000000000000000000000000000000000000000..1896d47c5ec5b1e8cd5f61fd5fe8a76694ea2d22
--- /dev/null
+++ b/format/de/frontmatter.tex
@@ -0,0 +1,12 @@
+% !TeX root = main.tex
+
+\colorlet{linkcolor}{black}
+
+\startfront
+\toc % Table of contents
+\lof % List of Figures
+\lot % List of Tables
+\loa % List of Acronyms
+\startmain
+
+\colorlet{linkcolor}{RWTHBlau100}
\ No newline at end of file
diff --git a/de/literature.tex b/format/de/literature.tex
similarity index 100%
rename from de/literature.tex
rename to format/de/literature.tex
diff --git a/format/en/frontmatter.tex b/format/en/frontmatter.tex
new file mode 100644
index 0000000000000000000000000000000000000000..3c2a5f65cb7d10566a17bd43e67b8059c26bad97
--- /dev/null
+++ b/format/en/frontmatter.tex
@@ -0,0 +1,14 @@
+% !TeX root = main.tex
+
+\colorlet{linkcolor}{black}
+
+\startfront
+\toc % Table of contents
+\lof % List of Figures
+\lot % List of Tables
+\loa % List of Acronyms
+\los % List of Symbols
+\glossarylist % Glossary
+\startmain
+
+\colorlet{linkcolor}{RWTHBlau100}
\ No newline at end of file
diff --git a/format/fonts/Fira/FiraMath-Regular.otf b/format/fonts/Fira/FiraMath-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f1f9d40c2c82258858e603dba709ea24fb1a1bc2
Binary files /dev/null and b/format/fonts/Fira/FiraMath-Regular.otf differ
diff --git a/format/fonts/Fira/Fira_Sans.zip b/format/fonts/Fira/Fira_Sans.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b512abe450ac48d9faf7e6813c6e52d5e6724a26
Binary files /dev/null and b/format/fonts/Fira/Fira_Sans.zip differ
diff --git a/format/fonts/Iokharic/Font License.txt b/format/fonts/Iokharic/Font License.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b4e6c6ec0c71d09a77ddfd2ac7402aa89f17955d
--- /dev/null
+++ b/format/fonts/Iokharic/Font License.txt	
@@ -0,0 +1,47 @@
+Shareware/ Font License
+
+Pixel Sagas Freeware Fonts EULA (End User License Agreement) and Software Inclusion Agreement
+
+"Purchaser" and "User" may be used interchangeably in this agreement.
+
+"Pixel Sagas" and "Neale Davidson" may be used interchangeably in this agreement. These all refer to the intellectual and legal property of Neale Davidson.
+
+Usage
+
+Pixel Saga's Shareware Fonts are free to use for personal, non-commercial purposes. No payment is necessary to use Pixel Saga's Freeware Fonts for personal use, and there is no limit to the amount of prints, pages, or other medium to be produced using them. However, you cannot offer the font for commercial sale, or offer for direct download. The inclusion othe font name and/or site URL in the credits or documentation when it is used is appreciated, but this is not mandatory.
+
+Payment
+
+Payment is not required for the use of Pixel Saga's Shareware Fonts. Commercial use requires a modest fee which can be paid through the pixelsagas.com web site through Paypal.com's services. The transaction receipt for any shareware "commercial license" purchase will suffice as proof of license.
+
+Support
+
+Font installation help is available at http://www.pixelsagas.com. If you experience problems with any Pixel Saga's Freeware font (such as spacing issues or missing characters), please verify that you have the correct and current version of the fonts. In the case of Freeware fonts, downloading the font directly from the Pixel Sagas site will ensure that the font files have not been altered.
+
+Software Inclusion Agreement
+
+Pixel Saga's software products are protected by copyright laws and International copyright treaties, as well as other intellectual property laws and treaties. All Pixel Saga's software products are licensed, not sold.
+
+1) GRANT OF LICENSE
+
+This document grants the user the following rights:
+
+Installation and Use. The user may install and use an unlimited number of copies of the software product. The user may not offer Pixel Sagas freeware fonts for direct download unless the user has received explicit, written permission from Neale Davidson. Otherwise please direct users to the http://www.pixelsagas.com website. Pixel Sagas freeware fonts may, however, be embedded for web, publication, or general software use.
+
+2) WARRANTIES
+
+None
+
+Pixel Sagas expressly disclaims any warranty for the software product. The software product and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or non-infringement. The entire risk arising out of use or performance of the software product remains with the user.
+
+No Liability For Consequential Damages.
+
+In no event shall Neale Davidson or Pixel Sagas be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this product, even if Pixel Sagas has been advised of the possibility of such damages.
+
+3) MISCELLANEOUS
+
+Should the user have any questions concerning this document or you desire to contact Neale Davidson for any reason, please email jaynz@pixelsagas.com .
+
+Governing Law
+
+This agreement is governed by and subject to the laws of the United States of America.
diff --git a/format/fonts/Iokharic/Iokharic.ttf b/format/fonts/Iokharic/Iokharic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3223d6ca1eebc378210582d90d19b97ec39833e7
Binary files /dev/null and b/format/fonts/Iokharic/Iokharic.ttf differ
diff --git a/format/fonts/Iokharic/otf/Iokharic-Bold-Italic.otf b/format/fonts/Iokharic/otf/Iokharic-Bold-Italic.otf
new file mode 100644
index 0000000000000000000000000000000000000000..a4c31b8a02e06f0be69886148df29d509a3231b1
Binary files /dev/null and b/format/fonts/Iokharic/otf/Iokharic-Bold-Italic.otf differ
diff --git a/format/fonts/Iokharic/otf/Iokharic-Bold.otf b/format/fonts/Iokharic/otf/Iokharic-Bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..523e23bd76b6dc6274baca18197875427d87e7d5
Binary files /dev/null and b/format/fonts/Iokharic/otf/Iokharic-Bold.otf differ
diff --git a/format/fonts/Iokharic/otf/Iokharic-Italic.otf b/format/fonts/Iokharic/otf/Iokharic-Italic.otf
new file mode 100644
index 0000000000000000000000000000000000000000..4ba553d9e8d20a9ef4c676a01e418323f301def3
Binary files /dev/null and b/format/fonts/Iokharic/otf/Iokharic-Italic.otf differ
diff --git a/format/fonts/Iokharic/otf/Iokharic.otf b/format/fonts/Iokharic/otf/Iokharic.otf
new file mode 100644
index 0000000000000000000000000000000000000000..a1eecfe67404053653cf3be3df39feef8502b1e9
Binary files /dev/null and b/format/fonts/Iokharic/otf/Iokharic.otf differ
diff --git a/format/rwthcolors b/format/rwthcolors
new file mode 160000
index 0000000000000000000000000000000000000000..4db26a8fcc129032e310ca2da61dc2a0f383ff94
--- /dev/null
+++ b/format/rwthcolors
@@ -0,0 +1 @@
+Subproject commit 4db26a8fcc129032e310ca2da61dc2a0f383ff94
diff --git a/format/titlepage.tex b/format/titlepage.tex
new file mode 100644
index 0000000000000000000000000000000000000000..c8212fb4986cbf9a68c679914a481f4e6d62e803
--- /dev/null
+++ b/format/titlepage.tex
@@ -0,0 +1,110 @@
+\makeatletter
+
+% Define academic degree names based on the thesis type
+\ifthenelse{\equal{\thesistype}{Dissertation}}{%
+    \def\academicdegree{Dissertation}%
+    \def\academicdegreegerman{Dissertation}%
+}{%
+    \ifthenelse{\equal{\thesistype}{PA}}{%
+        \def\academicdegree{Project Thesis}%
+        \def\academicdegreegerman{Projektarbeit}%
+    }{%
+        \ifthenelse{\equal{\thesistype}{BA}}{%
+            \def\academicdegree{Bachelor Thesis}%
+            \def\academicdegreegerman{Bachelorarbeit}%
+        }{%
+            \ifthenelse{\equal{\thesistype}{MA}}{%
+                \def\academicdegree{Master Thesis}%
+                \def\academicdegreegerman{Masterarbeit}%
+            }{%
+                % Default case
+                \def\academicdegree{Thesis}%
+                \def\academicdegreegerman{Arbeit}%
+            }}}}
+
+\begin{titlepage}
+
+    % Temporarily adjust the page margins to increase the usable space
+    % \newgeometry{top=2cm,bottom=2cm,left=2cm,right=2cm}
+
+    \ifnum\papersize=4
+        \begin{tikzpicture}[remember picture,overlay]
+            \node[opacity=0.4, anchor=north east,inner sep=0pt]%
+            at ($(current page.north west)+(20.5cm,-0.5cm)$)
+            {\includegraphics[width=7.67cm]{wzl_eps_hks44.pdf}};
+        \end{tikzpicture}
+    \else
+        \begin{tikzpicture}[remember picture,overlay]
+            \node[opacity=0.4, anchor=north east]%
+            at (current page.north east)%
+            {\includegraphics[width=5.4cm]{wzl_eps_hks44.pdf}};
+        \end{tikzpicture}
+    \fi
+
+    \begin{flushleft}
+        {\small
+        The present work was submitted to the \\ \institute.\\
+        {\color{black!50} Diese Arbeit wurde vorgelegt am \institutegerman.}
+        }
+
+        \vfill
+
+        \textbf{\Large\@title}
+
+        \textbf{\Large\color{black!50}\titlegerman}
+
+    \end{flushleft}
+
+    \vspace{1cm}
+
+    \textbf{\large\academicdegree\color{black!50}\ /\ \academicdegreegerman }
+
+    \vfill
+
+    \textbf{\color{black!75}Presented by\color{black!50}\ /\ Vorgelegt von}
+
+    {\@author}\\
+    \studentid
+    \vfill
+    % Supervisor and Examiners
+    {
+        \textbf{\color{black!75}Supervised by\color{black!50}\ /\ Betreut von} \supervisor
+        \\
+        \textbf{\color{black!75}\\1\textsuperscript{st} Examiner\color{black!50}\ /\ 1. Prüfer} \firstexaminer
+        % Include 2nd examiner only if it's set
+        \ifthenelse{\equal{\secondexaminer}{}}{}{%
+            \\
+            \textbf{\color{black75}\\2\textsuperscript{nd} Examiner\color{black!50}\ /\ 2. Prüfer} \secondexaminer
+        }
+    }
+
+    \begin{flushright}
+        {\small
+            Aachen, \@date
+        }
+    \end{flushright}
+
+    \vfill
+
+    % Include the disclaimer text on the title page if applicable
+    \ifthenelse{\equal{\thesistype}{Dissertation}}{}{%
+        % Reduce vertical space before the disclaimer
+        \vspace{0.5cm}
+        \noindent {\footnotesize
+            Inhalt und Ergebnis dieser Arbeit sind ausschließlich zum internen Gebrauch bestimmt. Alle Urheberrechte liegen bei der RWTH Aachen. Ohne ausdrückliche Genehmigung des betreuenden Lehrstuhls ist es nicht gestattet, diese Arbeit oder Teile daraus an Dritte weiterzugeben.
+
+            \medskip
+
+            \textit{The content and results of this thesis are intended exclusively for internal use. All copyrights are held by RWTH Aachen University. Without the express permission of the supervising department, it is not permitted to pass this thesis or parts thereof to third parties.}
+        }
+    }
+
+    % Reset page geometry back to normal
+    \restoregeometry
+
+\end{titlepage}
+
+
+\makeatother
+
+\newpage\thispagestyle{empty}\null
\ No newline at end of file
diff --git a/img/TexStudio_Settings.png b/img/TexStudio_Settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae9c6faf672eef8839163f62a7ea77f1cc0e968c
Binary files /dev/null and b/img/TexStudio_Settings.png differ
diff --git a/lit/refs.bib b/lit/References.bib
similarity index 67%
rename from lit/refs.bib
rename to lit/References.bib
index 8d865a6f00a574712a685ed540393ce7ca343673..410e77c8b7d985b067bdb841ad81fbbf45864904 100644
--- a/lit/refs.bib
+++ b/lit/References.bib
@@ -1,7 +1,7 @@
 % Encoding: UTF-8
 % This file was created with Citavi 5.7.1.0
 
-@Article{HEVN04,
+@article{HEVN04,
   author    = {Alan R. Hevner and Salvatore T. March and Jinsoo Park and Sudha Ram},
   title     = {Design Science in Information Systems Research},
   issn      = {02767783},
@@ -12,16 +12,15 @@
   file      = {:HEVN04 - Design Science in Information Systems Research.pdf:PDF},
   journal   = {MIS Quarterly},
   publisher = {Management Information Systems Research Center, University of Minnesota},
-  year      = {2004},
+  year      = {2004}
 }
 
 
-@Book{LAMP86,
+@book{LAMP86,
   author    = {Leslie Lamport},
   title     = {LATEX User's Guide \& Reference Manual},
-  note      = {Online information on TeX and LaTeX is available at \htmladdnormallink{http://curia.ucc.ie/info/TeX/menu.html} {http://curia.ucc.ie/info/TeX/menu.html} and \htmladdnormallink{http://es-sun2.fernuni-hagen.de/info2html?(latex.info)Top} {http://es-sun2.fernuni-hagen.de/info2html?(latex.info)Top}},
   publisher = {Addison-Wesley Publishing Company, Inc.},
-  year      = {1986},
+  year      = {1986}
 }
 
 @Comment{jabref-meta: databaseType:biblatex;}
diff --git a/main.pdf b/main.pdf
deleted file mode 100644
index 6b4ca476505cceaaab4a11888ceaa1b5bcc23539..0000000000000000000000000000000000000000
Binary files a/main.pdf and /dev/null differ
diff --git a/main.tex b/main.tex
index 69d1219f9ccadbc3bde79c7d51691376519f1a87..9b2c9939a21583466f1ba83af3fc244c356303d8 100644
--- a/main.tex
+++ b/main.tex
@@ -1,29 +1,78 @@
+% !TeX root = main.tex
 \documentclass[
-	%% Options:
-	en, 				% Language [DE|EN]
-	sans,				% Font without serif (like Arial), serif font is default
-%	lit/refs_gpp.bib 	% Path to literature bib.-file 
-%	./figures/			% Path to figures folder
-	]{WZLtemplate}
+    a4paper,        % a4paper/a5paper
+    11pt,           % 11pt for A4, 8pt for A5
+    en,             % Language [DE|EN]
+    usefiramath,    % use fira math for equations
+    sans,           % Font without serif (like Arial),
+    % twoside,
+    openright
+    ]{format/WZLTemplate}
 
 
-\bibliography{lit/refs.bib}
+% Set up the document
 
+% Titlepage
+\title{Awesome Title}
+\newcommand\titlegerman{Rahmenwerk zur Unterstützung des Forschungsdatenmanagements in der projektbasierten Forschung der deutschen Ingenieurwissenschaften}
+\author{Tobias Hamann, M.Sc.}
+\date{\today} % TODO use \formatdate{dd}{mm}{yyyy} instead of \today
+
+% Define the thesis type here (options: PA, BA, MA, Dissertation)
+\newcommand{\thesistype}{PA} % Change this to BA, MA, or Dissertation as needed
+\newcommand\studentid{123456}
+\newcommand\institute{Chair of Intelligence in Quality Sensing | WZL | RWTH Aachen University}
+\newcommand\institutegerman{Lehrstuhl für Informations-, Qualitäts- und Sensorsysteme in der Produktion | WZL | RWTH Aachen}
+\newcommand\supervisor{Internal Supervisor M. Sc.}
+\newcommand\firstexaminer{Univ.-Prof. Dr.-Ing. Robert Schmitt}
+\newcommand\secondexaminer{} % add if necessary
+
+
+% Set up Bibliography
+\bibliography{lit/References.bib}
+
+% Set up Graphics
 \graphicspath{{./03_figures/}}
-\usepackage{booktabs}
 
+%% Import Custom Packages
+\input{Usercustomised_Content/custom_packages}
+
+% Begin of the document
 \begin{document}
 
-\includepdf[pages=1]{02_documents/deckblattundformularlogoverwendung.pdf}
-\include{02_documents/Themenstellung}
+%% Define own commands
+\include{Usercustomised_Content/functions}
+
+%% Set up keyphrases
+\input{Usercustomised_Content/keyphrases}
+
+%% Set up definitions
+%\input{definitions}
+
+% To avoid bugs with page numbering
+% \hypersetup{pageanchor=false}
 
+% To avoid bugs with page numbering
+% \hypersetup{pageanchor=true}
+
+
+% -- Additional documents -- 
+
+% Titlepage
+\include{format/titlepage}
+
+% -- FRONTMATTER -- 
 \include{frontmatter}
 
+
+
+% -- CHAPTERS -- 
 %Here you can include your chapters, as shown
 \include{01_chapters/ch1-intro}
+\renewcommand{\chaptercolor}{RWTHPetrol100}
 \include{01_chapters/ch2-theory}
-
-%% Proposed chapters:
+%
+% Proposed Chapters
 %\include{01_chapters/Einleitung} 
 %\include{01_chapters/Stand_der_Technik}
 %\include{01_chapters/Versuchsplanung}
@@ -31,7 +80,11 @@
 %\include{01_chapters/Diskussion_der_Ergebnisse}
 %\include{01_chapters/Zusammenfassung_und_Ausblick}
 
-\include{literature}
+% -- LITERATURE -- 
+%\printbibliography
+\include{format/literature}
+
+% -- APPENDIX --
 %\include{appendix}
 
 \end{document}
diff --git a/texlive_packages.txt b/texlive_packages.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dc55a364ef5bab874296df4c557cb70d17acb444
--- /dev/null
+++ b/texlive_packages.txt
@@ -0,0 +1 @@
+acronym adjustbox animate anyfontsize babel-english beamer biber biblatex bigfoot babel-german babel-french babel-english blindtext bookmark caption catchfile chronosys cleveref csquotes datetime diagbox draftwatermark enumitem environ extsizes fancyhdr fira firamath firamath-otf fmtcount footmisc geometry glossaries glossaries-extra hyphen-german ifplatform ifoddpage koma-script latexindent libertine listings ltablex makecell makeindex mathspec media9 microtype ninecolors nomencl nth ocgx2 pdflscape pdfpages pgfplots pict2e placeins preprint ragged2e regexpatch romanbar savetrees silence siunitx stackengine svg tabbing tabularray tcolorbox texcount textpos titlesec tikzpagenodes tocloft todonotes transparent trimspaces ulem wrapfig xltabular xstring zref
diff --git a/topic_description.pdf b/topic_description.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..24fa1451e913c25b1af0827b5bd7202360a02c87
Binary files /dev/null and b/topic_description.pdf differ