diff --git a/.gitignore b/.gitignore
index 21b07c0ca7ef349ec9a037c8e82f6264e93f7316..0ad22f6b07517b8d5115605b34ae7f1e55457027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,8 +43,12 @@ latex.out
 main.pdf
 *WZLstyle.xml
 # *.pdf
-main.bbl-SAVE-ERROR
-main.bcf-SAVE-ERROR
-main.glo
-main.ist
-main.slo
+*.bbl-SAVE-ERROR
+*.bcf-SAVE-ERROR
+*.glo
+*.ist
+*.slo
+*.sls
+*.slg
+*.gls
+*.glg
diff --git a/01_chapters/ch1-intro.tex b/01_chapters/ch1-intro.tex
index 1aff0be09e97c8d464ae1bece9327002f0de3e53..465d47a54b26001fe51a1ff2d498861d9194d322 100644
--- a/01_chapters/ch1-intro.tex
+++ b/01_chapters/ch1-intro.tex
@@ -51,7 +51,7 @@ The "label"-command is for referencing the table or graphic in your text: 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}
@@ -59,5 +59,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 \"acronyms.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 3c8321b507d5bf1bc4f9c3a59afea88d0190205a..37c94ceb2265072c3875720222fc648d98744bf7 100644
--- a/01_chapters/ch2-theory.tex
+++ b/01_chapters/ch2-theory.tex
@@ -23,15 +23,15 @@ To achieve rigorousness... \cite[80]{HEVN04}
 \section{test-section}
 
 \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.\\
diff --git a/02_documents/Themenstellung.tex b/02_documents/Themenstellung.tex
index a51619657eedb7e7189cd2d2fa16faebc0058b4b..6b51606223594c93f98e5c88c090a3c689ba52f0 100644
--- a/02_documents/Themenstellung.tex
+++ b/02_documents/Themenstellung.tex
@@ -1,20 +1,19 @@
 % !TeX root = main.tex
 % Themenstellung / Topic short description
 \pagestyle{empty}
-~
-\newpage
+\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}
+	\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}
+	\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
@@ -30,11 +29,11 @@ V. Name - Tel. 0241-80 xxxxx\\[2cm]
 	%% 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}
diff --git a/format/WZLTemplate.cls b/format/WZLTemplate.cls
index bea292faaf718b0aed5e0b90bbe3a844435071e4..f429ad51576a7163b6c37019128362ab196a2bbf 100644
--- a/format/WZLTemplate.cls
+++ b/format/WZLTemplate.cls
@@ -189,9 +189,9 @@
     \RequirePackage[
         % showframe,
         a4paper,
-		left=2.5cm,
-		right=2.5cm,
-		top=2.5cm,
+        left=2.5cm,
+        right=2.5cm,
+        top=2.5cm,
 		bottom=2cm
 	]
 	{geometry}
@@ -270,16 +270,26 @@ citecolor=black
 %% Add acronyms
 %TODO comment nolist
 \RequirePackage[
-	printonlyused,
-	%			withpage,
-	%			smaller,
-				nohyperlinks,
-	% nolist
-	]{acronym}
+    printonlyused,
+    withpage,
+    %			smaller,
+    %			nohyperlinks,
+    % nolist
+]{acronym}
 	
 %%----IMPORT USEFULL PACKAGES----
 
 %% Required for including any kind of graphical images
+\usepackage[
+    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
+\input{format/symbols}
 \RequirePackage{graphicx}
 
 %% For absolute placement of figures and creation of vector graphics
@@ -366,16 +376,19 @@ citecolor=black
 %% processing backend: bibtex
 %% 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}
-	
+    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{
@@ -442,14 +455,112 @@ citecolor=black
 %% 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
+
+\RequirePackage{blindtext}
+\RequirePackage{url}
+\RequirePackage{booktabs}
+\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}
+
+\setcounter{MaxMatrixCols}{32}
+% \RequirePackage[autoplay,loop,controls=true]{animate}
+\RequirePackage{fontspec}
+\newfontfamily\arialfont[NFSSFamily=arial]{Arial}
+\RequirePackage[inkscapelatex=false, inkscapepath=svgsubdir, pretex=\fontfamily{arial}\selectfont]{svg}
+\RequirePackage{adjustbox} % For limiting table width
+\RequirePackage{tcolorbox}
+\setlength{\fboxsep}{1pt}
+\RequirePackage{anyfontsize}
+
+\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
 
