tuda-ci (8nov19)

git-svn-id: svn://tug.org/texlive/trunk@52697 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2019-11-08 21:41:19 +0000
committer: Karl Berry <karl@freefriends.org> 2019-11-08 21:41:19 +0000
commit: ad12eac5a9018d44b7c837f103bc6f9d896e9180 (patch)
tree: f2f90642d5edbe829adf6c389f18e71f4ac6f87e /Master
parent: cee1b7f2580148a33ae6cc0631c56c7e35ce0bff (diff)
48 files changed, 2630 insertions, 675 deletions
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
new file mode 100644
index 00000000000..310620edb65
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
new file mode 100644
index 00000000000..38186ee0c3a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
@@ -0,0 +1,122 @@
+%% This is file `DEMO-TUDaAnnouncement.tex' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+% !TeX program = lualatex
+%%
+
+%% This is file `DEMO-TUDaAnnouncement.tex' version 1.20-beta (2019/10/26),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+% !TeX program = lualatex
+%%
+
+\documentclass[
+	paper=a4,
+	ngerman,
+	color=black!20,
+	footer=true,
+	type=announcement,
+%	logofile=example-image, %Falls die Logo Dateien nicht vorliegen
+	]{tudaposter}
+
+\usepackage[english, main=ngerman]{babel}
+\usepackage[babel]{csquotes}
+
+
+%Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
+\let\file\texttt
+\let\code\texttt
+
+\usepackage{layout}
+\usepackage{blindtext}
+
+%Setzt die Box in der Marginalspalte. Alternativ auch \marginpar nutzbar.
+\SetMarginpar{
+\begin{flushright}
+	\infofont
+	Graduate School of Computational Engineering\\
+	\includegraphics[width=5\baselineskip]{example-image}\\
+	Prof. Dr. X\\[\baselineskip]
+	\url{www.peitex.de}
+\end{flushright}
+\vfill
+\minisec{Requirements}
+Beschreibung
+}
+
+\usepackage{url}
+\begin{document}
+
+\title{\LaTeX{} im Corporate Design der TU~Darmstadt
+}
+\subtitle{Aushänge mit tudaposter}
+\titleinfo{Zusätzliche Informationen, die unterhalb des Untertitels eingefügt werden.}
+%\addTitleBoxLogo*{\includegraphics[width=.5\linewidth]{example-image}}
+
+\footerqrcode{https://peitex.de}
+\footer{Inhalt der Fußzeile}%Falls aktiviert
+
+
+\maketitle
+
+\section*{Grundlegende Informationen}
+
+Die Dokumentenklasse tudaposter dient der Erstellung von Aushängen und Nicht"=wissenschaftlichen Plakaten im Stil der TU-Darmstadt. Sie ist Teil des TUDa-CI-Bundles.
+
+Für dieses Dokument gelten die in DEMO-TUDaPoster beschriebenen Mechanismen. Zusätzlich wird jedoch ein Modus aktiviert, der überwiegend für Aushänge zur Bekanntgabe von Abschlussarbeiten verwendet wird: \code{type=announcement}.
+
+Dieser entspricht den Einzeloptionen: \code{marginpar=true}, \code{title=small}, \code{indenttext=false}, \code{logo=head}, \code{colorsubtitle=true}
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
index 43593adc738..b27b5c732cb 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
index 13a0dca9b48..591cd14b5d5 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaBeamer.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -53,8 +53,8 @@
 \begin{document}
 
 \title{LaTeX-Beamer im Corporate Design der TU Darmstadt}
-\subtitle{Version 1.0}
-\author[M. Peischl]{Marei Peischl \and der \TeX-Löwe}
+\subtitle{Version 1.2}
+\author[M. Peischl]{Marei Peischl}
 \department{\TeX/\LaTeX}
 \institute{pei\TeX}
 
@@ -88,11 +88,12 @@
 	\item \code{\textbackslash{}titlegraphic} Ersetzt den unteren Teil der Titelfolie. Zusätzlich existiert \code{\textbackslash{}titlegraphic*{Inhalt}}.
 	In diesem Fall wird der Inhalt in eine Box gesetzt, die so skaliert wird, dass Sie den Bereich des Titelbildes überdeckt und entsprechend mittig ausgeschnitten.
 \end{itemize}
+	Über die Option \code{authorontitle=true/false} kann zusätzlich zu den offiziellen Vorgaben der Autor und das Institut groß auf der Titelfolie gezeigt werden.
 \end{frame}
 
 \setupTUDaFrame{logo=true}
 \begin{frame}[fragile]{Logo im Frametitle}
-Das Logo innerhalb des Frametitle kann mit der Klassenoption \code{logo=false} ausgeschalten werden.
+Das Logo innerhalb des Frametitle kann mit der Klassenoption \code{logo=false} abgeschaltet werden.
 
 Soll das Logo später für ein Folie oder einen Bereich wieder aktiviert werden, steht das Makro
 \begin{verbatim}
@@ -127,6 +128,21 @@ Ein Beispiel.
 \end{example}
 \end{frame}
 
+\begin{frame}{Hinweis zur Ausrichtung (insbesondere columns)}
+	Die Standardausrichtung wurde gegenüber den Beamer-Voreinstellungen von \code{c} zu \code{t} geändert. Dies bedeutet, dass Inhalt auf der Folie oben ausgerichtet wird. Dies entspricht den Vorgaben, hat allerdings den Nachteil, dass die \code{columns}-Umgebung in diesem Fall bei der Positionierung von Bildern ungewohnte Ergebnisse erzeugt.
+
+	Die Ausrichtung kann in diesem Fall entweder global mit der Option \code{c} wieder zum Standard geändert werden, oder aber das \code{c} wird direkt an die \code{columns}-Umgebung übergeben. Zum Beispiel:
+\begin{columns}[onlytextwidth,c]%ohne das c ist die Ausrichtung verschoben
+	\column{.8\linewidth}
+	\begin{itemize}
+		\item eins
+		\item zwei
+	\end{itemize}
+	\column{.2\linewidth}
+	\includegraphics[width=\linewidth]{example-image}
+\end{columns}
+\end{frame}
+
 
 \begin{frame}[fragile]{Anpassungen der Mathematikschriftarten}
 	Es gibt keine fest Vorgabe zur Verwendung einer Mathematikschrift.
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
index 636a09f1c8c..8ce4172037f 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaBibliography.bib' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
new file mode 100644
index 00000000000..967601ac3af
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
new file mode 100644
index 00000000000..5781c17314a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
@@ -0,0 +1,182 @@
+%% This is file `DEMO-TUDaExercise.tex' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+% !TeX program = lualatex
+%%
+
+\documentclass[
+	ngerman,
+	]{tudaexercise}
+	
+\usepackage[english, main=ngerman]{babel}
+\usepackage[babel]{csquotes}
+
+\usepackage{biblatex}
+\bibliography{DEMO-TUDaBibliography}
+
+%Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
+\let\file\texttt
+\let\code\texttt
+\let\pck\textsf
+\let\cls\textsf
+\let\tbs\textbackslash
+
+\ConfigureHeadline{
+	headline={title-name-id}
+}
+
+%compatbilitx
+\let\unit\relax
+
+\begin{document}
+	
+\title[Übung TUDaExercise]{Übung zur Benutzung der TUDaExercise-Klasse}
+\author{Marei Peischl}
+\term{Sommersemester 2042}
+\sheetnumber{5}
+
+\maketitle
+
+\begin{task}{Titelei}
+Im Gegensatz zu den ganzen Titelseiten bei TUDaPub benötigt TUDaExercise eine platzsparende Möglichkeit für die Titelerzeugung. Daher verfügt TUDaexercise nur über einen Titelkopf. Für die Übergabe der Daten werden die folgenden Makros ausgewertet:
+\begin{verbatim}
+\title[Kurztitel für die Kopfzeile]{Titel}
+\subtitle{Untertitel}
+\author{Autor*in/Dozent*in}
+\term{Semester}
+\date{Datum}
+\sheetnumber{Nummer des Übungsblatts}
+\end{verbatim}
+Mit Ausnahme des Titels können alle Felder auch leer bleiben . Sofern keine Blattnummer übergeben wird, werden die Übungsaufgaben beginnend mit 1, fortlaufend nummeriert.
+\end{task}
+
+\begin{task}{Farbgebung}
+	Die Farbgebung nutzt die selben Mechanismen wie die übrigen Klassen des TUDa-CI-Bundles. Die Optionen \code{color}, \code{accentcolor}, \code{textaccentcolor}, \code{identbarcolor} funktionieren wie gewohnt (vgl. TUDaPub). Darüber hinaus ist es auch hier möglich den farbigen Titelblock zu deaktivieren. Die Option \code{colorback=false} ermöglicht es für Versionen zum Ausdrucken die Tonersparende Variante einzustellen.
+\end{task}
+
+\begin{task}{Eine Aufgabe erstellen}
+Aufgaben werden bei \cls{tudaexercise.cls} durch die Umgebung \code{task} definiert. Das Notwendige Argument übernimmt dabei eine Überschrift. Es kann leer bleiben.
+
+\begin{verbatim}
+	\begin{task}[<Optionen>]{Überschrift}
+		Text der Aufgabe
+	\end{task}
+\end{verbatim}
+
+Querverweise zwischen den Aufgaben sind wie üblich mit \code{\tbs{}label} und \code{\tbs{}ref} möglich.
+
+Neben der Umgebungsstruktur, die zur besseren Übersichtlichkeit zu empfehlen ist, verfügt tudaexercise auch über die Möglichkeit eine Aufgabe nur mit \code{\tbs{}task} einzuleiten.
+
+\begin{verbatim}
+\task{Überschrift der Aufgabe}
+\end{verbatim}
+
+In diesem Dokument wird lediglich die empfohlene Variante unter Nutzung der Umgebung gezeigt.
+
+Falls die Makro-Version benutzt und damit Optionen gesetzt werden, ist zu beachten, dass diese nicht automatisch wieder beendet werden kann, da ja das Ende der Umgebung fehlt. Dies ist der Hauptgrund für die Empfehlung der Umgebung.
+\end{task}
+
+\begin{task}{Kopfzeilenanpassungen}
+Der Mechanismus für die Kopfzeilen wurde angepasst, sodass sein Inhalt frei wählbar ist.
+
+\begin{verbatim}
+\ConfigureHeadline{
+   headline={Inhalt der Kopfzeile}
+}
+\end{verbatim}
+
+Es existiert nun eine Unterscheidung zwischen linken und rechten Seiten, sofern \code{twoside=true}.
+
+\begin{verbatim}
+\ConfigureHeadline{
+   even={Inhalt der Kopfzeile für linke Seiten},
+   odd={Inhalt der Kopfzeile für rechte Seiten},
+   oneside={Inhalt der Kopfzeile im einseitigen Modus}
+}
+\end{verbatim}
+
+Einstellungen, die gleiche Felder betreffen überschreiben sich gegenseitig.
+
+\begin{subtask}[Freie Inhalte]
+Die Inhalte sind frei wählbar und werden automatisch in einer Box mit der gleichen Breite, wie der Text gesetzt. Der Inhalt wird linksbündig platziert. Es ist möglich Grafiken oder Tabellen innerhalb dieser Box zu platzieren.
+\end{subtask}
+
+\begin{subtask}[Vorgefertigte Elemente]
+Für die Kopfzeilen existieren  einige vorgefertigte Elemente, die dort platziert werden können.
+\begin{verbatim}
+	\ShortTitle
+	\StudentID
+	\StudentName
+\end{verbatim}
+Darüber hinaus kann auch jeglicher \LaTeX-Content dort eingefügt werden.
+
+Zusätzlich sind einige Werte vorbelegt und platzieren die Einträge nach dem selbsterklärenden Namensschema:
+\code{title-name-id}, \code{title-name}, \code{title}, \code{name-id}, \code{name}
+\end{subtask}
+
+\begin{subtask}[Kopfzeile auch auf der Titelseite]
+Da die Kopfzeile häufig für die Angabe von Studentendaten genutzt wird, ist es mit der Klassenoption \code{headtotitle} auch möglich die Kopfzeile ebenfalls auf der Titelseite einzufügen.
+\end{subtask}
+\end{task}
+
+
+\begin{task}[solution=true]{Lösungen}
+tudaexercise verfügt über einen Mechanismus um Lösungsvorschläge innerhalb der Dateien mit zu verwalten. Hierfür existiert die Umgebung \code{solution}.
+
+Die Ausgabe der Lösungen wird entweder global
+\begin{verbatim}
+\documentclass[...,
+   solution=true,
+]{tudaexercise}
+\end{verbatim}
+oder lokal für einzelne Aufgaben konfiguriert:
+
+\begin{verbatim}
+\begin{task}[solution=true]{Überschrift}
+Aufgabentext
+   \begin{solution}
+   Lösungstext
+   \end{solution}
+\end{task}
+\end{verbatim}
+Die Voreinstellung ist \code{solution=false}.
+\begin{solution}
+Beispiel für einen Lösungsvorschlag
+\end{solution}
+
+\end{task}
+
+\begin{task}{Kompatibilitätsmodus}
+Die Klasse \cls{tudaexercise} verfügt über einen Kompatibilitätsmodus, um den Umstieg von zuvor existierenden Templates, wie TUDexercise zu erleichtern.
+Um den Kompatibilitätsmodus zu aktivieren, existiert die Option \code{compat=true}.
+
+Damit können Strukturen wie \code{examheader}, \code{examheaderdefault} und die Erzeugung von Aufgaben mitilfe von \code{\tbs{}subsection} wie gewohnt verwendet werden. Da einige dieser Mechanismen jedoch der Philosophie der semantischen Auszeichnung widersprechen wird ihre Verwendung hier nicht genauer erklärt. Nutzer, denen diese Mechanismen nicht vertraut sind, wird empfohlen die durch TUDaExercise zur Verfügung gestellten Varianten zu nutzen.
+
+Beim zugehörigen Release im Development Repository findet sich auch eine Beispieldatei, die die alten Mechanismen verwendet und spezielle Hinweise für Umsteiger enthält. %TODO link einfügen.
+\end{task}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
index fdab6d79138..e2570df5961 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaFromaddress.lco' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
index 91b5ae3ea69..4ef7fbca8b0 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
index 90709bd5206..2e5c2d7a08c 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaLetter.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
index 0d2a7d2fd5a..be2abf55249 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
index 56ce9986621..8a614d519ed 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaPhD.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -261,53 +261,54 @@ thesis={type=drfinal,dr=phil}
 
 Im folgenden findet sich die Bedeutung der einzelnen Optionen:
 \begin{description}
-	\item[type=<Wert>] Auswahl des Typus. Dieser wird auf die Titelseite gesetzt und wählt zudem aus welche Informationen für die Titelseite zwingend übergeben werden müssen.
-	Es stehen die folgenden Werte zur Verfügung:
-	\begin{itemize}
-		\item \code{sta}: Studienarbeit
-		\item \code{diplom}: Diplomarbeit
-		\item \code{bachelor}: Bachelorarbeit
-		\item \code{master}: Masterarbeit
-		\item \code{pp}: Project-Proposal
-		\item \code{dr}: vorgelegte Dissertation
-		\item \code{drfinal}: genehmighte Dissertation
-	\end{itemize}
-	Wird ein Typus angegeben, der nicht erkannt wird, so wird der Text direkt übergeben. Notwendige Titelfelder über den Titel hinaus gibt es in diesem Fall nicht	
-	\item[dr=<Kürzel>] Lädt einen der vordefinierten Texte für die Titelseite. Als Werte stehen bislang \code{rernat}, \code{ing} und \code{phil} zur Verfügung. Zum Beispiel lädt der Wert \code{phil}:
-	\begin{quote}
-	Zur Erlangung des Grades eines Doktor der Philosophie (Dr.\,phil.)
-	\end{quote}
-	Sofern keiner dieser Werte dem angestrebten Titel entspricht, kann ein Text direkt übergeben werden. 
-	\begin{verbatim}
-	\drtext{Zur Erlangung des Grades \ldots}
-	\end{verbatim}
-	
+\item[type=<Wert>] Auswahl des Typus. Dieser wird auf die Titelseite gesetzt und wählt zudem aus welche Informationen für die Titelseite zwingend übergeben werden müssen.
+Es stehen die folgenden Werte zur Verfügung (die Werte in Klammern sind die notwendigen Titeldaten)
+\begin{itemize}
+\item \code{sta}: Studienarbeit (title, author, date)
+\item \code{diplom}: Diplomarbeit (title, author, submissiondate, reviewer, department)
+\item \code{bachelor}: Bachelorarbeit (title, author, submissiondate, department, reviewer)
+\item \code{master}: Masterarbeit (title, author, submissiondate, department, reviewer)
+\item \code{pp}: Project-Proposal  (title, author, date, department)
+\item \code{dr}: vorgelegte Dissertation (title, author, submissiondate , birthplace, department, reviewer)
+\item \code{drfinal}: genehmighte Dissertation (title, author, submissiondate,examdate, birthplace, department, reviewer)
+\end{itemize}
+Wird ein Typus angegeben, der nicht erkannt wird, so wird der Text direkt übergeben. Notwendige Titelfelder über den Titel hinaus gibt es in diesem Fall nicht.
+\item[dr=<Kürzel>] Lädt einen der vordefinierten Texte für die Titelseite. Als Werte stehen bislang \code{rernat}, \code{ing} und \code{phil} zur Verfügung. Zum Beispiel lädt der Wert \code{phil}:
+\begin{quote}
+Zur Erlangung des Grades eines Doktor der Philosophie (Dr.\,phil.)
+\end{quote}
+Sofern keiner dieser Werte dem angestrebten Titel entspricht, kann ein Text direkt übergeben werden.
+\begin{verbatim}
+\drtext{Zur Erlangung des Grades \ldots}
+\end{verbatim}
+
 	\item[department=<Kürzel>] Die Fachbereiche sind fest als Textbausteine in deutscher sowie englischer Sprache hinterlegt. Diese Option ermöglicht die Auswahl als Dokumentenklassenoption. Aus Kompatibilitätsgründen kann jedoch auch das Makro \code{department}-Makro hierfür genutzt werden. Zur Verfügung stehen:\par
-	\begin{tabular}{@{}l@{${}\to{}$}l@{}}
-		arch  & Architektur\\
-		bauing& Bau- und Umweltingenieurwissenschaften\\
-		bio   &Biologie\\
-		chem  &Chemie\\
-		etit  &Elektrotechnik und Informationstechnik\\
-		gugw  &Gesellschafts- und Geschichtswissenschaften\\
-		humanw&Humanwissenschaften\\
-		inf   &Informatik\\
-		mb    &Maschinenbau\\
-		matgeo&Material- und Geowissenschaften\\
-		math  &Mathematik\\
-		phys  &Physik\\
-		wi    &Rechts- und Wirtschaftswissenschaften
-	\end{tabular}
+\begin{tabular}{@{}l@{${}\to{}$}l@{}}
+	arch  & Architektur\\
+	bauing& Bau- und Umweltingenieurwissenschaften\\
+	bio   &Biologie\\
+	chem  &Chemie\\
+	etit  &Elektrotechnik und Informationstechnik\\
+	gugw  &Gesellschafts- und Geschichtswissenschaften\\
+	humanw&Humanwissenschaften\\
+	inf   &Informatik\\
+	mb    &Maschinenbau\\
+	matgeo&Material- und Geowissenschaften\\
+	math  &Mathematik\\
+	phys  &Physik\\
+	wi    &Rechts- und Wirtschaftswissenschaften
+\end{tabular}
 	
-	Neben den Fachbereichen existieren für Abschlussarbeiten, die keine Dissertationen sind auch Studienbereiche, siehe DEMO-TUDaThesis.
-	Falls etwas anderes als eines dieser Kürzel übergeben wird, wird der Text direkt verwendet und eine entsprechende Warnung ausgegeben.
-		
-	\item[ignore-missing-data] Diese Option ist ein Schalter, der es ermöglicht die Fehlermeldung über nicht übergebene Titeldaten auszuschalten. In diesem Fall wird lediglich eine Warnung erzeugt, falls die angegeben Daten nicht mit den Anforderungen übereinstimmen.
+Neben den Fachbereichen existieren für Abschlussarbeiten, die keine Dissertationen sind auch Studienbereiche, siehe DEMO-TUDaThesis.
+Falls etwas anderes als eines dieser Kürzel übergeben wird, wird der Text direkt verwendet und eine entsprechende Warnung ausgegeben.
+
+Die Auswahl der Fachrichtung erzeugt zusätzlich eine Box auf der Titelseite unterhalb des Logos. Falls diese automatische Erstellung nicht gewünscht ist, kann dies über die Option \code{instbox=false} deaktiviert werden.
+\item[ignore-missing-data] Diese Option ist ein Schalter, der es ermöglicht die Fehlermeldung über nicht übergebene Titeldaten auszuschalten. In diesem Fall wird lediglich eine Warnung erzeugt, falls die angegeben Daten nicht mit den Anforderungen übereinstimmen.
 \end{description}
 
 \minisec{Abweichung von den Vorgaben für die Titelseite}
 Da es möglich sein kann von dieser Vorgabe abzuweichen existiert für Sonderfälle die Dokumentenklassenoption \code{instbox=false}. Damit wird die automatische Verarbeitung der Daten für die Boxen auf der der Titelseite unterdrückt. In diesem Fall ist der Autor jedoch selbst für die Einhaltung der Vorschriften verantwortlich. Weiter Informationen zur Konstruktion der Boxen findet sich in den Verwendungshinweisen zu Basisklasse TUDaPub.
 
 \printbibliography
-	
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
index 6084d4e7e88..7ac92f21c2f 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
index 802f967b5f7..114751275ee 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaPoster.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -45,6 +45,7 @@
 %Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
 \let\file\texttt
 \let\code\texttt
+\let\tbs\textbackslash
 
 \usepackage{multicol}
 
@@ -65,13 +66,13 @@
 \maketitle
 
 \section*{Grundlengende Informationen}
-Die Dokumentenklasse tudaposter dient der Erstellung von Aushängen und Nicht-wissenschaftlichen-Plakaten im Stil der TU-Darmstadt. Sie ist Teil des TUDa\TeX-Bundles.
+Die Dokumentenklasse tudaposter dient der Erstellung von Aushängen und Nicht-wissenschaftlichen-Plakaten im Stil der TU-Darmstadt. Sie ist Teil des TUDa-CI-Bundles.
 
 \begin{multicols}{2}
 \subsection*{Verwendung}
 Im wesentlichen entspricht Ihre Verwendung der Klasse tudapub, da die Titel ähnlich aufgebaut sind. Unterhalb des Titels, kann der Anwender normalen Fließtext schreiben oder wie bei Standard-\LaTeX{} formatieren.
 
-Die tudaposter-Klasse basiert wie auch tudapub auf \KOMAScript{} und beitet daher mehr Mechanismen als für Poster grunsätzlich notwendig sind.
+Die tudaposter-Klasse basiert wie auch tudapub auf \KOMAScript{} und bietet daher mehr Mechanismen als für Poster grunsätzlich notwendig sind.
 
 Im Unterschied zur tudasciposter-Klasse, die auf tikzposter basiert, ermöglicht tudaposter es wie gewohnt Fließtext zu schreiben, um ergänzende Informationen einfach zu platzieren.
 
@@ -88,8 +89,13 @@ Innerhalb des Posterinhaltes (Dazu zählt auch die titlegraphic) sind zwei Läng
 	\item[paper=<Papierformat>] Papierformat. Voreingestellt ist a0. Unterstützt werden Formate von A0 bis A4. 
 	\item[fontsize=<Schriftgröße/auto>] Basischriftgröße. Die anderen Größen werden entsprechend skaliert. Für die unterstützte Papierformate sind entsprechende Skalierungsschritte hinterlegt diese Voreinstellung entspricht dem Wert auto.
 	\item[logo=head/body] Das Logo wird in der Idenditätsleiste (head) oder innerhalb des Dokumenteninhalts, ggf. überlappend mit dem Bild gesetzt.
-	\item[accentcolor=<Farbkürzel>] Akzentfarbe nach den Corporate Design Richtlinien
+	\item[color=<Farbkürzel>] Akzentfarbe nach den Corporate Design Richtlinien.
+	\item[colorsubtitle=true/false] Hintergrundfarbe beim Untertitel an-/ausschalten.
 	\item[footer=true/false] Aktivierung/Deaktivierung der Fußzeile. Voreinstellung ist false.
+	\item[marginpar=true/false] Ermöglicht die Nutzung einer Randnotizspalte . Diese hat die Breite des Logos. Sie wird entweder über das Makro \code{\tbs{}SetMarginpar} oder über das Standard-Makro \code{\tbs{}marginpar} befüllt. Eine Verwendung dieses Modus ist in der zusätzlichen Demo-Datei \file{DEMO-TUDaAnnouncement} gezeigt
+	\item[title=large/small/default] Ermöglicht es die Schriftgrößen um eine Stufe zu verkleinern. Die Option \code{large} entspricht hierbei der Option \code{default}. Im Fall des Wertes \code{small} werden die Titelschriftgrößen des nächsten kleineren Papierformates verwendet. Die Basischriftgröße und die Randeinstellungen bleiben davon unberührt.
+	\item[type=default/announcement] Diese Option liefert die Möglichkeit bestimmte Posterlayouts über einen Einzigen Wert zu laden.
+	Der Wert \code{announcement} setzt die folgenden Optionen: \code{marginpar=true, indenttext=false, logo=head, title=small,colorsubtitle=true} und aktiviert zusätzlich die Ausgabe ds Untertitels in fetter Schrift.
 \end{description}
 \end{multicols}
 
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
index d9d69b28ec6..45b0ff25f7c 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
index 6784405762b..871c20f0f51 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaPub.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -52,14 +52,14 @@
 \begin{document}
 	
 	
-\title{\LaTeX{} im Corporate Design der TU~Darmstadt}
+\title{\texorpdfstring{TUDaPub -- \LaTeX-Paper im Corporate Design der TU Darmstadt}{TUDaPub -- LaTeX-Paper im Corporate Design der TU Darmstadt}}
 \subtitle{Die Dokumentenklasse tudapub}
 \author{Marei Peischl\thanks{pei\TeX{} \TeX{}nical Solutions}\and der \TeX-Löwe}
 
-%\titleimage{
+\titleimage{
 %	%Folgende Box kann selbstverständlich durch ein mit \includegraphics geladenes Bild ersetzt werden.
-%	\color{black!30}\rule{\width}{\height}
-%}
+	\color{black!30}\rule{\width}{\height}
+}
 
 
 %Varianten der Infoboxen
@@ -101,11 +101,11 @@ Sie ist Teil des TUDa-CI-Bundles und basiert in Teilen auf dem tuddesign-Paket v
 In diesem Dokument werden die speziellen Optionen und Einstellungsmöglichkeiten erläutert.
 
 \section{Verwendung}
-Die Klasse kann wie für Dokumentenklassen üblich eingebunden werden
+Die Klasse wird wie gewohnt geladen:
 \begin{verbatim}
 \documentclass[<Optionen>{tudapub}
 \end{verbatim}
-Im folgenden werden die möglichen Optionen beschrieben
+Im folgenden werden die möglichen Optionen beschrieben.
 
 \subsection{Klassenoptionen}
 
@@ -113,11 +113,11 @@ Im folgenden werden die möglichen Optionen beschrieben
 	\item[class=<article|report|book>] Diese Option legt die Basisdokumentenklasse fest. Die Werte laden die entsprechende KOMA-Script-Klasse \cite{scrguide}. Der Wert \code{article} lädt somit die Klasse \code{scrartcl}.
 	
 	KOMA-Script ist eine Sammlung von Klassen und Paketen für \LaTeX, die neben den typografischen Anpassungen an den Europäischen Raum auch die Konfigurationsmöglichkeiten stark erweitert.
-	\item[color=<Farbe>] Wählt die Schmuckfarbe für die Nutzung in der Identitätsleiste aus. Die Farbcodes finden sich in der Farbübersicht in den Corporate Design Richtlinien. Neben diesen Farben kann prinzipiell jede beliebige Farbe übergeben werden. Die Optionen \code{accentcolor}, \code{textaccentcolor} und \code{identbarcolor} werden anlog direkt an tudacolors übergeben. Auf diesem Weg können die Farben unabhängig voneinander gesetzt werden.
+	\item[color=<Farbe>] Wählt die Schmuckfarbe für die Nutzung in der Identitätsleiste aus. Die Farbcodes finden sich in der Farbübersicht in den Corporate Design Richtlinien. Neben diesen Farben kann prinzipiell jede beliebige Farbe übergeben werden. Die Optionen \code{accentcolor}, \code{textaccentcolor} und \code{identbarcolor} werden anlog direkt an \pck{tudacolors} übergeben. Auf diesem Weg können die Farben unabhängig voneinander gesetzt werden.
 	\item[marginpar] Schaltet die Randnotizspalte um. Voreingestellt ist \code{auto}. Dies bedeutet, dass die Randnotizspalte wie im Corporate Design Handbuch über die fünfte Spalte läuft.  \marginpar{Beispiel für eine Randnotiz}.
 	Darüber werden auch die Werte \code{true} und \code{false} akzeptiert. \code{false} setzt die Breite der Randnotizspalte auf 0. Der Mechanismus selbst wird nicht deaktiviert.
 	
-	Randnotizen werden über den komafont-Mechanismus im Element \code{marginpar} gesetzt. Seine Voreinstellung entspricht
+	Randnotizen werden über den komafont-Mechanismus \cite[vgl.][]{scrguide} im Element \code{marginpar} gesetzt. Seine Voreinstellung entspricht
 	\begin{verbatim}
 	\setkomafont{marginpar}{\accentfont}
 	\end{verbatim}
@@ -131,21 +131,24 @@ Im folgenden werden die möglichen Optionen beschrieben
 	}
 	\item[twocolumn] Aktiviert den zweispaltigen Modus global. In diesem Fall werden jedoch aufgrund ihrer Natur zwei Randnotizspalten erzeugt. Eine Nutzung in Kombination mit \code{marginpar=auto} ist daher in den meisten Fällen fragwürdig. Falls der zweispaltige Modus lediglich lokal aktiviert wird, entfällt dieses Verhalten, allerdings werden dann Randnotizen deaktiviert. 
 	\item[ruledheaders] Wählt den Stil der Überschriften aus. \code{ruledheaders=all} wählt den mit Linien eingerahmten Stil für alle bis zur \verb+\subsubsection+. Bei \code{chapter} beziehungsweise \code{section} ist dieser Stil entsprechend 
-	beschränkt. False lädt den Standardstil aus KOMA-Script.
+	beschränkt. False lädt den Standardstil aus \KOMAScript.
 	\item[type] Als Typ stehen im Moment \code{publication} und \code{thesis} zur Verfügung. Die besonderen Möglichkeiten im Typ thesis sind in der Datei DEMO-TUDaThesis.tex/.pdf geschildert. Voreingestellt ist \code{publication}.
+	Zusätzlich existiert ab Version 1.2 noch der Modus \code{intern}. Dieser wählt die Optionen \code{titlepage=false} für einen Titelkopf statt Titelseiten, sowie die TUDaPub-Optionen \code{pdfa=false} und \code{IMRAD=false}. Dieser Modus ist für kurze, interne Berichte gedacht.
 	\item[headline] Die Kopfzeile verfügt über die im Corporate Design beschriebenen Layoutmöglichkeiten über den Wert \code{automark}. Da diese Lösung typografisch nicht sonderlich sinnvoll ist, ist es auch möglich, diese abzuschalten. Voreingestellt ist ein Stil ohne Kolumnentitel.
-	\item[colorback] Schaltet zwischen dem farbigen Block auf der Titelseite und weißem Hintergrund um.
+	\item[logo] Option für die Titelseite, siehe \ref{sec:title}
+	\item[colorback] Option für die Titelseite, siehe \ref{sec:title}
+	\item[IMRAD=true/false] Deaktiviert die Prüfung auf IMRAD-Labels, siehe Abschnitt \ref{sec:IMRAD}.
+	\item[logofile=<Dateipfad>] Erlaubt es ein alternatives Logo zu übergeben. Diese Option existiert, um die Templates auch ohne das TUDa-Logo nutzen zu können. Die Logos sind der internen Verwendung vorbehalten und dürfen daher nicht mit diesem Template veröffentlicht werden.
 \end{description}
 
-\noindent Der Rest der Dokumentenklasse entspricht dem Standard von KOMA-Script, vgl. Abschnitt \ref{KOMA}.
+\noindent Der Rest der Dokumentenklasse entspricht dem Standard von \KOMAScript, vgl. Abschnitt \ref{sec:KOMA}.
 
 \subsection{Die Titelseite}
+\label{sec:title}
 
 Die Titelseite wird von tudapub automatisch generiert. Die Verwendung hierfür entspricht größtenteils der klassischen Methode unter Verwendung von \code{maketitle}.
 
-Die \KOMAScript-Option \code{titlepage} erlaubt es üblicherweise, zwischen Titelseiten und Titelkopf umzuschalten.
-Diese Funktion wurde deaktiviert und erzeugt bei Verwendung eine entsprechende Warnung. Die Corporate Design Vorgaben lassen die Erzeugung eines einzelnen Titelkopfes nicht zu. Der Wert \code{titlepage=firstiscover} wird erzwungen.
-
+Die \KOMAScript-Option \code{titlepage} erlaubt es üblicherweise, zwischen Titelseiten und Titelkopf umzuschalten. Bis Version 1.2 war diese Option deaktiviert. Mittlerweile existiert ein Modus für einen Titelkopf, dieser entspricht jedoch nicht den offiziellen Vorgaben und ist für interne Verwendung gedacht. Aufgrund der Implementierung wird \code{titlepage=true} identisch zu \code{titlepage=firstiscover} behandelt.
 
 Die Makros wie \code{author}, \code{title}, \code{subtitle} und \code{date} entsprechen der normalen Verwendung. Für die Institutszuweisung kann ebenfalls wie gewohnt \code{thanks} verwendet werden.
 
@@ -159,18 +162,6 @@ Das Makro \code{titleimage} akzeptiert beliebigen Inhalt. Dieser wird bündig mi
 \titleimage{\includegraphics[width=\width]{example-image}}
 \end{verbatim}
 
-
-
-
-Die Position des Logos ist umschaltbar. Dies geschieht über die Dokumentenklassenoption \code{logo=head/body}.
-\begin{description}
-	\item[logo=head] Das Logo wird im Kopf direkt neben dem Titel platziert. Der Titel wird in der Breite reduziert. Der Hintergrund des Titels wird in der Farbe der Identitätsleiste eingefärbt. Zusätzliche Infoboxen (s.u.) werden ebenfalls im Kopf platziert.
-	\item[logo=body] Das Logo samt der Infoboxen wird im Körper der Titelseite platziert. Sofern ein 
-\end{description}
-
-
-
-
 Zusätzlich stehen die Makros \code{titleimage} und \code{addTitleBox} zur Verfügung, um den unteren Teil der Titelseite zu füllen.
 
 \begin{verbatim}
@@ -186,10 +177,16 @@ Um die Institutsboxen für Logos zu verwenden, liefert \cls{tudapub} das Makro \
 \addTitleBoxLogo*{\includegraphics[width=\linewidth]{example-image}}
 \end{verbatim}
 
-\subsection{Strukturierungselemente}
-
+\minisec{Optionen für die Titelseite}
+Die Position des Logos ist umschaltbar. Dies geschieht über die Dokumentenklassenoption \code{logo=head/body}.
+\begin{description}
+	\item[logo=head] Das Logo wird im Kopf direkt neben dem Titel platziert. Der Titel wird in der Breite reduziert. Der Hintergrund des Titels wird in der Farbe der Identitätsleiste eingefärbt. Zusätzliche Infoboxen (s.u.) werden ebenfalls im Kopf platziert.
+	\item[logo=body] Das Logo samt der Infoboxen wird im Körper der Titelseite platziert.
+\end{description}
 
+Darüber hinaus lässt sich die Farbgebung umschalten. Die Option \code{colorback} schaltet zwischen dem farbigen Block auf der Titelseite und weißem Hintergrund um. Falls die Kombination \code{colorback=false} und \code{logo=head} geschaltet ist, bleibt der obere Teil der Titelseite jedoch farbig.
 
+\subsection{Strukturierungselemente}
 \minisec{Die abstract-Umgebung}
 Die \code{abstract}-Umgebung wird für \cls{tudapub} um eine Option für die Sprache erweitert. Somit ist es möglich, mehrere Zusammenfassungen in einem Dokument zu nutzen.
 
@@ -207,7 +204,7 @@ Für die Verwendung ist wichtig, dass alle im Dokument genutzten Sprachen gelade
 
 
 \subsection{PDF/A Konformität}
-Die Klasse TUDaPub unterstützt den Standard PDF/A 1b. Der PDF/A-Modus ist automatisch aktiviert. die zugehörige Option kann jedoch über \code{pdfa=false} ausgeschaltet werden.
+Die Klasse TUDaPub unterstützt den Standard PDF/A 2b. Der PDF/A-Modus ist automatisch aktiviert. die zugehörige Option kann jedoch über \code{pdfa=false} ausgeschaltet werden.
 Nun wird zusätzlich eine \code{\textbackslash.xmpdata}-Datei generiert. Üblicherweise werden die Titelinformationen direkt übernommen.
 
 Dies kann jedoch bei der Verwendung einiger Makros innerhalb der Felder zu Problemen führen. Beispielsweise enthält der Titel für dieses Dokument das Makro \code{\LaTeX}. Es können daher nur Textelemente übernommen werden. Ähnlich den Linkbezeichnungen über PDF-Lesezeichen.
@@ -239,6 +236,7 @@ Um diesen Fehler zu beheben, können die notwendigen *.icc-Dateien unter \url{ht
 Darüber hinaus werden bei \hologo{XeLaTeX} einige Features nicht unterstützt. In diesem Fall erzeugt \code{pdfa=false} ein kompilierbares Dokument, allerdings sollte für validierbare PDF/A-Dateien auf \hologo{LuaLaTeX} einer möglichst aktuellen Version umgestiegen werden.
 
 \subsection{Zusätzliche Metadaten nach Wunsch der Universitätsbibliothek}
+\label{sec:IMRAD}
 Es existiert ein Mechanismus um das Strukturierungsmodell IMRaD \cite{imrad} zu kennzeichnen.
 Im Stil der einzelnen Teilbereiche können so, über Aufruf von 
 
@@ -288,7 +286,7 @@ Es gibt ähnliche Ansätze für ein paar weitere Kombinationen. Einige Beispiele
 
 
 \section{Standard-KOMA-Script}
-\label{KOMA}
+\label{sec:KOMA}
 Da die Klasse bis auf ein paar erzwungene Einstellungen, die das Layout betreffen, vollständig \KOMAScript-kompatibel ist, ist für sämtliche Modifikationen ein Blick in die \KOMAScript-Dokumentation hilfreich. Für einen Großteil bietet \KOMAScript{} eine eigene Lösung, wodurch Ergänzungspakete oft hinfällig sind.
 
 Beispiele für typische Modifikationen, die auch im Rahmen des Corporate Design zulässig sind:
@@ -305,7 +303,7 @@ Beispiele für typische Modifikationen, die auch im Rahmen des Corporate Design
 
 \subsection{\texorpdfstring{\hologo{XeLaTeX}}{XeLaTeX} und PDF/A}
 Das Paket \pck{pdfx}, über welches die PDF/A Kompatibilität erzeugt wird, hat nur einen begrenzten Support für \hologo{XeLaTeX}.
-Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren XeLateX-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Diese werden vor der Überprüfung auf das Paketalter ausgegeben. Das Paket muss geladen worden sein, bevor die Überprüfung auf Alter möglich ist.
+Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren \hologo{XeLaTeX}-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Diese werden vor der Überprüfung auf das Paketalter ausgegeben. Das Paket muss geladen worden sein, bevor die Überprüfung auf Alter möglich ist.
 
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf
new file mode 100644
index 00000000000..d84c1334f0e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex
new file mode 100644
index 00000000000..b906d509ab7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex
@@ -0,0 +1,64 @@
+%% This is file `DEMO-TUDaReport.tex' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+% !TeX program = lualatex
+%%
+
+\documentclass[
+	ngerman,
+	accentcolor=9c,% Farbe für Hervorhebungen auf Basis der Deklarationen in den 
+	type=intern,
+	marginpar=false
+	]{tudapub}
+	
+\usepackage[english, main=ngerman]{babel}
+\usepackage[babel]{csquotes}
+
+%Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
+\let\file\texttt
+\let\code\texttt
+\let\pck\textsf
+\let\cls\textsf
+
+\begin{document}
+	
+	
+\title{TUDaReport -- Minimales Template für TUDa-CI}
+\author{Marei Peischl}
+%\date{} % Ohne Angabe wird automatisch das heutige Datum eingefügt
+
+\maketitle
+
+\tableofcontents
+
+\section{Über diese Datei}
+Die Datei \file{DEMO-TUDaReport.tex} beziehungsweise ihre Ausgabe \file{DEMO-TUDaReport.pdf} ist ein minimales Template für die Verwendung Der Dokumentensklasse \file{tudapub.cls}.
+
+	
+Für Erläuterungen zur Funktionsweise und den Möglichkeiten zur Änderung sei auf DEMO-TUDaPub.pdf verwiesen.
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
index 2cee61d2a3c..e0da964115e 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
index ec299a74b80..50b9235e10d 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaSciPoster.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
index 50cc0276b01..6cf5fc49080 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
index cf26942f491..b8921725b9c 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis.tex' version 1.11 (2019/09/25),
+%% This is file `DEMO-TUDaThesis.tex' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -244,17 +244,17 @@ thesis={type=drfinal,dr=phil}
 Im folgenden findet sich die Bedeutung der einzelnen Optionen:
 \begin{description}
 	\item[type=<Wert>] Auswahl des Typus. Dieser wird auf die Titelseite gesetzt und wählt zudem aus welche Informationen für die Titelseite zwingend übergeben werden müssen.
-	Es stehen die folgenden Werte zur Verfügung:
+	Es stehen die folgenden Werte zur Verfügung (die Werte in Klammern sind die notwendigen Titeldaten):
 	\begin{itemize}
-		\item \code{sta}: Studienarbeit
-		\item \code{diplom}: Diplomarbeit
-		\item \code{bachelor}: Bachelorarbeit
-		\item \code{master}: Masterarbeit
-		\item \code{pp}: Project-Proposal
-		\item \code{dr}: vorgelegte Dissertation
-		\item \code{drfinal}: genehmighte Dissertation
+		\item \code{sta}: Studienarbeit (title, author, date)
+		\item \code{diplom}: Diplomarbeit (title, author, submissiondate, reviewer, department)
+		\item \code{bachelor}: Bachelorarbeit (title, author, submissiondate, department, reviewer)
+		\item \code{master}: Masterarbeit (title, author, submissiondate, department, reviewer)
+		\item \code{pp}: Project-Proposal  (title, author, date, department)
+		\item \code{dr}: vorgelegte Dissertation (title, author, submissiondate , birthplace, department, reviewer)
+		\item \code{drfinal}: genehmighte Dissertation (title, author, submissiondate,examdate, birthplace, department, reviewer)
 	\end{itemize}
-	Wird ein Typus angegeben, der nicht erkannt wird, so wird der Text direkt übergeben. Notwendige Titelfelder über den Titel hinaus gibt es in diesem Fall nicht	
+	Wird ein Typus angegeben, der nicht erkannt wird, so wird der Text direkt übergeben. Notwendige Titelfelder über den Titel hinaus gibt es in diesem Fall nicht.	
 	\item[dr=<Kürzel>] Lädt einen der vordefinierten Texte für die Titelseite. Als Werte stehen bislang \code{rernat}, \code{ing} und \code{phil} zur Verfügung. Zum Beispiel lädt der Wert \code{phil}:
 	\begin{quote}
 		Zur Erlangung des Grades eines Doktor der Philosophie (Dr.\,phil.)
@@ -292,6 +292,8 @@ Im folgenden findet sich die Bedeutung der einzelnen Optionen:
 	\end{tabular}
 	
 	Falls etwas anderes als eines dieser Kürzel übergeben wird, wird der Text direkt verwendet und eine entsprechende Warnung ausgegeben.
+
+	Die Auswahl der Fachrichtung erzeugt zusätzlich eine Box auf der Titelseite unterhalb des Logos. Falls diese automatische Erstellung nicht gewünscht ist, kann dies über die Option \code{instbox=false} deaktiviert werden.
 	
 	\item[ignore-missing-data] Diese Option ist ein Schalter, der es ermöglicht die Fehlermeldung über nicht übergebene Titeldaten auszuschalten. In diesem Fall wird lediglich eine Warnung erzeugt, falls die angegeben Daten nicht mit den Anforderungen übereinstimmen.
 \end{description}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/README.md b/Master/texmf-dist/doc/latex/tuda-ci/README.md
index 8028e97a1c8..d5a43e6e6aa 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/README.md
+++ b/Master/texmf-dist/doc/latex/tuda-ci/README.md
@@ -2,7 +2,7 @@
 
  Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2019
 
- tuda-ci 2019/09/25 v1.11
+ tuda-ci 2019/11/07 v1.20
 
 ***************************************************************************
 
@@ -50,25 +50,35 @@ Für Nicht-Mitglieder ist eine Möglichkeit zur Platzierung eines Ersatzlogos do
 
 ## Enthaltene Templatedateien
 
-Dokumententyp | Templatedatei(en) | Dokumentenklasse
-------------- | ----------------- | ----------------
-Wissenschaftliche Artikel | DEMO-TUDaPub.tex, verwendet auch DEMO-TUDaBibliography.bib | tudapub.cls mit tudasize9pt.clo
-Abschlussarbeiten | DEMO-TUDaThesis.tex/DEMO-TUDaPhD.tex, verwendet auch DEMO-TUDaBibliography.bib | tudapub.cls mit tudathesis.cfg
-Wissenschaftliche Poster | DEMO-TUDaSciPoster.tex | tudasciposter.cls
-Veranstaltungsankündigungen | DEMO-TUDaPoster.tex | tudaposter.cls
-Präsentationen | DEMO-TUDaBeamer.tex | tudabeamer.cls
-Briefe | DEMO-TUDaLetter.tex, verwendet auch DEMO-TUDaFromaddress.lco  | tudaletter.cls mit tudalettersize10pt.clo
+Dokumententyp				 | Templatedatei(en)									| Dokumentenklasse
+---------------------------------------- | ------------------------------------------------------------------------------------ | ----------------
+Interne Berichte (minimales template)	 | DEMO-TUDaReport.tex									| tudapub.cls mit tudasize9pt.clo
+Wissenschaftliche Artikel   	     	 | DEMO-TUDaPub.tex, verwendet auch DEMO-TUDaBibliography.bib				| tudapub.cls 
+Abschlussarbeiten 			 | DEMO-TUDaThesis.tex/DEMO-TUDaPhD.tex, verwendet auch DEMO-TUDaBibliography.bib	| tudapub.cls mit tudathesis.cfg
+Wissenschaftliche Poster		 | DEMO-TUDaSciPoster.tex		 	   					| tudasciposter.cls
+Veranstaltungsankündigungen		 | DEMO-TUDaPoster.tex									| tudaposter.cls
+Ausschreibungen				 | DEMO-TUDaAnnouncement.tex								| tudaposter.cls
+Präsentationen				 | DEMO-TUDaBeamer.tex									| tudabeamer.cls
+Briefe					 | DEMO-TUDaLetter.tex, verwendet auch DEMO-TUDaFromaddress.lco 			| tudaletter.cls mit tudalettersize10pt.clo
+Übungsblätter				 | DEMO-TUDaExercise.tex	       							| tudaexercise.cls
+
+Darüber hinaus existieren Beispieldateien für:
+Kompatibilitätsmodus TUDexercise: https://github.com/tudace/tuda_latex_templates/blob/master/example/Examples-TUDexercise-compat.tex
+Farbskalen von tuda-pgfplots: https://github.com/tudace/tuda_latex_templates/blob/master/example/Examples-TUDa-pgfplots.tex
 
 ## Liste aller enthaltenen Dateien:
 
 * README.md
 * demo/
+  - DEMO-TUDaAnnouncement.tex
   - DEMO-TUDaBeamer.tex
   - DEMO-TUDaBibliography.bib
+  - DEMO-TUDaExercise.tex
   - DEMO-TUDaLetter.tex
   - DEMO-TUDaPhD.tex
   - DEMO-TUDaPoster.tex
   - DEMO-TUDaPub.tex
+  - DEMP-TUDaReport.tex
   - DEMO-TUDaSciPoster.tex
   - DEMO-TUDaThesis.tex
   - TuDa_Demo.lco
@@ -82,6 +92,7 @@ Briefe | DEMO-TUDaLetter.tex, verwendet auch DEMO-TUDaFromaddress.lco  | tudalet
   - tudacolors.cfg
   - tudacolors.def
   - tudacolors.sty
+  - tudaexercise.cls
   - tudafonts.sty
   - tudaletter.cls
   - tudalettersize10pt.clo
@@ -91,8 +102,13 @@ Briefe | DEMO-TUDaLetter.tex, verwendet auch DEMO-TUDaFromaddress.lco  | tudalet
   - tudasciposter.cls
   - tudasize9pt.clo
   - tudathesis.cfg
-
-
+  - tuda-a0paper.clo
+  - tuda-a1paper.clo
+  - tuda-a2paper.clo
+  - tuda-a3paper.clo
+  - tuda-a4paper.clo
+  - tuda-a5paper.clo
+ 
 
 # Summary
 
@@ -103,14 +119,17 @@ If you are not a German speaker and require some help using these files, please
  
 ## Includes templates and document types
 
-document type | name of template file | used documentclass and config
-------------- | ----------------- | ----------------
-scientific paper | DEMO-TUDaPub.tex, using DEMO-TUDaBibliography.bib | tudapub.cls and tudasize9pt.clo
-theses | DEMO-TUDaThesis.tex/DEMO-TUDaPhD.tex, using DEMO-TUDaBibliography.bib | tudapub.cls and tudathesis.cfg
-scientific poster | DEMO-TUDaSciPoster.tex | tudasciposter.cls
-announcement poster | DEMO-TUDaPoster.tex | tudaposter.cls
-presentation | DEMO-TUDaBeamer.tex | tudaposter.cls
-letter | DEMO-TUDaLetter.tex, using DEMO-TUDaFromaddress.lco  | tudaletter.cls and tudalettersize10pt.clo
+document type				| name of template file							| used documentclass and config
+--------------------------------------- | --------------------------------------------------------------------- | ------------------------------------------
+minimal Template for internal reports	| DEMO-TUDaReport.tex 							| tudapub.cls
+scientific paper     	      		| DEMO-TUDaPub.tex, using DEMO-TUDaBibliography.bib 			| tudapub.cls and tudasize9pt.clo
+theses	   				| DEMO-TUDaThesis.tex/DEMO-TUDaPhD.tex, using DEMO-TUDaBibliography.bib | tudapub.cls and tudathesis.cfg
+scientific poster			| DEMO-TUDaSciPoster.tex 		      				| tudasciposter.cls
+announcement poster			| DEMO-TUDaPoster.tex 							| tudaposter.cls
+theses announcements	   		| DEMO-TUDaAnnouncement.tex 						| tudaposter.cls
+presentation				| DEMO-TUDaBeamer.tex 							| tudaposter.cls
+letter					| DEMO-TUDaLetter.tex, using DEMO-TUDaFromaddress.lco  			| tudaletter.cls and tudalettersize10pt.clo
+exercise sheets/exams			| DEMO-TUDaExercise.tex      						| tudaexercise.cls
 
 # Version History 
 
@@ -121,4 +140,18 @@ letter | DEMO-TUDaLetter.tex, using DEMO-TUDaFromaddress.lco  | tudaletter.cls a
    - Fix compatibility issue with datetime package
    - Improved implementation of the headline option
    - Add information on package dependencies
- * v1.11 (2019-09-25) bugfixes + smaller adjustments to simplify usage
-\ No newline at end of file
+ * v1.11 (2019-09-25) bugfixes + smaller adjustments to simplify usage
+ * v1.20 (2019-10-26 - was not published on CTAN) 
+   - Enhancements for exercise sheets/exams and pdfa-mode
+   - Switch pdfa-mode to PDF/A-2b and enforce Type1 for valid documents
+   - Add tudaexercise.cls and corresponding demo file
+   - Documentation enhancements
+   - Type=intern for tudapub for intern reports
+   - Announcement mode for tudaposter
+   - Layout adjustments on TUDabeamer
+   - Additional pagestyle=false mode for tudapub
+ * v2.00 (2019-11-07) Additional Template files + some improved implementations
+   - changed title fontsize adjustments to use clo-files
+   - additional options for tudaposter, to use it for job/thesis announcements
+   - improved implementation of tudaexercise
+   - Bugfixes concerning the PDF/A-Mode
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
index c6481f6877c..1731938eedc 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamercolorthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamercolorthemeTUDa}
 [\filedate\space\fileversion]
@@ -62,6 +62,9 @@
 	\setbeamercolor*{title}{fg=black,bg=white}
 }
 
+\setbeamercolor*{author}{parent=title}
+\setbeamercolor*{institute}{parent=title}
+
 \bool_if:NTF \g_TUDa@beamer_colorframetitle_bool {
 	\setbeamercolor*{frametitle}{fg=textonaccentcolor,bg=accentcolor}	
 } {
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
index b1f54a81850..86a17cd96bf 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamerfontthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerfontthemeTUDa}
  [\filedate\space\fileversion]    
@@ -59,7 +59,8 @@
 
 \setbeamerfont{title}{size=\large,series=\bfseries}
 \setbeamerfont{subtitle}{size=\normalsize,series=\bfseries}
-\setbeamerfont{institute}{size=\small}
+\setbeamerfont{author}{size=\footnotesize, series=\bfseries}
+\setbeamerfont{institute}{size=\footnotesize, series=\mdseries}
 
 \setbeamerfont{frametitle}{size=\large,series=\bfseries}
 \setbeamerfont{author in head/foot}{size=\tiny}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
index 1838dfd3055..b2c16c0ebfe 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamerinnerthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,42 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/10/15),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -27,18 +57,25 @@
 %% ============================================================================
 %%
 \def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\filedate{2019/10/15}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerinnerthemeTUDa}
  [\filedate\space\fileversion]
 
+\RequirePackage{l3keys2e}
+
 \mode<presentation>
-%TODO wihtout outertheme
 
 \RequirePackage{trimclip}
 
-\ExplSyntaxOn
 
+\ExplSyntaxOn
+\keys_define:nn {TUDa/beamer/inner} {
+	authorontitle .bool_gset:N = \g_TUDa_authorontitle_bool,
+	authorontitle .initial:n = false,
+	authorontitle .default:n = true
+}
+\ProcessKeysOptions{TUDa/beamer/inner}
 
 \box_new:N \l_TUDa_titlegraphic_box
 
@@ -74,39 +111,63 @@
 	\nointerlineskip
 	\vspace{\dim_eval:n {-\c_TUDa_largerule_dim}}
 	\hbox_set:Nn \l_TUDa_titlehead_box {
+	\parbox{\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent}{%
 	\begin{beamercolorbox}[
-		wd=\TUDa@beamer@linewidth,
-%		sep=.5\ht\TUDa@logobox,
+		wd=\linewidth,
 		sep=\TUDa@beamer@logosep,
 	]{title}
 	\raggedright
-%	\hspace*{\fill}\smash{\raisebox{-\height}{\usebox\TUDa@logobox}}
 	\usebeamerfont{title}
 	\skip_horizontal:n {1ex}
 	\strut\parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-2ex\relax}{
 		\inserttitle
 		\par
 	}
-%\hfill%
 	\hspace{\fill}\raisebox{\dimexpr-\height+\ht\strutbox\relax}{\usebox\TUDa@logobox}
-%	\smash{\raisebox{-\height}{\usebox\TUDa@logobox}}
 	\ifx\insertsubtitle\@empty
 	\else
 	\par\vspace{\c_TUDa_largerule_dim}
 	\skip_horizontal:n {1ex}\parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-2ex\relax}{
 		\usebeamerfont{subtitle}\insertsubtitle
 	}
-%	\skip_vertical:n {-.25\ht\TUDa@logobox}
 	\fi
 	\end{beamercolorbox}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% bool if authorontrile
+\bool_if:NT \g_TUDa_authorontitle_bool {
+\par\nointerlineskip
+\begin{beamercolorbox}[
+	wd=\linewidth,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
+\end{beamercolorbox}
+\par\nointerlineskip
+	\begin{beamercolorbox}[
+	wd=\linewidth,
+	sep=\c_TUDa_largerule_dim,
+	]{title}
+	\raggedright
+	\skip_horizontal:n {1ex}
+	\parbox[t]{\dimexpr\linewidth-2ex\relax}{
+		\ifx\insertauthor\@empty
+		\else
+		\usebeamercolor[fg]{author}\usebeamerfont{author}\insertauthor\par
+		\fi
+		\ifx\insertauthor\@empty
+		\else
+		\usebeamercolor[fg]{institute}\usebeamerfont{institute}\insertinstitute
+		\fi
+	}
+\end{beamercolorbox}
+}
+	}
 	}
 	\box_use:N \l_TUDa_titlehead_box
-\nointerlineskip\begin{beamercolorbox}[wd=\linewidth,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
+\nointerlineskip\begin{beamercolorbox}[
+	wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent,ht=\c_TUDa_smallrule_dim,dp=\z@]{smallrule}
 	\end{beamercolorbox}
-	\dim_set:Nn \l_TUDa_titlegraphic_ht_dim {\textheight-\box_ht:N\l_TUDa_titlehead_box
+	\dim_set:Nn \l_TUDa_titlegraphic_ht_dim {\textheight-\box_ht:N\l_TUDa_titlehead_box-\box_dp:N \l_TUDa_titlehead_box
 	+\c_TUDa_largerule_dim-.5\c_TUDa_rulesep_dim-\c_TUDa_smallrule_dim}
 	\let\height\l_TUDa_titlegraphic_ht_dim
-	\dim_set:Nn \l_TUDa_titlegraphic_wd_dim{\linewidth}
+	\dim_set:Nn \l_TUDa_titlegraphic_wd_dim{\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent}
 	\let\width\l_TUDa_titlegraphic_wd_dim
 	\nointerlineskip
 	\begin{beamercolorbox}[wd=\width,
@@ -123,10 +184,12 @@
 \defbeamertemplate*{block begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=.5pt]{block title}%TODO
+	\begin{beamercolorbox}[ wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,sep=.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi]{block title}
 	\ifx\insertblocktitle\@empty
 	\else
-	\begin{beamercolorbox}[colsep=.75ex, wd=\dimexpr\linewidth-1pt\relax]{block title}
+	\begin{beamercolorbox}[colsep=.75ex,
+		 wd=\dimexpr\linewidth-1pt\relax]{block title}
 		\usebeamerfont*{block title}\insertblocktitle%
 	\end{beamercolorbox}%
 	\ifbeamercolorempty[bg]{block title}
@@ -145,7 +208,11 @@
 \defbeamertemplate*{block alerted begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=1.5pt]{block frame alerted}
+	\begin{beamercolorbox}[
+		wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,
+		sep=1.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi,
+	]{block frame alerted}
 	\ifx\insertblocktitle\@empty
 	\else
 	\begin{beamercolorbox}[wd={\dimexpr\linewidth-3pt},colsep=.75ex]{block title alerted}
@@ -165,7 +232,11 @@
 \defbeamertemplate*{block example begin}{TUDa}
 {
 	\par\vskip\medskipamount%
-	\begin{beamercolorbox}[sep=1.5pt]{block frame example}
+	\begin{beamercolorbox}[
+		wd=\dimexpr\linewidth+2\TUDa@beamer@extraindent,
+		sep=1.5pt,
+		leftskip=\dimexpr\ifdim\TUDa@beamer@extraindent>\z@\TUDa@beamer@extraindent-\beamer@colbox@sep\else\z@\fi,
+		]{block frame example}
 	\ifx\insertblocktitle\@empty
 	\else
 	\begin{beamercolorbox}[wd={\dimexpr\linewidth-3pt},colsep=.75ex]{block title example}
@@ -181,31 +252,10 @@
 	{\end{beamercolorbox}\end{beamercolorbox}\vskip\smallskipamount}
 
 %Itemize Items
-\defbeamertemplate*{itemize item}{TUDa}{\usebeamerfont*{itemize item}\raise1.25pt\hbox{\donotcoloroutermaths$\bullet$}}
-\defbeamertemplate*{itemize subitem}{TUDa}{\usebeamerfont*{itemize item}\raise1.5pt\hbox{\tiny\donotcoloroutermaths$\bullet$}}
+\defbeamertemplate*{itemize item}{TUDa}{\usebeamerfont*{itemize item}\raise\dimexpr.4\ht\strutbox-.4ex\hbox{\rule{.8ex}{.8ex}}}
+\defbeamertemplate*{itemize subitem}{TUDa}{\usebeamerfont*{itemize item}\setlength{\fboxsep}{\z@}\setlength{\fboxrule}{1pt}\raise\dimexpr.4\ht\strutbox-.2ex-\fboxrule\hbox{\fbox{\color{bg}\rule{.4ex}{.4ex}}}}
 \defbeamertemplate*{itemize subsubitem}{TUDa}{\usebeamerfont*{itemize subitem}\hbox{--}}
 
-%List spacing
-\setlength\labelwidth{.75em}
-\setlength\leftmargini{\dimexpr\labelwidth+\labelsep}
-\setlength\leftmarginii{\dimexpr\labelwidth+\labelsep}
-\setlength\leftmarginiii{\dimexpr\labelwidth+\labelsep}
-
-\def\@listi{\leftmargin\leftmargini
-	\topsep \z@ \@plus2\p@ \@minus2.5\p@
-	\parsep 0\p@
-	\itemsep3\p@ \@plus2\p@ \@minus3\p@}
-\let\@listI\@listi
-\def\@listii{\leftmargin\leftmarginii
-	\topsep    \z@ \@plus1\p@ \@minus2\p@
-	\parsep    0\p@   \@plus\p@
-	\itemsep   \parsep}
-\def\@listiii{\leftmargin\leftmarginiii
-	\topsep    \z@ \@plus1\p@ \@minus2\p@
-	\parsep    0\p@   \@plus\p@
-	\itemsep   \parsep}
-
-
 \mode<all>
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
index 661c5c3ac57..ba85657b2c5 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamerouterthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerouterthemeTUDa}
  [\filedate\space\fileversion]
@@ -41,6 +41,12 @@
 	logo .initial:n =true,
 	logofile .tl_gset:N = \g_TUDa_logofile_tl,
 	logofile .initial:n = tuda_logo,
+    colorframetitle .bool_gset:N = \g_TUDa_colorframetitle_bool,
+    colorframetitle .initial:n = false,
+    colorframetitle .default:n = true,
+    centerframetitle .bool_gset:N = \g_TUDa_centerframetitle_bool,
+    centerframetitle .initial:n = false,
+    centerframetitle .default:n = true,
 }
 
 
@@ -55,11 +61,19 @@
 
 \newlength{\TUDa@beamer@sep}
 \setlength{\TUDa@beamer@sep}{1em}
+\newlength{\TUDa@beamer@logosep}
+\setlength{\TUDa@beamer@logosep}{2mm}
+\newlength{\TUDa@beamer@extraindent}
+\ExplSyntaxOn
+\bool_if:NT \g_TUDa_colorframetitle_bool {\setlength{\TUDa@beamer@extraindent}{\TUDa@beamer@logosep}}
 
-\setbeamersize{text~margin~left=\TUDa@beamer@sep,text~margin~right=\TUDa@beamer@sep}
+\setbeamersize{
+  text~margin~left= \dimexpr\TUDa@beamer@sep+\TUDa@beamer@extraindent\relax,
+  text~margin~right=\dimexpr\TUDa@beamer@sep+\TUDa@beamer@extraindent\relax,
+}
 
 \newlength{\TUDa@beamer@linewidth}
-\setlength{\TUDa@beamer@linewidth}{\dimexpr\paperwidth-2\TUDa@beamer@sep\relax}
+\setlength{\TUDa@beamer@linewidth}{\dimexpr\paperwidth-2\TUDa@beamer@sep-2\TUDa@beamer@extraindent\relax}
 
 %Logo
 
@@ -68,16 +82,8 @@
 	\makebox[2.2\c_TUDa_logoheight_dim][l]{\includegraphics[height=\c_TUDa_logoheight_dim]{\g_TUDa_logofile_tl}}%
 }
 
-\newlength{\TUDa@beamer@logosep}
-\setlength{\TUDa@beamer@logosep}{2mm}
-
-\ExplSyntaxOff
-
-%\RequirePackage[paper=slide]{tudarules}
-
-\ExplSyntaxOn
-\TUDa@makeheadrule[color=identbarcolor,width=\TUDa@beamer@linewidth]{TUDa@beamer@headrule}
-\TUDa@makefootrule[width=\TUDa@beamer@linewidth]{TUDa@beamer@rule}
+\TUDa@makeheadrule[color=identbarcolor,width=\paperwidth-2\TUDa@beamer@sep]{TUDa@beamer@headrule}
+\TUDa@makefootrule[width=\paperwidth-2\TUDa@beamer@sep]{TUDa@beamer@rule}
 
 \newlength{\TUDa@beamer@headheight}
 \setlength{\TUDa@beamer@headheight}{
@@ -142,25 +148,28 @@
 }
 
 \defbeamertemplate{headline}{TUDa theme.logo} {%
-%	\vspace{.75\TUDa@beamer@sep}
 	\begin{beamercolorbox}[
-		leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,%wd=\TUDa@beamer@linewidth,
+		leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,
 		ht=.75\TUDa@beamer@sep,dp=\box_dp:N \TUDa@beamer@headrule_box]{headline}
 		\TUDa@beamer@headrule
 	\end{beamercolorbox}
 }
 
-\ExplSyntaxOff
 
-\defbeamertemplate{frametitle}{TUDa theme.logo}{%
+\box_new:N \l_TUDa_frametitle_box
+
+\defbeamertemplate{frametitle}{TUDa~theme.logo}{%
 \nointerlineskip%
 \begin{beamercolorbox}[
-	sep=\TUDa@beamer@logosep,%wd=\dimexpr\TUDa@beamer@linewidth\relax,
-	rightskip=-\TUDa@beamer@logosep,
-%	leftskip=-\TUDa@beamer@logosep
+  sep=\TUDa@beamer@logosep,
+  wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent\relax,
+  rightskip=-\TUDa@beamer@logosep,
+  leftskip=\dimexpr-\TUDa@beamer@logosep+\TUDa@beamer@extraindent\relax,
 	]{frametitle}
-	\parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{%
-		\usebeamerfont{frametitle}\insertframetitle
+	\hbox_set:Nn \l_TUDa_frametitle_box {
+	\parbox[t]
+		{\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{%
+		\usebeamerfont{frametitle}\strut\insertframetitle
 		\ifx\insertframesubtitle\@empty
 		\else
 		\par
@@ -168,30 +177,42 @@
 		\usebeamerfont{framesubtitle}
 		\insertframesubtitle
 		\fi
-	}
+	}}
+	\leavevmode
+	\bool_if:NTF \g_TUDa_centerframetitle_bool
+		{\raisebox{\dimexpr-.5\height+.5\depth}}
+		{\use:n}
+			{\box_use:N \l_TUDa_frametitle_box}
 	\hfill%
-	\raisebox{\dimexpr-\height+\ht\strutbox\relax}{\usebox\TUDa@logobox}
+	\bool_if:NTF \g_TUDa_centerframetitle_bool
+		{\raisebox{\dimexpr-.5\height+.5\depth}}
+		{\raisebox{\dimexpr-\height+\ht\strutbox}}
+		{\usebox\TUDa@logobox}
 \end{beamercolorbox}
 \nointerlineskip
-\color{black}\TUDa@beamer@rule
+\leavevmode\color{black}\hspace*{-\TUDa@beamer@extraindent}\TUDa@beamer@rule
 }
 
-\defbeamertemplate*{headline}{TUDa theme.nologo}
+\defbeamertemplate*{headline}{TUDa~theme.nologo}
 {%
 	\vspace{.75\TUDa@beamer@sep}
 	\begin{beamercolorbox}[
 		leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep]{headline}
 		\TUDa@beamer@headrule
 	\end{beamercolorbox}
-}
-\defbeamertemplate*{frametitle}{TUDa theme.nologo}{%
+      }
+
+\defbeamertemplate*{frametitle}{TUDa~theme.nologo}{%
 	\nointerlineskip%
 \begin{beamercolorbox}[
-	sep=\TUDa@beamer@logosep,
+  sep=\TUDa@beamer@logosep,
+  wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent\relax,
+  leftskip=\dimexpr-\TUDa@beamer@logosep+\TUDa@beamer@extraindent\relax,
 	]{frametitle}
-	\parbox[t]{\dimexpr\TUDa@beamer@linewidth-2\TUDa@beamer@logosep}{%
-		\usebeamerfont{frametitle}
-		\insertframetitle
+	\hbox_set:Nn \l_TUDa_frametitle_box {
+	\parbox[t]
+	{\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{%
+		\usebeamerfont{frametitle}\strut\insertframetitle
 		\ifx\insertframesubtitle\@empty
 		\else
 		\par
@@ -199,15 +220,22 @@
 		\usebeamerfont{framesubtitle}
 		\insertframesubtitle
 		\fi
-	}%
+}}
+\leavevmode
+\bool_if:NTF \g_TUDa_centerframetitle_bool
+{\raisebox{\dimexpr-.5\height+.5\depth}}
+{\use:n}
+{\box_use:N \l_TUDa_frametitle_box}
 %	Rule for voffset similar to logo
-	\rule[\dimexpr-\ht\TUDa@logobox+\ht\strutbox\relax]{0pt}{\dimexpr\ht\TUDa@logobox+\dp\TUDa@logobox\relax}
+	\rule[\dim_eval:n {
+		\bool_if:NTF \g_TUDa_centerframetitle_bool
+		{-.5\ht\TUDa@logobox+.5\dp\TUDa@logobox} {-\ht\TUDa@logobox+\ht\strutbox}
+	}]{0pt}{\dimexpr\ht\TUDa@logobox+\dp\TUDa@logobox\relax}
 \end{beamercolorbox}
 	\nointerlineskip
 \TUDa@beamer@rule
 }
 
-\ExplSyntaxOn
 \cs_new:Nn \TUDa_setup_frame: {
 	\bool_if:NTF \g_TUDa_headlinelogo_bool {
 		\setbeamertemplate{frametitle}[TUDa~ theme.logo]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
index 10c021f9780..24b726359c9 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 1.11 (2019/09/25),
+%% This is file `beamerthemeTUDa.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerthemeTUDa}
  [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
@@ -58,7 +58,7 @@
 \useinnertheme{TUDa}
 %
 \setbeamertemplate{navigation symbols}{}
-\setbeamersize{text margin left=1em,text margin right=1em}
+%\setbeamersize{text margin left=1em,text margin right=1em}
 
 
 \mode<all>
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo
new file mode 100644
index 00000000000..20ec57f7910
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a0paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+	\cs_set:Nn \TUDa_title_fontsize: {{125pt}{165pt}}
+	\cs_set:Nn \TUDa_subtitle_fontsize: {{42pt}{55pt}}
+	\cs_set:Nn \TUDa_titleinfo_fontsize: {{28pt}{35pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+	\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {30pt}}
+	\dim_gset:Nn \g_TUDa_margin_dim {30mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo
new file mode 100644
index 00000000000..c6610afff5d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a1paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+		\cs_set:Nn \TUDa_title_fontsize: {{86pt}{120pt}}
+		\cs_set:Nn \TUDa_titleinfo_fontsize: {{35pt}{42pt}}
+		\cs_set:Nn \TUDa_titlethanks_fontsize: {{22pt}{26pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+	\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {25pt}}
+	\dim_gset:Nn \g_TUDa_margin_dim {30mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo
new file mode 100644
index 00000000000..430544c25a1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a2paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+		\cs_set:Nn \TUDa_title_fontsize: {{65pt}{82pt}}
+		\cs_set:Nn \TUDa_titleinfo_fontsize: {{22pt}{28pt}}
+		\cs_set:Nn \TUDa_titlethanks_fontsize: {{14pt}{20pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+	\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {25pt}}
+	\dim_gset:Nn \g_TUDa_margin_dim {30mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo
new file mode 100644
index 00000000000..6c6aafc1b2f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a3paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a3paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+  \cs_set:Nn \TUDa_title_fontsize: {{47pt}{61pt}}
+  \cs_set:Nn \TUDa_titleinfo_fontsize: {{16pt}{20pt}}
+  \cs_set:Nn \TUDa_titlethanks_fontsize: {{12pt}{16pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+  \tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {17pt}}
+  \dim_gset:Nn \g_TUDa_margin_dim {15mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo
new file mode 100644
index 00000000000..296a99dbe44
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a4paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a4paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+  \cs_set:Nn \TUDa_title_fontsize: {{36pt}{47pt}}
+  \cs_set:Nn \TUDa_titleinfo_fontsize: {{12pt}{14pt}}
+  \cs_set:Nn \TUDa_titlethanks_fontsize: {{10pt}{11.5pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+  \tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {14pt}}
+  \dim_gset:Nn \g_TUDa_margin_dim {15mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo
new file mode 100644
index 00000000000..086746405ee
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo
@@ -0,0 +1,41 @@
+%% This is file `tuda-a5paper.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+\ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a5paper}
+\cs_set:Nn \TUDa_setup_title_sizes: {
+  \cs_set:Nn \TUDa_title_fontsize: {{22pt}{28pt}}
+  \cs_set:Nn \TUDa_titleinfo_fontsize: {{10pt}{11.5pt}}
+  \cs_set:Nn \TUDa_titlethanks_fontsize: {{10pt}{11.5pt}}
+}
+\cs_set:Nn \TUDa_setup_base_sizes: {
+  \tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {10pt}}
+  \dim_gset:Nn \g_TUDa_margin_dim {12mm}
+}
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty
new file mode 100644
index 00000000000..2644bd9ecd4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty
@@ -0,0 +1,159 @@
+%% This is file `tuda-pgfplots.sty' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+% Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
+% The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
+\ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
+
+\RequirePackage{pgfplots}
+\RequirePackage{tudacolors}
+
+\pgfplotscreateplotcyclelist{tudabarplot cycle}{%
+  draw=TUDa-1a,  fill=TUDa-1b \\
+  draw=TUDa-9b,  fill=TUDa-9c \\
+  draw=TUDa-3b,  fill=TUDa-3c \\
+  draw=TUDa-10b, fill=TUDa-10c\\
+  draw=TUDa-5c,  fill=TUDa-5d \\
+  draw=TUDa-6d,  fill=TUDa-6a \\
+}
+
+\pgfplotscreateplotcyclelist{tudalineplot cycle}{%
+  TUDa-1b,  mark=*,        \\
+  TUDa-9c,  mark=diamond*, \\
+  TUDa-3c,  mark=square*,  \\
+  TUDa-10c, mark=triangle* \\
+  TUDa-5d,  mark=*,         \\
+  TUDa-6a,  mark=diamond*,  \\
+}
+
+
+\pgfplotsset{
+  tuda3dplot/.style={
+    axis line style = thin,
+    axis x line*=box,
+    axis y line*=box,
+    tudabaseplot,
+    xmajorgrids=true,
+    ymajorgrids=true,
+    major grid style={dotted},
+  },
+  tudalineplot/.style={
+    tudabaseplot,
+    grid,
+    legend style={cells={anchor=west}},
+    thick,
+    mark size=1.5pt, 
+    cycle list name=tudalineplot cycle,
+  },
+  tudabarplot base/.style={
+    tudabaseplot,
+    bar width=6pt,
+    cycle list name=tudabarplot cycle,
+  },
+  tudabarplot/.style={		
+    ybar,
+    tudabarplot base,
+    xmajorgrids=false,
+    ymajorgrids=true,
+  },
+  horizontal tudabarplot/.style={
+    xbar stacked,
+    tudabarplot base,
+    xmajorgrids=true,
+    ymajorgrids=false,
+  },
+  colormap={tudaa}{rgb255=(93,133,195)
+    rgb255=(0,156,218)
+    rgb255=(80,182,149)
+    rgb255=(175,204,80)
+    rgb255=(221,223,72)
+    rgb255=(255,224,92)
+    rgb255=(248,186,60)
+    rgb255=(238,122,52)
+    rgb255=(233,80,62)
+    rgb255=(201,48,142)
+    rgb255=(128,69,151)
+  },
+  colormap={tudab}{%
+    rgb255=(0,90,169)
+    rgb255=(0,131,204)
+    rgb255=(0,157,129)
+    rgb255=(153,192,0)
+    rgb255=(201,212,0)
+    rgb255=(253,202,0)
+    rgb255=(245,163,0)
+    rgb255=(236,101,0)
+    rgb255=(230,0,26)
+    rgb255=(166,0,132)
+    rgb255=(114,16,133)
+    rgb255=(0,78,138)
+  },
+  colormap={tudac}{
+    rgb255=(0,78,138)
+    rgb255=(0,104,157)
+    rgb255=(0,136,119)
+    rgb255=(127,171,22)
+    rgb255=(177,189,0)
+    rgb255=(215,172,0)
+    rgb255=(210,135,0)
+    rgb255=(204,76,3)
+    rgb255=(185,15,34)
+    rgb255=(149,17,10)
+    rgb255=(97,28,115)
+  },
+  colormap={tudad}{
+    rgb255=(36,53,114)
+    rgb255=(0,78,115)
+    rgb255=(0,113,94)
+    rgb255=(106,139,55)
+    rgb255=(153,166,4)
+    rgb255=(174,142,0)
+    rgb255=(190,111,0)
+    rgb255=(169,73,19)
+    rgb255=(156,28,38)
+    rgb255=(115,32,84)
+    rgb255=(76,34,106)
+  },
+  tudabaseplot/.style={
+    colormap name=viridis,
+    legend style={fill=white,cells={anchor=west}},
+    ticklabel style={font=\footnotesize},
+    legend style={font=\footnotesize},
+    major grid style={dotted},
+    axis x line=bottom,axis y line=left,
+  },
+  colormap={tuda}{
+    rgb255=(115,32,84)
+    rgb255=(0,157,129)
+    rgb255=(255,224,92)
+  }
+}
+
+\endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
index 2e30b5f986e..bcb2181a36a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 1.11 (2019/09/25),
+%% This is file `tudabeamer.cls' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{tudabeamer}
  [\filedate\space\fileversion\space]
@@ -43,10 +43,9 @@
 \ExplSyntaxOn
 \keys_define:nn {TUDa/beamer} {
 	accentcolor .code:n = \PassOptionsToPackage{accentcolor=#1}{tudacolors},
-	colortitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa},
-	colorbacktitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa},
-	colorframetitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa},
-	colorback .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa},
+	colorframetitle .code:n = \PassOptionsToPackage{\l_keys_key_tl=#1}{beamercolorthemeTUDa}
+	\PassOptionsToPackage{\l_keys_key_tl=#1}{beamerouterthemeTUDa},
+	colorframetitle .default:n = true,
 	logo .code:n = \PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa},
 	pdfa .bool_gset:N = \g_TUDa@pdfa_bool,
 	pdfa .initial:n = false,
@@ -58,9 +57,11 @@
 }
 
 
-\clist_map_inline:nn {colortitle, colorbacktitle, colorframetitle, colorback} {
+\clist_map_inline:nn {colortitle, colorbacktitle, colorback} {
 	\Module@DeclarePassOption[TUDa/beamer]{#1}{beamercolorthemeTUDa}
 }
+\Module@DeclarePassOption[TUDa/beamer]{centerframetitle}{beamerouterthemeTUDa}
+\Module@DeclarePassOption[TUDa/beamer]{authorontitle}{beamerinnerthemeTUDa}
 
 \ExplSyntaxOff
 
@@ -94,7 +95,7 @@
 \ExplSyntaxOn
 \bool_if:NT \g_TUDa@pdfa_bool {
 	\UnPreventPackageFromLoading{hyperref}
-	\PassOptionsToPackage{a-1b}{pdfx}
+	\PassOptionsToPackage{a-2b}{pdfx}
 	\RequirePackage{pdfx}
 }
 \ExplSyntaxOff
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
index ac9aa26af3c..d193b2149c3 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 1.11 (2019/09/25),
+%% This is file `tudacolors.def' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \ProvidesFile{tudacolors.def}
 [\filedate\space\fileversion\space Color definitions for tuda-ci]
 
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
index 7bf135eae7a..57c49ca2ba7 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 1.11 (2019/09/25),
+%% This is file `tudacolors.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
@@ -44,6 +44,7 @@
 	accentcolor .meta:n = {accent =#1},
 	textaccentcolor .meta:n = {textaccent = #1},
 	identbarcolor .meta:n = {identbar = #1},
+	color .meta:n = {accent=#1, textaccent=#1, identbar=#1},
 	text .choice:,
 	text/preferblack .code:n = \bool_gset_false:N \g_TUDa_color_whitetext_bool,
 	text/preferwhite .code:n = \bool_gset_true:N  \g_TUDa_color_whitetext_bool,
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls
new file mode 100644
index 00000000000..8af1b0c17d0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls
@@ -0,0 +1,726 @@
+%% This is file `tudaexercise.cls' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
+%%
+\def\fileversion{1.01}
+\def\filedate{2019/09/09}
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{expl3}
+\ProvidesExplClass{tudaexercise}
+	{\filedate}{\fileversion}{Exercise sheets and exams using TU Darmstadt's Coporate Desing (TUDa-CI)}
+
+\RequirePackage{l3keys2e}
+
+\tl_new:N \g_TUDa_thesis_options_tl
+
+\prop_new:N \g_TUDa_clsopts_prop
+\prop_new:N \g_TUDa_unknown_clsopts_prop 
+\prop_gput:Nnn \g_TUDa_clsopts_prop {captions} {nooneline}
+\prop_gput:Nnn \g_TUDa_clsopts_prop {parskip} {half-}
+
+\int_new:N \g_TUDa_ruledheaders_int
+\int_new:N \g_TUDa_paper_int
+
+%Message Declaration for option processing
+\msg_new:nnn {TUDaExercise} {titlepage-option-disabled} {
+	You~set~the~titlepage~option~to~#1.\\
+	This option is not supported by tudaexercise.cls.\\
+	The~KOMA-Script~option~titlepage~is~forced~to~"false".
+}
+
+\bool_new:N \g_TUDa_geometry_bool
+\bool_new:N \g_TUDa_custommargins_bool
+
+
+\keys_define:nn {TUDa/exercise} {
+  solution .bool_set:N = \l_TUDa_ex_solution_bool,
+  solution .initial:n = false,
+  solution .default:n = true,
+  compat .bool_gset:N = \g_TUDa_ex_compatibility_bool,
+  compatilibity .meta:n = {compat=#1},
+  compatibility .default:n = true,
+  compat .initial:n = false,
+}
+
+\keys_define:nn {TUDa/exercise/headline} {
+  headline .code:n = {
+    \if@twoside
+    \keys_set:nn  {TUDa/exercise/headline} {odd=#1,even=#1}
+    \else
+    \keys_set:nn {TUDa/exercise/headline} {oneside=#1}
+    \fi
+  },
+}
+
+\clist_map_inline:nn {odd, even, oneside} {
+  \tl_new:c {g_TUDa_ex_headline_#1_tl}
+  \keys_define:nn {TUDa/exercise/headline} {
+    #1 .choice:,
+    #1 / title-name-id .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {
+      \g_TUDa_shorttitle_tl\par
+      \StudentName\StudentID},
+    #1 / title-name .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {
+      \g_TUDa_shorttitle_tl\par
+      \smallskip
+      \StudentName},
+    #1 / title .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {\g_TUDa_shorttitle_tl},
+    #1 / name-id .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {\StudentName\StudentID},
+    #1 / name .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {\StudentName},
+    #1 / unknown .code:n = \tl_gset:cn {g_TUDa_ex_headline_#1_tl} {##1}
+  }
+}
+
+\keys_define:nn {TUDa/pub} {
+	color .code:n = {\PassOptionsToPackage{color=#1}{tudacolors}},
+	accentcolor .code:n = {\PassOptionsToPackage{accentcolor=#1}{tudacolors}},
+	textaccentcolor .code:n = {\PassOptionsToPackage{textaccentcolor=#1}{tudacolors}},
+	textonaccentcolor .code:n = {\PassOptionsToPackage{textaccentcolor=#1}{tudacolors}},
+	identbarcolor .code:n = {\PassOptionsToPackage{identbarcolor=#1}{tudacolors}},
+	color .initial:n = 0b,
+	custommargins .choice:,
+	custommargins / true .code:n ={
+		\bool_gset_true:N \g_TUDa_custommargins_bool
+		\bool_gset_false:N \g_TUDa_geometry_bool
+	},
+	custommargins / false .code:n ={
+		\bool_gset_false:N \g_TUDa_custommargins_bool
+		\bool_gset_true:N \g_TUDa_geometry_bool
+	},
+	custommargins / geometry .code:n = {
+		\bool_gset_true:N \g_TUDa_custommargins_bool
+		\bool_gset_true:N \g_TUDa_geometry_bool
+	},
+	custommargins .initial:n = false,
+	custommargins .default:n = true,
+	fontsize .code:n = \prop_gput:Nnn \g_TUDa_clsopts_prop {fontsize} {#1},
+	fontsize .initial:n = {10pt},
+	unknown .code:n = {\prop_gput:NVn \g_TUDa_unknown_clsopts_prop \l_keys_key_tl {#1}},
+	BCOR .code:n = \PassOptionsToPackage{bindingoffset=#1}{geometry},
+	bindingoffset .meta:n = {BCOR=#1},
+	captions .code:n = {\prop_gput:Nnx \g_TUDa_clsopts_prop {captions} {	
+		\use:n {\prop_item:Nn \g_TUDa_clsopts_prop {captions}}, #1}
+	},
+	titlepage .code:n = {\msg_warning:nnn {TUDaPub} {titlepage-option-disabled} {#1}},
+	paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{
+		\int_gset_eq:NN \g_TUDa_paper_int  \l_keys_choice_int
+		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
+		\PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
+		\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
+	},
+	paper .initial:n = a4,
+	logofile .tl_gset:N = \g_TUDa_logofile_tl,
+	logofile .initial:n = tuda_logo,
+        solution .meta:nn = {TUDa/exercise}{solution=#1},
+        compat .meta:nn = {TUDa/exercise}{compat=#1},
+        compatibility .meta:nn = {TUDa/exercise}{compat=#1},
+        compatibility .default:n = true,
+        headontitle .bool_gset:N = \g_TUDa_headontitle_bool,
+        headontitle .initial:n = false,
+        headontitle .default:n =true,
+        colorback .bool_gset:N  = \g_TUDa_colorback_bool,
+        colorback .default:n = true,
+        colorback .initial:n  = true,
+}
+
+\ProcessKeysOptions{TUDa/pub}
+
+\prop_map_inline:Nn \g_TUDa_clsopts_prop {
+	\tl_if_empty:nTF {#2} 
+		{\PassOptionsToClass  {#1} {scrartcl}}
+		{
+		\clist_map_inline:nn {#2} {\PassOptionsToClass  {#1=##1} {scrartcl}}
+		}
+}
+
+
+%Load tudasize clo file if available
+\file_if_exist:nT {tudasize\prop_item:Nn \g_TUDa_clsopts_prop {fontsize}.clo}
+	{\providecommand*{\@fontsizefilebase}{tudasize}}
+
+\LoadClass{scrartcl}
+
+\prop_map_inline:Nn \g_TUDa_unknown_clsopts_prop {
+	\cs_if_exist:cT {KV@KOMA.scrartcl.cls@#1} {
+	\tl_if_empty:nTF {#2} 
+		{\KOMAoptions{#1} }
+		{\clist_map_inline:nn {#2} {\KOMAoptions{#1=##1}}}
+	}
+}
+\renewcommand*\sectionlinesformat[4]{%
+\parbox{\linewidth}{
+	\rule[5\g_TUDa_titlerule_dim]{\linewidth}{\g_TUDa_titlerule_dim}\par\nointerlineskip
+	\@hangfrom{%
+		\hskip #2#3}{
+		\tl_if_eq:nnT {#1} {task} {
+			\exp_args:No \tl_if_empty:nF {#4}
+				{:~}
+		}
+		#4\rule[-\dp\strutbox]{0pt}{\dp\strutbox}\par}\nointerlineskip
+		\skip_vertical:n {\TUDa_titlerule_sep: -\dp\strutbox}
+	\smash{\rule{\linewidth}{\g_TUDa_titlerule_dim}}
+}}
+
+
+	
+
+\usepackage{tudarules}
+\usepackage{tudafonts}
+
+\dim_new:N \g_TUDa_innerMargin_dim
+\dim_new:N \g_TUDa_outerMargin_dim
+\dim_new:N \g_TUDa_bottomMargin_dim
+\dim_new:N \g_TUDa_topMargin_dim
+
+
+	%a3,a4
+	\int_compare:nTF {4<=\g_TUDa_paper_int<=5}
+	{
+		\dim_gset:Nn \g_TUDa_bottomMargin_dim {20mm}
+		\dim_gset:Nn \g_TUDa_outerMargin_dim {15mm}
+		\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
+		\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+	}{
+	%a0, a1, a2
+		\int_compare:nT {1<=\g_TUDa_paper_int<=3}
+		{
+			\dim_gset:Nn \g_TUDa_bottomMargin_dim {35mm}
+			\dim_gset:Nn \g_TUDa_outerMargin_dim {30mm}
+			\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+		}
+		%a5
+		\int_compare:nT {\g_TUDa_paper_int<=6}
+		{
+			\dim_gset:Nn \g_TUDa_bottomMargin_dim {16mm}
+			\dim_gset:Nn \g_TUDa_outerMargin_dim {12mm}
+			\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+		}
+		%a6
+		\int_compare:nT {\g_TUDa_paper_int<=7}
+		{
+			\dim_gset:Nn \g_TUDa_bottomMargin_dim {15mm}
+			\dim_gset:Nn \g_TUDa_outerMargin_dim {10mm}
+			\dim_gset_eq:NN	 \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+		}
+	}
+
+%TODO pubched
+%%punched
+%\dim_gset:Nn \g_TUDa_outerMargin_dim {15mm}
+%\dim_gset:Nn \g_TUDa_innerMargin_dim {20mm}
+%\if@twoside
+%\else
+%\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
+%\fi
+
+\dim_new:N \g_TUDa_columnSep_dim
+\dim_gset:Nn \g_TUDa_columnSep_dim {10pt}
+
+\dim_new:N \g_TUDa_headheight_dim
+\dim_new:N \g_TUDa_headwidth_dim
+
+
+\dim_gset:Nn \g_TUDa_headheight_dim {1.25\baselineskip +\c_TUDa_largerule_dim +\c_TUDa_rulesep_dim +\c_TUDa_smallrule_dim}
+
+%%%%%Anfang Randeinstellungen Geometry
+
+%Has to be loaded here due to headwidth options
+\usepackage[draft=false]{scrlayer-scrpage}
+
+\bool_if:NTF  \g_TUDa_geometry_bool {
+	\RequirePackage[top=\g_TUDa_topMargin_dim, inner=\g_TUDa_innerMargin_dim, outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, bottom=\g_TUDa_bottomMargin_dim, columnsep= \g_TUDa_columnSep_dim, includehead, includefoot, headheight=\g_TUDa_headheight_dim
+	]{geometry}
+}{
+	\KOMAoptions{headinclude, footinclude, headwidth=text,footwidth=text}
+}
+
+
+%%%%%%%%
+%Ende Randeinstellungen klassisch
+
+
+
+
+\newcommand*{\institution}[1]{
+	\def\TUDa@institution{#1}
+}
+
+\gdef\TUDa@datename{Datum}
+\gdef\TUDa@dateseparator{:~}
+
+
+
+
+\setkomafont{disposition}{\sffamily\bfseries}
+
+
+
+\dim_new:N \g_TUDa_titlerule_dim
+\dim_gset:Nn \g_TUDa_titlerule_dim {.5\c_TUDa_smallrule_dim}
+
+\cs_new:Nn \TUDa_titlerule_sep: {\the\dp\strutbox}
+
+\RequirePackage{tudacolors}
+\RequirePackage{environ}
+
+%TODO: mode -> light head. 
+
+\setkomafont{pageheadfoot}{\sffamily\small}
+\setkomafont{pagenumber}{}
+\addtokomafont{captionlabel}{\accentfont}
+\addtokomafont{caption}{\accentfont}
+
+\KOMAoptions{footsepline=.5\c_TUDa_smallrule_dim}
+\KOMAoptions{headsepline=.5\c_TUDa_smallrule_dim}
+  
+\box_new:N \g_TUDa_ex_headline_odd_box
+\box_new:N \g_TUDa_ex_headline_even_box
+\box_new:N \g_TUDa_ex_headline_oneside_box
+
+\cs_new:Nn \TUDa_preamble_ConfigureHeadline:n {
+  \tl_if_empty:nF {#1} {\keys_set:nn {TUDa/exercise/headline} {#1}}
+}
+
+\cs_new:Nn \TUDa_ConfigureHeadline:n {
+  \TUDa_preamble_ConfigureHeadline:n {#1}
+  \TUDa_update_headline_boxes:
+  \TUDa_ex_adjust_headheight:
+}
+
+\let\ConfigureHeadline\TUDa_preamble_ConfigureHeadline:n
+
+
+
+\bool_if:NT \g_TUDa_ex_compatibility_bool {
+
+\cs_new:Npn \TUDa_ex_env_to_tl_aux:w #1 \q_stop { \tl_gset:Nn     \g_TUDa_ex_headline_oneside_tl {#1} }
+
+\NewEnviron{examheader}{
+  \tl_gset:No \g_TUDa_ex_headline_oneside_tl {\BODY}
+  \tl_gset:No \g_TUDa_ex_headline_odd_tl {\BODY}
+  \tl_gset:No \g_TUDa_ex_headline_even_tl {\BODY}
+  \TUDa_ConfigureHeadline:n {}
+}
+
+  \newcommand*{\examheaderdefault}{\par\StudentName\StudentID}
+}
+
+
+\cs_new:Nn \TUDa_update_headline_boxes: {
+  \clist_map_inline:nn {even, odd, oneside}
+  {
+    \tl_if_empty:cF {g_TUDa_ex_headline_##1_tl} {
+      \vbox_gset:cn {g_TUDa_ex_headline_##1_box} {
+          \begin{minipage}[b]{\textwidth}
+          \usekomafont{pagehead}
+         \raggedright
+          \leavevmode\rule{\z@}{\dimexpr\ht\strutbox+\c_TUDa_rulesep_dim}
+          \ignorespaces
+          \use:c {g_TUDa_ex_headline_##1_tl}\ignorespaces\strut
+          \par\vspace{\z@}
+        \end{minipage}
+      }
+    }
+  }
+}
+
+
+\cs_new:Nn \TUDa_ex_adjust_headheight: {
+	\if@twoside
+	\dim_set:Nn \l_tmpa_dim {
+		\dim_max:nn 
+			{\box_ht:N \g_TUDa_ex_headline_odd_box}
+			{\box_ht:N \g_TUDa_ex_headline_even_box}
+	}
+	\else
+	\dim_set:Nn \l_tmpa_dim {
+		\box_ht:N \g_TUDa_ex_headline_oneside_box
+		+ \box_dp:N \g_TUDa_ex_headline_oneside_box
+	}
+	\fi
+        \dim_add:Nn \l_tmpa_dim {\box_dp:N \TUDa@headline_box}
+	\KOMAoptions{headinclude, headheight=\l_tmpa_dim}
+        \global\setlength{\headheight}{\l_tmpa_dim}
+	\clist_map_inline:nn {odd, even, oneside} {
+	\ModifyLayer[contents={\raisebox{\c_TUDa_rulesep_dim}[0pt][0pt]{\box_use:c {g_TUDa_ex_headline_##1_box}}}]{TUDa.ex.head.##1}
+	}
+}
+
+\newpairofpagestyles{TUDa.ex}{
+	\KOMAoptions{plainfootsepline}
+		\KOMAoptions {
+			headwidth=text,
+			footwidth=text
+			}
+	\setkomafont{pagehead}{}
+\box_if_exist:NF \TUDa@headline_box {
+	\TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline}
+}
+	\ModifyLayer[
+		background,
+		mode=picture,
+		contents={%\layercontentsmeasure
+			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
+				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+			}
+			\box_use:N \TUDa@headline_box
+		},
+		addvoffset=-\box_dp:N \TUDa@headline_box
+	]{TUDa.ex.head.above.line}	
+	\ModifyLayer[
+        background,
+%       mode=picture,
+        contents={%\layercontentsmeasure
+          \dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
+            \TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+          }
+          \box_use:N \TUDa@headline_box
+        },
+	]{plain.TUDa.ex.head.above.line}
+	\lehead{headmark}%TODO
+	\lohead{headmark}%TODO
+	\ofoot[\pagemark]{\pagemark}
+}
+
+\pagestyle{TUDa.ex}
+
+%Titelseite
+\tl_new:N  \g_TUDa_titleimage_code_tl
+\tl_gset_eq:NN  \g_TUDa_titleimage_code_tl \c_empty_tl
+\newcommand{\titleimage}[1]{\tl_gset:Nn \g_TUDa_titleimage_code_tl {#1}}
+
+\box_new:N  \g_TUDa_title_box 
+\skip_new:N \g_TUDa_title_fill_skip
+
+\renewcommand{\titlepagestyle}{plain.TUDa.ex}
+
+
+\seq_new:N \g_TUDa_author_seq
+
+\renewcommand*\author[1]{
+	\seq_gset_split:Nnn \g_TUDa_author_seq {\and} {#1}
+}
+
+\msg_new:nnn {TUDaPub} {unknown-language} {
+	You~selected~an~unknown~language~#1.\\
+	The~Variable~#2~does~not~have~a~predefined~value.\\
+	Ensure~to~redefine~#2~to~match~your~language.\\
+	Otherwise~the~ngerman~vaue~#3~will~be~used.
+}
+
+\cs_new:Nn \TUDa_define_captionFallback:Nn {
+	\providecommand*#1{
+	\msg_warning:nnxxx {TUDaPub} {unknown-language}
+		{\languagename} {\exp_not:N #1} {#2}
+	\def#1{#2}
+	}
+}
+
+\renewcommand*{\@author}{
+	\seq_use:Nnnn \g_TUDa_author_seq {~\authorandname{}~} {,~} {~\&~}
+      }
+
+\tl_new:N \g_TUDa_shorttitle_tl      
+      
+\RenewDocumentCommand{\title}{om}{
+  \IfNoValueTF{#1}{
+    \tl_gset:Nn  \g_TUDa_shorttitle_tl {#2}
+  }{
+    \tl_gset:Nn \g_TUDa_shorttitle_tl {#1}
+  }
+  \def\@title{#2}
+}
+
+% Define \subsubtitle for compatibility
+  \newcommand*{\subsubtitle}[1]{
+    \def\@subsubtitle{#1}
+  }
+  \subsubtitle{}
+
+
+\newcommand*{\TUDa@title@footnote}[2][1]{
+\textsuperscript{\@fnsymbol{#1}}#2
+}
+
+\renewcommand*{\titlepagestyle}{plain.TUDa.ex}
+
+\renewcommand*{\@maketitle}{%
+  \global\@topnum=\z@
+  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+  \vspace*{-\dim_eval:n {
+      \headheight
+      +\headsep
+      +\topskip
+      -\dp\strutbox
+    }}
+  \par
+  \nointerlineskip
+  \raisebox{\dim_eval:n {
+      -.5\c_TUDa_logoheight_dim
+    }}[0pt][.5\c_TUDa_logoheight_dim]{
+    \bool_if:NT \g_TUDa_colorback_bool {\color{accentcolor}\rule{\linewidth}{.5\c_TUDa_logoheight_dim}}
+
+  }
+  \par\nointerlineskip
+  \begingroup
+  \setlength{\fboxsep}{\z@}
+  \bool_if:NT \g_TUDa_colorback_bool {\colorbox{accentcolor}}{\parbox[t]{\linewidth}{
+      \raisebox{-\height}{%
+        \begin{minipage}[t]{\dimexpr\linewidth-2.2\c_TUDa_logoheight_dim-1ex}
+          \bool_if:NT \g_TUDa_colorback_bool  {\begin{addmargin}{3mm}}
+            \raggedright
+            \bool_if:NT \g_TUDa_colorback_bool {\color{textonaccentcolor}}
+            \tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
+            \leavevmode\usekomafont{title}%
+            {\usekomafont{title}{\huge \@title \par}}%
+            \vskip 1em
+            \bool_if:NF \g_TUDa_ex_compatibility_bool
+            {
+              {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+              \gdef\@subtitle{}
+              \vskip .5em
+            }
+            {\ifx\@author\@empty\else\usekomafont{author}\@author\par\fi}%
+            \vskip .5em
+          \bool_if:NTF \g_TUDa_colorback_bool {\end{addmargin}} {\par}
+        \end{minipage}}
+		\hfill\raisebox{\dim_eval:n {\bool_if:NTF \g_TUDa_colorback_bool
+				{-\height}
+				{-.9\c_TUDa_logoheight_dim}
+			}}[0pt][\dim_eval:n {\bool_if:NTF \g_TUDa_colorback_bool {1.5}{1.3}\c_TUDa_logoheight_dim}]{\makebox[2.2\c_TUDa_logoheight_dim][l]{\includegraphics[height=\c_TUDa_logoheight_dim]{\g_TUDa_logofile_tl}}}
+      \par\medskip
+    }}
+  \par
+  \nointerlineskip
+  \rule{\linewidth}{\g_TUDa_titlerule_dim}
+    % subtitle fields if not compat
+  \exp_args:Nf \tl_if_empty:nF {\g_TUDa_ex_sheetnum_tl\@date\g_TUDa_ex_term_tl\use:c {@subsubtitle}\@subtitle}{
+    \par\nointerlineskip
+    \bool_if:NT \g_TUDa_colorback_bool {\colorbox{accentcolor}}{
+      \parbox{\linewidth}{
+        \begin{minipage}{\linewidth}
+			\bool_if:NT \g_TUDa_colorback_bool {
+				\color{textonaccentcolor}
+				\begin{addmargin}{3mm}
+			}
+            \null\par
+            \def\TUDa@nextsep{}
+            \clist_map_inline:nn {@subtitle, @subsubtitle, g_TUDa_ex_term_tl, @date} {
+              \tl_if_empty:cF {##1} {\TUDa@nextsep\use:c {##1}\def\TUDa@nextsep{\\}}
+            }
+            % \tl_if_empty:NF \@subtitle {}
+            % \tl_if_empty:NF \g_TUDa_ex_term_tl {\TUDa@nextsep\g_TUDa_ex_term_tl\def\TUDa@nextsep{\\}}
+            % \tl_if_empty:NF \@date {\TUDa@nextsep\@date\def\TUDa@nextsep{\\}}
+            \tl_if_empty:NF \g_TUDa_ex_sheetnum_tl {\TUDa@nextsep\sheetname\sheetsep\g_TUDa_ex_sheetnum_tl}
+          \bool_if:NT \g_TUDa_colorback_bool {\end{addmargin}}
+        \end{minipage}
+        \vspace*{\dp\strutbox}
+      }}\par\nointerlineskip
+    \rule{\linewidth}{\g_TUDa_titlerule_dim}
+  }
+  \par
+  \bool_if:NT  \g_TUDa_headontitle_bool {
+    \if@twoside
+    \box_use:N \g_TUDa_ex_headline_odd_box
+    \else
+    \box_use:N \g_TUDa_ex_headline_oneside_box
+    \fi
+    \par
+    \rule{\linewidth}{\g_TUDa_titlerule_dim}
+    \par
+  }
+  \endgroup
+  \vskip 2em
+  \ConfigureHeadline{}
+}%
+
+\setkomafont{subtitle}{\bfseries}
+\setkomafont{author}{}
+\setkomafont{date}{}
+\newkomafont{sheetnumber}{\usekomafont{date}}
+
+\newkomafont{term}{\usekomafont{date}}
+
+\date{}
+\tl_new:N \g_TUDa_ex_sheetnum_tl
+\newcommand*{\sheetnumber}[1]{\tl_gset:Nn \g_TUDa_ex_sheetnum_tl {#1}}
+\sheetnumber{}
+\tl_new:N \g_TUDa_ex_term_tl
+\newcommand*{\term}[1]{\tl_gset:Nn \g_TUDa_ex_term_tl {#1}}
+\term{}
+
+\TUDa@makeheadrule[color=identbarcolor, width=\textwidth]{TUDa@title_headline}
+
+%Logos
+\RequirePackage{graphicx}
+	
+%%hyperref
+\usepackage{hyperref}
+\hypersetup{hidelinks, unicode}
+
+\providecaptionname{ngerman, german}{\sheetname}{Übungsblatt}
+\providecaptionname{english, american, british}{\sheetname}{Sheet}
+\newcommand*{\sheetsep}{~}
+
+\providecaptionname{ngerman, german}{\taskname}{Aufgabe}
+\providecaptionname{english, american, british}{\taskname}{Task}
+\newcommand*{\tasksep}{~}%TODO
+
+\providecaptionname{ngerman, german}{\solutionname}{Lösungsvorschlag}
+\providecaptionname{english, american, british}{\taskname}{Solution}
+\newcommand*{\solutionsep}{:~}
+
+\providecaptionname{ngerman, german}{\StudentNamename}{Nachname,~Vorname}
+\providecaptionname{english, american, british}{\StudentNamename}{Last Name,~ First Name}
+\newcommand*{\StudentNamesep}{:~}
+
+\providecommand{\StudentIDname}{Matrikelnummer}
+\providecaptionname{ngerman, german}{\StudentIDname}{Matrikelnummer}
+\providecaptionname{english, american, british}{\StudentIDname}{Enrollment ID}
+\newcommand*{\StudentIDsep}{:~}
+
+%Has to be initialized after captionnames have been defined
+ \AtBeginDocument{
+  \TUDa_update_headline_boxes:
+  \TUDa_ex_adjust_headheight:
+  \global\let\ConfigureHeadline\TUDa_ConfigureHeadline:n
+}
+
+
+
+%task environment
+%TODO: discussion: allow sectioning 
+\DeclareSectionCommand[%
+style=section,%
+level=1,%
+indent=\z@,%
+beforeskip=\cs_if_exist_use:NF \scr@subsection@beforeskip {-3.25ex\@plus -1ex \@minus -.2ex},%
+afterskip=\cs_if_exist_use:NF \scr@subsection@afterskip {1.5ex \@plus .2ex},%
+tocstyle=section,%
+tocindent=\cs_if_exist_use:NF \scr@tso@subsection@indent {1.5em},%
+tocnumwidth=\cs_if_exist_use:NF \scr@tso@subsection@numwidth {2.3em},%
+]{task}
+
+\renewcommand*{\thetask}{\g_TUDa_ex_sheetnum_tl\tl_if_empty:NF \g_TUDa_ex_sheetnum_tl{.}\arabic{task}}
+\renewcommand*{\taskformat}{\taskname\tasksep\thetask{}}
+
+\let\@task\task
+\cs_undefine:N \task
+
+\NewDocumentEnvironment{task}{om}{
+	\IfNoValueF{#1}{\keys_set:nn {TUDa/exercise}{#1}}
+	\@task{#2}
+}{}
+
+
+% subtasks
+\DeclareSectionCommand[%
+style=section,%
+level=2,%
+indent=\z@,%
+beforeskip=\cs_if_exist_use:NF \scr@subsubsection@beforeskip {-3.25ex\@plus -1ex \@minus -.2ex},%
+afterskip=\cs_if_exist_use:NF \scr@subsubsection@afterskip {1.5ex \@plus .2ex},%
+tocstyle=subsection,%
+tocindent=\cs_if_exist_use:NF \scr@tso@subsubsection@indent {1.5em},%
+tocnumwidth=\cs_if_exist_use:NF \scr@tso@subsubsection@numwidth {2.3em},%
+]{subtask}
+
+\renewcommand*{\thesubtask}{\alph{subtask})}
+\renewcommand*{\subtaskformat}{\thetask{}\thesubtask\enskip}
+\setkomafont{subtask}{\mdseries\normalsize}
+
+\let\@subtask\subtask
+\cs_undefine:N \subtask
+
+\NewDocumentEnvironment{subtask}{o}{
+	\@subtask{#1}
+      }{}
+
+%Solution mechanism
+
+\DeclareSectionCommand[%
+style=section,%
+level=2,%
+indent=\z@,%
+beforeskip=\cs_if_exist_use:NF \scr@subsubsection@beforeskip {-3.25ex\@plus -1ex \@minus -.2ex},%
+afterskip=\cs_if_exist_use:NF \scr@subsubsection@afterskip {1.5ex \@plus .2ex},%
+tocstyle=subsection,%
+tocindent=\cs_if_exist_use:NF \scr@tso@subsubsection@indent {1.5em},%
+tocnumwidth=\cs_if_exist_use:NF \scr@tso@subsubsection@numwidth {2.3em},%
+]{@solution}
+
+\NewEnviron{solution}{
+  \if_bool:N \l_TUDa_ex_solution_bool
+  \TUDa_ex_solutionheader:
+  \BODY\par
+  \fi:
+}
+
+\setkomafont{@solution}{\normalfont}
+
+\cs_new:Nn \TUDa_ex_solutionheader: {
+  \@solution*{\solutionname\solutionsep}
+}
+
+\box_new:N \g_TUDa_NumberForm_box
+\hbox_gset:Nn \g_TUDa_NumberForm_box {
+  \rule{\fboxrule}{1ex}
+  \rule{1em}{\fboxrule}
+  \rule{\fboxrule}{1ex}
+  \,
+}
+
+\newcommand*\TUDa@StudentID[1][7]{
+  \StudentIDname\StudentIDsep\prg_replicate:nn {#1} {\box_use:N \g_TUDa_NumberForm_box}
+}
+\let\StudentID\TUDa@StudentID
+
+\newcommand*\TUDa@StudentName{
+  \StudentNamename\StudentNamesep\hrulefill\qquad
+}
+\let\StudentName\TUDa@StudentName
+
+\let\ShortTitle\g_TUDa_shorttitle_tl
+
+% Compatibility Features
+
+\bool_if:NT \g_TUDa_ex_compatibility_bool {
+  \cs_set_eq:NN \c@subsection \c@task
+  \cs_set_eq:NN \subsection \task
+  \cs_set_eq:NN \c@subsubsection \c@subtask
+  \cs_set_eq:NN \subsubsection \subtask
+  \cs_set_eq:NN \thetask \thesubsection
+  \cs_set_eq:NN \thesubtask \thesubsection
+}
+
+\endinput
+%End of class tudaexercise.cls
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
index 09d47f5c82f..0f720d37e3a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 1.11 (2019/09/25),
+%% This is file `tudafonts.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,31 +26,42 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tudafonts}
  [\filedate\space\fileversion\space 
    font loading for TUDa-CI, TU Darmstadt's Corporate Design]
+
+\expandafter\newif\csname if@TUDa@T1\endcsname
    
+\DeclareOption{T1}{\csname @TUDa@T1true\endcsname}
+\ProcessOptions\relax
+
 \RequirePackage{iftex}
 \RequirePackage{anyfontsize}
 
 \ifPDFTeX
-	%Declare Euro Symbol
+        \csname @TUDa@T1true\endcsname
+        %Fallback for older versions
 	\expandafter\ifx\csname DeclareUnicodeCharacter\endcsname\relax
 	\RequirePackage[utf8]{inputenc}
+        \cs_if_exist:NF \texteuro {\RequirePackage{textcomp}}
+        \DeclareUnicodeCharacter{20AC}{\texteuro}
 	\fi
-	\RequirePackage{eurosym}
-	\DeclareUnicodeCharacter{20AC}{\euro}
-	\RequirePackage{XCharter}
 \else
 	\RequirePackage{fontspec}
+\fi
+
+\csname if@TUDa@T1\endcsname
+    \RequirePackage{XCharter}%activates T1
+    \PassOptionsToPackage{type1}{roboto}
+    \PassOptionsToPackage{type1}{roboto-mono}
+\else
 	\setmainfont{XCharter}
 \fi
 
 \RequirePackage{roboto}
-
 \IfFileExists{roboto-mono.sty}{
 	\RequirePackage{roboto-mono}
 }{
@@ -59,6 +70,7 @@
 	For correct font setup either install it manually or update you distribution}
 }
 
+
 \ifPDFTeX
 	\RequirePackage[T1]{fontenc}
 \fi
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
index 9dd30d37c61..7817e5cd0af 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 1.11 (2019/09/25),
+%% This is file `tudaletter.cls' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,11 +26,11 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\ProvidesExplPackage{tudaletter}
+\ProvidesExplClass{tudaletter}
 	{\filedate}{\fileversion}{Letters for TUDa-CI, Corporate Design of TU Darmstadt}
 
 \RequirePackage{l3keys2e}
@@ -406,7 +406,7 @@
 
 %pdfa
 \if_bool:N \g_TUDa@pdfa_bool
-\PassOptionsToPackage{a-1b}{pdfx}
+\PassOptionsToPackage{a-2b}{pdfx}
 \RequirePackage{pdfx}
 %%hyperref
 \hypersetup{hidelinks, unicode}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
index 856eb246867..7bc8f6a41fe 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
@@ -1,3 +1,33 @@
+%% This is file `tudalettersize10pt.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 %%  This is file `tudalettersize10pt.clo' version 1.0 (2018/12/12),
 %%  it is part of
 %%  TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
index d79e9169ebd..926ebc4cb92 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 1.11 (2019/09/25),
+%% This is file `tudaposter.cls' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
@@ -37,12 +37,13 @@
 \bool_new:N \g_TUDa_logo@inhead_bool
 \dim_new:N \g_TUDa_margin_dim
 \int_new:N \g_TUDa_paper_int
+\int_new:N \g_TUDa_postertype_int
 
 \keys_define:nn {TUDa/poster} {
 	accentcolor .code:n = {\PassOptionsToPackage{accent=#1}{tudacolors}},
-	color .meta:n = {accent=#1},
+	color .code:n = {\PassOptionsToPackage{color=#1}{tudacolors}},
 	textaccentcolor .code:n = {\PassOptionsToPackage{textaccent=#1}{tudacolors}},
-	identbarcolor .code:n = {\PassOptionsToPackage{indentbar=#1}{tudacolors}},
+	identbarcolor .code:n = {\PassOptionsToPackage{identbar=#1}{tudacolors}},
 	logo .choice:,
 	logo / head .code:n = {\bool_gset_true:N \g_TUDa_logo@inhead_bool},
 	logo / body .code:n = {\bool_gset_false:N \g_TUDa_logo@inhead_bool},
@@ -64,65 +65,63 @@
 	fontsize .initial:n = auto,
 	logofile .tl_gset:N = \g_TUDa_logofile_tl,
 	logofile .initial:n = tuda_logo,
+	type .choice:,
+	type / default .code:n = {
+		\int_gset:Nn \g_TUDa_postertype_int {1}
+	},
+	type / announcement .code:n = {
+		\int_gset:Nn \g_TUDa_postertype_int {2}
+		\keys_set:nn {TUDa/poster}{
+			marginpar=true,
+			indenttext=false,%allow overwrite - check default
+			logo=head,
+			title=small,
+			colorsubtitle=true
+		}
+	},
+	type .initial:n = default,
+	indenttext .bool_gset:N = \g_TUDa_indenttext_bool,
+	indenttext .initial:n = false,
+	indenttext .default:n = true,
+	marginpar .bool_gset:N = \g_TUDa_marginpar_bool,
+	marginpar / auto .meta:n = {marginpar = true} ,
+	marginpar .default:n = true,
+	marginpar .initial:n = false,
+	title .choice:,
+	title / default .meta:n = {title=large},
+	title / large .code:n = \bool_gset_false:N \g_TUDa_smalltitle_bool,
+	title / small  .code:n = \bool_gset_true:N \g_TUDa_smalltitle_bool,
+	title .initial:n = default,
+	colorsubtitle .bool_gset:N = \g_TUDa_colorsubtitle_bool,
+	colorsubtitle .default:n = true,
+	colorsubtitle .initial:n = false,
 }
 
 
 \ProcessKeysOptions{TUDa/poster}
 
+\ExplSyntaxOff
 \LoadClass[parskip=half-]{scrartcl}
+\ExplSyntaxOn
 
-\tl_if_empty:NT \l_keys_choice_tl {\keys_set:nn {TUDa/poster} {paper=a0}}
+\tl_if_empty:NT \g_TUDa_paper_tl {\keys_set:nn {TUDa/poster} {paper=a0}}
 
-
-
-\int_case:nn {\g_TUDa_paper_int}
-{
-	%paper=a0
-	{1} {
-		\cs_set:Nn \TUDa_title_fontsize: {{132pt}{148pt}}
-		\cs_set:Nn \TUDa_subtitle_fontsize: {{50pt}{62pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{45pt}{56pt}}
-		\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {30pt}}
-		\dim_gset:Nn \g_TUDa_margin_dim {30mm}
-	}
-	%paper=a1
-	{2} {
-		\cs_set:Nn \TUDa_title_fontsize: {{100pt}{124pt}}
-		\cs_set:Nn \TUDa_subtitle_fontsize: {{35pt}{42pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{30pt}{37pt}}
-		\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {25pt}}
-		\dim_gset:Nn \g_TUDa_margin_dim {30mm}
-	}
-	%paper=a2
-	{3} {
-		\cs_set:Nn \TUDa_title_fontsize: {{72pt}{84pt}}
-		\cs_set:Nn \TUDa_subtitle_fontsize: {{28pt}{34pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{25pt}{30pt}}
-		\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {25pt}}
-		\dim_gset:Nn \g_TUDa_margin_dim {30mm}
-	}
-	%paper=a3
-	{4} {
-		\cs_set:Nn \TUDa_title_fontsize: {{56pt}{68pt}}
-		\cs_set:Nn \TUDa_subtitle_fontsize: {{22pt}{28pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{19pt}{24pt}}
-		\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {17pt}}
-		\dim_gset:Nn \g_TUDa_margin_dim {15mm}
-	}
-	%paper=a4
-	{5} {
-		\cs_set:Nn \TUDa_title_fontsize: {{42pt}{52pt}}
-		\cs_set:Nn \TUDa_subtitle_fontsize: {{20pt}{25pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{17pt}{20pt}}
-		\tl_if_empty:NT \g_TUDa_fontsize_tl {\tl_gset:Nn \g_TUDa_fontsize_tl {14pt}}
-		\dim_gset:Nn \g_TUDa_margin_dim {15mm}
-	}
+\bool_if:NTF \g_TUDa_smalltitle_bool {
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_title_sizes:
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_base_sizes:
+}{
+	\int_gdecr:N \g_TUDa_paper_int
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_title_sizes:
+	\TUDa_setup_base_sizes:
 }
 
 
-\setkomafont{title}{\expandafter\fontsize\TUDa_title_fontsize:\selectfont}
-\setkomafont{subtitle}{\expandafter\fontsize\TUDa_subtitle_fontsize:\selectfont}
-\newkomafont{titleinfo}{\normalfont}
+\setkomafont{title}{\color{textonaccentcolor}\expandafter\fontsize\TUDa_title_fontsize:\selectfont}
+\setkomafont{subtitle}{\expandafter\fontsize\TUDa_titleinfo_fontsize:\selectfont}
+\newkomafont{titleinfo}{\expandafter\fontsize\TUDa_titleinfo_fontsize:\selectfont}
 
 
 \KOMAoptions{fontsize=\g_TUDa_fontsize_tl}
@@ -150,17 +149,65 @@
 \TUDa@makefootrule[width=\contentwidth, color=identbarcolor]{TUDa@smallrule}
 
 %%%%%%%%%%%%%%%%%%%%%%
-%
+\int_case:nn {\g_TUDa_postertype_int}
+{
+	{1} {}
+	{2} {
+		\addtokomafont{subtitle}{\bfseries}
+	}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%
+%marginpar option
+\dim_new:N \g_TUDa_marginpar_dim
 %%%%%%%%%%%%%%%%%%%%%%
+\dim_new:N \g_TUDa_titleindent_dim
+\begingroup
+\expandafter\fontsize\TUDa_title_fontsize:\selectfont
+	\dim_gset:Nn \g_TUDa_titleindent_dim {.5ex}
+\endgroup
+
+\dim_new:N \g_TUDa_columnSep_dim
+\dim_gset:Nn \g_TUDa_columnSep_dim {1em}
+
 \RequirePackage{geometry}
+
 \geometry{
 	margin= \g_TUDa_margin_dim,
+	hmargin = \dim_eval:n {
+		\g_TUDa_margin_dim +
+		\bool_if:NTF \g_TUDa_indenttext_bool
+		{\g_TUDa_titleindent_dim} {0pt}
+	},
 	top=\dim_eval:n {
 		\box_ht:N \TUDa@posterrule_box + \box_dp:N \TUDa@posterrule_box
 		+ .5\c_TUDa_logoheight_dim
 		+\g_TUDa_margin_dim}
 }
-\setlength\columnsep{\g_TUDa_margin_dim}
+
+\bool_if:NTF \g_TUDa_marginpar_bool {
+	\dim_gset:Nn \g_TUDa_marginpar_dim {2.2\c_TUDa_logoheight_dim}
+	\geometry{
+		includemp, marginpar=\g_TUDa_marginpar_dim, marginparsep=\g_TUDa_columnSep_dim,
+		right = \dim_eval:n {
+			\g_TUDa_margin_dim +
+			\bool_if:nTF {\g_TUDa_indenttext_bool && !\g_TUDa_marginpar_bool}
+			{\g_TUDa_titleindent_dim} {0pt}
+		},
+	}
+	\KOMAoptions{mpinclude}
+}{
+	\dim_gzero:N \g_TUDa_marginpar_dim
+	\geometry{
+		nomarginpar,
+		right = \dim_eval:n {
+			\bool_if:NT \g_TUDa_indenttext_bool
+			{\g_TUDa_titleindent_dim}
+			+ \g_TUDa_margin_dim
+		},
+	}
+	\KOMAoptions{mpinclude=false}
+}
 
 
 \bool_if:NT \g_TUDa_poster_foot_bool {
@@ -190,7 +237,9 @@
 	mode=picture,
 	contents={%
 		\tl_if_empty:NF \g_TUDa_poster_qrcode_tl {
- 		\raisebox{\depth}{\qrcode[height=\dim_eval:n {\g_TUDa_qrcode_dim-2\fboxsep}]{\g_TUDa_poster_qrcode_tl}}
+		\let\width\g_TUDa_qrcode_dim
+		\let\height\g_TUDa_qrcode_dim
+		\g_TUDa_poster_qrcode_tl
  		}
 	}
  	]{TUDa.poster.qrcode}
@@ -198,10 +247,10 @@
 
 \bool_if:NTF \g_TUDa_poster_foot_bool {
 	\DeclareNewLayer[
-		clone=TUDa.poster.qrcode,
+	clone=TUDa.poster.qrcode,
 	align=bl,
 	hoffset=\g_TUDa_margin_dim,
-	width=\textwidth,
+	width=\paperwidth-2\g_TUDa_margin_dim,
 	height=\g_TUDa_footheight_dim,
 	contents={
 		\putUL{\rule{\layerwidth}{.5\c_TUDa_smallrule_dim}}
@@ -215,14 +264,16 @@
 		clone=TUDa.poster.qrcode,
 		align=bl,
 		hoffset=\g_TUDa_margin_dim,
-		width=\textwidth,
+		width=\paperwidth-2\g_TUDa_margin_dim,
 		height=0pt,
 		contents={\smash{\rule{\layerwidth}{.5\c_TUDa_smallrule_dim}}}
 	]{TUDa.poster.footer}
 }
 
 \DeclareNewLayer[
-	textarea,background,mode=picture,
+	background,mode=picture,
+	width=\paperwidth-2\g_TUDa_margin_dim,
+	hoffset=\g_TUDa_margin_dim,
 	voffset=\g_TUDa_margin_dim+\box_ht:N \TUDa@posterrule_box + \box_dp:N \TUDa@posterrule_box,
 	contents={\color{accentcolor}\rule{\layerwidth}{\layerheight}}
 ]{TUDa.poster.background}
@@ -231,15 +282,16 @@
 	textarea,
 	foreground,
 	align=tr,
-	addhoffset=\textwidth,
+	hoffset=\paperwidth-\g_TUDa_margin_dim,
 	width=2.2\c_TUDa_logoheight_dim,
-	height=15cm,
+	height=.5\textheight,
 	contents={\box_use:N \g_TUDa_title_info_box}
 ]{TUDa.poster.logo}
 
 \DeclareNewLayer[
+	clone=TUDa.poster.background,
+%	textarea,
 	align=tl,
-	textarea,
 	voffset=\g_TUDa_margin_dim,
 	height=\box_ht:N \TUDa@posterrule_box + \box_dp:N \TUDa@posterrule_box,
 	mode=picture,
@@ -248,69 +300,104 @@
 	}
 ]{TUDa.poster.rule}
 
-\DeclareNewPageStyleByLayers{TUDa.poster}{TUDa.poster.rule,TUDa.poster.background,TUDa.poster.qrcode,TUDa.poster.footer}
+
+\RequirePackage{scrlayer-notecolumn}
+\DeclareNewLayer[
+	clone=notecolumn.marginpar,
+]{TUDa.poster.marginpar}
+
+\DeclareNewPageStyleByLayers{TUDa.poster.title}{TUDa.poster.rule,TUDa.poster.background,TUDa.poster.qrcode,TUDa.poster.footer}
+\DeclareNewPageStyleByLayers{TUDa.poster}{TUDa.poster.rule,TUDa.poster.qrcode,TUDa.poster.footer, TUDa.poster.marginpar}
+\pagestyle{TUDa.poster}
+
 
 \dim_new:N \g_TUDa_titlegraphic_max_height_dim
-\skip_new:N \g_TUDa_title_fill_skip 
+\dim_new:N  \g_TUDa_titleback_dim
+
+\newcommand*{\titleinfo}[1]{\def\@titleinfo{#1}}
+\titleinfo{}
 
 \renewcommand*{\maketitle}{
 	\begingroup
 	\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-	\vbox_gset:Nn \g_TUDa_title_box {
-		\usekomafont{title}
+	\bool_if:NT \g_TUDa_marginpar_bool
+		{\setlength{\linewidth}{\dim_eval:n  {\textwidth+\g_TUDa_marginpar_dim + \marginparsep}}}
+	\vbox_gset:Nn \g_TUDa_title_box
+	{
+		\usesizeofkomafont{title}
 		\parbox[t]{\linewidth}{
+			\bool_if:NT \g_TUDa_smalltitle_bool {\raisebox{
+					\dim_max:nn {0pt} {1.5\c_TUDa_logoheight_dim - \height}
+				}}
+			{
 			\begin{minipage}[b]{\bool_if:NT \g_TUDa_logo@inhead_bool {.75}\linewidth}
-				\begin{addmargin}{.5ex}
+				\leavevmode\par\nointerlineskip
+				\bool_if:NF \g_TUDa_indenttext_bool {\begin{addmargin}{\g_TUDa_titleindent_dim }}
+					\usekomafont{title}
 					\raggedright
 					\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
 					\leavevmode\usekomafont{disposition}\usekomafont{title}%
 					\@title\strut\par
-					\vskip0pt
-				\end{addmargin}
-			\end{minipage}%
-			\par\nointerlineskip
-			\TUDa@smallrule\usekomafont{subtitle}\par
-			\begin{addmargin}{.5ex}
-				\@subtitle\strut
-			\end{addmargin}
+				\bool_if:NTF \g_TUDa_indenttext_bool {\nointerlineskip\leavevmode}{\end{addmargin}}
+			\end{minipage}
+		}
+	\par\nointerlineskip
+	\exp_args:Nf \tl_if_empty:nF {\@subtitle\@titleinfo} {
+			\bool_if:NT \g_TUDa_indenttext_bool {\hspace*{-\g_TUDa_titleindent_dim}}\TUDa@smallrule\par
+			\vspace{\c_TUDa_rulesep_dim}
+			\nointerlineskip
+			\bool_if:NTF \g_TUDa_indenttext_bool {\begingroup}{\begin{addmargin}{\g_TUDa_titleindent_dim }}
+			\bool_if:NT \g_TUDa_colorsubtitle_bool {\color{textonaccentcolor}}
+			\tl_if_empty:NF \@subtitle {{\usekomafont{subtitle}\strut\@subtitle\strut\par}}
+			\tl_if_empty:NF \@titleinfo {{\usekomafont{titleinfo}\strut\@titleinfo\par}}
+			\vspace{\c_TUDa_rulesep_dim}
+			\bool_if:NTF \g_TUDa_indenttext_bool {\engroup} {\end{addmargin}}
 		 \par\nointerlineskip
+		 \bool_if:NT \g_TUDa_indenttext_bool {\hspace*{-\g_TUDa_titleindent_dim}
+		}
+		}
 		 \TUDa@smallrule
 		}
 	}
 	\endgroup
 
 	\TUDa_Setup_Title_box:
-	\dim_compare:nT {\box_ht:N \g_TUDa_title_box < 2\c_TUDa_logoheight_dim} {
-		\skip_set:Nn \g_TUDa_title_fill_skip {2\c_TUDa_logoheight_dim - \box_ht:N \g_TUDa_title_box}
-	}
-	\dim_set:Nn \l_tmpa_dim {\box_ht:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim+\g_TUDa_title_fill_skip}
+	\dim_gset:Nn \g_TUDa_titleback_dim {	
+		\bool_if:NT \g_TUDa_colorsubtitle_bool {\box_dp:N \g_TUDa_title_box}+
+				\box_ht:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim
+			}
 
 	\ModifyLayer[
-		height=\l_tmpa_dim
+		height=\g_TUDa_titleback_dim
 	]{TUDa.poster.background}
 	
-	\tl_if_empty:NF \g_TUDa_poster_qrcode_tl {
-		\ModifyLayer[addwidth=-\g_TUDa_qrcode_dim-\c_TUDa_rulesep_dim]{TUDa.poster.footer}
-	}
-	
 	\bool_if:NF \g_TUDa_logo@inhead_bool {
 		\ModifyLayer[
-		addvoffset=\l_tmpa_dim +\box_dp:N \g_TUDa_title_box+\c_TUDa_smallrule_dim
+		addvoffset=\g_TUDa_titleback_dim+\c_TUDa_smallrule_dim %+\box_dp:N \g_TUDa_title_box
 		]{TUDa.poster.logo}
 	}
+	
+	\DeclareLayer[
+		clone=TUDa.poster.marginpar,
+		height=\textheight-\box_ht:N \g_TUDa_title_box-\box_dp:N \g_TUDa_title_box-.5\c_TUDa_logoheight_dim,
+		addvoffset=\box_ht:N \g_TUDa_title_box+\box_dp:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim,
+	]{TUDa.poster.marginpar.title}
+
+	
+	\tl_if_empty:NF \g_TUDa_poster_qrcode_tl {
+		\ModifyLayer[addwidth=-\g_TUDa_qrcode_dim-\c_TUDa_rulesep_dim]{TUDa.poster.footer}
+	}
+	
+	\AddLayersToPageStyle{TUDa.poster.title}{TUDa.poster.marginpar.title}
+	\AddLayersToPageStyle{TUDa.poster.title}{TUDa.poster.logo}
 
-	\AddLayersToPageStyle{TUDa.poster}{TUDa.poster.logo}
 	\begingroup
 
 	\bool_if:NT \g_TUDa_logo@inhead_bool {
 		\dim_compare:nT {\box_ht:N \g_TUDa_title_info_box+ \box_dp:N \g_TUDa_title_info_box  > \box_ht:N \g_TUDa_title_box} 
 		{\msg_warning:nn {TUDaPoster} {infobox-too-high}}
 	}
-
-	\vspace*{\dim_eval:n {\g_TUDa_title_fill_skip-\topskip}}\nointerlineskip
-
-	\box_use:N \g_TUDa_title_box
- 
+	\leavevmode\box_use:N \g_TUDa_title_box\par
 	\dim_set:Nn \g_TUDa_titlegraphic_max_height_dim {\textheight-\pagetotal}
 	\global\def\contentheight{\g_TUDa_titlegraphic_max_height_dim}
 	\global\def\contentwidth{\linewidth}
@@ -318,8 +405,11 @@
 		\par\nointerlineskip
 		\vbox{\parbox[t]{\linewidth}{\@titlegraphic}}
 	}
-	\thispagestyle{TUDa.poster}
+	\thispagestyle{TUDa.poster.title}
 	\endgroup\par
+	\let\@title\@empty
+	\let\@subtitle\@empty
+	\let\@titleinfo\@empty
 }
 
 \global\def\contentwidth{\linewidth}
@@ -340,18 +430,54 @@
 \box_new:N \g_TUDa_title_info_box
 \box_new:N \g_TUDa_title_box
 
+\colorlet{TUDa@InfoBoxColor}{white}
+
 \cs_new:Nn \TUDa_make_title_info_box:n {
 	\usekomafont{titleinfo}
 	\setlength{\fboxsep}{.2\baselineskip}
-	\colorbox{white}{\hspace*{\dimexpr.2\c_TUDa_logoheight_dim-\fboxsep}%
+	\colorbox{TUDa@InfoBoxColor}{\hspace*{\dimexpr.2\c_TUDa_logoheight_dim-\fboxsep}%
 		\parbox{2\c_TUDa_logoheight_dim}{
 			\raggedright
 			#1
 	}}
 }
 
+\cs_new:Nn \TUDa_make_title_logo_box:n {
+	\setlength{\fboxsep}{\z@}%
+	\parbox{2.2\c_TUDa_logoheight_dim}{
+		\colorbox{TUDa@InfoBoxColor}{
+			\rlap{
+				\makebox[2.5\c_TUDa_logoheight_dim][r]{
+					\colorbox{TUDa@InfoBoxColor}{#1\hspace{.3\c_TUDa_logoheight_dim}}
+				}
+			}
+		}
+	}
+}
+
+
 \newcommand{\addTitleBox}[1]{\seq_gput_right:Nn \g_TUDa_title_info_seq {\TUDa_make_title_info_box:n {#1}}}
 
+\NewDocumentCommand{\addTitleBoxLogo}{sm}{
+	\IfBooleanTF{#1}{
+		\seq_gput_right:Nn \g_TUDa_title_info_seq {
+			\TUDa_make_title_logo_box:n {#2}
+		}
+	}{
+		\seq_gput_right:Nn \g_TUDa_title_info_seq {
+			\TUDa_make_title_logo_box:n {
+				\hbox_set:Nn \l_tmpa_box {
+					\includegraphics[width=1.5\c_TUDa_logoheight_dim]{#2}
+				}
+				\dim_set:Nn \l_tmpa_dim {2\c_TUDa_logoheight_dim/3}
+				\dim_compare:nTF {\box_ht:N \l_tmpa_box > \l_tmpa_dim}
+				{\includegraphics[width=\l_tmpa_dim]{#2}}
+				{\box_use:N \l_tmpa_box}
+			}
+		}
+	}
+}
+
 \cs_new:Nn \TUDa_Setup_Title_box: {
 	\hbox_gset:Nn \g_TUDa_title_info_box
 	{\parbox{2.2\c_TUDa_logoheight_dim}{
@@ -371,9 +497,12 @@
 
 \tl_new:N \g_TUDa_poster_qrcode_tl
 \newcommand*{\footerqrcode}[1]{
-	\tl_gset:Nn \g_TUDa_poster_qrcode_tl {#1}
+	\tl_gset:Nn \g_TUDa_poster_qrcode_tl
+	{\raisebox{\depth}{\qrcode[height={\g_TUDa_qrcode_dim}]{#1}}}
 }
 
+\newcommand*{\footerqrcodeimg}[1]{\tl_gset:Nn \g_TUDa_poster_qrcode_tl {#1}}
+
 
 \RedeclareSectionCommand[afterskip=1ex plus .2ex]{section}
 \RedeclareSectionCommand[afterskip=.2ex plus .2ex]{subsection}
@@ -383,4 +512,34 @@
 	You~should~probably~switch~to~logo=bottom~or~reduce~the~number/size~of~InfoBoxes.
 }
 
+\keys_define:nn {TUDa/poster/marginpar}{
+	valign .tl_set:N = \l_TUDa_marginpar_valign_tl,
+	valign .initial:n = t,
+}
+
+
+
+
+\newcommand*{\infofont}{\accentfont\normalcolor\footnotesize}
+\DeclareTextFontCommand{\infotext}{\infofont}
+
+\int_new:N \g_TUDa_marginpar_int
+
+\NewDocumentCommand{\SetMarginpar}{om}{
+	\bool_if:NF \g_TUDa_marginpar_bool {\msg_warning:nn {TUDa/Poster} {marginpar-disabled}}
+	\IfNoValueF{#1}{\keys_set:nn {TUDa/poster/marginpar} {#1}}
+	\ModifyLayer[contents={\parbox[t][\layerheight][\l_TUDa_marginpar_valign_tl]{\layerwidth}{#2}}]{TUDa.poster.marginpar}
+	\bool_set_true:N \l_tmpa_bool
+}
+
+\msg_new:nnnn {TUDa/Poster} {marginpar-disabled} {
+	You~are~adding~data~to~the~marginpar~box,~though~marginpar option is set to false.\\
+	I~will~add~it,~but~cannot~ensure~the~position.
+} {
+	I'd~suggest~to~switch~the~marginpar~option~to~true.
+	See~the~TUDa-CI~documentation~for~further~information.
+}
+
+\addtokomafont{captionlabel}{\accentfont}
+\addtokomafont{caption}{\accentfont}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
index 6fe60939034..35f91dda992 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 1.11 (2019/09/25),
+%% This is file `tudapub.cls' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudapub}
@@ -50,12 +50,11 @@
 
 \int_new:N \g_TUDa_ruledheaders_int
 \int_new:N \g_TUDa_paper_int
-
-%Message Declaration for option processing
-\msg_new:nnn {TUDaPub} {titlepage-option-disabled} {
-	You~set~the~titlepage~option~to~#1.\\
-	The~Corporate~Design~guidelines~for~TU~Darmstadt~do~not~support~this~option.\\
-	The~KOMA-Script~option~titlepage~is~forced~to~"firstiscover".
+\msg_new:nnnn {TUDa} {compatibility-only} {
+	You~used~the~outdated~#1~option.\\
+	This~only~exists~due~to~compatibility~reasons.
+}{
+	Please~look~at~tuda-ci~documentation~for~further~information~and~avoid~using~outdated~options.
 }
 
 \bool_new:N \g_TUDa_geometry_bool
@@ -100,6 +99,7 @@
 	},
 	ruledheaders .initial:n = all,
 	type .choices:nn = {publication, thesis} {\tl_gset_eq:NN \g_TUDa_pubType_tl \l_keys_choice_tl},
+	type / intern .code:n = {\keys_set:nn {TUDa/pub}  {titlepage=false, pdfa=false, IMRAD=false}},
 	type .initial:n = publication,
 	unknown .code:n = {\prop_gput:NVn \g_TUDa_unknown_clsopts_prop \l_keys_key_tl {#1}},
 	headline .choice:,
@@ -110,6 +110,7 @@
 	headline .initial:n =false,
 	colorback .bool_gset:N = \g_TUDa_colorback_bool,
 	colorback .initial:n = true,
+	colortitleback .code:n =  \msg_warning:nnx {TUDa} {compatibility-only} {\l_keys_key_tl}\keys_set:nn {TUDa/pub} {logo=head,colorback=false},
 	pdfa .bool_gset:N = \g_TUDa@pdfa_bool,
 	pdfa .initial:n = true,
 	twocolumn .bool_gset:N = \g_TUDa_twocolumn_bool,
@@ -128,7 +129,6 @@
 	logo / top .code:n = {\bool_gset_true:N \g_TUDa_logo@inhead_bool},
 	logo / bottom .code:n = {\bool_gset_false:N \g_TUDa_logo@inhead_bool},
 	logo .initial:n = {body},
-	titlepage .code:n = {\msg_warning:nnn {TUDaPub} {titlepage-option-disabled} {#1}},
 	paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{
 		\int_gset_eq:NN \g_TUDa_paper_int  \l_keys_choice_int
 		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
@@ -143,6 +143,11 @@
 	noinstbox .code:n = {\tl_gput_right:Nn \g_TUDa_thesis_options_tl {,noinstbox=#1}},
 	logofile .tl_gset:N = \g_TUDa_logofile_tl,
 	logofile .initial:n = tuda_logo,
+	title .choice:,
+	title / default .meta:n = {title=large},
+	title / large .code:n = \bool_gset_false:N \g_TUDa_smalltitle_bool,
+	title / small  .code:n = \bool_gset_true:N \g_TUDa_smalltitle_bool,
+	title .initial:n = default,
 }
 %
 %%special option handling grouped values
@@ -156,8 +161,11 @@
 \ProcessKeysOptions{TUDa/pub}
 
 
-
-\bool_if:NT  \g_TUDa@pdfa_bool {\PassOptionsToPackage{RGB}{xcolor}}
+%Option adjustments required for valid PDF/A
+\bool_if:NT  \g_TUDa@pdfa_bool {
+  \PassOptionsToPackage{RGB}{xcolor}
+  \PassOptionsToPackage{T1}{tudafonts}
+}
 
 \prop_gput:Nnx \g_TUDa_clsopts_prop {twocolumn} {\bool_if:NTF \g_TUDa_twocolumn_bool {true} {false}}
 
@@ -400,7 +408,7 @@
 
 
 
-\setkomafont{disposition}{\sffamily\bfseries}
+
 
 
 
@@ -413,10 +421,11 @@
 
 \usepackage{tudacolors}
 
-%TODO: mode -> light head. 
-
+\setkomafont{disposition}{\sffamily\bfseries}
 \setkomafont{pageheadfoot}{\sffamily\small}
 \setkomafont{pagenumber}{}
+\addtokomafont{captionlabel}{\accentfont}
+\addtokomafont{caption}{\accentfont}
 
 
 \KOMAoptions{footsepline=.5\c_TUDa_smallrule_dim}
@@ -467,27 +476,31 @@
 
 \setkomafont{pagehead}{\Large\bfseries}
 
-
 	\if@twocolumn
 	\edef\sls@evenheadshift{\dim_eval:n {-\marginparwidth-\marginparsep\relax}}
 	\let\sls@oddheadshift\sls@evenheadshift
 	\let\sls@evenfootshift\sls@evenheadshift
 	\let\sls@oddfootshift\sls@evenheadshift
 	\fi
-	\ModifyLayer[
+	\RedeclareLayer[
+		clone=scrheadings.head.above.line,
 		background,
-		mode=picture,
 		contents={
 			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
 				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
 			}
 			\smash{\TUDa@headline}
 		}
-	]{TUDa.head.above.line}	
-	\ModifyLayer[
+	]{TUDa.head.above.line}
+	\RedeclareLayer[
+		clone=plain.scrheadings.head.above.line,
 		background,
-		mode=picture,
-		contents={\smash{\TUDa@headline}}
+		contents={
+			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
+				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+			}
+			\smash{\TUDa@headline}
+		}
 	]{plain.TUDa.head.above.line}
 	\bool_if:NT \g_TUDa_headline_bool {
 		\clist_map_variable:nNn {oneside, even, odd} \l_tmpa_tl {
@@ -526,7 +539,7 @@
 \box_new:N  \g_TUDa_title_box 
 \skip_new:N \g_TUDa_title_fill_skip
 
-\renewcommand{\titlepagestyle}{title.TUDa}
+\renewcommand{\titlepagestyle}{TUDa}
 
 
 \seq_new:N \g_TUDa_author_seq
@@ -559,152 +572,6 @@
 	You~should~probably~switch~to~logo=bottom~or~reduce~the~number/size~of~InfoBoxes.
 }
 
-\exp_args:NV \tl_if_eq:nnTF {\g_TUDa_pubType_tl}  {thesis} {
-	\input{tudathesis.cfg}
-} {
-
-\msg_new:nnnn {TUDa/pub} {only-thesis} {You~tried~to~use~\use:c { #1}.~This~macro~is~only~available~for~publications~of~type~thesis}{See~tuda-ci~documentation~for~further~information}
-
-\clist_map_inline:nn {birthplace, group, examdate, submissiondate, tuprints, urn, reviewer} {
-	\expandafter\newcommand\csname #1\endcsname[2][]{
-		\msg_error:nnn {TUDa/pub} {only-thesis} {#1}
-	}
-}
-\newcommand*{\TUDa@title@footnote}[2][1]{
-\textsuperscript{\@fnsymbol{#1}}#2
-}
-
-
-
-
-\renewcommand*{\maketitle}[1][1]{
-	\def\and{,~ }
-	\cs_if_exist_use:N \TUDa_pass_TitleData:
-	\TUDa_disable_marginpar:
-	\cleardoublepage
-	\begin{titlepage}
-		\setcounter{page}{%
-			#1%
-		}%
-		\def\thefootnote{\fnsymbol{footnote}}
-		\if@titlepageiscoverpage
-		\edef\titlepage@restore{%
-			\noexpand\endgroup
-			\noexpand\global\noexpand\@colht\the\@colht
-			\noexpand\global\noexpand\@colroom\the\@colroom
-			\noexpand\global\vsize\the\vsize
-			\noexpand\global\noexpand\@titlepageiscoverpagefalse
-			\noexpand\let\noexpand\titlepage@restore\noexpand\relax
-		}%
-		\begingroup
-		\topmargin=\dimexpr \coverpagetopmargin-1in\relax
-		\oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
-		\evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
-		\textwidth=\dimexpr
-		\paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
-		\textheight=\dimexpr
-		\paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
-		\headheight=0pt
-		\headsep=0pt
-		\footskip=\baselineskip
-		\@colht=\textheight
-		\@colroom=\textheight
-		\vsize=\textheight
-		\columnwidth=\textwidth
-		\hsize=\columnwidth
-		\linewidth=\hsize
-		\else
-		\let\titlepage@restore\relax
-		\fi
-		\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-		\hbox_gset:Nn \g_TUDa_title_box {
-			\parbox[t]{\linewidth}{
-				\begin{minipage}[b]{\bool_if:NT \g_TUDa_logo@inhead_bool {.75}\linewidth}
-					\begin{addmargin}{3mm}
-						\raggedright
-						\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
-						\leavevmode\usekomafont{title}%
-						\expandafter\fontsize\TUDa_title_fontsize:
-						\selectfont
-						\@title\strut\par
-						\vskip0pt
-					\end{addmargin}
-				\end{minipage}%
-				\par\nointerlineskip
-				\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
-				\begin{addmargin}{3mm}
-					\expandafter\fontsize\TUDa_titleinfo_fontsize:
-					\selectfont
-					{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
-					{\ifx\@subject\@empty\else\usekomafont{subject}{\@subject\par}\fi}
-					{%
-						\usekomafont{author}
-						\lineskip 0.75em
-						\@author
-						\par
-					}%
-					{\usekomafont{date}{\@date\par}}%
-					{\usekomafont{publishers}{\@publishers \par}}%
-				\end{addmargin}
-			\tl_if_empty:NF \@thanks {
-			\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont\par
-			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
-			\begin{addmargin}{3mm}
-				\let\footnotetext\TUDa@title@footnote
-				\@thanks
-			\end{addmargin}
-				\par\vspace{-\dp\strutbox}
-				\let\@thanks\@empty
-			}
-			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par}
-		
-		}
-			
-		\TUDa_adjust_titlepage_style:
-		
-
-		\nointerlineskip\box_use:N \g_TUDa_title_box
-		\par
-		\vfill\null
-		\if@twoside
-		\@tempswatrue
-		\expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
-		\else
-		\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
-		\@tempswafalse
-		\fi\fi
-		\fi
-		\if@tempswa
-		\next@tpage
-		\begin{minipage}[t]{\textwidth}
-			\@uppertitleback
-		\end{minipage}\par
-		\vfill
-		\begin{minipage}[b]{\textwidth}
-			\@lowertitleback
-		\end{minipage}\par
-		\@thanks\let\@thanks\@empty
-		\fi
-		\fi
-		\ifx\@dedication\@empty
-		\else
-		\next@tdpage\null\vfill
-		{\centering\usekomafont{dedication}{\@dedication \par}}%
-		\vskip \z@ \@plus3fill
-		\@thanks\let\@thanks\@empty
-		\cleardoubleemptypage
-		\fi
-		\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
-	\end{titlepage}
-	\setcounter{footnote}{0}%
-	\global\let\and\relax
-	\cleardoublepage
-	\TUDa_restore_typearea:
-	\aftergroup\TUDa_restore_typearea:
-}
-
-
-}
 
 \cs_set:Nn 	\TUDa_adjust_titlepage_style: {
 	\dim_set:Nn \l_tmpa_dim {\fp_to_dim:n {\expandafter \use_ii:nn\TUDa_title_fontsize: *2.8}}
@@ -770,55 +637,11 @@
 \setkomafont{author}{}
 \setkomafont{date}{}
 
-%TODO finish font setup
-
-\int_case:nn {\g_TUDa_paper_int}
-{
-	%paper=a0
-	{1} {
-		\cs_set:Nn \TUDa_title_fontsize: {{125pt}{165pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{42pt}{55pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{28pt}{35pt}}
-	}
-	%paper=a1
-	{2} {
-		\cs_set:Nn \TUDa_title_fontsize: {{86pt}{120pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{35pt}{42pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{22pt}{26pt}}
-	}
-	%paper=a2
-	{3} {
-		\cs_set:Nn \TUDa_title_fontsize: {{65pt}{82pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{22pt}{28pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{14pt}{20pt}}
-	}
-	%paper=a3
-	{4} {
-		\cs_set:Nn \TUDa_title_fontsize: {{47pt}{61pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{16pt}{20pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{12pt}{16pt}}
-	}
-	%paper=a4
-	{5} {
-		\cs_set:Nn \TUDa_title_fontsize: {{36pt}{47pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{12pt}{14pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{10pt}{11.5pt}}
-	}
-	%paper=a5
-	{6} {
-		\cs_set:Nn \TUDa_title_fontsize: {{22pt}{28pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{10pt}{11.5pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{10pt}{11.5pt}}
-	}
-	%paper=a6
-	{7} {
-		\cs_set:Nn \TUDa_title_fontsize: {{14pt}{16pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{9pt}{10pt}}	
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{9pt}{10pt}}
-	}
+\bool_if:NF \g_TUDa_smalltitle_bool {
+	\int_gdecr:N \g_TUDa_paper_int
 }
-
-
+\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+\TUDa_setup_title_sizes:
 
 \seq_new:N \g_TUDa_title_info_seq 
 \box_new:N \g_TUDa_title_info_box
@@ -919,7 +742,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\hbox_gset:Nn \g_TUDa_title_info_box
 	{
 		\parbox{\dimexpr2.5\c_TUDa_logoheight_dim}{
-		\seq_use:Nn \g_TUDa_title_info_seq  {\par\nointerlineskip\vspace{5mm}}
+		\seq_use:Nn \g_TUDa_title_info_seq  {\par\nointerlineskip\vspace{\dim_eval:n {\c_TUDa_largerule_dim+\c_TUDa_rulesep_dim}}}
 		}
 	}
 }
@@ -938,7 +761,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	}
 
 
-	\PassOptionsToPackage{a-1b}{pdfx}
+	\PassOptionsToPackage{a-2b}{pdfx}
 	\RequirePackage{pdfx}
 	
 	\sys_if_engine_pdftex:T {
@@ -1030,6 +853,285 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\newcommand{\Metadata}[1]{\ClassError{tudapub}{You~cannot~use~\string\Metadata\ ~with~pdfa=false.}{}}
 \fi:
 
+\csname if@TUDa@T1\endcsname
+\ifLuaTeX
+\RequirePackage[utf8]{luainputenc}
+\fi
+\fi
+
+\exp_args:NV \tl_if_eq:nnTF {\g_TUDa_pubType_tl}  {thesis} {
+	\input{tudathesis.cfg}
+} {
+
+\msg_new:nnnn {TUDa/pub} {only-thesis} {You~tried~to~use~\use:c { #1}.~This~macro~is~only~available~for~publications~of~type~thesis}{See~tuda-ci~documentation~for~further~information}
+
+\clist_map_inline:nn {birthplace, group, examdate, submissiondate, tuprints, urn, reviewer} {
+	\expandafter\newcommand\csname #1\endcsname[2][]{
+		\msg_error:nnn {TUDa/pub} {only-thesis} {#1}
+	}
+}
+\newcommand*{\TUDa@title@footnote}[2][1]{
+\textsuperscript{\@fnsymbol{#1}}#2
+}
+
+% The following macro is an adapted version of the corresponding KOMA-Script macro
+% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+\renewcommand*{\maketitle}[1][1]{
+	\def\and{,~ }
+	\cs_if_exist_use:N \TUDa_pass_TitleData:
+	\if@titlepage
+	\TUDa_disable_marginpar:
+	\begin{titlepage}
+		\setcounter{page}{%
+			#1%
+		}%
+		\def\thefootnote{\fnsymbol{footnote}}
+		\if@titlepageiscoverpage
+		\edef\titlepage@restore{%
+			\noexpand\endgroup
+			\noexpand\global\noexpand\@colht\the\@colht
+			\noexpand\global\noexpand\@colroom\the\@colroom
+			\noexpand\global\vsize\the\vsize
+			\noexpand\global\noexpand\@titlepageiscoverpagefalse
+			\noexpand\let\noexpand\titlepage@restore\noexpand\relax
+		}%
+		\begingroup
+		\topmargin=\dimexpr \coverpagetopmargin-1in\relax
+		\oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+		\evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+		\textwidth=\dimexpr
+		\paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+		\textheight=\dimexpr
+		\paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+		\headheight=0pt
+		\headsep=0pt
+		\footskip=\baselineskip
+		\@colht=\textheight
+		\@colroom=\textheight
+		\vsize=\textheight
+		\columnwidth=\textwidth
+		\hsize=\columnwidth
+		\linewidth=\hsize
+		\else
+		\let\titlepage@restore\relax
+		\fi
+		\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+		\hbox_gset:Nn \g_TUDa_title_box {
+			\parbox[t]{\linewidth}{
+				\begin{minipage}[b]{\bool_if:NT \g_TUDa_logo@inhead_bool {.75}\linewidth}
+					\bool_if:NT \g_TUDa_logo@inhead_bool {\color{textonaccentcolor}}
+					\begin{addmargin}{3mm}
+						\raggedright
+						\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
+						\leavevmode\usekomafont{title}%
+						\expandafter\fontsize\TUDa_title_fontsize:
+						\selectfont
+						\@title\strut\par
+						\vskip0pt
+					\end{addmargin}
+				\end{minipage}%
+				\par\nointerlineskip
+				\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
+				\begin{addmargin}{3mm}
+					\expandafter\fontsize\TUDa_titleinfo_fontsize:
+					\selectfont
+					{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
+					{\ifx\@subject\@empty\else\usekomafont{subject}{\@subject\par}\fi}
+					{%
+						\usekomafont{author}
+						\lineskip 0.75em
+						\@author
+						\par
+					}%
+					{\usekomafont{date}{\@date\par}}%
+					{\usekomafont{publishers}{\@publishers \par}}%
+				\end{addmargin}
+			\tl_if_empty:NF \@thanks {
+			\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont\par
+			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
+			\begin{addmargin}{3mm}
+				\let\footnotetext\TUDa@title@footnote
+				\@thanks
+			\end{addmargin}
+				\par\vspace{-\dp\strutbox}
+				\let\@thanks\@empty
+			}
+			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par}
+		
+		}
+			
+		\TUDa_adjust_titlepage_style:
+		
+
+		\nointerlineskip\box_use:N \g_TUDa_title_box
+		\par
+		\vfill\null
+		\if@twoside
+		\@tempswatrue
+		\expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+		\else
+		\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+		\@tempswafalse
+		\fi\fi
+		\fi
+		\if@tempswa
+		\next@tpage
+		\begin{minipage}[t]{\textwidth}
+			\@uppertitleback
+		\end{minipage}\par
+		\vfill
+		\begin{minipage}[b]{\textwidth}
+			\@lowertitleback
+		\end{minipage}\par
+		\@thanks\let\@thanks\@empty
+		\fi
+		\fi
+		\ifx\@dedication\@empty
+		\else
+		\next@tdpage\null\vfill
+		{\centering\usekomafont{dedication}{\@dedication \par}}%
+		\vskip \z@ \@plus3fill
+		\@thanks\let\@thanks\@empty
+		\cleardoubleemptypage
+		\fi
+		\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
+	\end{titlepage}
+	\setcounter{footnote}{0}%
+	\global\let\and\relax
+	\cleardoublepage
+	\TUDa_restore_typearea:
+	\aftergroup\TUDa_restore_typearea:
+	\else
+	\par
+	\@tempcnta=%
+	#1%
+	\relax\ifnum\@tempcnta=1\else
+	\ClassWarning{\KOMAClassName}{%
+		Optional argument of \string\maketitle\space ignored\MessageBreak
+		in `titlepage=false' mode%
+	}%
+	\fi
+	\ifx\@uppertitleback\@empty\else
+	\ClassWarning{\KOMAClassName}{%
+		non empty \string\uppertitleback\space ignored
+		by \string\maketitle\MessageBreak
+		in `titlepage=false' mode%
+	}%
+	\fi
+	\ifx\@lowertitleback\@empty\else
+	\ClassWarning{\KOMAClassName}{%
+		non empty \string\lowertitleback\space ignored
+		by \string\maketitle\MessageBreak
+		in `titlepage=false' mode%
+	}%
+	\fi
+	\begingroup
+	\let\titlepage@restore\relax
+	\def\thefootnote{\fnsymbol{footnote}}
+	\next@tdpage
+		\ifx\@extratitle\@empty
+			\ifx\@frontispiece\@empty\else \mbox{}\fi
+		\else
+		\@makeextratitle
+		\fi
+		\ifx\@frontispiece\@empty
+		\ifx\@extratitle\@empty\else\next@tdpage\fi
+		\else
+		\next@tpage
+		\@makefrontispiece
+		\next@tdpage
+		\fi
+	\@maketitle
+	\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
+	\@thanks\global\let\@thanks\@empty
+	\endgroup
+	\fi
+}
+
+
+}
+
+\renewcommand*{\@maketitle}{%
+	\global\@topnum=\z@
+	\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+	\vspace*{-\dim_eval:n {
+			\headheight
+			+\headsep
+			+\topskip
+			-\box_ht:N\TUDa@headline_box
+			-\box_dp:N \TUDa@headline_box
+%			-\dp\strutbox
+	}}
+	\par
+	\nointerlineskip
+	\begingroup
+	\usekomafont{disposition}
+	\hsize=\g_TUDa_headwidth_dim
+	\raisebox{\dim_eval:n {
+			-.5\c_TUDa_logoheight_dim
+	}}[0pt][.5\c_TUDa_logoheight_dim]{
+		\bool_if:NT \g_TUDa_colorback_bool {\color{accentcolor}\rule{\g_TUDa_headwidth_dim}{.5\c_TUDa_logoheight_dim}}
+	}
+	\par\nointerlineskip
+	\setlength{\fboxsep}{\z@}
+	\bool_if:NT \g_TUDa_colorback_bool {\colorbox{accentcolor}}{\parbox[t]{\g_TUDa_headwidth_dim}{
+			\raisebox{-\height}{%
+				\begin{minipage}[t]{\dimexpr\linewidth-2.2\c_TUDa_logoheight_dim-1ex}
+					\bool_if:NT \g_TUDa_colorback_bool  {\begin{addmargin}{.5\c_TUDa_largerule_dim}}
+						\raggedright
+						\bool_if:NT \g_TUDa_colorback_bool {\color{textonaccentcolor}}
+						\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
+						\leavevmode
+						{\Huge\usekomafont{title}{
+						\Huge
+						\@title \par
+						}}%
+						\vskip 1em
+						\bool_if:NTF \g_TUDa_colorback_bool {\end{addmargin}} {\par}
+			\vspace{\dim_eval:n {\c_TUDa_largerule_dim+\c_TUDa_rulesep_dim}}
+			\end{minipage}
+		}
+		\hfill
+		\raisebox{-\height}{
+		\TUDa_Setup_Title_box:
+		\makebox[2.2\c_TUDa_logoheight_dim][l]{
+		\box_use:N \g_TUDa_title_info_box
+		}
+		}
+		\dim_compare:nNnTF {\box_ht:N \g_TUDa_title_info_box + \box_ht:N \g_TUDa_title_info_box} > {1.1\c_TUDa_logoheight_dim}
+				{\vspace{\c_TUDa_largerule_dim}}
+				{\vspace{.5\c_TUDa_logoheight_dim}}
+
+		\par
+	}}
+	\par
+	\nointerlineskip
+	\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
+	\begin{addmargin}{.5\c_TUDa_largerule_dim}
+	\Large
+	\clist_map_inline:nn {subtitle, subject, author, date, publishers}
+		{\tl_if_empty:cF {@##1} {{\usekomafont{##1}\use:c {@##1}\par}}}
+	\vspace{\c_TUDa_rulesep_dim}
+	\end{addmargin}
+	\tl_if_empty:NF \@thanks {
+	\par\nointerlineskip
+	\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
+	\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont
+	\begin{addmargin}{.5\c_TUDa_largerule_dim}
+		\let\footnotetext\TUDa@title@footnote
+		\@thanks
+		\vspace{\c_TUDa_rulesep_dim}
+	\end{addmargin}
+	\par
+	\let\@thanks\@empty
+	}
+	\par\nointerlineskip
+		\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
+	\par
+	\endgroup
+	\vskip .5\c_TUDa_logoheight_dim
+}%
+
 %%Abstract anpassungen mit Sprache
 \providecommand{\abstract}{}% für book
 \RenewDocumentEnvironment{abstract}{o}{
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
index 2304752f24b..6801f5956da 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 1.11 (2019/09/25),
+%% This is file `tudarules.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
index b4d813c5dfd..0065c285e59 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 1.11 (2019/09/25),
+%% This is file `tudasciposter.cls' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
@@ -67,6 +67,11 @@
 	fontsize .code:n = \prop_gput:Nnn \g_TUDa_clsopts_prop {fontsize} {#1},
 	logofile .tl_gset:N = \g_TUDa_logofile_tl,
 	logofile .initial:n = tuda_logo,
+	title .choice:,
+	title / default .meta:n = {title=large},
+	title / large .code:n = \bool_gset_false:N \g_TUDa_smalltitle_bool,
+	title / small  .code:n = \bool_gset_true:N \g_TUDa_smalltitle_bool,
+	title .initial:n = default,
 }
 
 
@@ -75,39 +80,17 @@
 
 \ProcessKeysOptions{TUDa/poster}
 
-
-\int_case:nn {\g_TUDa_paper_int}
-{
-	%paper=a0
-	{1} {		%{130pt}{146pt}
-		\cs_set:Nn \TUDa_title_fontsize: {{125pt}{165pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{42pt}{55pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{28pt}{35pt}}
-		\prop_gput_if_new:Nnn \g_TUDa_clsopts_prop {fontsize} {30pt}
-		\dim_const:Nn \c_TUDa_margin_dim {30mm}
-	}
-	%paper=a1
-	{2} {
-		\cs_set:Nn \TUDa_title_fontsize: {{86pt}{120pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{35pt}{42pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{22pt}{26pt}}
-		\prop_gput_if_new:Nnn \g_TUDa_clsopts_prop {fontsize} {21pt}
-		\dim_const:Nn \c_TUDa_margin_dim {30mm}
-	}
-	%paper=a2
-	{3} {
-		\cs_set:Nn \TUDa_title_fontsize: {{65pt}{82pt}}
-		\cs_set:Nn \TUDa_titleinfo_fontsize: {{22pt}{28pt}}
-		\cs_set:Nn \TUDa_titlethanks_fontsize: {{14pt}{20pt}}
-		\prop_gput_if_new:Nnn \g_TUDa_clsopts_prop {fontsize} {15pt}
-		\dim_const:Nn \c_TUDa_margin_dim {30mm}
-	}
-	%paper=a3
-	{4} {
-		\cs_set:Nn \TUDa_title_fontsize: {{47pt}{61pt}}
-		\prop_gput_if_new:Nnn \g_TUDa_clsopts_prop {fontsize} {11pt}
-		\dim_const:Nn \c_TUDa_margin_dim {15mm}
-	}
+\dim_new:N \g_TUDa_margin_dim
+\bool_if:NTF \g_TUDa_smalltitle_bool {
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_title_sizes:
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_base_sizes:
+}{
+	\int_gdecr:N \g_TUDa_paper_int
+	\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
+	\TUDa_setup_title_sizes:
+	\TUDa_setup_base_sizes:
 }
 
 
@@ -163,7 +146,7 @@
 \box_new:N \g_TUDa_credit_box
 
 \TUDa@makeheadrule[
-	width=\paperwidth-2\c_TUDa_margin_dim,
+	width=\paperwidth-2\g_TUDa_margin_dim,
  	color=identbarcolor
  	]{TUDa@posterrule}
 
@@ -214,7 +197,7 @@
 %%%%%%%%%%%%%%%%%%%
 %PDFA
 \if_bool:N \g_TUDa@pdfa_bool
-\PassOptionsToPackage{a-1b}{pdfx}
+\PassOptionsToPackage{a-2b}{pdfx}
 \RequirePackage{pdfx}
 %%hyperref
 \hypersetup{hidelinks, unicode, hyperfootnotes=false}
@@ -341,7 +324,7 @@
 }
 
 \newlength{\contentwidth}
-\setlength{\contentwidth}{\dimexpr\paperwidth-2\c_TUDa_margin_dim\relax}
+\setlength{\contentwidth}{\dimexpr\paperwidth-2\g_TUDa_margin_dim\relax}
 \newlength{\contentheight}
 
 
@@ -350,14 +333,14 @@
 	{
 		spread,
 		parbox=false,
-		bottom=\dim_eval:n {\c_TUDa_margin_dim
+		bottom=\dim_eval:n {\g_TUDa_margin_dim
 			\bool_if:NT \g_TUDa_poster_foot_bool {+\g_TUDa_footheight_dim + 3\c_TUDa_rulesep_dim}
 		},
-		left=\c_TUDa_margin_dim,
-		right=\c_TUDa_margin_dim,
+		left=\g_TUDa_margin_dim,
+		right=\g_TUDa_margin_dim,
 		before= {\TUDa@poster_setup_title_box:},
 		top= \dim_eval:n {
-			\c_TUDa_margin_dim
+			\g_TUDa_margin_dim
 			+\box_ht:N \TUDa@posterrule_box
 			+\box_dp:N \TUDa@posterrule_box
 +			\g_TUDa_titleblock_dim
@@ -366,10 +349,10 @@
 			+\box_dp:N \g_TUDa_author_box
 		},
 		overlay={%
-			\coordinate(topleft) at ([xshift=\c_TUDa_margin_dim, yshift=-\c_TUDa_margin_dim]current~page.north~ west);
-			\coordinate(topright) at ([xshift=-\c_TUDa_margin_dim, yshift=-\c_TUDa_margin_dim]current~page.north~ east);
-			\coordinate(bottomleft) at ([xshift=\c_TUDa_margin_dim, yshift=\c_TUDa_margin_dim]current~page.south~ west);
-			\coordinate(bottomright) at ([xshift=-\c_TUDa_margin_dim, yshift=\c_TUDa_margin_dim]current~page.south~ east);
+			\coordinate(topleft) at ([xshift=\g_TUDa_margin_dim, yshift=-\g_TUDa_margin_dim]current~page.north~ west);
+			\coordinate(topright) at ([xshift=-\g_TUDa_margin_dim, yshift=-\g_TUDa_margin_dim]current~page.north~ east);
+			\coordinate(bottomleft) at ([xshift=\g_TUDa_margin_dim, yshift=\g_TUDa_margin_dim]current~page.south~ west);
+			\coordinate(bottomright) at ([xshift=-\g_TUDa_margin_dim, yshift=\g_TUDa_margin_dim]current~page.south~ east);
 			
 		
 			\node[inner~sep=0pt, anchor=north~west](identbar) at (topleft){\TUDa@posterrule};
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
index f08afc30bab..b58ac6004b6 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
@@ -1,3 +1,33 @@
+%% This is file `tudasize9pt.clo' version 2.0 (2019/11/07),
+%% it is part of
+%% TUDa-CI -- Corporate Design for TU Darmstadt
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2018--2019 by Marei Peischl <marei@peitex.de>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%%   Marei Peischl <tuda-ci@peitex.de>
+%%   Markus Lazanowski <latex@ce.tu-darmstadt.de>
+%%
+%% The development respository can be found at
+%% https://github.com/tudace/tuda_latex_templates
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 %%  This is file `tudasize9pt.clo' version 1.0 (2018/12/12),
 %%  it is part of
 %%  TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
index 4dd6d13762e..97d864ac87a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 1.11 (2019/09/25),
+%% This is file `tudathesis.cfg' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudathesis.cfg}
 {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)}
@@ -86,7 +86,7 @@
 	\str_case:nnTF {#1} {
 		{ce}{\TUDa_declare_caption:Nnn \TUDa@department {Computational\nobreakspace Engineering}{Computational\nobreakspace Engineering}}
 		{ese}{\TUDa_declare_caption:Nnn \TUDa@department {Energy~Science~and~Engineering}{Energy~Science~and~Engineering}}
-		{ist}{\TUDa_declare_caption:Nnn \TUDa@department {Information~Systems~Engineering}{Information~Systems~Engineering}}
+		{ist}{\TUDa_declare_caption:Nnn \TUDa@department {Information~Systems~Technology}{Information~Systems~Technology}}
 		{mech}{\TUDa_declare_caption:Nnn \TUDa@department {Mechanik}{Mechanics}}
 		{metro}{\TUDa_declare_caption:Nnn \TUDa@department {Mechatronik}{Mechatronics}}
 	}
@@ -120,9 +120,9 @@
 		\clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, date}
 		\bool_gset_false:N \g_TUDa_dr_bool
 	},
-%	type/diplom  .code:n = {\def\TUDa@thesisType{Diplomarbeit}\clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, date, reviewer, department}},
+%	type/diplom  .code:n = {\def\TUDa@thesisType{Diplomarbeit}\clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, submissiondate, reviewer, department}},
 	type/bsc  .meta:n = {type=bachelor},
-	type/bachelor  .code:n = \TUDa_declare_caption:Nnn \TUDa@thesisType{Bachelorarbeit}{bachelor~ thesis}\bool_gset_false:N \g_TUDa_dr_bool,
+	type/bachelor  .code:n = {\TUDa_declare_caption:Nnn \TUDa@thesisType{Bachelorarbeit}{bachelor~ thesis} \clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, submissiondate, department, reviewer}\bool_gset_false:N \g_TUDa_dr_bool},
 	type/pp  .code:n = {\def\TUDa@thesisType{Project-Proposal}\clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, date, department}\bool_gset_false:N \g_TUDa_dr_bool},
 	type/msc  .meta:n = {type=master},
 	type/master  .code:n = \TUDa_declare_caption:Nnn \TUDa@thesisType{Masterarbeit}{master~ thesis} \clist_gset:Nn \g_TUDa_Required_title_data_clist {title, author, submissiondate, department, reviewer}\bool_gset_false:N \g_TUDa_dr_bool,
@@ -245,7 +245,7 @@
 \newcommand*{\TUDa@thesis@dates}[1][,~]{
 	\bool_set_false:N \l_tmpa_bool
 	\tl_if_empty:NF \@date {
-		\TUDa@datename\tl_if_empty:NF \TUDa@datename {\TUDa@dateseparator}\TUDa@submissiondate
+		\TUDa@datename\tl_if_empty:NF \TUDa@datename {\TUDa@dateseparator}\@date
 		\bool_set_true:N  \l_tmpa_bool
 	}
 	\tl_if_empty:NF \TUDa@submissiondate {
author	Karl Berry <karl@freefriends.org>	2019-11-08 21:41:19 +0000
committer	Karl Berry <karl@freefriends.org>	2019-11-08 21:41:19 +0000
commit	ad12eac5a9018d44b7c837f103bc6f9d896e9180 (patch)
tree	f2f90642d5edbe829adf6c389f18e71f4ac6f87e /Master
parent	cee1b7f2580148a33ae6cc0631c56c7e35ce0bff (diff)