+\RequirePackage[
+    colorlinks=true,
+    linkcolor=linkcolor,
+    citecolor=linkcolor,
+    filecolor=linkcolor,
+    urlcolor=linkcolor,
+    pdfborderstyle={/S/U/W 1}, % underline links
+    linktoc=all,
+    bookmarksdepth=2,
+]{hyperref} % Make links, cites, toc, etc. clickable
 
+\RequirePackage[
+    printonlyused,
+    withpage,
+    %			smaller,
+    %			nohyperlinks,
+    % nolist
+]{acronym}
+\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
+\input{format/symbols}
+\input{format/glossary}
+
+\renewcommand\mkbibacro[1]{{\footnotesize\MakeUppercase{#1}}}
+
+\newcommand\ctformatchapter[1]{\parbox[t]{\dimexpr\textwidth-4em\relax}{\raggedright#1}}
+
+% \titleformat{\chapter}[display]{\vspace{-8em}\raggedleft{
+%         {\color{ctcolormain}\rule[-5pt]{2pt}{5cm}}\quad{\color{ctcolormain}\fontsize{60}{60}\selectfont\thechapter}
+%     }
+% }{-2.1em}{\ctformatchapter}[\phantomsection]
+
+\colorlet{linkcolor}{RWTHBlau100}
+\newcommand{\chaptercolor}{RWTHBlau100}
+
+% sourcemap configuration for weird 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={}]
+        }
+    }
+}
 
-
-
-
-
-%%----END OF FILE----
+\DeclareFieldFormat{url}{%
+    \mkbibacro{URL}\addcolon\space
+    \href{#1}{\nolinkurl{\thefield{verba}}}}
 
 \endinput
 %%----END OF FILE----
\ No newline at end of file
diff --git a/format/custom_packages.tex b/format/custom_packages.tex
index 43a1783600bea05de5c6e3c7dfa99beb934180e9..db97ec11f39d15c182b984f713e8d56d316dc3b9 100644
--- a/format/custom_packages.tex
+++ b/format/custom_packages.tex
@@ -1,9 +1,6 @@
 % !TeX root = ./main.tex
-
-
 % Use this file to load custom packages you have added yourself.
 
-
 \usepackage{nameref}
 \usepackage{pdfpages}
 \usepackage{booktabs}
@@ -11,7 +8,7 @@
 \usepackage{enumitem}
 \usepackage[super]{nth}
 \usepackage{draftwatermark}
-\usepackage{libertinus}
+% \usepackage{libertinus}
 %\usepackage{tabularx}
 
 % Rotate tables
@@ -19,36 +16,36 @@
 %\usepackage{adjustbox}
 \usepackage{pdflscape}
 \usepackage{afterpage}
-\usepackage{capt-of}% or use the larger `caption` package
+% \usepackage{capt-of}% or use the larger `caption` package
 \usepackage{booktabs}
 \usepackage{adjustbox}
 \usepackage{rotating}
 
 % for table footnote
-\usepackage{tablefootnote} 
+% \usepackage{tablefootnote}
 %\newcolumntype{b}{X}
 %\newcolumntype{s}{>{\hsize=.7\hsize}X}
-\usepackage{tabu}
+% \usepackage{tabu}
 
 %\usepackage{footnote}
 % \usepackage{footnotehyper}
 %\usepackage[textwidth=20mm]{todonotes}
 % \reversemarginpar
 
-% Better cell formatting in tables
-\usepackage{makecell}
-\usepackage{diagbox}
+% % Better cell formatting in tables
+% \usepackage{makecell}
+% \usepackage{diagbox}
 
-\usepackage{lipsum}
+% \usepackage{lipsum}
 
 % Have Tabluarx in Longtables
 \usepackage{xltabular}
 
 % Have labels for tables
 \makeatletter
-	\newcommand{\tablelabel}[2]{% \speciallabel{<stuff>}{<label>}
-		\edef\@currentlabel{#1}\label{#2}%
-	}
+\newcommand{\tablelabel}[2]{% \speciallabel{<stuff>}{<label>}
+	\edef\@currentlabel{#1}\label{#2}%
+}
 \makeatother
 
 % Exkursboxen:
@@ -118,7 +115,7 @@
 
 %% Set up Bibliography
 \usepackage{biblatex}
-\bibliography{lit/References.bib} 
+\bibliography{lit/References.bib}
 
 % Vor den Kapiteln
 % \renewcommand{\chaptercolor}{RWTHPetrol100}
diff --git a/format/en/frontmatter.tex b/format/en/frontmatter.tex
index 705658cfe79b6e55530c64171c4488939bcbea97..3c2a5f65cb7d10566a17bd43e67b8059c26bad97 100644
--- a/format/en/frontmatter.tex
+++ b/format/en/frontmatter.tex
@@ -7,9 +7,8 @@
 \lof % List of Figures
 \lot % List of Tables
 \loa % List of Acronyms
-% \los
-% \todo{fix right align dots}
-% \glossarylist
+\los % List of Symbols
+\glossarylist % Glossary
 \startmain
 
 \colorlet{linkcolor}{RWTHBlau100}
\ No newline at end of file
diff --git a/format/functions.tex b/format/functions.tex
index 1f8f4dcb4de734d768cdad497e4d3ce4bbd433cc..2a7d05b257b687c304c9698bc9a56919a8ca84bf 100644
--- a/format/functions.tex
+++ b/format/functions.tex
@@ -52,7 +52,13 @@
 \newglossarystyle{symbols_style}{
     \setglossarystyle{long3col}
     \renewenvironment{theglossary}%
-    {\begin{longtable}{@{}p{0.15\textwidth} p{\dimexpr 0.8\textwidth}<{\Dotfill} p{0.05\textwidth}@{}}}%
+    {\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
@@ -82,15 +88,23 @@
 
 %% Glossary
 \newglossarystyle{glossary_style}{
-    \setglossarystyle{long3col}
+    % \setglossarystyle{long3col}
+    \setglossarystyle{long}
     \renewenvironment{theglossary}%
-    {\begin{longtable}{@{}>{\raggedright\arraybackslash}p{0.2\textwidth} @{\hspace{6pt}}p{\dimexpr 0.7\textwidth-12pt} @{\hspace{6pt}}p{0.1\textwidth}@{}}}%
+    {\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
+        % & ##2% the number list in square brackets
         \\
     }% 
 }
diff --git a/format/glossary.tex b/format/glossary.tex
index 5ade616db106534ace06f3dde2bbd9131f33d5ab..4c6df0b6c2c75d3f19dfbbcd0eff157c1fe3e73a 100644
--- a/format/glossary.tex
+++ b/format/glossary.tex
@@ -1,50 +1,41 @@
-% !TeX root = ./main.tex
-
+% !TeX root = main.tex
 % Documentation: https://www.ctan.org/pkg/glossaries
-
-\usepackage[
-	nopostdot,
-	nogroupskip,
-	style=super,
-	nonumberlist,
-	toc
-	]{glossaries}
-% Note: Show borders with style=superborder
-
-%\usepackage{glossaries}
-
-\makeglossaries
-
-% Format Glossary
-\setlength{\glsdescwidth}{0.8\textwidth}
-
 \newglossaryentry{latex}
 {
-	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.}
+    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}
 {
-	name=mathematics,
-	description={Mathematics is what mathematicians do}
+    type=main,
+    name=mathematics,
+    description={Mathematics is what mathematicians do}
 }
 
 \newglossaryentry{Forschungsdaten}
 {
-	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}
-	}
+    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}.
-	}
+    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/format/symbols.tex b/format/symbols.tex
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..66dc07873fd565cbcc7eaf1d14865bcf204bf236 100644
--- a/format/symbols.tex
+++ b/format/symbols.tex
@@ -0,0 +1,7 @@
+
+\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/format/titlepage.tex b/format/titlepage.tex
index faabfd47019d312ec9139db4da4a92701fc9c9b5..85eab1f760742d2b05a8dcfae6966280ecb4e4b3 100644
--- a/format/titlepage.tex
+++ b/format/titlepage.tex
@@ -1,65 +1,73 @@
 \makeatletter
 
 \begin{titlepage}
-	
-	\begin{tikzpicture}[remember picture, overlay, shift={(current page.north east)}]
-		\node[anchor=north east, xshift=-2.5mm, yshift=-4mm]{
-			\includegraphics[height=32mm]{03_figures/titlepage/DIGITAL_WZL-Logo-Blau.jpg}
-		};
-	\end{tikzpicture}
-	
+
+	\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
+
 	\vspace{1cm}
-	
+
 	\begin{flushleft}
-		
+
 		The present work was submitted to the \institute.\\
 		{\color{black50} Diese Arbeit wurde vorgelegt am \institutegerman.}
-		
+
 		\vfill
-		
+
 		\textbf{\Large\@title}
-		
+
 		\textbf{\Large\color{black50}\titlegerman}
-		
+
 	\end{flushleft}
-	
+
 	\vspace{1cm}
-	
+
 	{\large \degree{} Thesis}\\
 	{\large\color{black50} \degree }%sarbeit}
-	
+
 	\vfill
-	
+
 	\textbf{\color{black75}Presented by\color{black50}\ /\ Vorgelegt von}
-	
+
 	{\large\@author}\\
 	\normalsize{\studentid}
-	
+
 	\vspace{2cm}
-	
+
 	\begin{tabbing}
-		
+
 		\textbf{\color{black75}Supervised by\color{black50}\ /\ Betreut von}\quad
 		\=\supervisor
-		
+
 		\\[3\parskip]
-		
+
 		\textbf{\color{black75}1\textsuperscript{st} Examiner\color{black50}\ /\ 1. Prüfer}
 		\>\firstexaminer
-		
+
 		\\[\parskip]
-		
+
 		\textbf{\color{black75}2\textsuperscript{nd} Examiner\color{black50}\ /\ 1. Prüfer}
 		\>\secondexaminer
-		
+
 	\end{tabbing}
-	
+
 	\vspace{1cm}
-	
+
 	\begin{flushright}
 		Aachen, \@date
 	\end{flushright}
-	
+
 \end{titlepage}
 
 \makeatother
diff --git a/main.tex b/main.tex
index b7607b670765433edfe160b9fdfcf981f8451e6c..32080d344f768edad73687301118f2f109c3c710 100644
--- a/main.tex
+++ b/main.tex
@@ -43,16 +43,16 @@
 
 %% Set up glossary
 % \input{glossary}
-	
+
 %% Set up Acronyms
-\input{format/acronyms}
+% \input{format/acronyms}
 
 %% Set up keyphrases
 \input{format/keyphrases}
 
 %% Set up definitions
 %\input{definitions}
-	
+
 % To avoid bugs with page numbering
 % \hypersetup{pageanchor=false}
 
@@ -71,28 +71,32 @@
 
 % -- 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
+%\include{01_chapters/Einleitung} 
+%\include{01_chapters/Stand_der_Technik}
+%\include{01_chapters/Versuchsplanung}
+%\include{01_chapters/Versuchsdurchführung}
+%\include{01_chapters/Diskussion_der_Ergebnisse}
+%\include{01_chapters/Zusammenfassung_und_Ausblick}
+
+% -- LITERATURE -- 
+%\printbibliography
+\include{format/literature}
+
+% -- GLOSSARY --
+%\printglossary
+% \printglossaries
+
+% -- APPENDIX --
+%\include{appendix}
 
-	% Proposed Chapters
-	%\include{01_chapters/Einleitung} 
-	%\include{01_chapters/Stand_der_Technik}
-	%\include{01_chapters/Versuchsplanung}
-	%\include{01_chapters/Versuchsdurchführung}
-	%\include{01_chapters/Diskussion_der_Ergebnisse}
-	%\include{01_chapters/Zusammenfassung_und_Ausblick}
-		
-	% -- LITERATURE -- 
-	%\printbibliography
-	\include{format/literature}
-	
-	% -- GLOSSARY --
-	%\printglossary
-	% \printglossaries
-
-	% -- APPENDIX --
-	%\include{appendix}
-	
 \end{document}
diff --git a/texlive_packages.txt b/texlive_packages.txt
index 6343d311e74de952d287943aaa8cfac2ae1042bd..85753c2a4ceaf3d78af5db6e57ee5a4271121942 100644
--- a/texlive_packages.txt
+++ b/texlive_packages.txt
@@ -1 +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 enumitem environ extsizes fancyhdr fira firamath firamath-otf fmtcount footmisc geometry glossaries glossaries-extra hyphen-german ifplatform koma-script latexindent listings makeindex mathspec media9 microtype ninecolors nomencl ocgx2 pdflscape pdfpages pgfplots placeins preprint ragged2e regexpatch savetrees silence siunitx stackengine svg tabbing tabularray tcolorbox texcount textpos titlesec tocloft todonotes transparent trimspaces wrapfig xstring zref
+acronym adjustbox animate anyfontsize babel-english beamer biber biblatex bigfoot babel-german babel-french babel-english blindtext bookmark caption catchfile chronosys cleveref csquotes datetime 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 makeindex mathspec media9 microtype ninecolors nomencl nth ocgx2 pdflscape pdfpages pgfplots placeins preprint ragged2e regexpatch romanbar savetrees silence siunitx stackengine svg tabbing tabularray tcolorbox texcount textpos titlesec tikzpagenodes tocloft todonotes transparent trimspaces wrapfig xltabular xstring zref