tudscr (27jan17)

git-svn-id: svn://tug.org/texlive/trunk@43067 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 3381 insertions, 3047 deletions

diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index 796761d1788..b4cd3a6bb01 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -10,37 +10,30 @@
 %% tudscr-comp.dtx  (with options: `package,fontsfix,option')
 %% tudscr-comp.dtx  (with options: `package,fontsfix,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -62,7 +55,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
@@ -75,7 +68,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{fix-tudscrfonts}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package for font fixes
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index be4fca64f63..9dee2001aef 100644
--- a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
@@ -6,37 +6,30 @@
 %%
 %% tudscr-mathswap.dtx  (with options: `package')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-mathswap.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathswap}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (swap mathematical separators)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
index 16a89f7e51d..3e6f2143a55 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
@@ -27,37 +27,30 @@
 %% tudscr-comp.dtx  (with options: `class,article,body')
 %% tudscr-misc.dtx  (with options: `class,article,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -79,24 +72,24 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
-  \@ifundefined{TUD@Class@Parent}{%
+  \ifx\TUD@Class@Parent\@undefined%
     \newcommand*\TUD@Class@Name{#1}%
     \TUD@Class@Info%
-  }{}%
+  \fi%
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -335,8 +328,8 @@
       \cs@set@lock{tud@cdgeometry@num}{1}%
     \fi%
     \@tempswafalse%
-    \ifx\@tempb\tud@cdgeometry@num\relax\@tempswatrue\fi%
-    \ifx\@tempc\tud@cdgeometry@calc@num\relax\@tempswatrue\fi%
+    \ifx\@tempb\tud@cdgeometry@num\relax\else\@tempswatrue\fi%
+    \ifx\@tempc\tud@cdgeometry@calc@num\relax\else\@tempswatrue\fi%
     \if@tempswa%
       \TUD@SpecialOptionAtDocument{tud@cdgeometry@process}%
     \fi%
@@ -382,85 +375,6 @@
   \renewcommand*\tud@x@ta@warnings@on{\DeactivateWarningFilters[typearea]}
 }{}
 %%% From File: tudscr-pagestyle.dtx
-\newcommand*\tud@ps@list{}
-\newcommand*\tud@if@tudheadings[3]{%
-  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
-}
-\newif\if@tud@ddc@internal
-\newcommand*\tud@comp@clearpage{}%
-\newcommand*\tud@comp@resetpagestyle{}%
-\newcommand*\tud@ddc@switch{}
-\edef\tud@ddc@switch{%
-  \TUD@numkey@bool,%
-  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
-  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
-  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
-  {black}{5},{cdblack}{5},%
-  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
-  {white}{7},{cdwhite}{7}%
-}
-\newif\if@tud@headlogo@option@set
-\newif\if@tud@footlogo@option@set
-\newif\if@tud@ddc@auto
-\newcommand*\tud@ddc@auto@num{0}
-\TUD@key{ddc}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal%
-      \@tud@ddc@autofalse%
-    \else%
-      \@tud@ddc@autotrue%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddcfoot=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-    \global\@tud@headlogo@option@settrue%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@head@num{0}
-\TUD@key{ddchead}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddcfoot=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@foot@num{0}
-\TUD@key{ddcfoot}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@dim@footlogoheight{}
-\let\tud@dim@footlogoheight\relax
-\TUD@key{footlogoheight}{%
-  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
-      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
-      \@tempa#1\@nil%
-    \fi%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-}
 \cs@lock{tud@head@font@num}{0}
 \cs@lock{tud@head@bar@num}{0}
 \bool@lock{@tud@head@widebar}
@@ -596,6 +510,81 @@
     \csundef{@@tud@ps@#1@#2@#3@#4}%
   }{}%
 }
+\newcommand*\tud@dim@footlogoheight{}
+\let\tud@dim@footlogoheight\relax
+\TUD@key{footlogoheight}{%
+  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
+      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
+      \@tempa#1\@nil%
+    \fi%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+}
+\newif\if@tud@ddc@internal
+\newcommand*\tud@comp@clearpage{}%
+\newcommand*\tud@comp@resetpagestyle{}%
+\newcommand*\tud@ddc@switch{}
+\edef\tud@ddc@switch{%
+  \TUD@numkey@bool,%
+  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
+  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
+  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
+  {black}{5},{cdblack}{5},%
+  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
+  {white}{7},{cdwhite}{7}%
+}
+\newif\if@tud@headlogo@option@set
+\newif\if@tud@footlogo@option@set
+\newif\if@tud@ddc@auto
+\newcommand*\tud@ddc@auto@num{0}
+\TUD@key{ddc}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal%
+      \@tud@ddc@autofalse%
+    \else%
+      \@tud@ddc@autotrue%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddcfoot=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+    \global\@tud@headlogo@option@settrue%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@head@num{0}
+\TUD@key{ddchead}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddcfoot=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@foot@num{0}
+\TUD@key{ddcfoot}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@layout@switch{}
 \edef\tud@layout@switch{%
@@ -740,17 +729,7 @@
     \TUD@SpecialOptionAtDocument{tud@layout@process}%
   \fi%
 }
-\newcommand*\tud@font@koma@set[2]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{#2\nobreak}%
-}
-\newcommand*\tud@font@koma@unset[1]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{\relax}%
-}
-\newcommand*\tud@font@koma@reset[1]{%
-  \ifcsdef{tud@font@koma@#1}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}{}%
-}
+\newcommand*\tud@pagecolor{}%
 \DefineFamilyMember{KOMA}
 \DefineFamilyKey{KOMA}{headings}{%
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
@@ -764,7 +743,6 @@
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
   \FamilyKeyStateProcessed%
 }
-\newcommand*\tud@pagecolor{}%
 \newcommand*\tud@dim@pageheadingsvskip{0pt}
 \TUD@key{pageheadingsvskip}{%
   \TUD@set@dimenkey{pageheadingsvskip}{\tud@dim@pageheadingsvskip}{#1}%
@@ -931,6 +909,110 @@
   }%
   \TUDoptions{#2}%
 }
+\newcommand*\tud@v@comp{\tud@v@last}
+\TUD@key{tudscrver}[last]{%
+  \tud@v@get\@tempa{#1}%
+  \ifcsundef{tud@v@\@tempa}{%
+    \ClassWarningNoLine{\TUD@Class@Name}%
+    {%
+      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
+      this value is not supported. Because of this, the\MessageBreak%
+      value for `tudscrver' was set to `first'%
+    }%
+    \def\tud@v@comp{0}%
+  }{%
+    \ClassInfoNoLine{\TUD@Class@Name}%
+    {%
+      Switching compatibility level to `\@tempa'%
+    }%
+    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
+  }%
+  \FamilyKeyStateProcessed%
+}
+\AtEndOfClass%
+{%
+  \TUD@key{tudscrver}[]{%
+    \ClassError{\TUD@Class@Name}%
+    {Option `tudscrver' too late}{%
+      Option `tudscrver' can only be set while loading the\MessageBreak%
+      class `\TUD@Class@Name'
+      but you have tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed%
+  }%
+  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
+    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
+      \ClassError{\TUD@Class@Name}{%
+        KOMA-Script compatibility level too low%
+      }{%
+        \TUD@Version\space must be used at least with\MessageBreak%
+        KOMA-Script compatibility option `version=3.12'.%
+      }%
+    \fi%
+  }{%
+    \ClassError{\TUD@Class@Name}{%
+      KOMA-Script v\TUD@Version@KOMA is required%
+    }{%
+      \TUD@Version\space must at least be used with\MessageBreak%
+      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+    }%
+  }%
+}
+\csdef{tud@v@first}{0}
+\csdef{tud@v@2.00}{0}
+\csdef{tud@v@2.01}{0}
+\csdef{tud@v@2.01a}{0}
+\csdef{tud@v@2.01b}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.03}{1}
+\csdef{tud@v@2.03a}{1}
+\csdef{tud@v@2.04}{2}
+\csdef{tud@v@2.04a}{2}
+\csdef{tud@v@2.04b}{2}
+\csdef{tud@v@2.04c}{2}
+\csdef{tud@v@2.04d}{2}
+\csdef{tud@v@2.04e}{2}
+\csdef{tud@v@2.05}{3}
+\csdef{tud@v@2.05a}{3}
+\csdef{tud@v@2.05b}{3}
+\csdef{tud@v@2.05c}{3}
+\csdef{tud@v@2.05d}{3}
+\csdef{tud@v@2.05e}{3}
+\csdef{tud@v@2.05f}{3}
+\csdef{tud@v@2.05g}{3}
+\csdef{tud@v@last}{3}
+\newcommand*\tud@v@get[2]{%
+  \begingroup%
+    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
+    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
+    \@tempa #2\@nil%
+    \edef\tud@reserved{%
+      \endgroup%
+      \etex@unexpanded{\def#1}{\@tempc}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\tud@if@v@lower[1]{%
+  \begingroup%
+    \tud@v@get\@tempa{#1}%
+    \ifcsdef{tud@v@\@tempa}{%
+      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
+        \def\tud@reserved{\endgroup\@firstoftwo}%
+      \else%
+        \def\tud@reserved{\endgroup\@secondoftwo}%
+      \fi%
+    }{%
+      \def\tud@reserved{%
+        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          There's no defined macro `\string\tud@v@\@tempa'%
+        }%
+        \endgroup\@firstoftwo%
+      }%
+    }%
+  \tud@reserved%
+}
 \TUD@key{fontspec}[true]{%
   \ClassWarning{\TUD@Class@Name}%
   {%
@@ -1102,109 +1184,6 @@
   \fi%
 }
 \TUD@key{colour}[true]{\TUDoptions{color=#1}}
-\newcommand*\tud@v@comp{\tud@v@last}
-\TUD@key{tudscrver}[last]{%
-  \tud@v@get\@tempa{#1}%
-  \ifcsundef{tud@v@\@tempa}{%
-    \ClassWarningNoLine{\TUD@Class@Name}%
-    {%
-      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
-    }%
-    \def\tud@v@comp{0}%
-  }{%
-    \ClassInfoNoLine{\TUD@Class@Name}%
-    {%
-      Switching compatibility level to `\@tempa'%
-    }%
-    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
-  }%
-  \FamilyKeyStateProcessed%
-}
-\AtEndOfClass%
-{%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
-  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
-    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
-      \ClassError{\TUD@Class@Name}{%
-        KOMA-Script compatibility level too low%
-      }{%
-        \TUD@Version\space must be used at least with\MessageBreak%
-        KOMA-Script compatibility option `version=3.12'.%
-      }%
-    \fi%
-  }{%
-    \ClassError{\TUD@Class@Name}{%
-      KOMA-Script v\TUD@Version@KOMA is required%
-    }{%
-      \TUD@Version\space must at least be used with\MessageBreak%
-      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
-    }%
-  }%
-}
-\csdef{tud@v@first}{0}
-\csdef{tud@v@2.00}{0}
-\csdef{tud@v@2.01}{0}
-\csdef{tud@v@2.01a}{0}
-\csdef{tud@v@2.01b}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.03}{1}
-\csdef{tud@v@2.03a}{1}
-\csdef{tud@v@2.04}{2}
-\csdef{tud@v@2.04a}{2}
-\csdef{tud@v@2.04b}{2}
-\csdef{tud@v@2.04c}{2}
-\csdef{tud@v@2.04d}{2}
-\csdef{tud@v@2.04e}{2}
-\csdef{tud@v@2.05}{3}
-\csdef{tud@v@2.05a}{3}
-\csdef{tud@v@2.05b}{3}
-\csdef{tud@v@2.05c}{3}
-\csdef{tud@v@2.05d}{3}
-\csdef{tud@v@2.05e}{3}
-\csdef{tud@v@2.05f}{3}
-\csdef{tud@v@last}{3}
-\newcommand*\tud@v@get[2]{%
-  \begingroup%
-    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
-    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
-    \@tempa #2\@nil%
-    \edef\tud@reserved{%
-      \endgroup%
-      \etex@unexpanded{\def#1}{\@tempc}%
-    }%
-  \tud@reserved%
-}
-\newcommand*\tud@if@v@lower[1]{%
-  \begingroup%
-    \tud@v@get\@tempa{#1}%
-    \ifcsdef{tud@v@\@tempa}{%
-      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
-        \def\tud@reserved{\endgroup\@firstoftwo}%
-      \else%
-        \def\tud@reserved{\endgroup\@secondoftwo}%
-      \fi%
-    }{%
-      \def\tud@reserved{%
-        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
-          There's no defined macro `\string\tud@v@\@tempa'%
-        }%
-        \endgroup\@firstoftwo%
-      }%
-    }%
-  \tud@reserved%
-}
 %%% From File: tudscr-misc.dtx
 \newif\if@tud@x@scr@paper@set
 \TUD@key{paper}{%
@@ -1304,18 +1283,6 @@
 \LoadClass{\TUD@Class@KOMA}[2015/04/23]
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
-\AtEndPreamble{%
-  \@ifpackageloaded{graphicx}{}{%
-    \@ifpackageloaded{graphics}{%
-      \ClassWarningNoLine{\TUD@Class@Name}{%
-        Package `graphics' was superseded by `graphicx',\MessageBreak%
-        which now will be loaded automatically%
-      }%
-    }{}%
-  }%
-  \RequirePackage{graphicx}[1999/02/16]%
-  \RequirePackage{tudscrcolor}[\TUD@Version]%
-}
 \cs@lock{tud@x@multicol@num}{1}
 \newcommand*\tud@x@multicol@check{%
   \ifnum\tud@x@multicol@num>\@ne\relax%
@@ -1327,6 +1294,18 @@
   \fi%
 }
 \AfterPackage{multicol}{\renewcommand*\tud@x@multicol@check{\relax}}
+\AtEndPreamble{%
+  \@ifpackageloaded{graphicx}{}{%
+    \@ifpackageloaded{graphics}{%
+      \ClassWarningNoLine{\TUD@Class@Name}{%
+        Package `graphics' was superseded by `graphicx',\MessageBreak%
+        which now will be loaded automatically%
+      }%
+    }{}%
+    \RequirePackage{graphicx}[1999/02/16]%
+  }%
+  \RequirePackage{tudscrcolor}[\TUD@Version]%
+}
 %%% From File: tudscr-fonts.dtx
 \newcommand*\tud@univers{lun}
 \newif\if@tud@univers
@@ -1416,6 +1395,19 @@
   \fi%
   \undef\tud@font@check%
 }
+\newcommand*\tud@raggedright{\raggedright}
+\newcommand*\tud@RaggedRight{\raggedright}
+\AfterPackage*{ragged2e}{%
+  \ifdef{\LaTeXraggedright}{%
+    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
+  }{}%
+  \renewcommand*\tud@RaggedRight{\RaggedRight}%
+}
+\AfterPackage*{siunitx}{%
+  \providecommand*\lseries{\fontseries{l}\selectfont}%
+}
+\newif\if@tud@x@bm@requested
+\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
 \RequirePackage{trimspaces}[2009/09/17]
 \newif\if@tud@x@mweights@enabled
 \AfterPackage*{mweights}{\@tud@x@mweights@enabledtrue}
@@ -1927,11 +1919,6 @@
   \fi%
   \AtBeginDocument{\tud@font@math@init\let\tud@font@math@init\relax}%
 }
-\newif\if@tud@x@bm@requested
-\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
-\AfterPackage*{siunitx}{%
-  \providecommand*\lseries{\fontseries{l}\selectfont}%
-}
 \newrobustcmd*\ifdin{%
   \ifx\f@family\tud@dinbold%
     \expandafter\@firstoftwo%
@@ -1946,14 +1933,6 @@
     \sectfont#1%
   \fi%
 }
-\newcommand*\tud@raggedright{\raggedright}
-\newcommand*\tud@RaggedRight{\raggedright}
-\AfterPackage*{ragged2e}{%
-  \ifdef{\LaTeXraggedright}{%
-    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
-  }{}%
-  \renewcommand*\tud@RaggedRight{\RaggedRight}%
-}
 \RequirePackage{textcase}[2004/10/07]
 \newcommand*\tud@makeuppercase[1]{%
   \ifdin{\begingroup\MakeTextUppercase{#1}\endgroup}{#1}%
@@ -1994,21 +1973,29 @@
     \let\footnote\@gobble%
     \def\newline{\space\ignorespaces}%
     \def\\{\space\ignorespaces}%
-    \def\@tempa##1{\csdef{##1}####1{\noexpand\relax}}%
+    \let\@tempc\relax%
+    \def\@tempa##1{\csedef{##1}####1{\@tempc}}%
     \let\@tempb\tud@split@author@list%
     \ifx\and\relax\else%
       \robustify\and%
     \fi%
     \expandafter\forcsvlist\expandafter\@tempa\expandafter{\@tempb}%
+    \def\@tempa##1##2{%
+      \def\@tempb####1##2####2\@nil{%
+        \IfArgIsEmpty{####2}{%
+          \def##1{####1}%
+        }{%
+          \@tempb####1####2\@nil%
+        }%
+      }%
+      \expandafter\@tempb##1##2\@nil%
+    }%
     \protected@edef\@@author{#1}%
-    \tud@replace\@@author{ \relax }{}%
-    \tud@replace\@@author{\relax }{}%
-    \tud@replace\@@author{ \relax}{}%
-    \tud@replace\@@author{\relax}{}%
-    \tud@replace\@@author{ \and }{\and}%
-    \tud@replace\@@author{ \and}{\and}%
-    \tud@replace\@@author{\and }{\and}%
-    \protected@xdef\@@author{\trim@spaces{\@@author}}%
+    \@tempa{\@@author}{ \@tempc }%
+    \@tempa{\@@author}{\@tempc }%
+    \@tempa{\@@author}{ \@tempc}%
+    \@tempa{\@@author}{\@tempc}%
+    \xdef\@@author{\expandonce\@@author}%
   \endgroup%
 }
 \newcommand*\@authormore{}
@@ -2021,6 +2008,7 @@
 \newcommand*\@thesis{}
 \newcommand*\@@thesis{}
 \newcommand*\thesis[1]{\tud@thesis@do{thesis}{#1}}
+\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\tud@thanks{}
 \newcommand*\tud@thesis@do[2]{%
   \begingroup%
@@ -2070,7 +2058,6 @@
   \fi%
   \protected@xdef\@@thesis{\trim@spaces{#2}}%
 }
-\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\@graduation{}
 \newcommand*\@@graduation{}
 \newcommand*\graduation[2][]{%
@@ -2552,6 +2539,22 @@
   \tud@locale@english{\@dotswap}{.}%
 }
 %%% From File: tudscr-area.dtx
+\newif\if@tud@x@crop@center
+\AfterPackage{crop}{%
+  \CheckCommand*\CROP@center{%
+    \voffset\stockheight
+    \advance\voffset-\paperheight
+    \voffset.5\voffset
+    \hoffset\stockwidth
+    \advance\hoffset-\paperwidth
+    \hoffset.5\hoffset
+  }%
+  \pretocmd{\CROP@center}{%
+    \@tud@x@crop@centertrue%
+  }{}{\tud@patch@wrn{CROP@center}}
+}
+\newif\if@tud@x@standalone@crop
+\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newlength\tud@len@widemargin
 \newlength\tud@len@slimmargin
 \newlength\tud@len@both
@@ -2741,22 +2744,6 @@
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
 }
-\newif\if@tud@x@crop@center
-\AfterPackage{crop}{%
-  \CheckCommand*\CROP@center{%
-    \voffset\stockheight
-    \advance\voffset-\paperheight
-    \voffset.5\voffset
-    \hoffset\stockwidth
-    \advance\hoffset-\paperwidth
-    \hoffset.5\hoffset
-  }%
-  \pretocmd{\CROP@center}{%
-    \@tud@x@crop@centertrue%
-  }{}{\tud@patch@wrn{CROP@center}}
-}
-\newif\if@tud@x@standalone@crop
-\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newcommand*\tud@cdgeometry@process{}
 \newcommand*\tud@cdgeometry@@process{}
 \if@tud@x@standalone@crop
@@ -3551,19 +3538,6 @@
   \AtEndPreamble{%
     \if@tud@x@standalone@crop%
       \pagestyle{empty}%
-      \hoffset=-72.27pt%
-      \voffset=-72.27pt%
-      \topmargin=0pt%
-      \headheight=0pt%
-      \headsep=0pt%
-      \marginparsep=0pt%
-      \marginparwidth=0pt%
-      \footskip=0pt%
-      \marginparpush=0pt%
-      \oddsidemargin=0pt%
-      \evensidemargin=0pt%
-      \topskip=0pt%
-      \textheight=\maxdimen%
       \let\tud@AfterChangingArea\relax%
       \let\tud@cdgeometry@process\relax%
     \else%
@@ -3971,16 +3945,43 @@
   ]{tudheadings.pagecolor}%
   \AddLayersToPageStyle{@everystyle@}{tudheadings.pagecolor}%
 }
+\newcommand*\tud@ps@list{}
 \listadd\tud@ps@list{tudheadings}
 \listadd\tud@ps@list{plain.tudheadings}
 \listadd\tud@ps@list{empty.tudheadings}
-\PreventPackageFromLoading[%
-  \ClassWarning{\TUD@Class@Name}{%
-    The package `fancyhdr' must not be used with a\MessageBreak%
-    TUD-Script class. You should make use of the\MessageBreak%
-    capabilities of package `scrlayer-scrpage' instead%
-  }%
-]{fancyhdr}
+\newcommand*\tud@if@tudheadings[3]{%
+  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
+}
+\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
+  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
+}{}{\tud@patch@wrn{thispagestyle}}
+\newcommand*\tud@pagestyle{}
+\let\tud@pagestyle\pagestyle
+\pretocmd{\tud@pagestyle}{%
+  \tud@BeforeSelectAnyPageStyle{#1}%
+  \edef\currentpagestyle{#1}%
+}{}{\tud@patch@wrn{pagestyle}}
+\tud@cmd@store{pagestyle}
+\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
+\BeforePackage{scrlayer-scrpage}{%
+  \tud@cmd@restore{pagestyle}%
+  \undef\tud@pagestyle%
+}
+\TUD@UnwindPackage{scrlayer-scrpage}{%
+  \ifcsundef{if@chapter}{%
+    \newif\if@chapter%
+    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
+  }{}%
+  \cslet{ps@tudheadings}{\ps@headings}%
+  \cslet{ps@plain.tudheadings}{\ps@plain}%
+  \cslet{ps@empty.tudheadings}{\ps@empty}%
+  \providecommand*\currentpagestyle{plain}%
+  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
+  \providecommand*\GetRealPageStyle[1]{#1}%
+  \let\pagestyle\tud@pagestyle%
+  \undef\tud@pagestyle%
+  \tud@cdgeometry@init%
+}
 \newcommand*\tud@ps@onselect{%
   \DeclarePageStyleAlias{plain}{plain.tudheadings}%
   \DeclarePageStyleAlias{headings}{tudheadings}%
@@ -4056,36 +4057,6 @@
   \ifstr{\tud@head@fontcolor}{white}{\let\tud@len@line\tud@len@heavyline}{}%
   \global\let\tud@foot@fontcolor\tud@foot@fontcolor%
 }
-\newcommand*\tud@pagestyle{}
-\let\tud@pagestyle\pagestyle
-\pretocmd{\tud@pagestyle}{%
-  \tud@BeforeSelectAnyPageStyle{#1}%
-  \edef\currentpagestyle{#1}%
-}{}{\tud@patch@wrn{pagestyle}}
-\tud@cmd@store{pagestyle}
-\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
-\BeforePackage{scrlayer-scrpage}{%
-  \tud@cmd@restore{pagestyle}%
-  \undef\tud@pagestyle%
-}
-\TUD@UnwindPackage{scrlayer-scrpage}{%
-  \ifcsundef{if@chapter}{%
-    \newif\if@chapter%
-    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
-  }{}%
-  \cslet{ps@tudheadings}{\ps@headings}%
-  \cslet{ps@plain.tudheadings}{\ps@plain}%
-  \cslet{ps@empty.tudheadings}{\ps@empty}%
-  \providecommand*\currentpagestyle{plain}%
-  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
-  \providecommand*\GetRealPageStyle[1]{#1}%
-  \let\pagestyle\tud@pagestyle%
-  \undef\tud@pagestyle%
-  \tud@cdgeometry@init%
-}
-\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
-  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
-}{}{\tud@patch@wrn{thispagestyle}}
 \newcommand*\tud@head@fontsize{}
 \newcommand*\tud@head@font@light{}
 \newcommand*\tud@head@font@bold{}
@@ -4241,40 +4212,6 @@
   \endgroup%
   \vbox to #1{#2}%
 }
-\AtBeginDocument{%
-  \tud@if@v@lower{2.04}{%
-    \renewcommand*\tud@comp@clearpage{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
-      \fi%
-    }%
-    \renewcommand*\tud@comp@resetpagestyle{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{%
-          \expandafter\pagestyle\expandafter{\currentpagestyle}%
-        }{}%
-      \fi%
-    }%
-  }{}%
-}
-\newcommand*\tud@ddc@check{%
-  \let\@tempa\tud@ddc@head@num%
-  \let\@tempb\tud@ddc@foot@num%
-  \if@tud@ddc@auto%
-    \ifdefvoid{\tud@headlogo@filename}{%
-      \let\@tempa\tud@ddc@auto@num%
-      \let\@tempb\z@%
-    }{%
-      \let\@tempa\z@%
-      \let\@tempb\tud@ddc@auto@num%
-    }%
-  \fi%
-  \tud@if@v@lower{2.03}{%
-    \ifnum\@tempb=\z@\relax%
-      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
-    \fi%
-  }{}%
-}
 \tud@newlayerbox{main@black}
 \tud@newlayerbox{main@HKS41}
 \tud@newlayerbox{main@white}
@@ -4403,10 +4340,6 @@
     \ifnum\@tempa>\z@\relax\tud@headlogo@wrn\fi%
   }%
 }
-\tud@newlayerbox{foot@black}
-\tud@newlayerbox{foot@HKS41}
-\tud@newlayerbox{foot@white}
-\tud@newlayerbox{foot@option}
 \AtEndOfClass{%
   \ifdefvoid{\tud@dim@footlogoheight}{%
     \tud@if@v@lower{2.03}{%
@@ -4416,6 +4349,10 @@
     }%
   }{}%
 }
+\tud@newlayerbox{foot@black}
+\tud@newlayerbox{foot@HKS41}
+\tud@newlayerbox{foot@white}
+\tud@newlayerbox{foot@option}
 \newcommand*\tud@footlogo@ddc@set[2]{%
   \tud@savelayerbox{foot@#1}{%
     \includegraphics[keepaspectratio,totalheight=\tud@dim@footlogoheight]{#2}%
@@ -4629,6 +4566,40 @@
     \hbox to #2{}%
   \fi%
 }
+\AtBeginDocument{%
+  \tud@if@v@lower{2.04}{%
+    \renewcommand*\tud@comp@clearpage{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
+      \fi%
+    }%
+    \renewcommand*\tud@comp@resetpagestyle{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{%
+          \expandafter\pagestyle\expandafter{\currentpagestyle}%
+        }{}%
+      \fi%
+    }%
+  }{}%
+}
+\newcommand*\tud@ddc@check{%
+  \let\@tempa\tud@ddc@head@num%
+  \let\@tempb\tud@ddc@foot@num%
+  \if@tud@ddc@auto%
+    \ifdefvoid{\tud@headlogo@filename}{%
+      \let\@tempa\tud@ddc@auto@num%
+      \let\@tempb\z@%
+    }{%
+      \let\@tempa\z@%
+      \let\@tempb\tud@ddc@auto@num%
+    }%
+  \fi%
+  \tud@if@v@lower{2.03}{%
+    \ifnum\@tempb=\z@\relax%
+      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
+    \fi%
+  }{}%
+}
 \newcommand*\tud@ps@parameters[1]{%
   \TUD@parameter@def{cdfont}[true]{\TUDoption{cdfont}{#1}}%
   \TUD@parameter@def{cdhead}[true]{\TUDoption{cdhead}{#1}}%
@@ -4704,6 +4675,13 @@
   \tud@ps@parameters{#1}%
   \TUD@parameter@handler@default{}%
 }
+\PreventPackageFromLoading[%
+  \ClassWarning{\TUD@Class@Name}{%
+    The package `fancyhdr' must not be used with a\MessageBreak%
+    TUD-Script class. You should make use of the\MessageBreak%
+    capabilities of package `scrlayer-scrpage' instead%
+  }%
+]{fancyhdr}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@x@scr@headings@current{}
 \newcommand*\tud@sec@fontsize{}
@@ -4884,15 +4862,17 @@
   \let\tud@@startpart\scr@@startpart%
   \ifcsdef{scr@v@3.21}{\@tempswatrue}{\@tempswafalse}%
   \if@tempswa%
-    \patchcmd{\tud@@startpart}%
-      {\usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}}%
-      {\usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}}%
-      {}{\tud@patch@wrn{scr@@startpart}}%
+    \patchcmd{\tud@@startpart}{%
+      \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
+    }{%
+      \usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}%
+    }{}{\tud@patch@wrn{scr@@startpart}}%
   \else%
-    \patchcmd{\tud@@startpart}%
-      {\usekomafont{#1prefix}{\@nameuse{#1format}}}%
-      {\usekomafont{#1prefix}{\tud@makeuppercase{\@nameuse{#1format}}}}%
-      {}{\tud@patch@wrn{scr@@startpart}}%
+    \patchcmd{\tud@@startpart}{%
+      \usekomafont{#1prefix}{\@nameuse{#1format}}%
+    }{%
+      \usekomafont{#1prefix}{\tud@makeuppercase{\@nameuse{#1format}}}%
+    }{}{\tud@patch@wrn{scr@@startpart}}%
   \fi%
 \else
   \newcommand*\tud@@part{}%
@@ -4977,83 +4957,10 @@
   \usekomafont{subject}%
   \mdseries%
   \large%
+  \tud@raggedright%
 }
 \robustify{\thanks}
 \robustify{\footnotemark}
-\newcommand*\tud@title@uppercase[1]{%
-  \let\@tempa\relax%
-  \begingroup%
-    \let\\\newline%
-    \def\thanks##1{\gdef\@tempa{##1}}%
-    \let\footnote\thanks%
-    \sbox\z@{#1}%
-    \let\thanks\@gobble%
-    \let\footnote\@gobble%
-    \tud@makeuppercase{#1}%
-  \endgroup%
-  \ifx\@tempa\relax\else\thanks\@tempa\fi%
-}
-\newcommand*\tud@title@delimiter{:\nobreakspace}
-\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
-\newcommand*\tud@newline@title{}
-\newcommand*\tud@split@author@title[2]{%
-  \tud@multiple@fields@store{@author}{#1}%
-  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
-  {\usekomafont{author}{\ignorespaces#1}}%
-  \if@tud@cover\else%
-    \ifx\@authormore\@empty\else%
-      \tud@newline@title%
-      \@authormore%
-    \fi%
-    \ifx\@dateofbirth\@empty\else%
-      \if@titlepage%
-        \tud@newline@title%
-        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
-        \@dateofbirth%
-        \ifx\@placeofbirth\@empty\else%
-          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
-        \fi%
-      \else%
-        \tud@title@wrn{dateofbirth}%
-      \fi%
-    \fi%
-    \def\@tempc##1{%
-      \ifstr{\csuse{@##1}}{}{}{%
-        \if@titlepage%
-          \tud@newline@title%
-          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
-          \csuse{@##1}%
-        \else%
-          \tud@title@wrn{##1}%
-        \fi%
-      }%
-    }%
-    \@tempc{course}%
-    \@tempc{discipline}%
-    \@tempc{matriculationnumber}%
-    \@tempc{matriculationyear}%
-  \fi%
-  \tud@multiple@fields@restore{@author}%
-  \tud@multiple@@@split{#2}{\vskip 2ex}%
-}
-\newcommand*\tud@title@wrn[1]{%
-  \ClassWarning{\TUD@Class@Name}{%
-    `\@backslashchar#1' has to be used with\MessageBreak%
-    activated titlepage option%
-  }%
-}
-\newcommand*\tud@thesis@tosubject{%
-  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
-    \ifx\@subject\@empty\else%
-      \ClassWarning{\TUD@Class@Name}{%
-        The option `subjectthesis' was activated, so\MessageBreak%
-        the field `subject' will be overwritten with the\MessageBreak%
-        given thesis%
-      }%
-    \fi%
-    \let\@subject\@thesis%
-  \fi\fi%
-}
 \newcommand*\tud@title@pagenumber{}
 \let\tud@title@pagenumber\relax
 \newcommand*\tud@maketitle[1][]{%
@@ -5320,21 +5227,6 @@
     \fi%
   \end{titlepage}%
 }
-\newcommand*\tud@title@names[1]{%
-  \letcs\@tempa{@#1}%
-  \ifx\@tempa\@empty\else%
-    \def\and{%
-      \ifcsvoid{#1othername}{\par}{%
-        \vskip 1ex\@plus.5ex\@minus.5ex%
-        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
-      }%
-      \let\and\par%
-    }%
-    \vskip 1ex\@plus.5ex\@minus.5ex%
-    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
-    {\usekomafont{author}{\csuse{@#1}\par}}%
-  \fi%
-}
 \newcommand*\tud@make@titlehead{%
   \renewcommand*\tud@title@fontcolor{}%
   \ifcase\tud@layout@title@num\relax\or\else% *color
@@ -5438,6 +5330,95 @@
     \tud@if@v@lower{2.03}{\tud@ddc@enlargepage[\titlepagestyle]}{}%
   \endgroup%
 }
+\newcommand*\tud@title@uppercase[1]{%
+  \let\@tempa\relax%
+  \begingroup%
+    \let\\\newline%
+    \def\thanks##1{\gdef\@tempa{##1}}%
+    \let\footnote\thanks%
+    \sbox\z@{#1}%
+    \let\thanks\@gobble%
+    \let\footnote\@gobble%
+    \tud@makeuppercase{#1}%
+  \endgroup%
+  \ifx\@tempa\relax\else\thanks\@tempa\fi%
+}
+\newcommand*\tud@thesis@tosubject{%
+  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
+    \ifx\@subject\@empty\else%
+      \ClassWarning{\TUD@Class@Name}{%
+        The option `subjectthesis' was activated, so\MessageBreak%
+        the field `subject' will be overwritten with the\MessageBreak%
+        given thesis%
+      }%
+    \fi%
+    \let\@subject\@thesis%
+  \fi\fi%
+}
+\newcommand*\tud@title@names[1]{%
+  \letcs\@tempa{@#1}%
+  \ifx\@tempa\@empty\else%
+    \def\and{%
+      \ifcsvoid{#1othername}{\par}{%
+        \vskip 1ex\@plus.5ex\@minus.5ex%
+        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
+      }%
+      \let\and\par%
+    }%
+    \vskip 1ex\@plus.5ex\@minus.5ex%
+    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
+    {\usekomafont{author}{\csuse{@#1}\par}}%
+  \fi%
+}
+\newcommand*\tud@title@delimiter{:\nobreakspace}
+\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
+\newcommand*\tud@newline@title{}
+\newcommand*\tud@split@author@title[2]{%
+  \tud@multiple@fields@store{@author}{#1}%
+  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
+  {\usekomafont{author}{\ignorespaces#1\unskip}}%
+  \if@tud@cover\else%
+    \ifx\@authormore\@empty\else%
+      \tud@newline@title%
+      \@authormore%
+    \fi%
+    \ifx\@dateofbirth\@empty\else%
+      \if@titlepage%
+        \tud@newline@title%
+        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
+        \@dateofbirth%
+        \ifx\@placeofbirth\@empty\else%
+          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
+        \fi%
+      \else%
+        \tud@title@wrn{dateofbirth}%
+      \fi%
+    \fi%
+    \def\@tempc##1{%
+      \ifstr{\csuse{@##1}}{}{}{%
+        \if@titlepage%
+          \tud@newline@title%
+          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
+          \csuse{@##1}%
+        \else%
+          \tud@title@wrn{##1}%
+        \fi%
+      }%
+    }%
+    \@tempc{course}%
+    \@tempc{discipline}%
+    \@tempc{matriculationnumber}%
+    \@tempc{matriculationyear}%
+  \fi%
+  \tud@multiple@fields@restore{@author}%
+  \tud@multiple@@@split{#2}{\vskip 2ex}%
+}
+\newcommand*\tud@title@wrn[1]{%
+  \ClassWarning{\TUD@Class@Name}{%
+    `\@backslashchar#1' has to be used with\MessageBreak%
+    activated titlepage option%
+  }%
+}
 \newcommand\maketitleonecolumn[2][]{%
   \if@twocolumn%
     \if@titlepage%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index 81dcfd6e07b..77a32426c06 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
@@ -7,37 +7,30 @@
 %% tudscr-version.dtx  (with options: `package,base')
 %% tudscr-base.dtx  (with options: `package,base')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -59,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
@@ -72,7 +65,7 @@
 }{}
 %%% From File: tudscr-base.dtx
 \ProvidesPackage{tudscrbase}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (basics for the bundle)%
 ]
@@ -113,6 +106,11 @@
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{etexcmds}[2011/02/16]
 \RequirePackage{kvsetkeys}[2012/04/25]
+\newcommand*\tud@reserved{}
+\newtoks\tud@toks@
+\newcommand*\eaddto@hook[2]{%
+  \expandafter\addto@hook\expandafter#1\expandafter{#2}%
+}
 \newcommand*\ifxblank{\ifstr{}}
 \newcommand*\ifxnumber[1]{%
   \if\relax\detokenize\expandafter{\romannumeral-0#1}\relax%
@@ -207,38 +205,16 @@
     \expandafter\def\expandafter #1\expandafter{#1}%
   }%
 }
-\newcommand*\tud@reserved{}
-\newtoks\tud@toks@
-\newcommand*\eaddto@hook[2]{%
-  \expandafter\addto@hook\expandafter#1\expandafter{#2}%
+\newcommand*\tud@font@koma@set[2]{%
+  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
+  \csdef{tud@font@koma@#1}{#2\nobreak}%
 }
-\newcommand*\tud@replace[3]{%
-  \begingroup%
-    \toks@{\def\@tempa##1}%
-    \eaddto@hook\toks@{\detokenize{#2}}%
-    \addto@hook\toks@{##2\@nil{\@tempb{##1}{##2}}}%
-    \the\toks@%
-    \def\@tempb##1##2{%
-      \IfArgIsEmpty{##2}{%
-        \appto#1{##1}%
-        \let\@tempc\relax%
-      }{%
-        \appto#1{##1#3}%
-        \def\@tempc{\@tempa##2\@nil}%
-      }%
-      \@tempc%
-    }%
-    \toks@{\@tempa}%
-    \edef\@tempc{\expandafter\detokenize\expandafter{#1}}%
-    \eaddto@hook\toks@{\@tempc}%
-    \eaddto@hook\toks@{\detokenize{#2}\@nil}%
-    \def#1{}%
-    \the\toks@%
-    \edef\tud@reserved{%
-      \noexpand\endgroup%
-      \def\noexpand#1{#1}%
-    }%
-  \tud@reserved%
+\newcommand*\tud@font@koma@unset[1]{%
+  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
+  \csdef{tud@font@koma@#1}{\relax}%
+}
+\newcommand*\tud@font@koma@reset[1]{%
+  \ifcsdef{tud@font@koma@#1}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}{}%
 }
 \DefineFamily{TUD}
 \newcommand*\TUDProcessOptions{\FamilyProcessOptions{TUD}}
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 977fa1c56ec..94b9c022e91 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -27,37 +27,30 @@
 %% tudscr-comp.dtx  (with options: `class,book,body')
 %% tudscr-misc.dtx  (with options: `class,book,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -79,24 +72,24 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
-  \@ifundefined{TUD@Class@Parent}{%
+  \ifx\TUD@Class@Parent\@undefined%
     \newcommand*\TUD@Class@Name{#1}%
     \TUD@Class@Info%
-  }{}%
+  \fi%
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -335,8 +328,8 @@
       \cs@set@lock{tud@cdgeometry@num}{1}%
     \fi%
     \@tempswafalse%
-    \ifx\@tempb\tud@cdgeometry@num\relax\@tempswatrue\fi%
-    \ifx\@tempc\tud@cdgeometry@calc@num\relax\@tempswatrue\fi%
+    \ifx\@tempb\tud@cdgeometry@num\relax\else\@tempswatrue\fi%
+    \ifx\@tempc\tud@cdgeometry@calc@num\relax\else\@tempswatrue\fi%
     \if@tempswa%
       \TUD@SpecialOptionAtDocument{tud@cdgeometry@process}%
     \fi%
@@ -382,85 +375,6 @@
   \renewcommand*\tud@x@ta@warnings@on{\DeactivateWarningFilters[typearea]}
 }{}
 %%% From File: tudscr-pagestyle.dtx
-\newcommand*\tud@ps@list{}
-\newcommand*\tud@if@tudheadings[3]{%
-  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
-}
-\newif\if@tud@ddc@internal
-\newcommand*\tud@comp@clearpage{}%
-\newcommand*\tud@comp@resetpagestyle{}%
-\newcommand*\tud@ddc@switch{}
-\edef\tud@ddc@switch{%
-  \TUD@numkey@bool,%
-  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
-  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
-  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
-  {black}{5},{cdblack}{5},%
-  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
-  {white}{7},{cdwhite}{7}%
-}
-\newif\if@tud@headlogo@option@set
-\newif\if@tud@footlogo@option@set
-\newif\if@tud@ddc@auto
-\newcommand*\tud@ddc@auto@num{0}
-\TUD@key{ddc}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal%
-      \@tud@ddc@autofalse%
-    \else%
-      \@tud@ddc@autotrue%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddcfoot=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-    \global\@tud@headlogo@option@settrue%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@head@num{0}
-\TUD@key{ddchead}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddcfoot=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@foot@num{0}
-\TUD@key{ddcfoot}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@dim@footlogoheight{}
-\let\tud@dim@footlogoheight\relax
-\TUD@key{footlogoheight}{%
-  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
-      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
-      \@tempa#1\@nil%
-    \fi%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-}
 \cs@lock{tud@head@font@num}{0}
 \cs@lock{tud@head@bar@num}{0}
 \bool@lock{@tud@head@widebar}
@@ -596,6 +510,81 @@
     \csundef{@@tud@ps@#1@#2@#3@#4}%
   }{}%
 }
+\newcommand*\tud@dim@footlogoheight{}
+\let\tud@dim@footlogoheight\relax
+\TUD@key{footlogoheight}{%
+  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
+      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
+      \@tempa#1\@nil%
+    \fi%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+}
+\newif\if@tud@ddc@internal
+\newcommand*\tud@comp@clearpage{}%
+\newcommand*\tud@comp@resetpagestyle{}%
+\newcommand*\tud@ddc@switch{}
+\edef\tud@ddc@switch{%
+  \TUD@numkey@bool,%
+  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
+  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
+  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
+  {black}{5},{cdblack}{5},%
+  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
+  {white}{7},{cdwhite}{7}%
+}
+\newif\if@tud@headlogo@option@set
+\newif\if@tud@footlogo@option@set
+\newif\if@tud@ddc@auto
+\newcommand*\tud@ddc@auto@num{0}
+\TUD@key{ddc}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal%
+      \@tud@ddc@autofalse%
+    \else%
+      \@tud@ddc@autotrue%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddcfoot=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+    \global\@tud@headlogo@option@settrue%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@head@num{0}
+\TUD@key{ddchead}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddcfoot=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@foot@num{0}
+\TUD@key{ddcfoot}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@layout@switch{}
 \edef\tud@layout@switch{%
@@ -854,17 +843,7 @@
 \newif\if@tud@clearcolor
 \TUD@ifkey{clearcolor}{@tud@clearcolor}
 \TUD@ifkey{clearcolour}{@tud@clearcolor}
-\newcommand*\tud@font@koma@set[2]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{#2\nobreak}%
-}
-\newcommand*\tud@font@koma@unset[1]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{\relax}%
-}
-\newcommand*\tud@font@koma@reset[1]{%
-  \ifcsdef{tud@font@koma@#1}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}{}%
-}
+\newcommand*\tud@pagecolor{}%
 \DefineFamilyMember{KOMA}
 \DefineFamilyKey{KOMA}{headings}{%
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
@@ -878,7 +857,6 @@
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
   \FamilyKeyStateProcessed%
 }
-\newcommand*\tud@pagecolor{}%
 \newcommand*\tud@dim@pageheadingsvskip{0pt}
 \TUD@key{pageheadingsvskip}{%
   \TUD@set@dimenkey{pageheadingsvskip}{\tud@dim@pageheadingsvskip}{#1}%
@@ -1046,6 +1024,110 @@
   }%
   \TUDoptions{#2}%
 }
+\newcommand*\tud@v@comp{\tud@v@last}
+\TUD@key{tudscrver}[last]{%
+  \tud@v@get\@tempa{#1}%
+  \ifcsundef{tud@v@\@tempa}{%
+    \ClassWarningNoLine{\TUD@Class@Name}%
+    {%
+      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
+      this value is not supported. Because of this, the\MessageBreak%
+      value for `tudscrver' was set to `first'%
+    }%
+    \def\tud@v@comp{0}%
+  }{%
+    \ClassInfoNoLine{\TUD@Class@Name}%
+    {%
+      Switching compatibility level to `\@tempa'%
+    }%
+    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
+  }%
+  \FamilyKeyStateProcessed%
+}
+\AtEndOfClass%
+{%
+  \TUD@key{tudscrver}[]{%
+    \ClassError{\TUD@Class@Name}%
+    {Option `tudscrver' too late}{%
+      Option `tudscrver' can only be set while loading the\MessageBreak%
+      class `\TUD@Class@Name'
+      but you have tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed%
+  }%
+  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
+    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
+      \ClassError{\TUD@Class@Name}{%
+        KOMA-Script compatibility level too low%
+      }{%
+        \TUD@Version\space must be used at least with\MessageBreak%
+        KOMA-Script compatibility option `version=3.12'.%
+      }%
+    \fi%
+  }{%
+    \ClassError{\TUD@Class@Name}{%
+      KOMA-Script v\TUD@Version@KOMA is required%
+    }{%
+      \TUD@Version\space must at least be used with\MessageBreak%
+      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+    }%
+  }%
+}
+\csdef{tud@v@first}{0}
+\csdef{tud@v@2.00}{0}
+\csdef{tud@v@2.01}{0}
+\csdef{tud@v@2.01a}{0}
+\csdef{tud@v@2.01b}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.03}{1}
+\csdef{tud@v@2.03a}{1}
+\csdef{tud@v@2.04}{2}
+\csdef{tud@v@2.04a}{2}
+\csdef{tud@v@2.04b}{2}
+\csdef{tud@v@2.04c}{2}
+\csdef{tud@v@2.04d}{2}
+\csdef{tud@v@2.04e}{2}
+\csdef{tud@v@2.05}{3}
+\csdef{tud@v@2.05a}{3}
+\csdef{tud@v@2.05b}{3}
+\csdef{tud@v@2.05c}{3}
+\csdef{tud@v@2.05d}{3}
+\csdef{tud@v@2.05e}{3}
+\csdef{tud@v@2.05f}{3}
+\csdef{tud@v@2.05g}{3}
+\csdef{tud@v@last}{3}
+\newcommand*\tud@v@get[2]{%
+  \begingroup%
+    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
+    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
+    \@tempa #2\@nil%
+    \edef\tud@reserved{%
+      \endgroup%
+      \etex@unexpanded{\def#1}{\@tempc}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\tud@if@v@lower[1]{%
+  \begingroup%
+    \tud@v@get\@tempa{#1}%
+    \ifcsdef{tud@v@\@tempa}{%
+      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
+        \def\tud@reserved{\endgroup\@firstoftwo}%
+      \else%
+        \def\tud@reserved{\endgroup\@secondoftwo}%
+      \fi%
+    }{%
+      \def\tud@reserved{%
+        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          There's no defined macro `\string\tud@v@\@tempa'%
+        }%
+        \endgroup\@firstoftwo%
+      }%
+    }%
+  \tud@reserved%
+}
 \TUD@key{fontspec}[true]{%
   \ClassWarning{\TUD@Class@Name}%
   {%
@@ -1217,109 +1299,6 @@
   \fi%
 }
 \TUD@key{colour}[true]{\TUDoptions{color=#1}}
-\newcommand*\tud@v@comp{\tud@v@last}
-\TUD@key{tudscrver}[last]{%
-  \tud@v@get\@tempa{#1}%
-  \ifcsundef{tud@v@\@tempa}{%
-    \ClassWarningNoLine{\TUD@Class@Name}%
-    {%
-      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
-    }%
-    \def\tud@v@comp{0}%
-  }{%
-    \ClassInfoNoLine{\TUD@Class@Name}%
-    {%
-      Switching compatibility level to `\@tempa'%
-    }%
-    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
-  }%
-  \FamilyKeyStateProcessed%
-}
-\AtEndOfClass%
-{%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
-  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
-    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
-      \ClassError{\TUD@Class@Name}{%
-        KOMA-Script compatibility level too low%
-      }{%
-        \TUD@Version\space must be used at least with\MessageBreak%
-        KOMA-Script compatibility option `version=3.12'.%
-      }%
-    \fi%
-  }{%
-    \ClassError{\TUD@Class@Name}{%
-      KOMA-Script v\TUD@Version@KOMA is required%
-    }{%
-      \TUD@Version\space must at least be used with\MessageBreak%
-      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
-    }%
-  }%
-}
-\csdef{tud@v@first}{0}
-\csdef{tud@v@2.00}{0}
-\csdef{tud@v@2.01}{0}
-\csdef{tud@v@2.01a}{0}
-\csdef{tud@v@2.01b}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.03}{1}
-\csdef{tud@v@2.03a}{1}
-\csdef{tud@v@2.04}{2}
-\csdef{tud@v@2.04a}{2}
-\csdef{tud@v@2.04b}{2}
-\csdef{tud@v@2.04c}{2}
-\csdef{tud@v@2.04d}{2}
-\csdef{tud@v@2.04e}{2}
-\csdef{tud@v@2.05}{3}
-\csdef{tud@v@2.05a}{3}
-\csdef{tud@v@2.05b}{3}
-\csdef{tud@v@2.05c}{3}
-\csdef{tud@v@2.05d}{3}
-\csdef{tud@v@2.05e}{3}
-\csdef{tud@v@2.05f}{3}
-\csdef{tud@v@last}{3}
-\newcommand*\tud@v@get[2]{%
-  \begingroup%
-    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
-    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
-    \@tempa #2\@nil%
-    \edef\tud@reserved{%
-      \endgroup%
-      \etex@unexpanded{\def#1}{\@tempc}%
-    }%
-  \tud@reserved%
-}
-\newcommand*\tud@if@v@lower[1]{%
-  \begingroup%
-    \tud@v@get\@tempa{#1}%
-    \ifcsdef{tud@v@\@tempa}{%
-      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
-        \def\tud@reserved{\endgroup\@firstoftwo}%
-      \else%
-        \def\tud@reserved{\endgroup\@secondoftwo}%
-      \fi%
-    }{%
-      \def\tud@reserved{%
-        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
-          There's no defined macro `\string\tud@v@\@tempa'%
-        }%
-        \endgroup\@firstoftwo%
-      }%
-    }%
-  \tud@reserved%
-}
 %%% From File: tudscr-misc.dtx
 \newif\if@tud@x@scr@paper@set
 \TUD@key{paper}{%
@@ -1419,18 +1398,6 @@
 \LoadClass{\TUD@Class@KOMA}[2015/04/23]
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
-\AtEndPreamble{%
-  \@ifpackageloaded{graphicx}{}{%
-    \@ifpackageloaded{graphics}{%
-      \ClassWarningNoLine{\TUD@Class@Name}{%
-        Package `graphics' was superseded by `graphicx',\MessageBreak%
-        which now will be loaded automatically%
-      }%
-    }{}%
-  }%
-  \RequirePackage{graphicx}[1999/02/16]%
-  \RequirePackage{tudscrcolor}[\TUD@Version]%
-}
 \cs@lock{tud@x@multicol@num}{1}
 \newcommand*\tud@x@multicol@check{%
   \ifnum\tud@x@multicol@num>\@ne\relax%
@@ -1442,6 +1409,18 @@
   \fi%
 }
 \AfterPackage{multicol}{\renewcommand*\tud@x@multicol@check{\relax}}
+\AtEndPreamble{%
+  \@ifpackageloaded{graphicx}{}{%
+    \@ifpackageloaded{graphics}{%
+      \ClassWarningNoLine{\TUD@Class@Name}{%
+        Package `graphics' was superseded by `graphicx',\MessageBreak%
+        which now will be loaded automatically%
+      }%
+    }{}%
+    \RequirePackage{graphicx}[1999/02/16]%
+  }%
+  \RequirePackage{tudscrcolor}[\TUD@Version]%
+}
 %%% From File: tudscr-fonts.dtx
 \newcommand*\tud@univers{lun}
 \newif\if@tud@univers
@@ -1531,6 +1510,19 @@
   \fi%
   \undef\tud@font@check%
 }
+\newcommand*\tud@raggedright{\raggedright}
+\newcommand*\tud@RaggedRight{\raggedright}
+\AfterPackage*{ragged2e}{%
+  \ifdef{\LaTeXraggedright}{%
+    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
+  }{}%
+  \renewcommand*\tud@RaggedRight{\RaggedRight}%
+}
+\AfterPackage*{siunitx}{%
+  \providecommand*\lseries{\fontseries{l}\selectfont}%
+}
+\newif\if@tud@x@bm@requested
+\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
 \RequirePackage{trimspaces}[2009/09/17]
 \newif\if@tud@x@mweights@enabled
 \AfterPackage*{mweights}{\@tud@x@mweights@enabledtrue}
@@ -2042,11 +2034,6 @@
   \fi%
   \AtBeginDocument{\tud@font@math@init\let\tud@font@math@init\relax}%
 }
-\newif\if@tud@x@bm@requested
-\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
-\AfterPackage*{siunitx}{%
-  \providecommand*\lseries{\fontseries{l}\selectfont}%
-}
 \newrobustcmd*\ifdin{%
   \ifx\f@family\tud@dinbold%
     \expandafter\@firstoftwo%
@@ -2061,14 +2048,6 @@
     \sectfont#1%
   \fi%
 }
-\newcommand*\tud@raggedright{\raggedright}
-\newcommand*\tud@RaggedRight{\raggedright}
-\AfterPackage*{ragged2e}{%
-  \ifdef{\LaTeXraggedright}{%
-    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
-  }{}%
-  \renewcommand*\tud@RaggedRight{\RaggedRight}%
-}
 \RequirePackage{textcase}[2004/10/07]
 \newcommand*\tud@makeuppercase[1]{%
   \ifdin{\begingroup\MakeTextUppercase{#1}\endgroup}{#1}%
@@ -2109,21 +2088,29 @@
     \let\footnote\@gobble%
     \def\newline{\space\ignorespaces}%
     \def\\{\space\ignorespaces}%
-    \def\@tempa##1{\csdef{##1}####1{\noexpand\relax}}%
+    \let\@tempc\relax%
+    \def\@tempa##1{\csedef{##1}####1{\@tempc}}%
     \let\@tempb\tud@split@author@list%
     \ifx\and\relax\else%
       \robustify\and%
     \fi%
     \expandafter\forcsvlist\expandafter\@tempa\expandafter{\@tempb}%
+    \def\@tempa##1##2{%
+      \def\@tempb####1##2####2\@nil{%
+        \IfArgIsEmpty{####2}{%
+          \def##1{####1}%
+        }{%
+          \@tempb####1####2\@nil%
+        }%
+      }%
+      \expandafter\@tempb##1##2\@nil%
+    }%
     \protected@edef\@@author{#1}%
-    \tud@replace\@@author{ \relax }{}%
-    \tud@replace\@@author{\relax }{}%
-    \tud@replace\@@author{ \relax}{}%
-    \tud@replace\@@author{\relax}{}%
-    \tud@replace\@@author{ \and }{\and}%
-    \tud@replace\@@author{ \and}{\and}%
-    \tud@replace\@@author{\and }{\and}%
-    \protected@xdef\@@author{\trim@spaces{\@@author}}%
+    \@tempa{\@@author}{ \@tempc }%
+    \@tempa{\@@author}{\@tempc }%
+    \@tempa{\@@author}{ \@tempc}%
+    \@tempa{\@@author}{\@tempc}%
+    \xdef\@@author{\expandonce\@@author}%
   \endgroup%
 }
 \newcommand*\@authormore{}
@@ -2136,6 +2123,7 @@
 \newcommand*\@thesis{}
 \newcommand*\@@thesis{}
 \newcommand*\thesis[1]{\tud@thesis@do{thesis}{#1}}
+\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\tud@thanks{}
 \newcommand*\tud@thesis@do[2]{%
   \begingroup%
@@ -2185,7 +2173,6 @@
   \fi%
   \protected@xdef\@@thesis{\trim@spaces{#2}}%
 }
-\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\@graduation{}
 \newcommand*\@@graduation{}
 \newcommand*\graduation[2][]{%
@@ -2670,6 +2657,22 @@
   \tud@locale@english{\@dotswap}{.}%
 }
 %%% From File: tudscr-area.dtx
+\newif\if@tud@x@crop@center
+\AfterPackage{crop}{%
+  \CheckCommand*\CROP@center{%
+    \voffset\stockheight
+    \advance\voffset-\paperheight
+    \voffset.5\voffset
+    \hoffset\stockwidth
+    \advance\hoffset-\paperwidth
+    \hoffset.5\hoffset
+  }%
+  \pretocmd{\CROP@center}{%
+    \@tud@x@crop@centertrue%
+  }{}{\tud@patch@wrn{CROP@center}}
+}
+\newif\if@tud@x@standalone@crop
+\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newlength\tud@len@widemargin
 \newlength\tud@len@slimmargin
 \newlength\tud@len@both
@@ -2859,22 +2862,6 @@
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
 }
-\newif\if@tud@x@crop@center
-\AfterPackage{crop}{%
-  \CheckCommand*\CROP@center{%
-    \voffset\stockheight
-    \advance\voffset-\paperheight
-    \voffset.5\voffset
-    \hoffset\stockwidth
-    \advance\hoffset-\paperwidth
-    \hoffset.5\hoffset
-  }%
-  \pretocmd{\CROP@center}{%
-    \@tud@x@crop@centertrue%
-  }{}{\tud@patch@wrn{CROP@center}}
-}
-\newif\if@tud@x@standalone@crop
-\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newcommand*\tud@cdgeometry@process{}
 \newcommand*\tud@cdgeometry@@process{}
 \if@tud@x@standalone@crop
@@ -3669,19 +3656,6 @@
   \AtEndPreamble{%
     \if@tud@x@standalone@crop%
       \pagestyle{empty}%
-      \hoffset=-72.27pt%
-      \voffset=-72.27pt%
-      \topmargin=0pt%
-      \headheight=0pt%
-      \headsep=0pt%
-      \marginparsep=0pt%
-      \marginparwidth=0pt%
-      \footskip=0pt%
-      \marginparpush=0pt%
-      \oddsidemargin=0pt%
-      \evensidemargin=0pt%
-      \topskip=0pt%
-      \textheight=\maxdimen%
       \let\tud@AfterChangingArea\relax%
       \let\tud@cdgeometry@process\relax%
     \else%
@@ -4090,16 +4064,43 @@
   ]{tudheadings.pagecolor}%
   \AddLayersToPageStyle{@everystyle@}{tudheadings.pagecolor}%
 }
+\newcommand*\tud@ps@list{}
 \listadd\tud@ps@list{tudheadings}
 \listadd\tud@ps@list{plain.tudheadings}
 \listadd\tud@ps@list{empty.tudheadings}
-\PreventPackageFromLoading[%
-  \ClassWarning{\TUD@Class@Name}{%
-    The package `fancyhdr' must not be used with a\MessageBreak%
-    TUD-Script class. You should make use of the\MessageBreak%
-    capabilities of package `scrlayer-scrpage' instead%
-  }%
-]{fancyhdr}
+\newcommand*\tud@if@tudheadings[3]{%
+  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
+}
+\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
+  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
+}{}{\tud@patch@wrn{thispagestyle}}
+\newcommand*\tud@pagestyle{}
+\let\tud@pagestyle\pagestyle
+\pretocmd{\tud@pagestyle}{%
+  \tud@BeforeSelectAnyPageStyle{#1}%
+  \edef\currentpagestyle{#1}%
+}{}{\tud@patch@wrn{pagestyle}}
+\tud@cmd@store{pagestyle}
+\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
+\BeforePackage{scrlayer-scrpage}{%
+  \tud@cmd@restore{pagestyle}%
+  \undef\tud@pagestyle%
+}
+\TUD@UnwindPackage{scrlayer-scrpage}{%
+  \ifcsundef{if@chapter}{%
+    \newif\if@chapter%
+    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
+  }{}%
+  \cslet{ps@tudheadings}{\ps@headings}%
+  \cslet{ps@plain.tudheadings}{\ps@plain}%
+  \cslet{ps@empty.tudheadings}{\ps@empty}%
+  \providecommand*\currentpagestyle{plain}%
+  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
+  \providecommand*\GetRealPageStyle[1]{#1}%
+  \let\pagestyle\tud@pagestyle%
+  \undef\tud@pagestyle%
+  \tud@cdgeometry@init%
+}
 \newcommand*\tud@ps@onselect{%
   \DeclarePageStyleAlias{plain}{plain.tudheadings}%
   \DeclarePageStyleAlias{headings}{tudheadings}%
@@ -4175,36 +4176,6 @@
   \ifstr{\tud@head@fontcolor}{white}{\let\tud@len@line\tud@len@heavyline}{}%
   \global\let\tud@foot@fontcolor\tud@foot@fontcolor%
 }
-\newcommand*\tud@pagestyle{}
-\let\tud@pagestyle\pagestyle
-\pretocmd{\tud@pagestyle}{%
-  \tud@BeforeSelectAnyPageStyle{#1}%
-  \edef\currentpagestyle{#1}%
-}{}{\tud@patch@wrn{pagestyle}}
-\tud@cmd@store{pagestyle}
-\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
-\BeforePackage{scrlayer-scrpage}{%
-  \tud@cmd@restore{pagestyle}%
-  \undef\tud@pagestyle%
-}
-\TUD@UnwindPackage{scrlayer-scrpage}{%
-  \ifcsundef{if@chapter}{%
-    \newif\if@chapter%
-    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
-  }{}%
-  \cslet{ps@tudheadings}{\ps@headings}%
-  \cslet{ps@plain.tudheadings}{\ps@plain}%
-  \cslet{ps@empty.tudheadings}{\ps@empty}%
-  \providecommand*\currentpagestyle{plain}%
-  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
-  \providecommand*\GetRealPageStyle[1]{#1}%
-  \let\pagestyle\tud@pagestyle%
-  \undef\tud@pagestyle%
-  \tud@cdgeometry@init%
-}
-\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
-  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
-}{}{\tud@patch@wrn{thispagestyle}}
 \newcommand*\tud@head@fontsize{}
 \newcommand*\tud@head@font@light{}
 \newcommand*\tud@head@font@bold{}
@@ -4360,40 +4331,6 @@
   \endgroup%
   \vbox to #1{#2}%
 }
-\AtBeginDocument{%
-  \tud@if@v@lower{2.04}{%
-    \renewcommand*\tud@comp@clearpage{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
-      \fi%
-    }%
-    \renewcommand*\tud@comp@resetpagestyle{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{%
-          \expandafter\pagestyle\expandafter{\currentpagestyle}%
-        }{}%
-      \fi%
-    }%
-  }{}%
-}
-\newcommand*\tud@ddc@check{%
-  \let\@tempa\tud@ddc@head@num%
-  \let\@tempb\tud@ddc@foot@num%
-  \if@tud@ddc@auto%
-    \ifdefvoid{\tud@headlogo@filename}{%
-      \let\@tempa\tud@ddc@auto@num%
-      \let\@tempb\z@%
-    }{%
-      \let\@tempa\z@%
-      \let\@tempb\tud@ddc@auto@num%
-    }%
-  \fi%
-  \tud@if@v@lower{2.03}{%
-    \ifnum\@tempb=\z@\relax%
-      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
-    \fi%
-  }{}%
-}
 \tud@newlayerbox{main@black}
 \tud@newlayerbox{main@HKS41}
 \tud@newlayerbox{main@white}
@@ -4522,10 +4459,6 @@
     \ifnum\@tempa>\z@\relax\tud@headlogo@wrn\fi%
   }%
 }
-\tud@newlayerbox{foot@black}
-\tud@newlayerbox{foot@HKS41}
-\tud@newlayerbox{foot@white}
-\tud@newlayerbox{foot@option}
 \AtEndOfClass{%
   \ifdefvoid{\tud@dim@footlogoheight}{%
     \tud@if@v@lower{2.03}{%
@@ -4535,6 +4468,10 @@
     }%
   }{}%
 }
+\tud@newlayerbox{foot@black}
+\tud@newlayerbox{foot@HKS41}
+\tud@newlayerbox{foot@white}
+\tud@newlayerbox{foot@option}
 \newcommand*\tud@footlogo@ddc@set[2]{%
   \tud@savelayerbox{foot@#1}{%
     \includegraphics[keepaspectratio,totalheight=\tud@dim@footlogoheight]{#2}%
@@ -4748,6 +4685,40 @@
     \hbox to #2{}%
   \fi%
 }
+\AtBeginDocument{%
+  \tud@if@v@lower{2.04}{%
+    \renewcommand*\tud@comp@clearpage{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
+      \fi%
+    }%
+    \renewcommand*\tud@comp@resetpagestyle{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{%
+          \expandafter\pagestyle\expandafter{\currentpagestyle}%
+        }{}%
+      \fi%
+    }%
+  }{}%
+}
+\newcommand*\tud@ddc@check{%
+  \let\@tempa\tud@ddc@head@num%
+  \let\@tempb\tud@ddc@foot@num%
+  \if@tud@ddc@auto%
+    \ifdefvoid{\tud@headlogo@filename}{%
+      \let\@tempa\tud@ddc@auto@num%
+      \let\@tempb\z@%
+    }{%
+      \let\@tempa\z@%
+      \let\@tempb\tud@ddc@auto@num%
+    }%
+  \fi%
+  \tud@if@v@lower{2.03}{%
+    \ifnum\@tempb=\z@\relax%
+      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
+    \fi%
+  }{}%
+}
 \newcommand*\tud@ps@parameters[1]{%
   \TUD@parameter@def{cdfont}[true]{\TUDoption{cdfont}{#1}}%
   \TUD@parameter@def{cdhead}[true]{\TUDoption{cdhead}{#1}}%
@@ -4827,6 +4798,13 @@
   \tud@ps@parameters{#1}%
   \TUD@parameter@handler@default{}%
 }
+\PreventPackageFromLoading[%
+  \ClassWarning{\TUD@Class@Name}{%
+    The package `fancyhdr' must not be used with a\MessageBreak%
+    TUD-Script class. You should make use of the\MessageBreak%
+    capabilities of package `scrlayer-scrpage' instead%
+  }%
+]{fancyhdr}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@x@scr@headings@current{}
 \newcommand*\tud@sec@fontsize{}
@@ -4867,6 +4845,11 @@
     \fi%
   ]%
 }
+\newcommand*\tud@headmidvskip@normal{\par\nobreak\vspace{.5\baselineskip}}
+\newcommand*\tud@headmidvskip@reverse{%
+  \setbox\z@\vbox{\tud@headmidvskip@normal}%
+  \vspace*{\dimexpr-\dp\strutbox-\ht\strutbox-\ht\z@\relax}%
+}
 \newcommand*\tud@title@fontcolor{}
 \newcommand*\tud@part@fontcolor{}
 \newcommand*\tud@chapter@fontcolor{}
@@ -4877,11 +4860,6 @@
   \tud@color{\tud@part@fontcolor}%
   \usesizeofkomafont{section}%
 }
-\newcommand*\tud@headmidvskip@normal{\par\nobreak\vspace{.5\baselineskip}}
-\newcommand*\tud@headmidvskip@reverse{%
-  \setbox\z@\vbox{\tud@headmidvskip@normal}%
-  \vspace*{\dimexpr-\dp\strutbox-\ht\strutbox-\ht\z@\relax}%
-}
 \newcommand*\tud@layout@process{%
   \ifcase\tud@layout@cover@num\relax% false
     \bool@std@lock{@tud@cdgeometry@cover}{false}%
@@ -5134,6 +5112,51 @@
   }%
   \tud@layout@specialpage@unset%
 }
+\newcommand*\tud@partpreamble{%
+  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
+    \renewcommand*\tud@abstract@level@num{1}%
+  \fi%
+  \KOMAoptions{titlepage=false}%
+  \addtokomafont{disposition}{\tud@color{\tud@part@fontcolor}}%
+  \addtokomafont{dictum}{\tud@color{\tud@part@fontcolor}}%
+  \tud@color{\tud@part@fontcolor}%
+  \vskip\dimexpr\topskip+.9\baselineskip\relax%
+  \@afterindentfalse\@afterheading%
+}
+\newcommand*\tud@chapterpreamble{%
+  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
+    \renewcommand*\tud@abstract@level@num{1}%
+  \fi%
+  \KOMAoptions{titlepage=false}%
+  \if@tud@chapterpage%
+    \ifcase\tud@cdfont@num\relax\or% true
+      \TUDoptions{cdfont=true}%
+    \or% heavy
+      \TUDoptions{cdfont=heavy}%
+    \fi%
+    \addtokomafont{disposition}{\tud@color{\tud@chapter@fontcolor}}%
+    \addtokomafont{dictum}{\tud@color{\tud@chapter@fontcolor}}%
+    \tud@color{\tud@chapter@fontcolor}%
+  \fi%
+  \@afterindentfalse\@afterheading%
+}
+\CheckCommand\set@@@@preamble[6]{%
+  \expandafter\gdef\csname #1@preamble\endcsname{%
+    \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
+  }%
+}
+\patchcmd{\set@@@@preamble}{%
+  \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
+}{%
+  \def\@tempa####1@####2{%
+    \@nameuse{tud@####1preamble}%
+    \KOMAoptionOf[\KOMAoption{parskip}]{\KOMAClassFileName}{parskip}%
+  }%
+  \hbox to\hsize{%
+    \let\phantomsection\relax%
+    #4\parbox[{#2}]{#3}{\@tempa#1#6\par}#5\par%
+  }%
+}{}{\tud@patch@wrn{set@@@@preamble}}
 \ifcsdef{scr@v@3.18}{\@tempswatrue}{\@tempswafalse}
 \if@tempswa
   \newcommand*\tud@@startpart{}%
@@ -5148,7 +5171,9 @@
       }{}%
     }{%
       \ifnumbered{#1}{%
-        \usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}%
+        \usekomafont{#1prefix}{%
+          \nobreak\tud@makeuppercase{\@nameuse{#1format}}%
+        }%
         \if@tud@parttitle%
           \enskip%
         \else%
@@ -5234,17 +5259,6 @@
     \size@part%
   }{}{\tud@patch@wrn{@spart}}%
 \fi
-\newcommand*\tud@partpreamble{%
-  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
-    \renewcommand*\tud@abstract@level@num{1}%
-  \fi%
-  \KOMAoptions{titlepage=false}%
-  \addtokomafont{disposition}{\tud@color{\tud@part@fontcolor}}%
-  \addtokomafont{dictum}{\tud@color{\tud@part@fontcolor}}%
-  \tud@color{\tud@part@fontcolor}%
-  \vskip\dimexpr\topskip+.9\baselineskip\relax%
-  \@afterindentfalse\@afterheading%
-}
 \newcommand*\tud@chapterheadstartvskip{%
   \renewcommand*\tud@chapter@fontcolor{}%
   \ifcase\tud@layout@chapter@num\relax\or\else% *color
@@ -5288,40 +5302,6 @@
     \tud@headmidvskip@normal%
   }{}{\tud@patch@wrn{@@makechapterhead}}%
 \fi
-\newcommand*\tud@chapterpreamble{%
-  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
-    \renewcommand*\tud@abstract@level@num{1}%
-  \fi%
-  \KOMAoptions{titlepage=false}%
-  \if@tud@chapterpage%
-    \ifcase\tud@cdfont@num\relax\or% true
-      \TUDoptions{cdfont=true}%
-    \or% heavy
-      \TUDoptions{cdfont=heavy}%
-    \fi%
-    \addtokomafont{disposition}{\tud@color{\tud@chapter@fontcolor}}%
-    \addtokomafont{dictum}{\tud@color{\tud@chapter@fontcolor}}%
-    \tud@color{\tud@chapter@fontcolor}%
-  \fi%
-  \@afterindentfalse\@afterheading%
-}
-\CheckCommand\set@@@@preamble[6]{%
-  \expandafter\gdef\csname #1@preamble\endcsname{%
-    \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
-  }%
-}
-\patchcmd{\set@@@@preamble}{%
-  \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
-}{%
-  \def\@tempa####1@####2{%
-    \@nameuse{tud@####1preamble}%
-    \KOMAoptionOf[\KOMAoption{parskip}]{\KOMAClassFileName}{parskip}%
-  }%
-  \hbox to\hsize{%
-    \let\phantomsection\relax%
-    #4\parbox[{#2}]{#3}{\@tempa#1#6\par}#5\par%
-  }%
-}{}{\tud@patch@wrn{set@@@@preamble}}
 \newcommand*\tud@chapter@pre{%
   \if@tud@chapterpage%
     \@restonecolfalse%
@@ -5486,83 +5466,10 @@
   \usekomafont{subject}%
   \mdseries%
   \large%
+  \tud@raggedright%
 }
 \robustify{\thanks}
 \robustify{\footnotemark}
-\newcommand*\tud@title@uppercase[1]{%
-  \let\@tempa\relax%
-  \begingroup%
-    \let\\\newline%
-    \def\thanks##1{\gdef\@tempa{##1}}%
-    \let\footnote\thanks%
-    \sbox\z@{#1}%
-    \let\thanks\@gobble%
-    \let\footnote\@gobble%
-    \tud@makeuppercase{#1}%
-  \endgroup%
-  \ifx\@tempa\relax\else\thanks\@tempa\fi%
-}
-\newcommand*\tud@title@delimiter{:\nobreakspace}
-\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
-\newcommand*\tud@newline@title{}
-\newcommand*\tud@split@author@title[2]{%
-  \tud@multiple@fields@store{@author}{#1}%
-  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
-  {\usekomafont{author}{\ignorespaces#1}}%
-  \if@tud@cover\else%
-    \ifx\@authormore\@empty\else%
-      \tud@newline@title%
-      \@authormore%
-    \fi%
-    \ifx\@dateofbirth\@empty\else%
-      \if@titlepage%
-        \tud@newline@title%
-        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
-        \@dateofbirth%
-        \ifx\@placeofbirth\@empty\else%
-          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
-        \fi%
-      \else%
-        \tud@title@wrn{dateofbirth}%
-      \fi%
-    \fi%
-    \def\@tempc##1{%
-      \ifstr{\csuse{@##1}}{}{}{%
-        \if@titlepage%
-          \tud@newline@title%
-          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
-          \csuse{@##1}%
-        \else%
-          \tud@title@wrn{##1}%
-        \fi%
-      }%
-    }%
-    \@tempc{course}%
-    \@tempc{discipline}%
-    \@tempc{matriculationnumber}%
-    \@tempc{matriculationyear}%
-  \fi%
-  \tud@multiple@fields@restore{@author}%
-  \tud@multiple@@@split{#2}{\vskip 2ex}%
-}
-\newcommand*\tud@title@wrn[1]{%
-  \ClassWarning{\TUD@Class@Name}{%
-    `\@backslashchar#1' has to be used with\MessageBreak%
-    activated titlepage option%
-  }%
-}
-\newcommand*\tud@thesis@tosubject{%
-  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
-    \ifx\@subject\@empty\else%
-      \ClassWarning{\TUD@Class@Name}{%
-        The option `subjectthesis' was activated, so\MessageBreak%
-        the field `subject' will be overwritten with the\MessageBreak%
-        given thesis%
-      }%
-    \fi%
-    \let\@subject\@thesis%
-  \fi\fi%
-}
 \newcommand*\tud@title@pagenumber{}
 \let\tud@title@pagenumber\relax
 \newcommand*\tud@maketitle[1][]{%
@@ -5828,21 +5735,6 @@
     \fi%
   \end{titlepage}%
 }
-\newcommand*\tud@title@names[1]{%
-  \letcs\@tempa{@#1}%
-  \ifx\@tempa\@empty\else%
-    \def\and{%
-      \ifcsvoid{#1othername}{\par}{%
-        \vskip 1ex\@plus.5ex\@minus.5ex%
-        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
-      }%
-      \let\and\par%
-    }%
-    \vskip 1ex\@plus.5ex\@minus.5ex%
-    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
-    {\usekomafont{author}{\csuse{@#1}\par}}%
-  \fi%
-}
 \newcommand*\tud@make@titlehead{%
   \renewcommand*\tud@title@fontcolor{}%
   \ifcase\tud@layout@title@num\relax\or\else% *color
@@ -5946,6 +5838,95 @@
     \tud@if@v@lower{2.03}{\tud@ddc@enlargepage[\titlepagestyle]}{}%
   \endgroup%
 }
+\newcommand*\tud@title@uppercase[1]{%
+  \let\@tempa\relax%
+  \begingroup%
+    \let\\\newline%
+    \def\thanks##1{\gdef\@tempa{##1}}%
+    \let\footnote\thanks%
+    \sbox\z@{#1}%
+    \let\thanks\@gobble%
+    \let\footnote\@gobble%
+    \tud@makeuppercase{#1}%
+  \endgroup%
+  \ifx\@tempa\relax\else\thanks\@tempa\fi%
+}
+\newcommand*\tud@thesis@tosubject{%
+  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
+    \ifx\@subject\@empty\else%
+      \ClassWarning{\TUD@Class@Name}{%
+        The option `subjectthesis' was activated, so\MessageBreak%
+        the field `subject' will be overwritten with the\MessageBreak%
+        given thesis%
+      }%
+    \fi%
+    \let\@subject\@thesis%
+  \fi\fi%
+}
+\newcommand*\tud@title@names[1]{%
+  \letcs\@tempa{@#1}%
+  \ifx\@tempa\@empty\else%
+    \def\and{%
+      \ifcsvoid{#1othername}{\par}{%
+        \vskip 1ex\@plus.5ex\@minus.5ex%
+        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
+      }%
+      \let\and\par%
+    }%
+    \vskip 1ex\@plus.5ex\@minus.5ex%
+    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
+    {\usekomafont{author}{\csuse{@#1}\par}}%
+  \fi%
+}
+\newcommand*\tud@title@delimiter{:\nobreakspace}
+\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
+\newcommand*\tud@newline@title{}
+\newcommand*\tud@split@author@title[2]{%
+  \tud@multiple@fields@store{@author}{#1}%
+  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
+  {\usekomafont{author}{\ignorespaces#1\unskip}}%
+  \if@tud@cover\else%
+    \ifx\@authormore\@empty\else%
+      \tud@newline@title%
+      \@authormore%
+    \fi%
+    \ifx\@dateofbirth\@empty\else%
+      \if@titlepage%
+        \tud@newline@title%
+        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
+        \@dateofbirth%
+        \ifx\@placeofbirth\@empty\else%
+          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
+        \fi%
+      \else%
+        \tud@title@wrn{dateofbirth}%
+      \fi%
+    \fi%
+    \def\@tempc##1{%
+      \ifstr{\csuse{@##1}}{}{}{%
+        \if@titlepage%
+          \tud@newline@title%
+          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
+          \csuse{@##1}%
+        \else%
+          \tud@title@wrn{##1}%
+        \fi%
+      }%
+    }%
+    \@tempc{course}%
+    \@tempc{discipline}%
+    \@tempc{matriculationnumber}%
+    \@tempc{matriculationyear}%
+  \fi%
+  \tud@multiple@fields@restore{@author}%
+  \tud@multiple@@@split{#2}{\vskip 2ex}%
+}
+\newcommand*\tud@title@wrn[1]{%
+  \ClassWarning{\TUD@Class@Name}{%
+    `\@backslashchar#1' has to be used with\MessageBreak%
+    activated titlepage option%
+  }%
+}
 \newcommand\maketitleonecolumn[2][]{%
   \if@twocolumn%
     \if@titlepage%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index 9a2d8a16489..d6a5f2fbe99 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
@@ -7,37 +7,30 @@
 %% tudscr-version.dtx  (with options: `package,color')
 %% tudscr-color.dtx  (with options: `package,color')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -59,7 +52,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
@@ -72,7 +65,7 @@
 }{}
 %%% From File: tudscr-color.dtx
 \ProvidesPackage{tudscrcolor}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (corporate design colors)%
 ]
@@ -80,12 +73,11 @@
 \DeclareOption{reduced}{\let\tud@setcolors@add\relax}
 \DeclareOption{oldcolors}{\let\tud@setcolors@add\tud@setcolors@old}
 \DeclareOption{full}{\let\tud@setcolors@add\tud@setcolors@old}
-\newcommand*\tud@color[1]{\ifdefvoid{#1}{}{\color{#1}}}
 \newcommand*\setcdcolors[1]{%
   \selectcolormodel{#1}%
   \tud@setcolors@do%
 }
-\newcommand*\tud@setcolors@add{}
+\newcommand*\tud@color[1]{\ifdefvoid{#1}{}{\color{#1}}}
 \newcommand*\tud@setcolors@do{%
   \definecolor{HKS41}{cmyk/RGB/rgb}{%
     1.00,0.70,0.10,0.50/011,042,081/0.0431372549,0.16470588235,0.31764705882%
@@ -122,6 +114,7 @@
   \colorlet{cdorange}{HKS07}%
   \tud@setcolors@add%
 }
+\newcommand*\tud@setcolors@add{}
 \newcommand*\tud@setcolors@old{%
   \colorlet{HKS41K10}{HKS41!10}%
   \colorlet{HKS41K20}{HKS41!20}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
index 191633c4251..c69357e0b45 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
@@ -10,37 +10,30 @@
 %% tudscr-misc.dtx  (with options: `package,comp,book,execute')
 %% tudscr-comp.dtx  (with options: `package,comp,book,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -62,11 +55,11 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
-\@ifundefined{TUD@Class@Name}{%
+\ifx\TUD@Class@Name\@undefined
   \PackageError{%
     tudscrcomp-book%
   }{Unsupported class found}{%
@@ -74,7 +67,7 @@
     tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl, tudscrposter).%
   }%
   \endinput
-}{}
+\fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
     \ifdin{TUD-SCRIPT}{%
@@ -84,7 +77,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-book}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
index 8138c76f88c..b82d6036db5 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
@@ -10,37 +10,30 @@
 %% tudscr-misc.dtx  (with options: `package,comp,poster,execute')
 %% tudscr-comp.dtx  (with options: `package,comp,poster,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -62,11 +55,11 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
-\@ifundefined{TUD@Class@Name}{%
+\ifx\TUD@Class@Name\@undefined
   \PackageError{%
     tudscrcomp-poster%
   }{Unsupported class found}{%
@@ -74,7 +67,7 @@
     tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl, tudscrposter).%
   }%
   \endinput
-}{}
+\fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
     \ifdin{TUD-SCRIPT}{%
@@ -84,7 +77,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp-poster}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
@@ -244,7 +237,7 @@
 }
 \newcommand\sectiontopskip{\scr@section@beforeskip}
 \newcommand\subsectiontopskip{\scr@subsection@beforeskip}
-\setcounter{secnumdepth}{-1}
+\setcounter{secnumdepth}{\m@ne}
 \newcommand*\fusszeile[2][]{\footcontent[#1]{#2}}
 \newcommand*\footcolumn[2]{%
   \ifxnumber{#1}{%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
index 0bcc52e725e..8eb0609d017 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
@@ -7,37 +7,30 @@
 %% tudscr-version.dtx  (with options: `package,comp,base')
 %% tudscr-comp.dtx  (with options: `package,comp,base,identify')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -59,11 +52,11 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
-\@ifundefined{TUD@Class@Name}{%
+\ifx\TUD@Class@Name\@undefined
   \PackageError{%
     tudscrcomp%
   }{Unsupported class found}{%
@@ -71,7 +64,7 @@
     tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl, tudscrposter).%
   }%
   \endinput
-}{}
+\fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
     \ifdin{TUD-SCRIPT}{%
@@ -81,7 +74,7 @@
 }{}
 %%% From File: tudscr-comp.dtx
 \ProvidesPackage{tudscrcomp}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (compatibility for old tud(scr) classes)%
 ]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
index 6e69c932af9..e69668a06f4 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
@@ -5,41 +5,37 @@
 %% The original source files were:
 %%
 %% tudscr-version.dtx  (with options: `class,doc')
-%% tudscr-doc.dtx  (with options: `class,doc')
+%% tudscr-base.dtx  (with options: `class,doc')
+%% tudscr-doc.dtx  (with options: `class,doc,option')
+%% tudscr-locale.dtx  (with options: `class,doc')
 %% tudscr-manual.dtx  (with options: `class,doc')
-%% tudscr-misc.dtx  (with options: `class,doc,xindy')
+%% tudscr-doc.dtx  (with options: `class,doc,body')
+%% tudscr-texindy.dtx  (with options: `class,doc')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -61,24 +57,24 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
-  \@ifundefined{TUD@Class@Parent}{%
+  \ifx\TUD@Class@Parent\@undefined%
     \newcommand*\TUD@Class@Name{#1}%
     \TUD@Class@Info%
-  }{}%
+  \fi%
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -95,16 +91,23 @@
     }\csname xspace\endcsname%
   }%
 }{}
+%%% From File: tudscr-base.dtx
+\RequirePackage{scrlfile}[2013/12/19]
+\RequirePackage{etoolbox}[2011/01/03]
+\newcommand*\tud@reserved{}
+\newcommand*\eaddto@hook[2]{%
+  \expandafter\addto@hook\expandafter#1\expandafter{#2}%
+}
+\BeforePackage{tudscrbase}{%
+  \undef\tud@reserved%
+  \undef\eaddto@hook%
+}
+\newcommand*\TUD@UnwindPackage[2]{\AtEndPreamble{\@ifpackageloaded{#1}{}{#2}}}
+\BeforePackage{tudscrbase}{\undef\TUD@UnwindPackage}
 %%% From File: tudscr-doc.dtx
-\RequirePackage{scrbase}[2013/12/19]%
-\newcommand*\saved@maketitle{}%
+\newcommand*\scr@maketitle{}%
 \PassOptionsToClass{toc=left}{scrartcl}%
-\AfterClass{scrartcl}{\let\saved@maketitle\@maketitle}%
-\AfterClass{ltxdoc}{%
-  \let\@maketitle\saved@maketitle%
-  \codeline@indexfalse%
-}%
-\AfterPackage{inputenc}{\RequirePackage{csquotes}[2011/10/22]}%
+\AfterClass{scrartcl}{\let\scr@maketitle\@maketitle}%
 \newcommand*\sd@saved@LoadClass{}
 \let\sd@saved@LoadClass=\LoadClass
 \renewcommand*\LoadClass[2][]{%
@@ -133,28 +136,260 @@
 }
 \LoadClassWithOptions{ltxdoc}
 \setcounter{IndexColumns}{2}
+\setcounter{StandardModuleDepth}{2}
 \DeclareOption{final}{\let\tudfinalflag\relax}
 \DeclareOption{texindy}{\let\tudxdyflag\relax}
 \DeclareOption{xindy}{\let\tudxdyflag\relax}
 \DeclareOption{xdy}{\let\tudxdyflag\relax}
 \ProcessOptions\relax
-\setlength\topmargin{-1in}
-\setlength\headheight{0pt}
-\setlength\headsep{30pt}
-\setlength\footskip{1.5\headsep}
-\setlength\textheight{\dimexpr\paperheight-2.5\headsep-\footskip\relax}
-\setlength\marginparwidth{150pt}
-\setlength\marginparsep{0pt}
-\setlength\oddsidemargin{\dimexpr\marginparwidth+\marginparsep-1in\relax}
-\setlength\textwidth{%
-  \dimexpr\paperwidth-1in-\oddsidemargin-.5\headsep\relax%
-}
-\RequirePackage{tudscrbase}[\TUD@Version]
+%%% From File: tudscr-locale.dtx
+\newcommand*\tud@locale@define[1]{%
+  \providecommand*#1{%
+    \ClassError{\TUD@Class@Name}{%
+      `\string#1' not defined for language `\languagename'%
+    }{%
+      Currently the class `\TUD@Class@Name' only supports the\MessageBreak%
+      languages german and english an its dialects. You must\MessageBreak%
+      define single patterns by yourself, e.g.:\MessageBreak%
+      `\string\providecaptionname{\languagename}\string#1{<text>}'\MessageBreak%
+      You can send your definitions to \tudscrmail\space in\MessageBreak%
+      order to implement support for additional languages.%
+    }%
+  }%
+}
+\tud@locale@define{\tud@general@name}
+\tud@locale@define{\tud@implementation@name}
+\tud@locale@define{\tud@changes@name}
+\tud@locale@define{\tud@todo@name}
+\tud@locale@define{\tud@environment@name}
+\tud@locale@define{\tud@environments@name}
+\tud@locale@define{\tud@option@name}
+\tud@locale@define{\tud@options@name}
+\tud@locale@define{\tud@pagestyle@name}
+\tud@locale@define{\tud@pagestyles@name}
+\tud@locale@define{\tud@layer@name}
+\tud@locale@define{\tud@layers@name}
+\tud@locale@define{\tud@length@name}
+\tud@locale@define{\tud@lengths@name}
+\tud@locale@define{\tud@counter@name}
+\tud@locale@define{\tud@counters@name}
+\tud@locale@define{\tud@TUDcolor@name}
+\tud@locale@define{\tud@TUDcolors@name}
+\tud@locale@define{\tud@locale@name}
+\tud@locale@define{\tud@locales@name}
+\tud@locale@define{\tud@field@name}
+\tud@locale@define{\tud@fields@name}
+\tud@locale@define{\tud@KOMAfont@name}
+\tud@locale@define{\tud@KOMAfonts@name}
+\tud@locale@define{\tud@parameter@name}
+\tud@locale@define{\tud@parameters@name}
+\tud@locale@define{\tud@index@text}
+\newcommand*\tud@locale@german{%
+  \providecaptionname{%
+    german,ngerman,austrian,naustrian,swissgerman,nswissgerman%
+  }%
+}
+\tud@locale@german{\tud@general@name}{Allgemein}%
+\tud@locale@german{\tud@implementation@name}{Implementierung}%
+\tud@locale@german{\tud@changes@name}{\"Anderungsliste}
+\tud@locale@german{\tud@todo@name}{Liste der noch zu erledigenden Punkte}
+\tud@locale@german{\tud@environment@name}{Umg.}
+\tud@locale@german{\tud@environments@name}{Umgebungen}
+\tud@locale@german{\tud@option@name}{Opt.}
+\tud@locale@german{\tud@options@name}{Optionen}
+\tud@locale@german{\tud@pagestyle@name}{Seitenstil}
+\tud@locale@german{\tud@pagestyles@name}{Seitenstile}
+\tud@locale@german{\tud@layer@name}{Layer}
+\tud@locale@german{\tud@layers@name}{Layer (Seitenstilebenen)}
+\tud@locale@german{\tud@length@name}{L\"ange}
+\tud@locale@german{\tud@lengths@name}{L\"angen}
+\tud@locale@german{\tud@counter@name}{Z\"ahler}
+\tud@locale@german{\tud@counters@name}{Z\"ahler}
+\tud@locale@german{\tud@TUDcolor@name}{Farbe}
+\tud@locale@german{\tud@TUDcolors@name}{Farben}
+\tud@locale@german{\tud@locale@name}{Lok.}
+\tud@locale@german{\tud@locales@name}{Lokalisierungsvariablen}
+\tud@locale@german{\tud@field@name}{Feld}
+\tud@locale@german{\tud@fields@name}{Eingabefelder}
+\tud@locale@german{\tud@KOMAfont@name}{Schriftel.}
+\tud@locale@german{\tud@KOMAfonts@name}{Schriftelemente}
+\tud@locale@german{\tud@parameter@name}{Param.}
+\tud@locale@german{\tud@parameters@name}{Parameter}
+\tud@locale@german{\tud@index@text}{%
+  Kursive Zahlen entsprechen der Seite, auf welcher der korrespondierende
+  Eintrag beschrieben wird. Unterstrichene Zahlen verweisen auf die
+  \ifcodeline@index Codezeile der \fi Definition. Alle weiteren Eintr\"age sind
+  \ifcodeline@index Zeilennummern\else Seitenzahlen\fi, wo der jeweilige
+  Eintrag verwendet wird.
+}
+\newcommand*\tud@locale@english{%
+  \providecaptionname{%
+    american,australian,british,canadian,english,newzealand,UKenglish,USenglish%
+  }%
+}
+\tud@locale@english{\tud@general@name}{General}%
+\tud@locale@english{\tud@implementation@name}{Implementation}%
+\tud@locale@english{\tud@changes@name}{Change History}
+\tud@locale@english{\tud@todo@name}{List of ToDos}
+\tud@locale@english{\tud@environment@name}{env.}
+\tud@locale@english{\tud@environments@name}{environments}
+\tud@locale@english{\tud@option@name}{opt.}
+\tud@locale@english{\tud@options@name}{options}
+\tud@locale@english{\tud@pagestyle@name}{pagestyle}
+\tud@locale@english{\tud@pagestyles@name}{pagestyles}
+\tud@locale@english{\tud@layer@name}{layer}
+\tud@locale@english{\tud@layers@name}{layers (pagestyle)}
+\tud@locale@english{\tud@length@name}{length}
+\tud@locale@english{\tud@lengths@name}{lengths}
+\tud@locale@english{\tud@counter@name}{counter}
+\tud@locale@english{\tud@counters@name}{counters}
+\tud@locale@english{\tud@TUDcolor@name}{color}
+\tud@locale@english{\tud@TUDcolors@name}{colors}
+\tud@locale@english{\tud@locale@name}{locale}
+\tud@locale@english{\tud@locales@name}{locales}
+\tud@locale@english{\tud@field@name}{field}
+\tud@locale@english{\tud@fields@name}{input fields}
+\tud@locale@english{\tud@KOMAfont@name}{font}
+\tud@locale@english{\tud@KOMAfonts@name}{font elements}
+\tud@locale@english{\tud@parameter@name}{param.}
+\tud@locale@english{\tud@parameters@name}{parameters}
+\tud@locale@english{\tud@index@text}{%
+  Numbers written in italic refer to the page where the corresponding entry is
+  described. Numbers underlined refer to the
+  \ifcodeline@index code line of the \fi definition. All additional entries
+  refer to the \ifcodeline@index code lines \else pages \fi where the entry is
+  used.
+}
+%%% From File: tudscr-manual.dtx
+\RequirePackage{scrhack}[2014/02/27]
+\RequirePackage{xspace}[2009/10/20]
+\xspaceaddexceptions{"=}
+\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
+\newcommand*\vKOMAScript{v\TUD@Version@KOMA}
+\newcommand*\tud@english[1]{#1}
+\AtBeginDocument{%
+  \providecommand*\iflanguageloaded[3]{#3}%
+  \iflanguageloaded{english}{%
+    \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
+  }{}%
+}
+\RequirePackage{pdftexcmds}[2016/05/21]
+\PassOptionsToPackage{hyperindex=false,colorlinks,linkcolor=blue}{hyperref}
+\PassOptionsToPackage{open,openlevel=0}{bookmark}
+\AfterPackage*{hyperref}{%
+  \newcommand*\hypersource@def{}
+  \newcommand*\hypersourcedef[1]{%
+    \ifstr{#1}{\hypersource@def}{}{%
+      \Hy@raisedlink{\hyperdef{}{source:#1}{}}%
+      \xdef\hypersource@def{#1}%
+    }%
+  }%
+  \newcommand*\hypersource@ref@codeline[2][\@firstofone]{%
+    \begingroup%
+      \def\@tempa##1{\hyperref{}{}{source:##1}{#1{##1}}}%
+      \forcsvlist\@tempa{#2}%
+    \endgroup%
+  }%
+  \newcommand*\hypersource@ref@page[2][\@firstofone]{%
+    \begingroup%
+      \def\@tempa##1{\hyperlink{page.##1}{#1{##1}}}%
+      \forcsvlist\@tempa{#2}%
+    \endgroup%
+  }%
+  \renewcommand*\main[1]{%
+    \ifcodeline@index%
+      \hypersource@ref@codeline[\underline]{#1}%
+    \else%
+      \hypersource@ref@page[\underline]{#1}%
+    \fi%
+  }%
+  \renewcommand*\usage[1]{\hypersource@ref@page[\textit]{#1}}%
+}
+\TUD@UnwindPackage{hyperref}{%
+  \providecommand*\hypersetup[1]{}%
+  \providecommand*\href[3][]{#3}%
+  \providecommand*\phantomsection{}%
+  \providecommand*\texorpdfstring[2]{#1}%
+  \RequirePackage{url}[2013/09/16]%
+  \providecommand*\nolinkurl[1]{\url{#1}}%
+  \providecommand*\hypersourcedef[1]{}
+  \providecommand*\hypersource@def{}
+  \providecommand*\hypersource@ref@codeline[2][]{}
+  \providecommand*\hypersource@ref@page[2][]{}
+}
+\TUD@UnwindPackage{trimspaces}{\providecommand*\trim@spaces[1]{#1}}
+\newcommand*\hrfn[2]{%
+  \href{#1}{\trim@spaces{#2}}%
+  \footnote{%
+    \begingroup%
+      \def\_{_}%
+      \edef\@tempa{#1}%
+      \strut\expandafter\url\expandafter{\@tempa}%
+    \endgroup%
+  }%
+}
+\newrobustcmd*\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}%
+\AfterPackage*{hyperref}{%
+  \patchcmd{\pdfstringdef}{\csname HyPsd@babel@}{%
+    \let\bbl@info\@gobble\csname HyPsd@babel@%
+  }{}{\tud@patch@wrn{pdfstringdef}}%
+}
+\AfterPackage*{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
+\newcommand*\tud@replace[3]{%
+  \begingroup%
+    \toks@{\def\@tempa##1}%
+    \eaddto@hook\toks@{\detokenize{#2}}%
+    \addto@hook\toks@{##2\@nil{\@tempb{##1}{##2}}}%
+    \the\toks@%
+    \def\@tempb##1##2{%
+      \IfArgIsEmpty{##2}{%
+        \appto#1{##1}%
+        \let\@tempc\relax%
+      }{%
+        \appto#1{##1#3}%
+        \def\@tempc{\@tempa##2\@nil}%
+      }%
+      \@tempc%
+    }%
+    \toks@{\@tempa}%
+    \edef\@tempc{\expandafter\detokenize\expandafter{#1}}%
+    \eaddto@hook\toks@{\@tempc}%
+    \eaddto@hook\toks@{\detokenize{#2}\@nil}%
+    \def#1{}%
+    \the\toks@%
+    \edef\tud@reserved{%
+      \noexpand\endgroup%
+      \def\noexpand#1{#1}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\CD{\tud@english{Corporate Design}\xspace}
+\newcommand*\CDs{\tud@english{Corporate Designs}\xspace}
+\newcommand*\TUD{Technische Universit\"at Dresden\xspace}
+\newcommand*\TnUD{Technischen Universit\"at Dresden\xspace}
+\newcommand*\TUDCD{\CD der \TnUD}
+\newcommand*\TUDCDs{\CDs der \TnUD}
+\newrobustcmd*\DDC{%
+  \mbox{%
+    D\kern.05em R\kern.05em E\kern.05em S\kern.05em %
+    D\kern.05em E\kern.05em N\kern.1em-\kern.1em concept%
+  }\xspace%
+}
+\AfterPackage*{hyperref}{%
+  \pdfstringdefDisableCommands{%
+    \def\DDC{DRESDEN-concept}%
+    \def\TUDScript{TUD-Script}%
+    \def\KOMAScript{KOMA-Script}%
+  }%
+}
+\newcommand*\Univers{\texorpdfstring{\textubn{Univers}}{Univers}\xspace}
+\newcommand*\DIN{\texorpdfstring{\textdbn{DIN~BOLD}}{DIN BOLD}\xspace}
+%%% From File: tudscr-doc.dtx
 \RequirePackage{dox}[2010/12/16]
 \@ifpackagelater{dox}{2010/12/17}{%
   \ClassWarning{\TUD@Class@Name}{%
     Package `dox' was updated so some patches\MessageBreak%
-    are maybe outdated
+    are maybe outdated%
   }%
 }{}%
 \CheckCommand\m@cro@[2]{%
@@ -192,211 +427,6 @@
   \global\advance\c@CodelineNo\m@ne
   \ignorespaces
 }
-\CheckCommand*\changes@[3]{%
-  \protected@edef\@tempa{%
-    \noexpand\glossary{%
-      #1\levelchar
-      \ifx\saved@macroname\@empty
-        \space
-        \actualchar
-        \generalname
-      \else
-        \saved@indexname
-        \actualchar
-        \string\verb\quotechar*%
-        \verbatimchar\saved@macroname
-        \verbatimchar
-      \fi
-      :\levelchar #3%
-    }%
-  }%
-  \@tempa\endgroup\@esphack%
-}
-\ifdefined\tudxdyflag%
-  \renewcommand*\changes@[3]{%
-    \@tempswatrue%
-    \ifblank{#1}{\@tempswafalse}{}%
-    \ifblank{#3}{\@tempswafalse}{}%
-    \if@tempswa%
-      \protected@edef\@tempa{%
-        \noexpand\glossary{%
-          #1\levelchar%
-          \ifx\saved@macroname\@empty%
-            \generalname%
-          \else%
-            \implementationname%
-          \fi%
-          \levelchar
-          \ifx\saved@macroname\@empty\else%
-            \saved@indexname
-            \ifx\saved@idxtype\@empty\else%
-              \space\saved@idxtype
-            \fi%
-            \actualchar
-            \string\verb\quotechar*%
-            \verbatimchar\saved@macroname
-            \verbatimchar%
-            \ifx\saved@idxtype\@empty\else%
-              \space(\saved@idxtype)%
-            \fi%
-            :\levelchar
-          \fi
-          #2 #3%
-          \actualchar%
-          #3% (#2)%
-        }%
-      }%
-    \else%
-      \let\@tempa\relax%
-    \fi%
-    \@tempa\endgroup\@esphack%
-  }%
-\else%
-  \renewcommand*\changes@[3]{%
-    \protected@edef\@tempa{%
-      \noexpand\glossary{%
-        #1\levelchar
-        \ifx\saved@macroname\@empty
-          \quotechar!
-          \actualchar
-          \generalname
-        \else
-          \saved@indexname
-          \actualchar
-          \string\verb\quotechar*%
-          \verbatimchar\saved@macroname
-          \verbatimchar
-        \fi
-        :\levelchar #3%
-      }%
-    }%
-    \@tempa\endgroup\@esphack%
-  }%
-\fi%
-\CheckCommand*\@wrglossary[1]{%
-  \protected@write\@glossaryfile{}%
-  {\string\glossaryentry{#1}{\thepage}}%
-  \endgroup
-  \@esphack%
-}
-\def\filesep{?-}
-\def\@wrglossary#1{%
-  \ifx\special@index\index%
-    \@tempswafalse%
-  \else%
-    \@tempswatrue%
-  \fi%
-  \ifx\saved@macroname\@empty%
-    \@tempswafalse%
-  \fi%
-  \if@tempswa%
-    \global\advance\c@CodelineNo\@ne
-    \protected@write\@glossaryfile{}{%
-      \string\glossaryentry{#1}{\filesep\number\c@CodelineNo}%
-    }
-    \global\advance\c@CodelineNo\m@ne
-  \else%
-    \protected@write\@glossaryfile{}{\string\glossaryentry{#1}{\thepage}}
-  \fi%
-  \endgroup
-  \@esphack%
-}
-\renewcommand*\generalname{Allgemein}
-\newcommand*\implementationname{Implementierung}
-\newcommand*\hypersourcedef[1]{}
-\newcommand*\hypersource@def{}
-\newcommand*\hypersourceref[1]{#1}
-\newcommand*\hypersource@ref[2][]{}
-\PassOptionsToPackage{hyperindex=false}{hyperref}
-\AfterPackage{hyperref}{%
-  \renewcommand*\hypersourcedef[1]{%
-    \ifstr{#1}{\hypersource@def}{}{%
-      \Hy@raisedlink{\hyperdef{}{source:#1}{}}%
-      \xdef\hypersource@def{#1}%
-    }%
-  }%
-  \renewcommand*\hypersourceref[1]{\hypersource@ref{#1}}%
-  \renewcommand*\main[1]{\hypersource@ref[\underline]{#1}}%
-  \renewcommand*\hypersource@ref[2][\@firstofone]{%
-    \begingroup%
-      \def\@tempa##1-##2\relax{%
-        \IfArgIsEmpty{##2}{%
-          \hyperlink{page.\@tempc}{#1{\@tempc}}%
-        }{%
-          \hyperref{}{}{source:\@tempc}{#1{\@tempc}}%
-        }%
-      }%
-      \def\@tempb##1{%
-        \def\@tempc{##1}%
-        \expandafter\@tempa##1-\relax%
-      }%
-      \forcsvlist\@tempb{#2}%
-    \endgroup%
-  }%
-}
-\CheckCommand*\@doxcreatespecialmainindex[3]{%
-  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
-    \@bsphack%
-    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)
-      \encapchar main}%
-    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}
-      \encapchar main}%
-    \@esphack%
-  }%
-}
-\patchcmd{\@doxcreatespecialmainindex}{\actualchar}{%
-  \space(#2)\actualchar%
-}{}{\tud@patch@wrn{@doxcreatespecialmainindex}}
-\patchcmd{\@doxcreatespecialmainindex}{\@esphack}{%
-  \@esphack\hypersourcedef{\filesep\number\c@CodelineNo}%
-}{}{\tud@patch@wrn{@doxcreatespecialmainindex}}
-\CheckCommand*\@doxcreatespecialmainmacrolikeindex[3]{%
-  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
-    \@SpecialIndexHelper@##1\@nil
-    \@bsphack%
-    \special@index{\@gtempa\actualchar
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
-      \space(#2)\encapchar main}%
-    \special@index{#3:\levelchar\@gtempa\actualchar%
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
-      \encapchar main}%
-    \@esphack%
-  }%
-}
-\patchcmd{\@doxcreatespecialmainmacrolikeindex}{\actualchar}{%
-  \space(#2)\actualchar%
-}{}{\tud@patch@wrn{@doxcreatespecialmainmacrolikeindex}}
-\patchcmd{\@doxcreatespecialmainmacrolikeindex}{\@esphack}{%
-  \@esphack\hypersourcedef{\filesep\number\c@CodelineNo}%
-}{}{\tud@patch@wrn{@doxcreatespecialmainmacrolikeindex}}
-\CheckCommand*\@doxcreatespecialindex[3]{%
-  \expandafter\def\csname Special#1Index\endcsname##1{%
-    \@bsphack%
-    \index{##1\actualchar{\protect\ttfamily##1} (#2)\encapchar usage}%
-    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}
-      \encapchar usage}%
-    \@esphack%
-  }%
-}
-\patchcmd{\@doxcreatespecialindex}{\actualchar}{%
-  \space(#2)\actualchar%
-}{}{\tud@patch@wrn{@doxcreatespecialindex}}
-\CheckCommand*\@doxcreatespecialmacrolikeindex[3]{%
-  \expandafter\def\csname Special#1Index\endcsname##1{%
-    \@SpecialIndexHelper@##1\@nil
-    \@bsphack%
-    \index{\@gtempa\actualchar
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
-      \space(#2)\encapchar usage}%
-    \index{#3:\levelchar\@gtempa\actualchar
-      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
-      \encapchar usage}%
-    \@esphack%
-  }%
-}
-\patchcmd{\@doxcreatespecialmacrolikeindex}{\actualchar}{%
-  \space(#2)\actualchar%
-}{}{\tud@patch@wrn{@doxcreatespecialmacrolikeindex}}
 \CheckCommand\doxitem[4][]{%
   \@nameuse{dox@macrolike\dox@macrolikedefault}%
   \def\dox@idxtype{#3}%
@@ -432,66 +462,198 @@
   \@doxcreatedescribe{#2}
   \@doxcreateenv{#2}{#3}%
 }
-\CheckCommand\doxitem[4][]{%
+\renewcommand*\doxitem[4][]{%
   \@nameuse{dox@macrolike\dox@macrolikedefault}%
   \def\dox@idxtype{#3}%
-  \setkeys{dox}{#1}
-  \@ifundefined{Print#2Name}{%
-    \ifdox@macrolike
-      \expandafter\def\csname Print#2Name\endcsname##1{%
-        \strut\MacroFont\string ##1\ }
-    \else
-      \expandafter\def\csname Print#2Name\endcsname##1{%
-        \strut\MacroFont ##1\ }
-    \fi}{}
-  \ifdox@macrolike
+  \setkeys{dox}{#1}%
+  \ifdox@macrolike%
     \def\@doxexpr{\@doxcreatespecialmainmacrolikeindex{#2}}%
-  \else
+  \else%
     \def\@doxexpr{\@doxcreatespecialmainindex{#2}}%
-  \fi
+  \fi%
   \expandafter\@doxexpr\expandafter{\dox@idxtype}{#4}%
-  \@ifundefined{PrintDescribe#2}{%
-    \ifdox@macrolike
-      \expandafter\def\csname PrintDescribe#2\endcsname##1{%
-        \strut\MacroFont\string ##1\ }
-    \else
-      \expandafter\def\csname PrintDescribe#2\endcsname##1{%
-        \strut\MacroFont ##1\ }
-    \fi}{}
-  \ifdox@macrolike
+  \ifdox@macrolike%
     \def\@doxexpr{\@doxcreatespecialmacrolikeindex{#2}}%
-  \else
+  \else%
     \def\@doxexpr{\@doxcreatespecialindex{#2}}%
-  \fi
+  \fi%
   \expandafter\@doxexpr\expandafter{\dox@idxtype}{#4}%
-  \@doxcreatedescribe{#2}
-  \@doxcreateenv{#2}{#3}%
-}
-\CheckCommand*\@doxcreateenv[2]{%
-  \expandafter\def\csname #2\endcsname{%
-    \@ifnextchar[%]
-    {\@doxenv{#1}}{\@doxenv{#1}[]}}
-  \expandafter\let\csname end#2\endcsname\endtrivlist%
-}
-\pretocmd{\@doxcreateenv}{%
   \ifdox@macrolike%
-    \def\@doxexpr{\@doxcreatemacrolikeindexname{#1}}%
+    \def\@doxexpr{\@doxcreatemacrolikeprintname{#2}}%
+  \else%
+    \def\@doxexpr{\@doxcreateprintname{#2}}%
+  \fi%
+  \expandafter\@doxexpr\expandafter{\dox@idxtype}%
+  \ifdox@macrolike%
+    \def\@doxexpr{\@doxcreatemacrolikeindexname{#2}}%
   \else%
-    \def\@doxexpr{\@doxcreateindexname{#1}}%
+    \def\@doxexpr{\@doxcreateindexname{#2}}%
   \fi%
   \expandafter\@doxexpr\expandafter{\dox@idxtype}%
-}{}{\tud@patch@wrn{@doxcreateenv}}
-\newcommand*\saved@idxtype{}
+  \@doxcreatedescribe{#2}%
+  \@doxcreateenv{#2}{#3}%
+}
+\newrobustcmd*\index@type[1]{%
+  \begingroup%
+  \normalfont\scriptsize\space(#1)%
+  \endgroup%
+}
+\CheckCommand*\@doxcreatespecialmainmacrolikeindex[3]{%
+  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
+    \@SpecialIndexHelper@##1\@nil
+    \@bsphack%
+    \special@index{\@gtempa\actualchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \space(#2)\encapchar main}%
+    \special@index{#3:\levelchar\@gtempa\actualchar%
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \encapchar main}%
+    \@esphack%
+  }%
+}
+\renewcommand*\@doxcreatespecialmainmacrolikeindex[3]{%
+  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
+    \@SpecialIndexHelper@##1\@nil%
+    \@bsphack%
+    \protected@edef\tud@reserved{#2}%
+    \special@index{%
+      \@gtempa\space\expandonce\tud@reserved\actualchar%
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
+      \index@type{\expandonce\tud@reserved}\encapchar main%
+    }%
+    \protected@edef\tud@reserved{#3}%
+    \special@index{%
+      \expandonce\tud@reserved:\levelchar\@gtempa\actualchar%
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
+      \encapchar main%
+    }%
+    \@esphack%
+    \let\parameter@parent@changes\relax%
+    \hypersourcedef{\filesep\number\c@CodelineNo}%
+  }%
+}
+\CheckCommand*\@doxcreatespecialmainindex[3]{%
+  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
+    \@bsphack%
+    \special@index{##1\actualchar{\string\ttfamily\space##1} (#2)
+      \encapchar main}%
+    \special@index{#3:\levelchar##1\actualchar{\string\ttfamily\space##1}
+      \encapchar main}%
+    \@esphack%
+  }%
+}
+\renewcommand*\@doxcreatespecialmainindex[3]{%
+  \expandafter\def\csname SpecialMain#1Index\endcsname##1{%
+    \@bsphack%
+    \protected@edef\tud@reserved{#2}%
+    \special@index{%
+      ##1\space\expandonce\tud@reserved\actualchar%
+      {\string\ttfamily\space##1}\index@type{\expandonce\tud@reserved}%
+      \encapchar main%
+    }%
+    \protected@edef\tud@reserved{#3}%
+    \special@index{%
+      \expandonce\tud@reserved:\levelchar##1\actualchar%
+      {\string\ttfamily\space##1}\encapchar main%
+    }%
+    \@esphack%
+    \let\parameter@parent@changes\relax%
+    \hypersourcedef{\filesep\number\c@CodelineNo}%
+  }%
+}
+\CheckCommand*\@doxcreatespecialmacrolikeindex[3]{%
+  \expandafter\def\csname Special#1Index\endcsname##1{%
+    \@SpecialIndexHelper@##1\@nil
+    \@bsphack%
+    \index{\@gtempa\actualchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \space(#2)\encapchar usage}%
+    \index{#3:\levelchar\@gtempa\actualchar
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar
+      \encapchar usage}%
+    \@esphack%
+  }%
+}
+\renewcommand*\@doxcreatespecialmacrolikeindex[3]{%
+  \expandafter\def\csname Special#1Index\endcsname##1{%
+    \@SpecialIndexHelper@##1\@nil%
+    \@bsphack%
+    \protected@edef\tud@reserved{#2}%
+    \index{%
+      \@gtempa\space\expandonce\tud@reserved\actualchar%
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
+      \index@type{\expandonce\tud@reserved}\encapchar usage%
+    }%
+    \protected@edef\tud@reserved{#3}%
+    \index{%
+      \expandonce\tud@reserved:\levelchar\@gtempa\actualchar%
+      \string\verb\quotechar*\verbatimchar\bslash\@gtempa\verbatimchar%
+      \encapchar usage%
+    }%
+    \@esphack%
+  }%
+}
+\CheckCommand*\@doxcreatespecialindex[3]{%
+  \expandafter\def\csname Special#1Index\endcsname##1{%
+    \@bsphack%
+    \index{##1\actualchar{\protect\ttfamily##1} (#2)\encapchar usage}%
+    \index{#3:\levelchar##1\actualchar{\protect\ttfamily##1}
+      \encapchar usage}%
+    \@esphack%
+  }%
+}
+\renewcommand*\@doxcreatespecialindex[3]{%
+  \expandafter\def\csname Special#1Index\endcsname##1{%
+    \@bsphack%
+    \protected@edef\tud@reserved{#2}%
+    \index{%
+      ##1\space\expandonce\tud@reserved\actualchar%
+      {\protect\ttfamily##1}\index@type{\expandonce\tud@reserved}%
+      \encapchar usage%
+    }%
+    \protected@edef\tud@reserved{#3}%
+    \index{%
+      \expandonce\tud@reserved:\levelchar##1\actualchar%
+      {\protect\ttfamily##1}\encapchar usage%
+    }%
+    \@esphack%
+  }%
+}
+\def\@doxcreatemacrolikeprintname#1#2{%
+  \@ifundefined{Print#1Name}{%
+    \expandafter\def\csname Print#1Name\endcsname##1{%
+      \MacroFont\string##1\index@type{#2}\strut\ %
+    }%
+  }{}%
+  \@ifundefined{PrintDescribe#1}{%
+    \expandafter\def\csname PrintDescribe#1\endcsname##1{%
+      \MacroFont\string##1\index@type{#2}\strut\ %
+    }%
+  }{}%
+}
+\def\@doxcreateprintname#1#2{%
+  \@ifundefined{Print#1Name}{%
+    \expandafter\def\csname Print#1Name\endcsname##1{%
+      \MacroFont##1\index@type{#2}\strut\ %
+    }%
+  }{}%
+  \@ifundefined{PrintDescribe#1}{%
+    \expandafter\def\csname PrintDescribe#1\endcsname##1{%
+      \MacroFont##1\index@type{#2}\strut\ %
+    }%
+  }{}%
+}
+\newcommand*\saved@indextype{}
 \def\@doxcreatemacrolikeindexname#1#2{%
   \expandafter\def\csname Set#1IndexName\endcsname##1{%
     \edef\saved@indexname{\expandafter\@gobble##1}%
-    \edef\saved@idxtype{#2}%
+    \protected@edef\saved@indextype{#2}%
   }%
 }
 \def\@doxcreateindexname#1#2{%
   \expandafter\def\csname Set#1IndexName\endcsname##1{%
     \let\saved@indexname##1%
-    \edef\saved@idxtype{#2}%
+    \protected@edef\saved@indextype{#2}%
   }%
 }
 \CheckCommand\@@doxenv[2]{%
@@ -528,105 +690,354 @@
 \patchcmd{\@@doxenv}{\ignorespaces}{%
   \csname Set#1IndexName\endcsname{\saved@macroname}\ignorespaces%
 }{}{\tud@patch@wrn{@@doxenv}}
-\def\SetMacroIndexName#1{%
-  \edef\saved@indexname{\expandafter\@gobble#1}
-  \let\saved@idxtype\@empty%
-}
-\def\SetEnvIndexName#1{%
-  \let\saved@indexname#1%
-  \edef\saved@idxtype{environment}%
+\newcommand*\SetMacroIndexName[1]{%
+  \edef\saved@indexname{\expandafter\@gobble#1}%
+  \let\saved@indextype\@empty%
 }
 \CheckCommand*\SpecialMainMacroIndex[1]{%
   \SpecialMainIndex{#1}\nobreak%
   \DoNotIndex{#1}%
 }
 \apptocmd{\SpecialMainMacroIndex}{%
+  \let\parameter@parent@changes\relax%
   \hypersourcedef{\filesep\number\c@CodelineNo}%
 }{}{\tud@patch@wrn{SpecialMainMacroIndex}}
-\doxitem[idxtype=Umgebung]{Env}{environment}{Umgebungen}
-\doxitem[idxtype=Option]{Option}{option}{Optionen}
-\doxitem[idxtype=Parameter]{Parameter}{parameter}{Parameter}
-\doxitem[idxtype=Seitenstil]{PageStyle}{pagestyle}{Seitenstile}
-\doxitem[idxtype=Layer]{Layer}{layer}{Layer (Seitenstilebenen)}
-\doxitem[macrolike,idxtype=L\noexpand\"ange]{Length}{length}{L\noexpand\"angen}
-\doxitem[idxtype=Z\noexpand\"ahler]{Counter}{counter}{Z\noexpand\"ahler}
-\doxitem[idxtype=Farbe]{Color}{color}{Farben}
-\doxitem[macrolike,idxtype=Lok.]{Locale}{locale}{Lokalisierungsvariablen}
-\doxitem[macrolike,idxtype=Feld]{Field}{field}{Eingabefelder}
-\doxitem[idxtype=Schriftelement]{Font}{KOMAfont}{Schriftelemente}
+\renewcommand*\tud@reserved[3][]{%
+  \doxitem[#1,idxtype=\csname tud@#3@name\endcsname]{#2}{#3}{%
+    \csname tud@#3s@name\endcsname%
+  }%
+}
+\undef\PrintEnvName
+\undef\PrintDescribeEnv
+\tud@reserved{Env}{environment}
+\tud@reserved{Option}{option}
+\tud@reserved{PageStyle}{pagestyle}
+\tud@reserved{Layer}{layer}
+\tud@reserved[macrolike]{Length}{length}
+\tud@reserved{Counter}{counter}
+\tud@reserved{Color}{TUDcolor}
+\tud@reserved[macrolike]{Locale}{locale}
+\tud@reserved[macrolike]{Field}{field}
+\tud@reserved{Font}{KOMAfont}
+\tud@reserved{Parameter}{parameter}
+\newcommand*\parameter@parent@changes{}
+\let\parameter@parent@changes\relax
+\newcommand*\parameter@parent@indexname{}
+\let\parameter@parent@indexname\relax
+\newcommand*\parameter@parent@indexformat{}
+\let\parameter@parent@indexformat\relax
+\apptocmd\SetMacroIndexName{%
+  \edef\parameter@parent@indexname{\expandafter\@gobble#1}%
+  \edef\parameter@parent@indexformat{%
+    \string\verb\quotechar*\verbatimchar#1\verbatimchar%
+  }%
+}{}{\tud@patch@wrn{SetMacroIndexName}}
+\apptocmd\SetEnvIndexName{%
+  \protected@edef\parameter@parent@indexname{#1\space\saved@indextype}%
+  \protected@edef\parameter@parent@indexformat{%
+    \string\verb\quotechar*\verbatimchar#1\verbatimchar%
+    \index@type{\saved@indextype}%
+  }%
+}{}{\tud@patch@wrn{SetEnvIndexName}}
+\renewcommand*\SpecialMainParameterIndex[1]{%
+  \ifx\parameter@parent@indexname\relax%
+    \ClassError{\TUD@Class@Name}{No previous macro or environment}{%
+      Since parameters can only be used for macros or\MessageBreak%
+      environments, you have to use `parameter' within\MessageBreak%
+      `macro' or `environment'.%
+    }%
+  \fi%
+  \protected@edef\parameter@parent@changes{%
+    \parameter@parent@indexname\actualchar%
+    \parameter@parent@indexformat:\levelchar%
+  }%
+  \@bsphack%
+  \special@index{%
+    \parameter@parent@indexname\actualchar%
+    \parameter@parent@indexformat\levelchar%
+    #1\space\tud@parameter@name\actualchar%
+    {\string\ttfamily\space#1}\index@type{\tud@parameter@name}%
+    \encapchar main%
+  }%
+  \special@index{%
+    \tud@parameters@name:\levelchar%
+    #1\space\parameter@parent@indexname%
+    \actualchar{\string\ttfamily\space#1}%
+    \noexpand\,--\noexpand\,\parameter@parent@indexformat%
+    \encapchar main%
+  }%
+  \@esphack%
+  \hypersourcedef{\filesep\number\c@CodelineNo}%
+}
+\CheckCommand*\changes@[3]{%
+  \protected@edef\@tempa{%
+    \noexpand\glossary{%
+      #1\levelchar
+      \ifx\saved@macroname\@empty
+        \space
+        \actualchar
+        \generalname
+      \else
+        \saved@indexname
+        \actualchar
+        \string\verb\quotechar*%
+        \verbatimchar\saved@macroname
+        \verbatimchar
+      \fi
+      :\levelchar #3%
+    }%
+  }%
+  \@tempa\endgroup\@esphack%
+}
+\ifdefined\tudxdyflag%
+  \renewcommand*\changes@[3]{%
+    \@tempswatrue%
+    \ifblank{#1}{\@tempswafalse}{}%
+    \ifblank{#3}{\@tempswafalse}{}%
+    \if@tempswa%
+      \ifx\parameter@parent@changes\relax%
+        \protected@edef\@tempb{%
+          \saved@indexname%
+          \ifx\saved@indextype\@empty\else%
+            \space\saved@indextype%
+          \fi%
+          \actualchar%
+          \string\verb\quotechar*%
+          \verbatimchar\saved@macroname%
+          \verbatimchar%
+          \ifx\saved@indextype\@empty\else%
+            \index@type{\saved@indextype}%
+          \fi%
+          :\levelchar%
+        }%
+      \else%
+        \protected@edef\@tempb{%
+          \parameter@parent@changes%
+          \saved@indexname%
+          \ifx\saved@indextype\@empty\else%
+            \space\saved@indextype%
+          \fi%
+          \actualchar%
+          {\noexpand\ttfamily\saved@macroname}%
+          \ifx\saved@indextype\@empty\else%
+            \index@type{\saved@indextype}%
+          \fi%
+          :\levelchar%
+        }%
+      \fi%
+      \protected@edef\@tempa{%
+        \noexpand\glossary{%
+          #1\levelchar%
+          \ifx\saved@macroname\@empty%
+            \tud@general@name%
+          \else%
+            \tud@implementation@name%
+          \fi%
+          \levelchar%
+          \ifx\saved@macroname\@empty\else%
+            \@tempb%
+          \fi%
+          #2 #3%
+          \actualchar%
+          #3% (#2)%
+        }%
+      }%
+    \else%
+      \let\@tempa\relax%
+    \fi%
+    \@tempa\endgroup\@esphack%
+  }%
+\else%
+  \renewcommand*\changes@[3]{%
+    \protected@edef\@tempa{%
+      \noexpand\glossary{%
+        #1\levelchar%
+        \ifx\saved@macroname\@empty%
+          \quotechar!%
+          \actualchar%
+          \tud@general@name%
+          :\levelchar%
+        \else%
+          \ifx\parameter@parent@changes\relax\else%
+            \parameter@parent@changes zzz\space%
+          \fi%
+          \saved@indexname%
+          \ifx\saved@indextype\@empty\else%
+            \space\saved@indextype%
+          \fi%
+          \actualchar%
+          \string\verb\quotechar*%
+          \verbatimchar\saved@macroname%
+          \verbatimchar%
+          \ifx\saved@indextype\@empty\else%
+            \index@type{\saved@indextype}%
+          \fi%
+          \ifx\parameter@parent@changes\relax%
+            :\levelchar%
+          \else%
+            :\space%
+          \fi%
+        \fi%
+        #3%
+      }%
+    }%
+    \@tempa\endgroup\@esphack%
+  }%
+\fi%
+\CheckCommand*\@wrglossary[1]{%
+  \protected@write\@glossaryfile{}%
+  {\string\glossaryentry{#1}{\thepage}}%
+  \endgroup
+  \@esphack%
+}
+\def\@wrglossary#1{%
+  \ifx\saved@macroname\@empty%
+    \protected@write\@glossaryfile{}{%
+      \string\glossaryentry{#1|usage}{\thepage}%
+    }%
+  \else%
+    \ifcodeline@index%
+      \global\advance\c@CodelineNo\@ne%
+      \protected@write\@glossaryfile{}{%
+        \string\glossaryentry{#1|main}{\filesep\number\c@CodelineNo}%
+      }%
+      \global\advance\c@CodelineNo\m@ne%
+    \else%
+      \protected@write\@glossaryfile{}{%
+        \string\glossaryentry{#1|main}{\thepage}%
+      }%
+    \fi%
+  \fi%
+  \endgroup%
+  \@esphack%
+}
+\newcommand*\tud@lst@subsub{}
+\newcommand*\tud@lst@subsubsub{}
+\newcommand*\subsubsubitem{\@idxitem\hspace*{35\p@}}
+\newcommand*\efil{\hfil\nopagebreak}%
+\newcommand*\tud@lst@def{%
+  \newcommand*\tud@lst@values{}%
+  \newif\if@tud@lst@multi%
+  \newcommand*\tud@lst@init{%
+    \let\tud@lst@values\relax%
+    \let\tud@lst@subsub\relax%
+    \@tud@lst@multifalse%
+  }%
+  \newcommand*\tud@lst@add[1]{%
+    \ifx\tud@lst@values\relax\else%
+      \@tud@lst@multitrue%
+      \def\tud@lst@subsub{\subsubitem}%
+    \fi%
+    \listadd\tud@lst@values{\tud@lst@subsub ##1}%
+  }%
+  \newcommand*\tud@lst@process{%
+    \if@tud@lst@multi%
+      \preto\tud@lst@values{\efill}%
+    \fi%
+    \forlistloop{}{\tud@lst@values}%
+    \tud@lst@init%
+  }%
+  \newcommand*\tud@lst@@values{}%
+  \newif\if@tud@lst@@multi%
+  \newcommand*\tud@lst@@init{%
+    \let\tud@lst@@values\relax%
+    \def\tud@lst@subsub{\subsubitem}%
+    \def\tud@lst@subsubsub{\space}%
+    \@tud@lst@@multifalse%
+  }%
+  \newcommand*\tud@lst@@add[1]{%
+    \@tud@lst@multitrue%
+    \ifx\tud@lst@@values\relax\else%
+      \@tud@lst@@multitrue%
+      \def\tud@lst@subsubsub{\subsubsubitem}%
+    \fi%
+    \listadd\tud@lst@@values{##1}%
+  }%
+  \newcommand*\tud@lst@@process{%
+    \if@tud@lst@@multi%
+      \appto\tud@lst@values{\efill}%
+    \fi%
+    \edef\tud@reserved####1{%
+      \noexpand\listadd\noexpand\tud@lst@values{%
+        \expandonce\tud@lst@subsubsub####1%
+      }%
+    }%
+    \forlistloop{\tud@reserved}{\tud@lst@@values}%
+    \tud@lst@@init%
+  }%
+}
 \ifdefined\tudxdyflag
   \newcommand*\tud@write@replace{}
   \newwrite\tud@write@replace
   \newcommand*\tud@read@replace{}
   \newread\tud@read@replace
-  \def\actualchar{<&1&>}
-  \def\quotechar{<&2&>}
-  \def\levelchar{<&3&>}
+  \def\actualchar{<|1|>}
+  \def\quotechar{<|2|>}
+  \def\levelchar{<|3|>}
   \begingroup
-    \endlinechar=-1\relax%
+    \endlinechar=\m@ne\relax%
     \def\tud@reserved#1#2{%
-      \immediate\openin\tud@read@replace=\jobname.#1\relax%
-      \immediate\openout\tud@write@replace=\jobname-xdy.#1\relax%
-      \@tempswafalse%
-      \loop\unless\ifeof\tud@read@replace%
-        \readline\tud@read@replace to\tud@line@replace%
-        \tud@replace\tud@line@replace{"}{""}%
-        \tud@replace\tud@line@replace{!}{"!}%
-        \tud@replace\tud@line@replace{:}{":}%
-        \tud@replace\tud@line@replace{@}{"@}%
-        \tud@replace\tud@line@replace{\"@}{"\@backslashchar"@}%
-        \expandafter\tud@replace\expandafter\tud@line@replace%
-          \expandafter{\actualchar}{@}%
-        \expandafter\tud@replace\expandafter\tud@line@replace%
-          \expandafter{\quotechar}{"}%
-        \expandafter\tud@replace\expandafter\tud@line@replace%
-          \expandafter{\levelchar}{!}%
-        \tud@replace\tud@line@replace{" @}{}%
-        \ifeof\tud@read@replace\else%
-          \immediate\write\tud@write@replace{%
-            \unexpanded\expandafter{\tud@line@replace}%
-          }%
-          \@tempswatrue%
-        \fi%
-      \repeat%
-      \immediate\closein\tud@read@replace%
-      \immediate\closeout\tud@write@replace%
-      \ifnum\pdfshellescape=\@ne\relax%
-        \if@tempswa%
-          \immediate\write18{%
-            texindy\space%
-              -o \jobname.#2\space%
-              -M \@currname-#2.xdy\space%
-              -L german-din\space%
-              -t \jobname-#2.xlg\space%
-            \jobname-xdy.#1
-          }%
-        \else%
-          \immediate\openout\tud@write@replace=\jobname.#2\relax%
-          \immediate\closeout\tud@write@replace%
+      \IfFileExists{\jobname.#1}{%
+        \immediate\openin\tud@read@replace=\jobname.#1\relax%
+        \immediate\openout\tud@write@replace=\jobname-xdy.#1\relax%
+        \@tempswafalse%
+        \loop\unless\ifeof\tud@read@replace%
+          \readline\tud@read@replace to\tud@line@replace%
+          \tud@replace\tud@line@replace{"}{""}%
+          \tud@replace\tud@line@replace{!}{"!}%
+          \tud@replace\tud@line@replace{:}{":}%
+          \tud@replace\tud@line@replace{@}{"@}%
+          \tud@replace\tud@line@replace{\"@}{"\@backslashchar"@}%
+          \expandafter\tud@replace\expandafter\tud@line@replace%
+            \expandafter{\actualchar}{@}%
+          \expandafter\tud@replace\expandafter\tud@line@replace%
+            \expandafter{\quotechar}{"}%
+          \expandafter\tud@replace\expandafter\tud@line@replace%
+            \expandafter{\levelchar}{!}%
+          \tud@replace\tud@line@replace{" @}{}%
+          \ifeof\tud@read@replace\else%
+            \immediate\write\tud@write@replace{%
+              \unexpanded\expandafter{\tud@line@replace}%
+            }%
+            \@tempswatrue%
+          \fi%
+        \repeat%
+        \immediate\closein\tud@read@replace%
+        \immediate\closeout\tud@write@replace%
+        \ifnum\pdf@shellescape=\@ne\relax%
+          \if@tempswa%
+            \immediate\write18{%
+              texindy\space%
+                -o \jobname.#2\space%
+                -M \@currname-#2.xdy\space%
+                -t \jobname-#2.xlg\space%
+              \jobname-xdy.#1%
+            }%
+          \else%
+            \immediate\openout\tud@write@replace=\jobname.#2\relax%
+            \immediate\closeout\tud@write@replace%
+          \fi%
         \fi%
-      \fi%
+      }{}%
     }%
     \tud@reserved{idx}{ind}%
     \tud@reserved{glo}{gls}%
   \endgroup
 \else
-  \ifnum\pdfshellescape=\@ne\relax%
-    \immediate\write18{makeindex -s gglo.ist -o \jobname.gls \jobname.glo}%
-    \immediate\write18{makeindex -s gind.ist -o \jobname.ind \jobname.idx}%
+  \ifnum\pdf@shellescape=\@ne\relax%
+    \immediate\write18{%
+      makeindex -s gglo.ist -t \jobname.glg -o \jobname.gls \jobname.glo%
+    }%
+    \immediate\write18{%
+      makeindex -s gind.ist -t \jobname.ilg -o \jobname.ind \jobname.idx%
+    }%
   \fi%
 \fi
-\IndexPrologue{%
-  \addsec{Index}%
-  Unterstrichene Zahlen, die gegebenenfalls mit einem Hyperlink versehen sind,
-  verweisen auf die \ifcodeline@index Codezeile der \fi Definition, alle
-  weiteren sind \ifcodeline@index Zeilennummern\else Seitenzahlen\fi, wo der
-  jeweilige Eintrag verwendet wird.
-}
-\GlossaryPrologue{\addsec{\"Anderungsliste}}
+\IndexPrologue{\addsec{\indexname}\tud@index@text}
+\GlossaryPrologue{\addsec{\tud@changes@name}}
 \DeclareNewTOC[%
   type=todo,%
-  listname={Liste der noch zu erledigenden Punkte},%
+  listname={\tud@todo@name},%
   name=ToDo,%
   tocentryindent=\z@,%
   owner=\@currname,%
@@ -662,62 +1073,125 @@
   \ifdefined\tudfinalflag\else%
     \begingroup%
       \csuse{phantomsection}%
-      \def\tud@reserved{\ifxblank{#2}{ToDo: ??}{ToDo: #2}}%
+      \IfArgIsEmpty{#2}{%
+        \def\tud@reserved{??}%
+      }{%
+        \def\tud@reserved{#2}%
+      }%
       \endgraf%
       \hfuzz0.8pt%
-      \leavevmode\marginpar{\raggedleft\fbox{\tud@reserved\strut}}%
+      \leavevmode\marginpar{\raggedleft\fbox{ToDo:\space\tud@reserved\strut}}%
       \fbox{\parbox{\dimexpr\textwidth-2\fboxsep\relax}{#1\strut}}%
       \endgraf%
-      \global\advance\c@CodelineNo\@ne
-      \addxcontentsline{tdo}{todo}{#2:~#1~(\filesep\number\c@CodelineNo)}%
-      \global\advance\c@CodelineNo\m@ne
+      \let\@tempa\@empty%
+      \ifdefined\currentfile%
+        \def\@tempa{\,--\,\texttt{\currentfile}}%
+      \fi%
+      \addxcontentsline{tdo}{todo}{\tud@reserved\@tempa:\space#1}%
     \endgroup%
   \fi%
 }
-\AtBeginDocument{%
-  \@ifpackageloaded{etoolbox}{}{%
-    \providecommand*\newrobustcmd{\DeclareRobustCommand}%
-  }%
-  \newrobustcmd*\app[1]{\mbox{\textsl{\textbf{#1}}}}
-  \newrobustcmd*\cls[1]{\mbox{\textsf{\textbf{#1}}}}
-  \newrobustcmd*\pkg[1]{\mbox{\textsf{\textbf{#1}}}}
-  \newrobustcmd*\opt[1]{\mbox{\texttt{#1}}}
-  \newrobustcmd*\val[1]{\mbox{\texttt{#1}}}
-  \newrobustcmd*\pgs[1]{\mbox{\texttt{#1}}}
-  \newrobustcmd*\env[1]{\mbox{\texttt{#1}}}
-  \newrobustcmd*\file[1]{\mbox{\texttt{#1}}}
-  \@ifpackageloaded{hyperref}{%
-    \pdfstringdefDisableCommands{%
-      \def\TUDScript{TUD-Script}%
-      \let\cls\@firstofone%
-      \let\pkg\@firstofone%
+\newcommand*\calculatearea{%
+  \setlength\topmargin{-1in}%
+  \setlength\headheight{0pt}%
+  \setlength\headsep{3em}%
+  \setlength\footskip{1.5\headsep}%
+  \setlength\textheight{\dimexpr\paperheight-2.5\headsep-\footskip\relax}%
+  \settowidth\MacroIndent{\rmfamily\scriptsize 0000\ }%
+  \begingroup%
+    \MacroFont\selectfont%
+    \settowidth\@tempdima{\space}%
+    \setlength\@tempdima{80\@tempdima}%
+    \addtolength\@tempdima{\MacroIndent}%
+    \edef\@tempa{%
+      \endgroup%
+      \noexpand\setlength\noexpand\textwidth{\the\@tempdima}%
     }%
-  }{%
-    \RequirePackage{url}[2013/09/16]%
-    \providecommand*\hypersetup[1]{}%
-    \providecommand*\phantomsection{}%
-    \providecommand*\texorpdfstring[2]{#1}%
+  \@tempa%
+  \setlength\columnsep{1em}%
+  \setlength\marginparsep{1em}%
+  \setlength\marginparwidth{%
+    \dimexpr\paperwidth-\textwidth-2\marginparsep\relax%
   }%
-  \@ifpackageloaded{babel}{}{%
-    \ClassWarning{\TUD@Class@Name}{Package `babel' not loaded}%
-    \let\selectlanguage\@gobble%
-    \let\glqq\relax%
-    \let\grqq\relax%
+  \setlength\oddsidemargin{\dimexpr\marginparwidth+\marginparsep-1in\relax}%
+}
+\AtEndPreamble{\calculatearea}
+\AfterPackage{tudscrfonts}{%
+  \RequirePackage{mweights}[2013/07/21]%
+  \CheckCommand*\MacroFont{%
+    \fontencoding\encodingdefault%
+    \fontfamily\ttdefault%
+    \fontseries\mddefault%
+    \fontshape\updefault%
+    \small%
   }%
-  \@ifpackageloaded{csquotes}{}{%
-    \ClassWarning{\TUD@Class@Name}{Package `csquotes' not loaded}%
-    \providecommand\enquote[1]{\glqq#1\grqq{}}%
+  \renewcommand*\MacroFont{%
+    \fontencoding\encodingdefault%
+    \fontfamily\ttdefault%
+    \fontseries\mdseries@tt%
+    \fontshape\updefault%
+    \small%
+  }%
+  \CheckCommand*\AltMacroFont{%
+    \fontencoding\encodingdefault%
+    \fontfamily\ttdefault%
+    \fontseries\mddefault%
+    \fontshape\sldefault%
+    \small%
   }%
-  \@ifpackageloaded{tudscrfonts}{%
-    \RequirePackage{mweights}[2013/07/21]%
-    \ifnum\tud@cdfont@num>\z@\relax% true/heavy
-      \def\mddefault{m}%
+  \renewcommand*\AltMacroFont{%
+    \fontencoding\encodingdefault%
+    \fontfamily\ttdefault%
+    \fontseries\mdseries@tt%
+    \fontshape\sldefault%
+    \small%
+  }%
+  \newcommand*\saved@calculatearea{}%
+  \let\saved@calculatearea\calculatearea%
+  \let\calculatearea\relax%
+  \appto\tud@font@set{%
+    \ifcase\tud@cdfont@num\relax\else% true/heavy
       \def\mdseries@tt{m}%
       \renewcommand*\@pnumwidth{1.7em}%
       \renewcommand*\@tocrmarg{2.7em}%
     \fi%
-    \setlength\columnsep{10pt}%
-  }{%
+    \saved@calculatearea%
+  }%
+}
+\newrobustcmd*\app[1]{\mbox{\textsl{\textbf{#1}}}}
+\newrobustcmd*\cls[1]{\mbox{\textsf{\textbf{#1}}}}
+\newrobustcmd*\pkg[1]{\mbox{\textsf{\textbf{#1}}}}
+\newrobustcmd*\opt[1]{\mbox{\texttt{#1}}}
+\newrobustcmd*\val[1]{\mbox{\texttt{#1}}}
+\newrobustcmd*\pgs[1]{\mbox{\texttt{#1}}}
+\newrobustcmd*\env[1]{\mbox{\texttt{#1}}}
+\newrobustcmd*\prm[1]{\mbox{\texttt{#1}}}
+\newrobustcmd*\file[1]{\mbox{\texttt{#1}}}
+\AfterPackage{hyperref}{%
+  \pdfstringdefDisableCommands{%
+    \let\app\@firstofone%
+    \let\cls\@firstofone%
+    \let\pkg\@firstofone%
+    \let\opt\@firstofone%
+    \let\val\@firstofone%
+    \let\pgs\@firstofone%
+    \let\env\@firstofone%
+    \let\prm\@firstofone%
+    \let\file\@firstofone%
+  }%
+}
+\AtEndPreamble{%
+  \@ifpackageloaded{babel}{}{%
+    \ClassWarning{\TUD@Class@Name}{Package `babel' not loaded}%
+    \providecommand*\selectlanguage[1]{}%
+    \providecommand*\glqq{\relax}%
+    \providecommand*\grqq{\relax}%
+  }%
+  \@ifpackageloaded{csquotes}{}{%
+    \ClassWarning{\TUD@Class@Name}{Package `csquotes' not loaded}%
+    \providecommand\enquote[1]{\emph{#1}}%
+  }%
+  \@ifpackageloaded{tudscrfonts}{}{%
     \RequirePackage{lmodern}[2009/10/30]%
     \providecommand*\ifdin[2]{#2}%
     \providecommand*\textuln[1]{\textsf{#1}}%
@@ -730,69 +1204,11 @@
     \providecommand*\textuxs[1]{\textubs{#1}}%
     \providecommand*\textdbn[1]{\textubn{#1}}%
   }%
-  \title{%
-    \file{\filename}\thanks{%
-      Dies ist Version \fileversion\nobreakspace{}von Datei \file{\filename}.%
-    }%
-  }%
-  \author{Falk Hanisch\thanks{\tudscrmail}}%
-  \date{\filedate}%
-}
-%%% From File: tudscr-manual.dtx
-\RequirePackage{scrhack}[2014/02/27]
-\RequirePackage{xspace}[2009/10/20]
-\xspaceaddexceptions{"=}
-\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
-\newcommand*\vKOMAScript{v\TUD@Version@KOMA}
-\newcommand*\tud@english[1]{#1}
-\AtBeginDocument{%
-  \providecommand*\iflanguageloaded[3]{#3}%
-  \iflanguageloaded{english}{%
-    \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
-  }{}%
 }
-\newcommand*\CD{\tud@english{Corporate Design}\xspace}
-\newcommand*\CDs{\tud@english{Corporate Designs}\xspace}
-\newcommand*\TUD{Technische Universit\"at Dresden\xspace}
-\newcommand*\TnUD{Technischen Universit\"at Dresden\xspace}
-\newcommand*\TUDCD{\CD der \TnUD}
-\newcommand*\TUDCDs{\CDs der \TnUD}
-\AtBeginDocument{%
-\newrobustcmd*\DDC{%
-  \mbox{%
-    D\kern.05em R\kern.05em E\kern.05em S\kern.05em %
-    D\kern.05em E\kern.05em N\kern.1em-\kern.1em concept%
-  }\xspace%
-}
-}
-\newcommand*\Univers{\texorpdfstring{\textubn{Univers}}{Univers}\xspace}
-\newcommand*\DIN{\texorpdfstring{\textdbn{DIN~BOLD}}{DIN BOLD}\xspace}
-%%% From File: tudscr-misc.dtx
+%%% From File: tudscr-texindy.dtx
 \catcode`\#=12
 \newcommand*\@hashchar{#}
 \catcode`\#=6
-\newcommand*\tud@lst@def{%
-  \newcommand*\tud@lst@values{}%
-  \newif\if@tud@lst@multi%
-  \newcommand*\tud@lst@init{%
-    \let\tud@lst@values\relax%
-    \@tud@lst@multifalse%
-  }%
-  \newcommand*\tud@lst@add[1]{%
-    \ifx\tud@lst@values\relax\else%
-      \@tud@lst@multitrue%
-    \fi%
-    \listadd\tud@lst@values{##1}%
-  }%
-  \newcommand*\tud@lst@process{%
-    \def\tud@reserved{}%
-    \if@tud@lst@multi%
-      \def\tud@reserved{\subsubitem}%
-      \efill%
-    \fi%
-    \forlistloop\tud@reserved{\tud@lst@values}%
-  }%
-}
 \begingroup
 \ifdef{\tudxdyflag}{%
 \newcommand*\tud@write@xdy{}
@@ -833,16 +1249,25 @@
     \space\space\string\tud@lst@def\@percentchar%
   }%
   \fi%
+  \if@tud@xdy@glo%
+  \write\tud@write@xdy{%
+    "^^J%
+    \space\space:close "\string~n\string~n\string\end{#1}\string~n"^^J%
+    \space\space:hierdepth 4^^J%
+    )%
+  }%
+  \else%
   \write\tud@write@xdy{%
     "^^J%
     \space\space:close "\string~n\string~n\string\end{#1}\string~n"^^J%
     \space\space:hierdepth 3^^J%
     )%
   }%
+  \fi%
   \write\tud@write@xdy{%
     (define-location-class^^J%
     \space\space"arabic-page-numbers" ("arabic-numbers")%
-    \space:min-range-length 1^^J%
+    \space:min-range-length 2^^J%
     )^^J%
     (define-alphabet "AlphaExtended"^^J%
     \space(^^J%
@@ -854,25 +1279,12 @@
     \space)^^J%
     )^^J%
     (define-location-class^^J%
-    \space\space"part" ("AlphaExtended" :sep "-" "arabic-numbers")%
-    \space:min-range-length 1^^J%
+    \space\space"codeline" ("AlphaExtended" :sep "-" "arabic-numbers")%
+    \space:min-range-length 2^^J%
     )^^J%
+    (define-location-class-order ("arabic-page-numbers" "codeline"))^^J%
     (markup-range :sep "--")%
   }%
-  \if@tud@xdy@glo%
-  \write\tud@write@xdy{%
-    (markup-locclass-list%
-    \space:open "\string\pfill\string\hypersourceref{" :close "}\string\relax"%
-    )%
-  }%
-  \else%
-  \write\tud@write@xdy{%
-    (markup-locclass-list%
-    \space:open "\string\pfill\space"%
-    \space:close "\string\relax"%
-    )%
-  }%
-  \fi%
   \write\tud@write@xdy{%
     (merge-rule "\@backslashchar[(.*)\@backslashchar]" "" :eregexp)%
     ^^J%
@@ -900,7 +1312,7 @@
     \space"(.*?)(@)([\string^@~n]*)"%
     \space"\string\1\string~b\string\3"%
     \space:eregexp :again%
-    )
+    )%
   }%
   \if@tud@xdy@glo%
   \write\tud@write@xdy{%
@@ -924,32 +1336,50 @@
     :open "\string~n\@spaces\string\subitem\space" :depth 2%
     )^^J%
     (markup-indexentry-list^^J%
-    \space\space:open \space"\string\tud@lst@init"^^J%
+    \space\space:open\space\space"\string\tud@lst@init"^^J%
     \space\space:close "\string~n \@spaces\space\string\tud@lst@process"^^J%
     \space\space:depth 3^^J%
     )^^J%
     (markup-indexentry^^J%
-    \space\space:open \space"\string~n\@spaces\space\string\tud@lst@add{"^^J%
+    \space\space:open%
+    \space\space"\string~n\@spaces\space\space\string\tud@lst@add{"^^J%
     \space\space:close "}"^^J%
     \space\space:depth 3^^J%
+    )^^J%
+    (markup-indexentry-list^^J%
+    \space\space:close "\string~n\@spaces\@spaces\string\tud@lst@@process{"^^J%
+    \space\space:open\space\space"}\string\tud@lst@@init"^^J%
+    \space\space:depth 4^^J%
+    )^^J%
+    (markup-indexentry^^J%
+    \space\space:open%
+    \space\space"\string~n\@spaces\@spaces\string\tud@lst@@add{"^^J%
+    \space\space:close "}"^^J%
+    \space\space:depth 4^^J%
     )%
   }%
   \else%
   \write\tud@write@xdy{%
-    (markup-indexentry-list :open "\string\efill" :depth 1)%
+    (markup-indexentry-list :open "\string\efil" :depth 1)%
   }%
   \fi%
-  \if@tud@xdy@glo\else%
   \write\tud@write@xdy{%
-    (define-attributes (("main" "usage" "default")))^^J%
-    (markup-locref :attr "main"%
-    \space\space:open "\string\main{"\space\space:close "}"%
-    )^^J%
+    (markup-locclass-list%
+    \space:open "\string\pfill\space"%
+    \space:close "\string\relax"%
+    \space:sep ",\space"%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (markup-attribute-group-list :sep ", ")^^J%
+    (define-attributes (("usage") ("main") ("default")))^^J%
     (markup-locref :attr "usage"%
     \space:open "\string\usage{"\space:close "}"%
+    )^^J%
+    (markup-locref :attr "main"%
+    \space\space:open "\string\main{"\space\space:close "}"%
     )%
   }%
-  \fi%
   \closeout\tud@write@xdy%
   }%
 }
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 8a944aa4f62..617ca2a6e8b 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -14,37 +14,30 @@
 %% tudscr-comp.dtx  (with options: `package,fonts,body')
 %% tudscr-misc.dtx  (with options: `package,fonts,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -66,7 +59,7 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
@@ -79,8 +72,9 @@
 }{}
 %%% From File: tudscr-fonts.dtx
 \ProvidesPackage{tudscrfonts}[%
-  2016/10/12 v2.05f TUD-Script
-  package (corporate design fonts)%
+  2017/01/26 v2.05g TUD-Script
+  package
+  (corporate design fonts)%
 ]
 \ifcsname KOMAClassName\endcsname\else
   \RequirePackage{scrextend}[2013/12/19]
@@ -251,6 +245,93 @@
   }%
   \TUDoptions{#2}%
 }
+\newcommand*\tud@v@comp{\tud@v@last}
+\TUD@key{tudscrver}[last]{%
+  \tud@v@get\@tempa{#1}%
+  \ifcsundef{tud@v@\@tempa}{%
+    \PackageWarningNoLine{tudscrfonts}%
+    {%
+      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
+      this value is not supported. Because of this, the\MessageBreak%
+      value for `tudscrver' was set to `first'%
+    }%
+    \def\tud@v@comp{0}%
+  }{%
+    \PackageInfoNoLine{tudscrfonts}%
+    {%
+      Switching compatibility level to `\@tempa'%
+    }%
+    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
+  }%
+  \FamilyKeyStateProcessed%
+}
+\AtEndOfPackage%
+{%
+  \TUD@key{tudscrver}[]{%
+    \PackageError{tudscrfonts}%
+    {Option `tudscrver' too late}{%
+      Option `tudscrver' can only be set while loading the\MessageBreak%
+      package `tudscrfonts'
+      but you have tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed%
+  }%
+}
+\csdef{tud@v@first}{0}
+\csdef{tud@v@2.00}{0}
+\csdef{tud@v@2.01}{0}
+\csdef{tud@v@2.01a}{0}
+\csdef{tud@v@2.01b}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.03}{1}
+\csdef{tud@v@2.03a}{1}
+\csdef{tud@v@2.04}{2}
+\csdef{tud@v@2.04a}{2}
+\csdef{tud@v@2.04b}{2}
+\csdef{tud@v@2.04c}{2}
+\csdef{tud@v@2.04d}{2}
+\csdef{tud@v@2.04e}{2}
+\csdef{tud@v@2.05}{3}
+\csdef{tud@v@2.05a}{3}
+\csdef{tud@v@2.05b}{3}
+\csdef{tud@v@2.05c}{3}
+\csdef{tud@v@2.05d}{3}
+\csdef{tud@v@2.05e}{3}
+\csdef{tud@v@2.05f}{3}
+\csdef{tud@v@2.05g}{3}
+\csdef{tud@v@last}{3}
+\newcommand*\tud@v@get[2]{%
+  \begingroup%
+    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
+    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
+    \@tempa #2\@nil%
+    \edef\tud@reserved{%
+      \endgroup%
+      \etex@unexpanded{\def#1}{\@tempc}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\tud@if@v@lower[1]{%
+  \begingroup%
+    \tud@v@get\@tempa{#1}%
+    \ifcsdef{tud@v@\@tempa}{%
+      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
+        \def\tud@reserved{\endgroup\@firstoftwo}%
+      \else%
+        \def\tud@reserved{\endgroup\@secondoftwo}%
+      \fi%
+    }{%
+      \def\tud@reserved{%
+        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          There's no defined macro `\string\tud@v@\@tempa'%
+        }%
+        \endgroup\@firstoftwo%
+      }%
+    }%
+  \tud@reserved%
+}
 \TUD@key{fontspec}[true]{%
   \PackageWarning{tudscrfonts}%
   {%
@@ -355,92 +436,6 @@
     \fi%
   \fi%
 }
-\newcommand*\tud@v@comp{\tud@v@last}
-\TUD@key{tudscrver}[last]{%
-  \tud@v@get\@tempa{#1}%
-  \ifcsundef{tud@v@\@tempa}{%
-    \PackageWarningNoLine{tudscrfonts}%
-    {%
-      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
-    }%
-    \def\tud@v@comp{0}%
-  }{%
-    \PackageInfoNoLine{tudscrfonts}%
-    {%
-      Switching compatibility level to `\@tempa'%
-    }%
-    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
-  }%
-  \FamilyKeyStateProcessed%
-}
-\AtEndOfPackage%
-{%
-  \TUD@key{tudscrver}[]{%
-    \PackageError{tudscrfonts}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      package `tudscrfonts'
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
-}
-\csdef{tud@v@first}{0}
-\csdef{tud@v@2.00}{0}
-\csdef{tud@v@2.01}{0}
-\csdef{tud@v@2.01a}{0}
-\csdef{tud@v@2.01b}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.03}{1}
-\csdef{tud@v@2.03a}{1}
-\csdef{tud@v@2.04}{2}
-\csdef{tud@v@2.04a}{2}
-\csdef{tud@v@2.04b}{2}
-\csdef{tud@v@2.04c}{2}
-\csdef{tud@v@2.04d}{2}
-\csdef{tud@v@2.04e}{2}
-\csdef{tud@v@2.05}{3}
-\csdef{tud@v@2.05a}{3}
-\csdef{tud@v@2.05b}{3}
-\csdef{tud@v@2.05c}{3}
-\csdef{tud@v@2.05d}{3}
-\csdef{tud@v@2.05e}{3}
-\csdef{tud@v@2.05f}{3}
-\csdef{tud@v@last}{3}
-\newcommand*\tud@v@get[2]{%
-  \begingroup%
-    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
-    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
-    \@tempa #2\@nil%
-    \edef\tud@reserved{%
-      \endgroup%
-      \etex@unexpanded{\def#1}{\@tempc}%
-    }%
-  \tud@reserved%
-}
-\newcommand*\tud@if@v@lower[1]{%
-  \begingroup%
-    \tud@v@get\@tempa{#1}%
-    \ifcsdef{tud@v@\@tempa}{%
-      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
-        \def\tud@reserved{\endgroup\@firstoftwo}%
-      \else%
-        \def\tud@reserved{\endgroup\@secondoftwo}%
-      \fi%
-    }{%
-      \def\tud@reserved{%
-        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
-          There's no defined macro `\string\tud@v@\@tempa'%
-        }%
-        \endgroup\@firstoftwo%
-      }%
-    }%
-  \tud@reserved%
-}
 %%% From File: tudscr-misc.dtx
 \newcommand*\TUD@SpecialOptionAtDocument[1]{}
 \DeclareOption*{\KOMAoptions{\CurrentOption}}
@@ -534,6 +529,27 @@
   \fi%
   \undef\tud@font@check%
 }
+\newcommand*\tud@raggedright{\raggedright}
+\newcommand*\tud@RaggedRight{\raggedright}
+\AfterPackage*{ragged2e}{%
+  \ifdef{\LaTeXraggedright}{%
+    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
+  }{}%
+  \renewcommand*\tud@RaggedRight{\RaggedRight}%
+}
+\AfterPackage*{siunitx}{%
+  \providecommand*\lseries{\fontseries{l}\selectfont}%
+}
+\AfterClass*{beamer}{\usefonttheme[onlymath]{serif}}
+\newif\if@tud@x@bm@requested
+\@ifpackageloaded{bm}{%
+  \PackageWarning{tudscrfonts}{%
+    Package `bm' must be loaded after `tudscrfonts'.\MessageBreak%
+    Otherwise the functionality can not be guaranteed%
+  }%
+}{%
+\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
+}
 \RequirePackage{trimspaces}[2009/09/17]
 \newif\if@tud@x@mweights@enabled
 \AfterPackage*{mweights}{\@tud@x@mweights@enabledtrue}
@@ -1038,12 +1054,6 @@
   \fi%
   \AtBeginDocument{\tud@font@math@init\let\tud@font@math@init\relax}%
 }
-\newif\if@tud@x@bm@requested
-\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
-\AfterClass*{beamer}{\usefonttheme[onlymath]{serif}}
-\AfterPackage*{siunitx}{%
-  \providecommand*\lseries{\fontseries{l}\selectfont}%
-}
 \newrobustcmd*\ifdin{%
   \ifx\f@family\tud@dinbold%
     \expandafter\@firstoftwo%
@@ -1058,14 +1068,6 @@
     \sectfont#1%
   \fi%
 }
-\newcommand*\tud@raggedright{\raggedright}
-\newcommand*\tud@RaggedRight{\raggedright}
-\AfterPackage*{ragged2e}{%
-  \ifdef{\LaTeXraggedright}{%
-    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
-  }{}%
-  \renewcommand*\tud@RaggedRight{\RaggedRight}%
-}
 \RequirePackage{textcase}[2004/10/07]
 \newcommand*\tud@makeuppercase[1]{%
   \ifdin{\begingroup\MakeTextUppercase{#1}\endgroup}{#1}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index 1130a2cc953..2462b9e4b73 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
@@ -10,41 +10,34 @@
 %% tudscr-manual.dtx  (with options: `class,manual,option')
 %% tudscr-misc.dtx  (with options: `class,manual,inherit,execute')
 %% tudscr-manual.dtx  (with options: `class,manual,body')
-%% tudscr-misc.dtx  (with options: `class,manual,xindy')
 %% tudscr-fields.dtx  (with options: `class,manual,body')
 %% tudscr-locale.dtx  (with options: `class,manual,body')
+%% tudscr-texindy.dtx  (with options: `class,manual')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -66,13 +59,13 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesWrapperClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@Parent{#2}%
@@ -81,7 +74,7 @@
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -201,12 +194,7 @@
     \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
   }{}%
 }
-\RequirePackage{ifluatex}[2016/05/16]
-\ifluatex
-  \RequirePackage{pdftexcmds}[2016/05/21]
-  \let\pdfstrcmp\pdf@strcmp
-  \let\pdfshellescape\pdf@shellescape
-\fi
+\RequirePackage{pdftexcmds}[2016/05/21]
 \newcommand*\tud@templist{}
 \let\tud@templist\relax
 \newcommand*\tud@list@sort[1]{%
@@ -235,7 +223,7 @@
       \if@tud@list@sorted%
         \expandafter\edef\expandafter\@tempb\expandafter{\@tempb,\@tempa}%
       \else%
-        \expandafter\ifnum\pdfstrcmp{#1}{\@tempa}<\z@\relax%
+        \expandafter\ifnum\pdf@strcmp{#1}{\@tempa}<\z@\relax%
           \ifx\@tempb\@empty%
             \expandafter\edef\expandafter\@tempb\expandafter{%
               #1,\@tempa%
@@ -339,7 +327,6 @@
   \renewcaptionname{ngerman}{\sectionautorefname}{Unterkapitel}%
   \renewcaptionname{ngerman}{\subsectionautorefname}{Abschnitt}%
   \renewcaptionname{ngerman}{\subsubsectionautorefname}{Unterabschnitt}%
-  \newcommand*\Email[1]{\href{mailto:#1}{\nolinkurl{#1}}}%
   \newcommand*\tud@manualname{tudscr}%
   \NewDocumentCommand\tudhyperdef{sm}{%
     \IfBooleanTF{#1}{%
@@ -379,19 +366,20 @@
     Nevertheless, essential commands are rudimentarily\MessageBreak%
     defined. At least the package `url' is loaded.%
   }%
-  \RequirePackage{url}[2013/09/16]%
   \providecommand*\hypersetup[1]{}%
+  \providecommand*\href[3][]{#3}%
+  \providecommand*\phantomsection{}%
+  \providecommand*\texorpdfstring[2]{#1}%
+  \RequirePackage{url}[2013/09/16]%
+  \providecommand*\nolinkurl[1]{\url{#1}}%
+  \providecommand*\hyperpage[1]{#1}%
+  \providecommand*\autoref{??\xspace\kernel@ifstar{\ref}{\ref}}%
   \providecommand*\hyperdef[3]{\label{#1.#2}#3}%
   \providerobustcmd*\hyperref{%
     \kernel@ifnextchar[{\tud@hyperref@a}{\tud@hyperref@b}%
   }
   \newcommand*\tud@hyperref@a[2][]{#2}
   \newcommand*\tud@hyperref@b[4]{#4}
-  \providecommand*\href[3][]{#3}%
-  \providecommand*\hyperpage[1]{#1}%
-  \providecommand*\autoref{??\xspace\kernel@ifstar{\ref}{\ref}}%
-  \providecommand*\phantomsection{}%
-  \providecommand*\texorpdfstring[2]{#1}%
   \tud@locale@german{\partautorefname}{Teil}%
   \tud@locale@german{\chapterautorefname}{Kapitel}%
   \tud@locale@german{\sectionautorefname}{Unterkapitel}%
@@ -402,28 +390,28 @@
   \tud@locale@english{\sectionautorefname}{section}%
   \tud@locale@english{\subsectionautorefname}{subsection}%
   \tud@locale@english{\subsubsectionautorefname}{subsubsection}%
-  \providecommand*\Email[1]{\mbox{#1}}%
   \ProvideDocumentCommand\tudhyperdef{sm}{\label{#2}}%
   \providecommand*\tudhyperref[2]{#2}%
   \providecommand*\autorefname[1][]{??\xspace}%
 }
-\RequirePackage{varioref}[2011/10/02]
-\renewcommand*\fullref[1]{\hyperref[#1]{\autoref*{#1} \vpageref{#1}}}
 \newcommand*\hrfn[2]{%
   \href{#1}{\trim@spaces{#2}}%
   \footnote{%
-    \scalebox{0.95}{%
+    \begingroup%
       \def\_{_}%
       \edef\@tempa{#1}%
       \strut\expandafter\url\expandafter{\@tempa}%
-    }%
+    \endgroup%
   }%
 }
+\newrobustcmd*\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}%
 \AfterPackage*{hyperref}{%
   \patchcmd{\pdfstringdef}{\csname HyPsd@babel@}{%
     \let\bbl@info\@gobble\csname HyPsd@babel@%
   }{}{\tud@patch@wrn{pdfstringdef}}%
 }
+\RequirePackage{varioref}[2011/10/02]
+\renewcommand*\fullref[1]{\hyperref[#1]{\autoref*{#1} \vpageref{#1}}}
 \AfterPackage*{hyperref}{\RequirePackage[babel]{microtype}[2013/05/23]}
 \TUD@UnwindPackage{hyperref}{\RequirePackage[babel]{microtype}[2013/05/23]}
 \newif\if@tud@declare
@@ -937,7 +925,6 @@
     \let\POParameter\@firstofone%
     \let\textOR\relax%
     \let\hologoRobust\@firstofone%
-    \def\TUDScript{TUD-Script}%
     \def\_{-}%
     \protected\def~{~}%
   }%
@@ -1287,23 +1274,6 @@
     \fi%
   }{}{\tud@patch@wrn{theindex}}%
 \fi%
-\newrobustcmd*\cleversee{\tud@cleversee{\seename}}
-\newrobustcmd*\cleverseealso{%
-  \ClassWarning{tudscrmanual}{You should use `|see' instead of `|seealso'}%
-  \tud@cleversee{\alsoname}%
-}
-\newcommand*\tud@cleversee{}
-\def\tud@cleversee#1#2#3\relax{%
-  \IfArgIsEmpty{#3}{%
-    \emph{#1}\space#2%
-  }{%
-    #3, \emph{\alsoname}\space#2%
-  }%
-}
-\NewDocumentCommand\seeref{sm}{%
-  \emph{\IfBooleanTF{#1}{\alsoname}{\seename}}\space#2%
-}
-\newcommand*\seeidx[2]{\pageref{idx:#1}}
 \NewDocumentCommand\makexdyindex{somo}{%
   \let\@tempb\@empty%
   \IfBooleanT{#1}{%
@@ -1442,6 +1412,23 @@
     }%
   \tud@reserved%
 }
+\newrobustcmd*\cleversee{\tud@cleversee{\seename}}
+\newrobustcmd*\cleverseealso{%
+  \ClassWarning{tudscrmanual}{You should use `|see' instead of `|seealso'}%
+  \tud@cleversee{\alsoname}%
+}
+\newcommand*\tud@cleversee{}
+\def\tud@cleversee#1#2#3\relax{%
+  \IfArgIsEmpty{#3}{%
+    \emph{#1}\space#2%
+  }{%
+    #3, \emph{\alsoname}\space#2%
+  }%
+}
+\NewDocumentCommand\seeref{sm}{%
+  \emph{\IfBooleanTF{#1}{\alsoname}{\seename}}\space#2%
+}
+\newcommand*\seeidx[2]{\pageref{idx:#1}}
 \NewDocumentCommand\Process@Index{mmd==od()d||}{%
   \ifboolexpr{%
     bool {@tud@index} or bool {@tud@obsolete}%
@@ -1945,7 +1932,7 @@
   \hyperref{tutorials/#1.pdf}{#1}{tutorials:#1}{\File*{#1.pdf}#2}%
 }
 \NewDocumentCommand\Tutorial{smd||}{%
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \filemodCmp{tutorials/#2.pdf}{tutorials/#2.tex}{}{%
       \let\@tempa\@empty%
       \ifdef{\tudfinalflag}{\appto\@tempa{\def\noexpand\tudfinalflag{}}}{}%
@@ -1985,7 +1972,7 @@
 }
 \newcommand*\IncludeExample[1]{%
   \lstinputlisting[style=tudscr]{examples/#1}%
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \filemodCmp{examples/#1.pdf}{examples/#1.tex}{}{%
       \immediate\write18{%
         pdflatex -output-directory examples examples/#1.tex^^J%
@@ -2087,11 +2074,11 @@
   \NewDocumentCommand\ToDo{somo}{}%
   \newcommand*\ListOfToDo{}%
 }
+\AfterPackage*{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
+\TUD@UnwindPackage{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
 \RequirePackage{textcomp}[2005/09/27]
 \RequirePackage{setspace}[2011/12/19]
 \setstretch{1.1}
-\AfterPackage*{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
-\TUD@UnwindPackage{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
 \PassOptionsToPackage{vskip=\smallskipamount}{quoting}
 \RequirePackage{quoting}[2014/01/28]
 \RequirePackage{isodate}[2010/01/03]
@@ -2117,6 +2104,34 @@
   \RequirePackage{ellipsis}[2004/9/28]%
   \let\ellipsispunctuation\relax%
 }
+\newcommand*\tud@replace[3]{%
+  \begingroup%
+    \toks@{\def\@tempa##1}%
+    \eaddto@hook\toks@{\detokenize{#2}}%
+    \addto@hook\toks@{##2\@nil{\@tempb{##1}{##2}}}%
+    \the\toks@%
+    \def\@tempb##1##2{%
+      \IfArgIsEmpty{##2}{%
+        \appto#1{##1}%
+        \let\@tempc\relax%
+      }{%
+        \appto#1{##1#3}%
+        \def\@tempc{\@tempa##2\@nil}%
+      }%
+      \@tempc%
+    }%
+    \toks@{\@tempa}%
+    \edef\@tempc{\expandafter\detokenize\expandafter{#1}}%
+    \eaddto@hook\toks@{\@tempc}%
+    \eaddto@hook\toks@{\detokenize{#2}\@nil}%
+    \def#1{}%
+    \the\toks@%
+    \edef\tud@reserved{%
+      \noexpand\endgroup%
+      \def\noexpand#1{#1}%
+    }%
+  \tud@reserved%
+}
 \newcommand*\Attention[2][\z@]{%
   \marginnote{%
     \setlength\fboxsep{0.25em}
@@ -2145,6 +2160,9 @@
   \addto@hook\toks@{{\tud@english{GitHub-Repository~\Distribution*{tudscr}}}}%
   \the\toks@\xspace%
 }
+\newcommand*\Download[1]{%
+  https://github.com/tud-cd/tudscr/releases/download/#1%
+}
 \newcommand*\notudscrartcl{%
   F\"ur die Klassen \Class{tudscrartcl} sowie \Class{tudscrposter} ist diese
   Option nicht verf\"ugbar.%
@@ -2169,6 +2187,13 @@
     D\kern.05em E\kern.05em N\kern.1em-\kern.1em concept%
   }\xspace%
 }
+\AfterPackage*{hyperref}{%
+  \pdfstringdefDisableCommands{%
+    \def\DDC{DRESDEN-concept}%
+    \def\TUDScript{TUD-Script}%
+    \def\KOMAScript{KOMA-Script}%
+  }%
+}
 \newcommand*\Univers{\texorpdfstring{\textubn{Univers}}{Univers}\xspace}
 \newcommand*\DIN{\texorpdfstring{\textdbn{DIN~BOLD}}{DIN BOLD}\xspace}
 \newcommand*\textsbn{}
@@ -2177,106 +2202,6 @@
 \newcommand*\textsbs{}
 \newrobustcmd*\sbsfont{\sffamily\bfseries\slshape}
 \DeclareTextFontCommand\textsbs{\sbsfont}
-%%% From File: tudscr-misc.dtx
-\begingroup
-\newcommand*\tud@write@xdy{}
-\newwrite\tud@write@xdy
-\newif\if@tud@xdy@glo
-\newcommand*\tud@xdy@create[2][theindex]{%
-  \IfFileExists{\@currname-#2.xdy}{}{%
-  \ifstr{#1}{theglossary}{\@tud@xdy@glotrue}{\@tud@xdy@glofalse}%
-  \openout\tud@write@xdy=\@currname-#2.xdy\relax%
-  \write\tud@write@xdy{(require "texindy.xdy")}%
-  \write\tud@write@xdy{%
-    (define-location-class^^J%
-    \space\space"arabic-page-numbers" ("arabic-numbers")%
-    \space:min-range-length 1^^J%
-    )^^J%
-    (markup-range :sep "--")%
-  }%
-  \write\tud@write@xdy{%
-    (markup-locclass-list%
-    \space:open "\string\,\string\dotfill\string\,"%
-    \space:close "\string\relax"%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (merge-rule "\@backslashchar[(.*)\@backslashchar]" "" :eregexp)%
-  }%
-  \write\tud@write@xdy{%
-    (markup-indexentry :open "~n \string\subsubsubitem " :depth 3)%
-  }%
-  \write\tud@write@xdy{%
-    (define-attributes (("declare" "!" "important" "?" "default")))^^J%
-    (markup-locref%
-    \space:attr "declare"\space\space%
-    \space:open "\string\textbf{\string\hyperpage{"%
-    \space:close "}}"%
-    )^^J%
-    (markup-locref%
-    \space:attr "!"\@spaces\@spaces%
-    \space:open "\string\textbf{\string\hyperpage{"%
-    \space:close "}}"%
-    )^^J%
-    (markup-locref%
-    \space:attr "important"%
-    \space:open "\string\textsl{\string\hyperpage{"%
-    \space:close "}}"%
-    )^^J%
-    (markup-locref%
-    \space:attr "?"\@spaces\@spaces%
-    \space:open "\string\textsl{\string\hyperpage{"%
-    \space:close "}}"%
-    )^^J%
-    (markup-locref%
-    \space:attr "default"\space\space%
-    \space:open "\string\hyperpage{"\@spaces\@spaces%
-    \space:close "}"%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (markup-crossref-list :class "see"^^J%
-    \space\space:open "\string\cleversee{" \@spaces:sep "; " :close "}"^^J%
-    )^^J%
-    (markup-crossref-list :class "seealso"^^J%
-    \space\space:open "\string\cleverseealso{" :sep "; " :close "}"^^J%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (define-crossref-class "seeunverified" :unverified)^^J%
-    (markup-crossref-list :class "seeunverified"^^J%
-    \space\space:open "\string\cleversee{" \@spaces:sep "; " :close "}"^^J%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (define-crossref-class "seeidx" :unverified)^^J%
-    (markup-crossref-list :class "seeidx"^^J%
-    \space\space:open "\string\seeidx{"\@spaces\@spaces:sep "; "%
-    \space:close "}{}"^^J%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (define-location-class-order^^J%
-    \space\space(^^J%
-    \@spaces"see" "seealso" "seeidx" "seeunverified"^^J%
-    \@spaces"roman-page-numbers" "arabic-page-numbers" "alpha-page-numbers"^^J%
-    \@spaces"Roman-page-numbers" "Alpha-page-numbers"^^J%
-    \space\space)^^J%
-    )%
-  }%
-  \write\tud@write@xdy{%
-    (markup-crossref-layer-list :class "see"%
-    \@spaces\space:sep "\string\,\string\textbar\string\,"%
-    )^^J%
-    (markup-crossref-layer-list :class "seealso"%
-    \space:sep "\string\,\string\textbar\string\,"%
-    )%
-  }%
-  \closeout\tud@write@xdy%
-  }%
-}
-\tud@xdy@create{ind}
-\endgroup
 %%% From File: tudscr-fields.dtx
 \newcommand*\@chairman{}
 \newcommand*\chairman[1]{\gdef\@chairman{#1}}
@@ -2370,6 +2295,107 @@
   The thesis is evaluated with a grade of \textbf{\@grade}.%
 }%
 \tud@locale@english{\noticename}{Notice}%
+%%% From File: tudscr-texindy.dtx
+\begingroup
+\newcommand*\tud@write@xdy{}
+\newwrite\tud@write@xdy
+\newif\if@tud@xdy@glo
+\newcommand*\tud@xdy@create[2][theindex]{%
+  \IfFileExists{\@currname-#2.xdy}{}{%
+  \ifstr{#1}{theglossary}{\@tud@xdy@glotrue}{\@tud@xdy@glofalse}%
+  \openout\tud@write@xdy=\@currname-#2.xdy\relax%
+  \write\tud@write@xdy{(require "texindy.xdy")}%
+  \write\tud@write@xdy{%
+    (define-location-class^^J%
+    \space\space"arabic-page-numbers" ("arabic-numbers")%
+    \space:min-range-length 2^^J%
+    )^^J%
+    (markup-range :sep "--")%
+  }%
+  \write\tud@write@xdy{%
+    (merge-rule "\@backslashchar[(.*)\@backslashchar]" "" :eregexp)%
+  }%
+  \write\tud@write@xdy{%
+    (markup-indexentry :open "~n \string\subsubsubitem " :depth 3)%
+  }%
+  \write\tud@write@xdy{%
+    (markup-locclass-list%
+    \space:open "\string\,\string\dotfill\string\,"%
+    \space:close "\string\relax"%
+    \space:sep ",\space"%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (define-attributes (("declare" "!" "important" "?" "default")))^^J%
+    (markup-locref%
+    \space:attr "declare"\space\space%
+    \space:open "\string\textbf{\string\hyperpage{"%
+    \space:close "}}"%
+    )^^J%
+    (markup-locref%
+    \space:attr "!"\@spaces\@spaces%
+    \space:open "\string\textbf{\string\hyperpage{"%
+    \space:close "}}"%
+    )^^J%
+    (markup-locref%
+    \space:attr "important"%
+    \space:open "\string\textsl{\string\hyperpage{"%
+    \space:close "}}"%
+    )^^J%
+    (markup-locref%
+    \space:attr "?"\@spaces\@spaces%
+    \space:open "\string\textsl{\string\hyperpage{"%
+    \space:close "}}"%
+    )^^J%
+    (markup-locref%
+    \space:attr "default"\space\space%
+    \space:open "\string\hyperpage{"\@spaces\@spaces%
+    \space:close "}"%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (markup-crossref-list :class "see"^^J%
+    \space\space:open "\string\cleversee{" \@spaces:sep "; " :close "}"^^J%
+    )^^J%
+    (markup-crossref-list :class "seealso"^^J%
+    \space\space:open "\string\cleverseealso{" :sep "; " :close "}"^^J%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (define-crossref-class "seeunverified" :unverified)^^J%
+    (markup-crossref-list :class "seeunverified"^^J%
+    \space\space:open "\string\cleversee{" \@spaces:sep "; " :close "}"^^J%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (define-crossref-class "seeidx" :unverified)^^J%
+    (markup-crossref-list :class "seeidx"^^J%
+    \space\space:open "\string\seeidx{"\@spaces\@spaces:sep "; "%
+    \space:close "}{}"^^J%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (define-location-class-order^^J%
+    \space\space(^^J%
+    \@spaces"see" "seealso" "seeidx" "seeunverified"^^J%
+    \@spaces"roman-page-numbers" "arabic-page-numbers" "alpha-page-numbers"^^J%
+    \@spaces"Roman-page-numbers" "Alpha-page-numbers"^^J%
+    \space\space)^^J%
+    )%
+  }%
+  \write\tud@write@xdy{%
+    (markup-crossref-layer-list :class "see"%
+    \@spaces\space:sep "\string\,\string\textbar\string\,"%
+    )^^J%
+    (markup-crossref-layer-list :class "seealso"%
+    \space:sep "\string\,\string\textbar\string\,"%
+    )%
+  }%
+  \closeout\tud@write@xdy%
+  }%
+}
+\tud@xdy@create{ind}
+\endgroup
 \endinput
 %%
 %% End of file `tudscrmanual.cls'.
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index 164d0abc848..b9ca7d00c53 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
@@ -27,37 +27,30 @@
 %% tudscr-comp.dtx  (with options: `class,poster,body')
 %% tudscr-misc.dtx  (with options: `class,poster,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -79,24 +72,24 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
-  \@ifundefined{TUD@Class@Parent}{%
+  \ifx\TUD@Class@Parent\@undefined%
     \newcommand*\TUD@Class@Name{#1}%
     \TUD@Class@Info%
-  }{}%
+  \fi%
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -335,8 +328,8 @@
       \cs@set@lock{tud@cdgeometry@num}{1}%
     \fi%
     \@tempswafalse%
-    \ifx\@tempb\tud@cdgeometry@num\relax\@tempswatrue\fi%
-    \ifx\@tempc\tud@cdgeometry@calc@num\relax\@tempswatrue\fi%
+    \ifx\@tempb\tud@cdgeometry@num\relax\else\@tempswatrue\fi%
+    \ifx\@tempc\tud@cdgeometry@calc@num\relax\else\@tempswatrue\fi%
     \if@tempswa%
       \TUD@SpecialOptionAtDocument{tud@cdgeometry@process}%
     \fi%
@@ -382,85 +375,6 @@
   \renewcommand*\tud@x@ta@warnings@on{\DeactivateWarningFilters[typearea]}
 }{}
 %%% From File: tudscr-pagestyle.dtx
-\newcommand*\tud@ps@list{}
-\newcommand*\tud@if@tudheadings[3]{%
-  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
-}
-\newif\if@tud@ddc@internal
-\newcommand*\tud@comp@clearpage{}%
-\newcommand*\tud@comp@resetpagestyle{}%
-\newcommand*\tud@ddc@switch{}
-\edef\tud@ddc@switch{%
-  \TUD@numkey@bool,%
-  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
-  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
-  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
-  {black}{5},{cdblack}{5},%
-  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
-  {white}{7},{cdwhite}{7}%
-}
-\newif\if@tud@headlogo@option@set
-\newif\if@tud@footlogo@option@set
-\newif\if@tud@ddc@auto
-\newcommand*\tud@ddc@auto@num{0}
-\TUD@key{ddc}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal%
-      \@tud@ddc@autofalse%
-    \else%
-      \@tud@ddc@autotrue%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddcfoot=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-    \global\@tud@headlogo@option@settrue%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@head@num{0}
-\TUD@key{ddchead}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddcfoot=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@foot@num{0}
-\TUD@key{ddcfoot}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@dim@footlogoheight{}
-\let\tud@dim@footlogoheight\relax
-\TUD@key{footlogoheight}{%
-  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
-      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
-      \@tempa#1\@nil%
-    \fi%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-}
 \cs@lock{tud@head@font@num}{0}
 \cs@lock{tud@head@bar@num}{0}
 \bool@lock{@tud@head@widebar}
@@ -596,6 +510,81 @@
     \csundef{@@tud@ps@#1@#2@#3@#4}%
   }{}%
 }
+\newcommand*\tud@dim@footlogoheight{}
+\let\tud@dim@footlogoheight\relax
+\TUD@key{footlogoheight}{%
+  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
+      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
+      \@tempa#1\@nil%
+    \fi%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+}
+\newif\if@tud@ddc@internal
+\newcommand*\tud@comp@clearpage{}%
+\newcommand*\tud@comp@resetpagestyle{}%
+\newcommand*\tud@ddc@switch{}
+\edef\tud@ddc@switch{%
+  \TUD@numkey@bool,%
+  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
+  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
+  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
+  {black}{5},{cdblack}{5},%
+  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
+  {white}{7},{cdwhite}{7}%
+}
+\newif\if@tud@headlogo@option@set
+\newif\if@tud@footlogo@option@set
+\newif\if@tud@ddc@auto
+\newcommand*\tud@ddc@auto@num{0}
+\TUD@key{ddc}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal%
+      \@tud@ddc@autofalse%
+    \else%
+      \@tud@ddc@autotrue%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddcfoot=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+    \global\@tud@headlogo@option@settrue%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@head@num{0}
+\TUD@key{ddchead}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddcfoot=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@foot@num{0}
+\TUD@key{ddcfoot}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@layout@switch{}
 \edef\tud@layout@switch{%
@@ -711,30 +700,6 @@
     \TUD@SpecialOptionAtDocument{tud@layout@process}%
   \fi%
 }
-\newcommand*\tud@font@koma@set[2]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{#2\nobreak}%
-}
-\newcommand*\tud@font@koma@unset[1]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{\relax}%
-}
-\newcommand*\tud@font@koma@reset[1]{%
-  \ifcsdef{tud@font@koma@#1}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}{}%
-}
-\DefineFamilyMember{KOMA}
-\DefineFamilyKey{KOMA}{headings}{%
-  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
-  \FamilyKeyStateProcessed%
-}
-\DefineFamilyKey{KOMA}{open}{%
-  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
-  \FamilyKeyStateProcessed%
-}
-\DefineFamilyKey{KOMA}{chapterprefix}{%
-  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
-  \FamilyKeyStateProcessed%
-}
 \newcommand*\tud@pagecolor{}%
 \TUD@key{backgroundcolor}[true]{%
   \TUD@set@numkey{backgroundcolor}{@tempa}{%
@@ -767,6 +732,19 @@
     \normalcolor%
   }%
 }
+\DefineFamilyMember{KOMA}
+\DefineFamilyKey{KOMA}{headings}{%
+  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
+  \FamilyKeyStateProcessed%
+}
+\DefineFamilyKey{KOMA}{open}{%
+  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
+  \FamilyKeyStateProcessed%
+}
+\DefineFamilyKey{KOMA}{chapterprefix}{%
+  \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
+  \FamilyKeyStateProcessed%
+}
 %%% From File: tudscr-title.dtx
 \DefineFamilyMember{KOMA}
 \DefineFamilyKey{KOMA}{titlepage}[true]{%
@@ -822,6 +800,110 @@
   }%
   \TUDoptions{#2}%
 }
+\newcommand*\tud@v@comp{\tud@v@last}
+\TUD@key{tudscrver}[last]{%
+  \tud@v@get\@tempa{#1}%
+  \ifcsundef{tud@v@\@tempa}{%
+    \ClassWarningNoLine{\TUD@Class@Name}%
+    {%
+      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
+      this value is not supported. Because of this, the\MessageBreak%
+      value for `tudscrver' was set to `first'%
+    }%
+    \def\tud@v@comp{0}%
+  }{%
+    \ClassInfoNoLine{\TUD@Class@Name}%
+    {%
+      Switching compatibility level to `\@tempa'%
+    }%
+    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
+  }%
+  \FamilyKeyStateProcessed%
+}
+\AtEndOfClass%
+{%
+  \TUD@key{tudscrver}[]{%
+    \ClassError{\TUD@Class@Name}%
+    {Option `tudscrver' too late}{%
+      Option `tudscrver' can only be set while loading the\MessageBreak%
+      class `\TUD@Class@Name'
+      but you have tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed%
+  }%
+  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
+    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
+      \ClassError{\TUD@Class@Name}{%
+        KOMA-Script compatibility level too low%
+      }{%
+        \TUD@Version\space must be used at least with\MessageBreak%
+        KOMA-Script compatibility option `version=3.12'.%
+      }%
+    \fi%
+  }{%
+    \ClassError{\TUD@Class@Name}{%
+      KOMA-Script v\TUD@Version@KOMA is required%
+    }{%
+      \TUD@Version\space must at least be used with\MessageBreak%
+      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+    }%
+  }%
+}
+\csdef{tud@v@first}{0}
+\csdef{tud@v@2.00}{0}
+\csdef{tud@v@2.01}{0}
+\csdef{tud@v@2.01a}{0}
+\csdef{tud@v@2.01b}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.03}{1}
+\csdef{tud@v@2.03a}{1}
+\csdef{tud@v@2.04}{2}
+\csdef{tud@v@2.04a}{2}
+\csdef{tud@v@2.04b}{2}
+\csdef{tud@v@2.04c}{2}
+\csdef{tud@v@2.04d}{2}
+\csdef{tud@v@2.04e}{2}
+\csdef{tud@v@2.05}{3}
+\csdef{tud@v@2.05a}{3}
+\csdef{tud@v@2.05b}{3}
+\csdef{tud@v@2.05c}{3}
+\csdef{tud@v@2.05d}{3}
+\csdef{tud@v@2.05e}{3}
+\csdef{tud@v@2.05f}{3}
+\csdef{tud@v@2.05g}{3}
+\csdef{tud@v@last}{3}
+\newcommand*\tud@v@get[2]{%
+  \begingroup%
+    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
+    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
+    \@tempa #2\@nil%
+    \edef\tud@reserved{%
+      \endgroup%
+      \etex@unexpanded{\def#1}{\@tempc}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\tud@if@v@lower[1]{%
+  \begingroup%
+    \tud@v@get\@tempa{#1}%
+    \ifcsdef{tud@v@\@tempa}{%
+      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
+        \def\tud@reserved{\endgroup\@firstoftwo}%
+      \else%
+        \def\tud@reserved{\endgroup\@secondoftwo}%
+      \fi%
+    }{%
+      \def\tud@reserved{%
+        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          There's no defined macro `\string\tud@v@\@tempa'%
+        }%
+        \endgroup\@firstoftwo%
+      }%
+    }%
+  \tud@reserved%
+}
 \TUD@key{fontspec}[true]{%
   \ClassWarning{\TUD@Class@Name}%
   {%
@@ -993,109 +1075,6 @@
   \fi%
 }
 \TUD@key{colour}[true]{\TUDoptions{color=#1}}
-\newcommand*\tud@v@comp{\tud@v@last}
-\TUD@key{tudscrver}[last]{%
-  \tud@v@get\@tempa{#1}%
-  \ifcsundef{tud@v@\@tempa}{%
-    \ClassWarningNoLine{\TUD@Class@Name}%
-    {%
-      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
-    }%
-    \def\tud@v@comp{0}%
-  }{%
-    \ClassInfoNoLine{\TUD@Class@Name}%
-    {%
-      Switching compatibility level to `\@tempa'%
-    }%
-    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
-  }%
-  \FamilyKeyStateProcessed%
-}
-\AtEndOfClass%
-{%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
-  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
-    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
-      \ClassError{\TUD@Class@Name}{%
-        KOMA-Script compatibility level too low%
-      }{%
-        \TUD@Version\space must be used at least with\MessageBreak%
-        KOMA-Script compatibility option `version=3.12'.%
-      }%
-    \fi%
-  }{%
-    \ClassError{\TUD@Class@Name}{%
-      KOMA-Script v\TUD@Version@KOMA is required%
-    }{%
-      \TUD@Version\space must at least be used with\MessageBreak%
-      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
-    }%
-  }%
-}
-\csdef{tud@v@first}{0}
-\csdef{tud@v@2.00}{0}
-\csdef{tud@v@2.01}{0}
-\csdef{tud@v@2.01a}{0}
-\csdef{tud@v@2.01b}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.03}{1}
-\csdef{tud@v@2.03a}{1}
-\csdef{tud@v@2.04}{2}
-\csdef{tud@v@2.04a}{2}
-\csdef{tud@v@2.04b}{2}
-\csdef{tud@v@2.04c}{2}
-\csdef{tud@v@2.04d}{2}
-\csdef{tud@v@2.04e}{2}
-\csdef{tud@v@2.05}{3}
-\csdef{tud@v@2.05a}{3}
-\csdef{tud@v@2.05b}{3}
-\csdef{tud@v@2.05c}{3}
-\csdef{tud@v@2.05d}{3}
-\csdef{tud@v@2.05e}{3}
-\csdef{tud@v@2.05f}{3}
-\csdef{tud@v@last}{3}
-\newcommand*\tud@v@get[2]{%
-  \begingroup%
-    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
-    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
-    \@tempa #2\@nil%
-    \edef\tud@reserved{%
-      \endgroup%
-      \etex@unexpanded{\def#1}{\@tempc}%
-    }%
-  \tud@reserved%
-}
-\newcommand*\tud@if@v@lower[1]{%
-  \begingroup%
-    \tud@v@get\@tempa{#1}%
-    \ifcsdef{tud@v@\@tempa}{%
-      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
-        \def\tud@reserved{\endgroup\@firstoftwo}%
-      \else%
-        \def\tud@reserved{\endgroup\@secondoftwo}%
-      \fi%
-    }{%
-      \def\tud@reserved{%
-        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
-          There's no defined macro `\string\tud@v@\@tempa'%
-        }%
-        \endgroup\@firstoftwo%
-      }%
-    }%
-  \tud@reserved%
-}
 %%% From File: tudscr-misc.dtx
 \newif\if@tud@x@scr@paper@set
 \TUD@key{paper}{%
@@ -1195,18 +1174,6 @@
 \LoadClass{\TUD@Class@KOMA}[2015/04/23]
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
-\AtEndPreamble{%
-  \@ifpackageloaded{graphicx}{}{%
-    \@ifpackageloaded{graphics}{%
-      \ClassWarningNoLine{\TUD@Class@Name}{%
-        Package `graphics' was superseded by `graphicx',\MessageBreak%
-        which now will be loaded automatically%
-      }%
-    }{}%
-  }%
-  \RequirePackage{graphicx}[1999/02/16]%
-  \RequirePackage{tudscrcolor}[\TUD@Version]%
-}
 \cs@lock{tud@x@multicol@num}{1}
 \newcommand*\tud@x@multicol@check{%
   \ifnum\tud@x@multicol@num>\@ne\relax%
@@ -1218,6 +1185,18 @@
   \fi%
 }
 \AfterPackage{multicol}{\renewcommand*\tud@x@multicol@check{\relax}}
+\AtEndPreamble{%
+  \@ifpackageloaded{graphicx}{}{%
+    \@ifpackageloaded{graphics}{%
+      \ClassWarningNoLine{\TUD@Class@Name}{%
+        Package `graphics' was superseded by `graphicx',\MessageBreak%
+        which now will be loaded automatically%
+      }%
+    }{}%
+    \RequirePackage{graphicx}[1999/02/16]%
+  }%
+  \RequirePackage{tudscrcolor}[\TUD@Version]%
+}
 %%% From File: tudscr-fonts.dtx
 \newcommand*\tud@univers{lun}
 \newif\if@tud@univers
@@ -1307,6 +1286,19 @@
   \fi%
   \undef\tud@font@check%
 }
+\newcommand*\tud@raggedright{\raggedright}
+\newcommand*\tud@RaggedRight{\raggedright}
+\AfterPackage*{ragged2e}{%
+  \ifdef{\LaTeXraggedright}{%
+    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
+  }{}%
+  \renewcommand*\tud@RaggedRight{\RaggedRight}%
+}
+\AfterPackage*{siunitx}{%
+  \providecommand*\lseries{\fontseries{l}\selectfont}%
+}
+\newif\if@tud@x@bm@requested
+\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
 \RequirePackage{trimspaces}[2009/09/17]
 \newif\if@tud@x@mweights@enabled
 \AfterPackage*{mweights}{\@tud@x@mweights@enabledtrue}
@@ -1818,11 +1810,6 @@
   \fi%
   \AtBeginDocument{\tud@font@math@init\let\tud@font@math@init\relax}%
 }
-\newif\if@tud@x@bm@requested
-\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
-\AfterPackage*{siunitx}{%
-  \providecommand*\lseries{\fontseries{l}\selectfont}%
-}
 \newrobustcmd*\ifdin{%
   \ifx\f@family\tud@dinbold%
     \expandafter\@firstoftwo%
@@ -1837,14 +1824,6 @@
     \sectfont#1%
   \fi%
 }
-\newcommand*\tud@raggedright{\raggedright}
-\newcommand*\tud@RaggedRight{\raggedright}
-\AfterPackage*{ragged2e}{%
-  \ifdef{\LaTeXraggedright}{%
-    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
-  }{}%
-  \renewcommand*\tud@RaggedRight{\RaggedRight}%
-}
 \RequirePackage{textcase}[2004/10/07]
 \newcommand*\tud@makeuppercase[1]{%
   \ifdin{\begingroup\MakeTextUppercase{#1}\endgroup}{#1}%
@@ -1901,21 +1880,29 @@
     \let\footnote\@gobble%
     \def\newline{\space\ignorespaces}%
     \def\\{\space\ignorespaces}%
-    \def\@tempa##1{\csdef{##1}####1{\noexpand\relax}}%
+    \let\@tempc\relax%
+    \def\@tempa##1{\csedef{##1}####1{\@tempc}}%
     \let\@tempb\tud@split@author@list%
     \ifx\and\relax\else%
       \robustify\and%
     \fi%
     \expandafter\forcsvlist\expandafter\@tempa\expandafter{\@tempb}%
+    \def\@tempa##1##2{%
+      \def\@tempb####1##2####2\@nil{%
+        \IfArgIsEmpty{####2}{%
+          \def##1{####1}%
+        }{%
+          \@tempb####1####2\@nil%
+        }%
+      }%
+      \expandafter\@tempb##1##2\@nil%
+    }%
     \protected@edef\@@author{#1}%
-    \tud@replace\@@author{ \relax }{}%
-    \tud@replace\@@author{\relax }{}%
-    \tud@replace\@@author{ \relax}{}%
-    \tud@replace\@@author{\relax}{}%
-    \tud@replace\@@author{ \and }{\and}%
-    \tud@replace\@@author{ \and}{\and}%
-    \tud@replace\@@author{\and }{\and}%
-    \protected@xdef\@@author{\trim@spaces{\@@author}}%
+    \@tempa{\@@author}{ \@tempc }%
+    \@tempa{\@@author}{\@tempc }%
+    \@tempa{\@@author}{ \@tempc}%
+    \@tempa{\@@author}{\@tempc}%
+    \xdef\@@author{\expandonce\@@author}%
   \endgroup%
 }
 \newcommand*\@authormore{}
@@ -2219,6 +2206,22 @@
   \tud@locale@english{\@dotswap}{.}%
 }
 %%% From File: tudscr-area.dtx
+\newif\if@tud@x@crop@center
+\AfterPackage{crop}{%
+  \CheckCommand*\CROP@center{%
+    \voffset\stockheight
+    \advance\voffset-\paperheight
+    \voffset.5\voffset
+    \hoffset\stockwidth
+    \advance\hoffset-\paperwidth
+    \hoffset.5\hoffset
+  }%
+  \pretocmd{\CROP@center}{%
+    \@tud@x@crop@centertrue%
+  }{}{\tud@patch@wrn{CROP@center}}
+}
+\newif\if@tud@x@standalone@crop
+\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newlength\tud@len@widemargin
 \newlength\tud@len@slimmargin
 \newlength\tud@len@both
@@ -2408,22 +2411,6 @@
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
 }
-\newif\if@tud@x@crop@center
-\AfterPackage{crop}{%
-  \CheckCommand*\CROP@center{%
-    \voffset\stockheight
-    \advance\voffset-\paperheight
-    \voffset.5\voffset
-    \hoffset\stockwidth
-    \advance\hoffset-\paperwidth
-    \hoffset.5\hoffset
-  }%
-  \pretocmd{\CROP@center}{%
-    \@tud@x@crop@centertrue%
-  }{}{\tud@patch@wrn{CROP@center}}
-}
-\newif\if@tud@x@standalone@crop
-\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newcommand*\tud@cdgeometry@process{}
 \newcommand*\tud@cdgeometry@@process{}
 \if@tud@x@standalone@crop
@@ -3218,19 +3205,6 @@
   \AtEndPreamble{%
     \if@tud@x@standalone@crop%
       \pagestyle{empty}%
-      \hoffset=-72.27pt%
-      \voffset=-72.27pt%
-      \topmargin=0pt%
-      \headheight=0pt%
-      \headsep=0pt%
-      \marginparsep=0pt%
-      \marginparwidth=0pt%
-      \footskip=0pt%
-      \marginparpush=0pt%
-      \oddsidemargin=0pt%
-      \evensidemargin=0pt%
-      \topskip=0pt%
-      \textheight=\maxdimen%
       \let\tud@AfterChangingArea\relax%
       \let\tud@cdgeometry@process\relax%
     \else%
@@ -3638,16 +3612,43 @@
   ]{tudheadings.pagecolor}%
   \AddLayersToPageStyle{@everystyle@}{tudheadings.pagecolor}%
 }
+\newcommand*\tud@ps@list{}
 \listadd\tud@ps@list{tudheadings}
 \listadd\tud@ps@list{plain.tudheadings}
 \listadd\tud@ps@list{empty.tudheadings}
-\PreventPackageFromLoading[%
-  \ClassWarning{\TUD@Class@Name}{%
-    The package `fancyhdr' must not be used with a\MessageBreak%
-    TUD-Script class. You should make use of the\MessageBreak%
-    capabilities of package `scrlayer-scrpage' instead%
-  }%
-]{fancyhdr}
+\newcommand*\tud@if@tudheadings[3]{%
+  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
+}
+\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
+  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
+}{}{\tud@patch@wrn{thispagestyle}}
+\newcommand*\tud@pagestyle{}
+\let\tud@pagestyle\pagestyle
+\pretocmd{\tud@pagestyle}{%
+  \tud@BeforeSelectAnyPageStyle{#1}%
+  \edef\currentpagestyle{#1}%
+}{}{\tud@patch@wrn{pagestyle}}
+\tud@cmd@store{pagestyle}
+\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
+\BeforePackage{scrlayer-scrpage}{%
+  \tud@cmd@restore{pagestyle}%
+  \undef\tud@pagestyle%
+}
+\TUD@UnwindPackage{scrlayer-scrpage}{%
+  \ifcsundef{if@chapter}{%
+    \newif\if@chapter%
+    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
+  }{}%
+  \cslet{ps@tudheadings}{\ps@headings}%
+  \cslet{ps@plain.tudheadings}{\ps@plain}%
+  \cslet{ps@empty.tudheadings}{\ps@empty}%
+  \providecommand*\currentpagestyle{plain}%
+  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
+  \providecommand*\GetRealPageStyle[1]{#1}%
+  \let\pagestyle\tud@pagestyle%
+  \undef\tud@pagestyle%
+  \tud@cdgeometry@init%
+}
 \newcommand*\tud@ps@onselect{%
   \DeclarePageStyleAlias{plain}{plain.tudheadings}%
   \DeclarePageStyleAlias{headings}{tudheadings}%
@@ -3719,36 +3720,6 @@
   \ifstr{\tud@head@fontcolor}{white}{\let\tud@len@line\tud@len@heavyline}{}%
   \global\let\tud@foot@fontcolor\tud@foot@fontcolor%
 }
-\newcommand*\tud@pagestyle{}
-\let\tud@pagestyle\pagestyle
-\pretocmd{\tud@pagestyle}{%
-  \tud@BeforeSelectAnyPageStyle{#1}%
-  \edef\currentpagestyle{#1}%
-}{}{\tud@patch@wrn{pagestyle}}
-\tud@cmd@store{pagestyle}
-\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
-\BeforePackage{scrlayer-scrpage}{%
-  \tud@cmd@restore{pagestyle}%
-  \undef\tud@pagestyle%
-}
-\TUD@UnwindPackage{scrlayer-scrpage}{%
-  \ifcsundef{if@chapter}{%
-    \newif\if@chapter%
-    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
-  }{}%
-  \cslet{ps@tudheadings}{\ps@headings}%
-  \cslet{ps@plain.tudheadings}{\ps@plain}%
-  \cslet{ps@empty.tudheadings}{\ps@empty}%
-  \providecommand*\currentpagestyle{plain}%
-  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
-  \providecommand*\GetRealPageStyle[1]{#1}%
-  \let\pagestyle\tud@pagestyle%
-  \undef\tud@pagestyle%
-  \tud@cdgeometry@init%
-}
-\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
-  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
-}{}{\tud@patch@wrn{thispagestyle}}
 \newcommand*\tud@head@fontsize{}
 \newcommand*\tud@head@font@light{}
 \newcommand*\tud@head@font@bold{}
@@ -3904,40 +3875,6 @@
   \endgroup%
   \vbox to #1{#2}%
 }
-\AtBeginDocument{%
-  \tud@if@v@lower{2.04}{%
-    \renewcommand*\tud@comp@clearpage{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
-      \fi%
-    }%
-    \renewcommand*\tud@comp@resetpagestyle{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{%
-          \expandafter\pagestyle\expandafter{\currentpagestyle}%
-        }{}%
-      \fi%
-    }%
-  }{}%
-}
-\newcommand*\tud@ddc@check{%
-  \let\@tempa\tud@ddc@head@num%
-  \let\@tempb\tud@ddc@foot@num%
-  \if@tud@ddc@auto%
-    \ifdefvoid{\tud@headlogo@filename}{%
-      \let\@tempa\tud@ddc@auto@num%
-      \let\@tempb\z@%
-    }{%
-      \let\@tempa\z@%
-      \let\@tempb\tud@ddc@auto@num%
-    }%
-  \fi%
-  \tud@if@v@lower{2.03}{%
-    \ifnum\@tempb=\z@\relax%
-      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
-    \fi%
-  }{}%
-}
 \tud@newlayerbox{main@black}
 \tud@newlayerbox{main@HKS41}
 \tud@newlayerbox{main@white}
@@ -4066,10 +4003,6 @@
     \ifnum\@tempa>\z@\relax\tud@headlogo@wrn\fi%
   }%
 }
-\tud@newlayerbox{foot@black}
-\tud@newlayerbox{foot@HKS41}
-\tud@newlayerbox{foot@white}
-\tud@newlayerbox{foot@option}
 \AtEndOfClass{%
   \ifdefvoid{\tud@dim@footlogoheight}{%
     \tud@if@v@lower{2.03}{%
@@ -4079,6 +4012,10 @@
     }%
   }{}%
 }
+\tud@newlayerbox{foot@black}
+\tud@newlayerbox{foot@HKS41}
+\tud@newlayerbox{foot@white}
+\tud@newlayerbox{foot@option}
 \newcommand*\tud@footlogo@ddc@set[2]{%
   \tud@savelayerbox{foot@#1}{%
     \includegraphics[keepaspectratio,totalheight=\tud@dim@footlogoheight]{#2}%
@@ -4363,6 +4300,40 @@
     \hbox to #2{}%
   \fi%
 }
+\AtBeginDocument{%
+  \tud@if@v@lower{2.04}{%
+    \renewcommand*\tud@comp@clearpage{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
+      \fi%
+    }%
+    \renewcommand*\tud@comp@resetpagestyle{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{%
+          \expandafter\pagestyle\expandafter{\currentpagestyle}%
+        }{}%
+      \fi%
+    }%
+  }{}%
+}
+\newcommand*\tud@ddc@check{%
+  \let\@tempa\tud@ddc@head@num%
+  \let\@tempb\tud@ddc@foot@num%
+  \if@tud@ddc@auto%
+    \ifdefvoid{\tud@headlogo@filename}{%
+      \let\@tempa\tud@ddc@auto@num%
+      \let\@tempb\z@%
+    }{%
+      \let\@tempa\z@%
+      \let\@tempb\tud@ddc@auto@num%
+    }%
+  \fi%
+  \tud@if@v@lower{2.03}{%
+    \ifnum\@tempb=\z@\relax%
+      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
+    \fi%
+  }{}%
+}
 \newcommand*\tud@ps@parameters[1]{%
   \TUD@parameter@def{cdfont}[true]{\TUDoption{cdfont}{#1}}%
   \TUD@parameter@def{cdhead}[true]{\TUDoption{cdhead}{#1}}%
@@ -4379,6 +4350,13 @@
   \TUD@parameter@def{tudfoot}[true]{\TUDoption{tudfoot}{#1}}%
   \TUD@parameter@let{logo}{headlogo}%
 }
+\PreventPackageFromLoading[%
+  \ClassWarning{\TUD@Class@Name}{%
+    The package `fancyhdr' must not be used with a\MessageBreak%
+    TUD-Script class. You should make use of the\MessageBreak%
+    capabilities of package `scrlayer-scrpage' instead%
+  }%
+]{fancyhdr}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@x@scr@headings@current{}
 \newcommand*\tud@sec@fontsize{}
@@ -4568,15 +4546,17 @@
   \let\tud@@startpart\scr@@startpart%
   \ifcsdef{scr@v@3.21}{\@tempswatrue}{\@tempswafalse}%
   \if@tempswa%
-    \patchcmd{\tud@@startpart}%
-      {\usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}}%
-      {\usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}}%
-      {}{\tud@patch@wrn{scr@@startpart}}%
+    \patchcmd{\tud@@startpart}{%
+      \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
+    }{%
+      \usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}%
+    }{}{\tud@patch@wrn{scr@@startpart}}%
   \else%
-    \patchcmd{\tud@@startpart}%
-      {\usekomafont{#1prefix}{\@nameuse{#1format}}}%
-      {\usekomafont{#1prefix}{\tud@makeuppercase{\@nameuse{#1format}}}}%
-      {}{\tud@patch@wrn{scr@@startpart}}%
+    \patchcmd{\tud@@startpart}{%
+      \usekomafont{#1prefix}{\@nameuse{#1format}}%
+    }{%
+      \usekomafont{#1prefix}{\tud@makeuppercase{\@nameuse{#1format}}}%
+    }{}{\tud@patch@wrn{scr@@startpart}}%
   \fi%
 \else
   \newcommand*\tud@@part{}%
@@ -4657,22 +4637,10 @@
   \usekomafont{subject}%
   \mdseries%
   \large%
+  \tud@raggedright%
 }
 \robustify{\thanks}
 \robustify{\footnotemark}
-\newcommand*\tud@title@uppercase[1]{%
-  \let\@tempa\relax%
-  \begingroup%
-    \let\\\newline%
-    \def\thanks##1{\gdef\@tempa{##1}}%
-    \let\footnote\thanks%
-    \sbox\z@{#1}%
-    \let\thanks\@gobble%
-    \let\footnote\@gobble%
-    \tud@makeuppercase{#1}%
-  \endgroup%
-  \ifx\@tempa\relax\else\thanks\@tempa\fi%
-}
 \newcommand*\tud@title@pagenumber{}
 \let\tud@title@pagenumber\relax
 \newcommand*\tud@maketitle[1][]{%
@@ -4782,6 +4750,19 @@
     \tud@if@v@lower{2.03}{\tud@ddc@enlargepage[\titlepagestyle]}{}%
   \endgroup%
 }
+\newcommand*\tud@title@uppercase[1]{%
+  \let\@tempa\relax%
+  \begingroup%
+    \let\\\newline%
+    \def\thanks##1{\gdef\@tempa{##1}}%
+    \let\footnote\thanks%
+    \sbox\z@{#1}%
+    \let\thanks\@gobble%
+    \let\footnote\@gobble%
+    \tud@makeuppercase{#1}%
+  \endgroup%
+  \ifx\@tempa\relax\else\thanks\@tempa\fi%
+}
 \newcommand\maketitleonecolumn[2][]{%
   \if@twocolumn%
       \tud@title@twocolumn{\tud@maketitle[#1]{#2}}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 788f5217b37..fe66916bc66 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
@@ -27,37 +27,30 @@
 %% tudscr-comp.dtx  (with options: `class,report,body')
 %% tudscr-misc.dtx  (with options: `class,report,body')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -79,24 +72,24 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \ProvidesClass{#1}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
     ^^J#3 (#2)%
   ]%
   \newcommand*\TUD@Class@KOMA{#2}%
-  \@ifundefined{TUD@Class@Parent}{%
+  \ifx\TUD@Class@Parent\@undefined%
     \newcommand*\TUD@Class@Name{#1}%
     \TUD@Class@Info%
-  }{}%
+  \fi%
 }
 \providecommand*\TUD@Class@Info{%
   \typeout{+---------------------------------------------------------------}%
-  \typeout{| The Corporate Design of Technische Universitaet Dresden}%
+  \typeout{| Corporate Design of Technische Universitaet Dresden}%
   \typeout{| Class: \TUD@Class@Name}%
   \typeout{| Version: \TUD@Version}%
   \typeout{| Author: Falk Hanisch (\tudscrmail)}%
@@ -335,8 +328,8 @@
       \cs@set@lock{tud@cdgeometry@num}{1}%
     \fi%
     \@tempswafalse%
-    \ifx\@tempb\tud@cdgeometry@num\relax\@tempswatrue\fi%
-    \ifx\@tempc\tud@cdgeometry@calc@num\relax\@tempswatrue\fi%
+    \ifx\@tempb\tud@cdgeometry@num\relax\else\@tempswatrue\fi%
+    \ifx\@tempc\tud@cdgeometry@calc@num\relax\else\@tempswatrue\fi%
     \if@tempswa%
       \TUD@SpecialOptionAtDocument{tud@cdgeometry@process}%
     \fi%
@@ -382,85 +375,6 @@
   \renewcommand*\tud@x@ta@warnings@on{\DeactivateWarningFilters[typearea]}
 }{}
 %%% From File: tudscr-pagestyle.dtx
-\newcommand*\tud@ps@list{}
-\newcommand*\tud@if@tudheadings[3]{%
-  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
-}
-\newif\if@tud@ddc@internal
-\newcommand*\tud@comp@clearpage{}%
-\newcommand*\tud@comp@resetpagestyle{}%
-\newcommand*\tud@ddc@switch{}
-\edef\tud@ddc@switch{%
-  \TUD@numkey@bool,%
-  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
-  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
-  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
-  {black}{5},{cdblack}{5},%
-  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
-  {white}{7},{cdwhite}{7}%
-}
-\newif\if@tud@headlogo@option@set
-\newif\if@tud@footlogo@option@set
-\newif\if@tud@ddc@auto
-\newcommand*\tud@ddc@auto@num{0}
-\TUD@key{ddc}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal%
-      \@tud@ddc@autofalse%
-    \else%
-      \@tud@ddc@autotrue%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddcfoot=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-    \global\@tud@headlogo@option@settrue%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@head@num{0}
-\TUD@key{ddchead}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddcfoot=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@ddc@foot@num{0}
-\TUD@key{ddcfoot}[true]{%
-  \tud@comp@clearpage%
-  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \if@tud@ddc@internal\else%
-      \@tud@ddc@internaltrue%
-      \TUDoptions{ddchead=false}%
-      \TUDoptions{ddc=false}%
-      \@tud@ddc@internalfalse%
-    \fi%
-  \fi%
-  \tud@comp@resetpagestyle%
-}
-\newcommand*\tud@dim@footlogoheight{}
-\let\tud@dim@footlogoheight\relax
-\TUD@key{footlogoheight}{%
-  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
-  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
-    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
-      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
-      \@tempa#1\@nil%
-    \fi%
-    \global\@tud@footlogo@option@settrue%
-  \fi%
-}
 \cs@lock{tud@head@font@num}{0}
 \cs@lock{tud@head@bar@num}{0}
 \bool@lock{@tud@head@widebar}
@@ -596,6 +510,81 @@
     \csundef{@@tud@ps@#1@#2@#3@#4}%
   }{}%
 }
+\newcommand*\tud@dim@footlogoheight{}
+\let\tud@dim@footlogoheight\relax
+\TUD@key{footlogoheight}{%
+  \TUD@set@dimenkey{footlogoheight}{\tud@dim@footlogoheight}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \ifdim\dimexpr\tud@dim@footlogoheight\relax<\z@\relax%
+      \def\@tempa-##1\@nil{\def\tud@dim@footlogoheight{##1}}%
+      \@tempa#1\@nil%
+    \fi%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+}
+\newif\if@tud@ddc@internal
+\newcommand*\tud@comp@clearpage{}%
+\newcommand*\tud@comp@resetpagestyle{}%
+\newcommand*\tud@ddc@switch{}
+\edef\tud@ddc@switch{%
+  \TUD@numkey@bool,%
+  {color}{2},{colour}{2},{cdcolor}{2},{cdcolour}{2},%
+  {colorblack}{3},{colourblack}{3},{cdcolorblack}{3},{cdcolourblack}{3},%
+  {gray}{4},{grey}{4},{HKS92}{4},{cdgray}{4},{cdgrey}{4},%
+  {black}{5},{cdblack}{5},%
+  {blue}{6},{HKS41}{6},{cdblue}{6},{cddarkblue}{6},%
+  {white}{7},{cdwhite}{7}%
+}
+\newif\if@tud@headlogo@option@set
+\newif\if@tud@footlogo@option@set
+\newif\if@tud@ddc@auto
+\newcommand*\tud@ddc@auto@num{0}
+\TUD@key{ddc}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddc}{tud@ddc@auto@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal%
+      \@tud@ddc@autofalse%
+    \else%
+      \@tud@ddc@autotrue%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddcfoot=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+    \global\@tud@headlogo@option@settrue%
+    \global\@tud@footlogo@option@settrue%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@head@num{0}
+\TUD@key{ddchead}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddchead}{tud@ddc@head@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddcfoot=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
+\newcommand*\tud@ddc@foot@num{0}
+\TUD@key{ddcfoot}[true]{%
+  \tud@comp@clearpage%
+  \TUD@set@numkey{ddcfoot}{tud@ddc@foot@num}{\tud@ddc@switch}{#1}%
+  \ifx\FamilyKeyState\FamilyKeyStateProcessed%
+    \if@tud@ddc@internal\else%
+      \@tud@ddc@internaltrue%
+      \TUDoptions{ddchead=false}%
+      \TUDoptions{ddc=false}%
+      \@tud@ddc@internalfalse%
+    \fi%
+  \fi%
+  \tud@comp@resetpagestyle%
+}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@layout@switch{}
 \edef\tud@layout@switch{%
@@ -854,17 +843,7 @@
 \newif\if@tud@clearcolor
 \TUD@ifkey{clearcolor}{@tud@clearcolor}
 \TUD@ifkey{clearcolour}{@tud@clearcolor}
-\newcommand*\tud@font@koma@set[2]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{#2\nobreak}%
-}
-\newcommand*\tud@font@koma@unset[1]{%
-  \ifcsdef{tud@font@koma@#1}{}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}%
-  \csdef{tud@font@koma@#1}{\relax}%
-}
-\newcommand*\tud@font@koma@reset[1]{%
-  \ifcsdef{tud@font@koma@#1}{\addtokomafont{#1}{\csuse{tud@font@koma@#1}}}{}%
-}
+\newcommand*\tud@pagecolor{}%
 \DefineFamilyMember{KOMA}
 \DefineFamilyKey{KOMA}{headings}{%
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
@@ -878,7 +857,6 @@
   \TUD@SpecialOptionAtDocument{tud@x@scr@headings@reset}%
   \FamilyKeyStateProcessed%
 }
-\newcommand*\tud@pagecolor{}%
 \newcommand*\tud@dim@pageheadingsvskip{0pt}
 \TUD@key{pageheadingsvskip}{%
   \TUD@set@dimenkey{pageheadingsvskip}{\tud@dim@pageheadingsvskip}{#1}%
@@ -1050,6 +1028,110 @@
   }%
   \TUDoptions{#2}%
 }
+\newcommand*\tud@v@comp{\tud@v@last}
+\TUD@key{tudscrver}[last]{%
+  \tud@v@get\@tempa{#1}%
+  \ifcsundef{tud@v@\@tempa}{%
+    \ClassWarningNoLine{\TUD@Class@Name}%
+    {%
+      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
+      this value is not supported. Because of this, the\MessageBreak%
+      value for `tudscrver' was set to `first'%
+    }%
+    \def\tud@v@comp{0}%
+  }{%
+    \ClassInfoNoLine{\TUD@Class@Name}%
+    {%
+      Switching compatibility level to `\@tempa'%
+    }%
+    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
+  }%
+  \FamilyKeyStateProcessed%
+}
+\AtEndOfClass%
+{%
+  \TUD@key{tudscrver}[]{%
+    \ClassError{\TUD@Class@Name}%
+    {Option `tudscrver' too late}{%
+      Option `tudscrver' can only be set while loading the\MessageBreak%
+      class `\TUD@Class@Name'
+      but you have tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed%
+  }%
+  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
+    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
+      \ClassError{\TUD@Class@Name}{%
+        KOMA-Script compatibility level too low%
+      }{%
+        \TUD@Version\space must be used at least with\MessageBreak%
+        KOMA-Script compatibility option `version=3.12'.%
+      }%
+    \fi%
+  }{%
+    \ClassError{\TUD@Class@Name}{%
+      KOMA-Script v\TUD@Version@KOMA is required%
+    }{%
+      \TUD@Version\space must at least be used with\MessageBreak%
+      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+    }%
+  }%
+}
+\csdef{tud@v@first}{0}
+\csdef{tud@v@2.00}{0}
+\csdef{tud@v@2.01}{0}
+\csdef{tud@v@2.01a}{0}
+\csdef{tud@v@2.01b}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.02}{0}
+\csdef{tud@v@2.03}{1}
+\csdef{tud@v@2.03a}{1}
+\csdef{tud@v@2.04}{2}
+\csdef{tud@v@2.04a}{2}
+\csdef{tud@v@2.04b}{2}
+\csdef{tud@v@2.04c}{2}
+\csdef{tud@v@2.04d}{2}
+\csdef{tud@v@2.04e}{2}
+\csdef{tud@v@2.05}{3}
+\csdef{tud@v@2.05a}{3}
+\csdef{tud@v@2.05b}{3}
+\csdef{tud@v@2.05c}{3}
+\csdef{tud@v@2.05d}{3}
+\csdef{tud@v@2.05e}{3}
+\csdef{tud@v@2.05f}{3}
+\csdef{tud@v@2.05g}{3}
+\csdef{tud@v@last}{3}
+\newcommand*\tud@v@get[2]{%
+  \begingroup%
+    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
+    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
+    \@tempa #2\@nil%
+    \edef\tud@reserved{%
+      \endgroup%
+      \etex@unexpanded{\def#1}{\@tempc}%
+    }%
+  \tud@reserved%
+}
+\newcommand*\tud@if@v@lower[1]{%
+  \begingroup%
+    \tud@v@get\@tempa{#1}%
+    \ifcsdef{tud@v@\@tempa}{%
+      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
+        \def\tud@reserved{\endgroup\@firstoftwo}%
+      \else%
+        \def\tud@reserved{\endgroup\@secondoftwo}%
+      \fi%
+    }{%
+      \def\tud@reserved{%
+        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+          There's no defined macro `\string\tud@v@\@tempa'%
+        }%
+        \endgroup\@firstoftwo%
+      }%
+    }%
+  \tud@reserved%
+}
 \TUD@key{fontspec}[true]{%
   \ClassWarning{\TUD@Class@Name}%
   {%
@@ -1221,109 +1303,6 @@
   \fi%
 }
 \TUD@key{colour}[true]{\TUDoptions{color=#1}}
-\newcommand*\tud@v@comp{\tud@v@last}
-\TUD@key{tudscrver}[last]{%
-  \tud@v@get\@tempa{#1}%
-  \ifcsundef{tud@v@\@tempa}{%
-    \ClassWarningNoLine{\TUD@Class@Name}%
-    {%
-      You have set option `tudscrver' to `\@tempa', but\MessageBreak%
-      this value is not supported. Because of this, the\MessageBreak%
-      value for `tudscrver' was set to `first'%
-    }%
-    \def\tud@v@comp{0}%
-  }{%
-    \ClassInfoNoLine{\TUD@Class@Name}%
-    {%
-      Switching compatibility level to `\@tempa'%
-    }%
-    \edef\tud@v@comp{\csuse{tud@v@\@tempa}}%
-  }%
-  \FamilyKeyStateProcessed%
-}
-\AtEndOfClass%
-{%
-  \TUD@key{tudscrver}[]{%
-    \ClassError{\TUD@Class@Name}%
-    {Option `tudscrver' too late}{%
-      Option `tudscrver' can only be set while loading the\MessageBreak%
-      class `\TUD@Class@Name'
-      but you have tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed%
-  }%
-  \ifcsdef{scr@v@\TUD@Version@KOMA}{%
-    \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax%
-      \ClassError{\TUD@Class@Name}{%
-        KOMA-Script compatibility level too low%
-      }{%
-        \TUD@Version\space must be used at least with\MessageBreak%
-        KOMA-Script compatibility option `version=3.12'.%
-      }%
-    \fi%
-  }{%
-    \ClassError{\TUD@Class@Name}{%
-      KOMA-Script v\TUD@Version@KOMA is required%
-    }{%
-      \TUD@Version\space must at least be used with\MessageBreak%
-      KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
-    }%
-  }%
-}
-\csdef{tud@v@first}{0}
-\csdef{tud@v@2.00}{0}
-\csdef{tud@v@2.01}{0}
-\csdef{tud@v@2.01a}{0}
-\csdef{tud@v@2.01b}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.02}{0}
-\csdef{tud@v@2.03}{1}
-\csdef{tud@v@2.03a}{1}
-\csdef{tud@v@2.04}{2}
-\csdef{tud@v@2.04a}{2}
-\csdef{tud@v@2.04b}{2}
-\csdef{tud@v@2.04c}{2}
-\csdef{tud@v@2.04d}{2}
-\csdef{tud@v@2.04e}{2}
-\csdef{tud@v@2.05}{3}
-\csdef{tud@v@2.05a}{3}
-\csdef{tud@v@2.05b}{3}
-\csdef{tud@v@2.05c}{3}
-\csdef{tud@v@2.05d}{3}
-\csdef{tud@v@2.05e}{3}
-\csdef{tud@v@2.05f}{3}
-\csdef{tud@v@last}{3}
-\newcommand*\tud@v@get[2]{%
-  \begingroup%
-    \def\@tempa{\kernel@ifnextchar v{\@tempb}{\@tempb v}}%
-    \def\@tempb v##1\@nil{\def\@tempc{##1}}%
-    \@tempa #2\@nil%
-    \edef\tud@reserved{%
-      \endgroup%
-      \etex@unexpanded{\def#1}{\@tempc}%
-    }%
-  \tud@reserved%
-}
-\newcommand*\tud@if@v@lower[1]{%
-  \begingroup%
-    \tud@v@get\@tempa{#1}%
-    \ifcsdef{tud@v@\@tempa}{%
-      \ifnum\tud@v@comp<\csuse{tud@v@\@tempa}\relax%
-        \def\tud@reserved{\endgroup\@firstoftwo}%
-      \else%
-        \def\tud@reserved{\endgroup\@secondoftwo}%
-      \fi%
-    }{%
-      \def\tud@reserved{%
-        \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
-          Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
-          There's no defined macro `\string\tud@v@\@tempa'%
-        }%
-        \endgroup\@firstoftwo%
-      }%
-    }%
-  \tud@reserved%
-}
 %%% From File: tudscr-misc.dtx
 \newif\if@tud@x@scr@paper@set
 \TUD@key{paper}{%
@@ -1423,18 +1402,6 @@
 \LoadClass{\TUD@Class@KOMA}[2015/04/23]
 %%% From File: tudscr-base.dtx
 \RequirePackage{environ}[2013/04/01]
-\AtEndPreamble{%
-  \@ifpackageloaded{graphicx}{}{%
-    \@ifpackageloaded{graphics}{%
-      \ClassWarningNoLine{\TUD@Class@Name}{%
-        Package `graphics' was superseded by `graphicx',\MessageBreak%
-        which now will be loaded automatically%
-      }%
-    }{}%
-  }%
-  \RequirePackage{graphicx}[1999/02/16]%
-  \RequirePackage{tudscrcolor}[\TUD@Version]%
-}
 \cs@lock{tud@x@multicol@num}{1}
 \newcommand*\tud@x@multicol@check{%
   \ifnum\tud@x@multicol@num>\@ne\relax%
@@ -1446,6 +1413,18 @@
   \fi%
 }
 \AfterPackage{multicol}{\renewcommand*\tud@x@multicol@check{\relax}}
+\AtEndPreamble{%
+  \@ifpackageloaded{graphicx}{}{%
+    \@ifpackageloaded{graphics}{%
+      \ClassWarningNoLine{\TUD@Class@Name}{%
+        Package `graphics' was superseded by `graphicx',\MessageBreak%
+        which now will be loaded automatically%
+      }%
+    }{}%
+    \RequirePackage{graphicx}[1999/02/16]%
+  }%
+  \RequirePackage{tudscrcolor}[\TUD@Version]%
+}
 %%% From File: tudscr-fonts.dtx
 \newcommand*\tud@univers{lun}
 \newif\if@tud@univers
@@ -1535,6 +1514,19 @@
   \fi%
   \undef\tud@font@check%
 }
+\newcommand*\tud@raggedright{\raggedright}
+\newcommand*\tud@RaggedRight{\raggedright}
+\AfterPackage*{ragged2e}{%
+  \ifdef{\LaTeXraggedright}{%
+    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
+  }{}%
+  \renewcommand*\tud@RaggedRight{\RaggedRight}%
+}
+\AfterPackage*{siunitx}{%
+  \providecommand*\lseries{\fontseries{l}\selectfont}%
+}
+\newif\if@tud@x@bm@requested
+\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
 \RequirePackage{trimspaces}[2009/09/17]
 \newif\if@tud@x@mweights@enabled
 \AfterPackage*{mweights}{\@tud@x@mweights@enabledtrue}
@@ -2046,11 +2038,6 @@
   \fi%
   \AtBeginDocument{\tud@font@math@init\let\tud@font@math@init\relax}%
 }
-\newif\if@tud@x@bm@requested
-\PreventPackageFromLoading[\@tud@x@bm@requestedtrue]{bm}
-\AfterPackage*{siunitx}{%
-  \providecommand*\lseries{\fontseries{l}\selectfont}%
-}
 \newrobustcmd*\ifdin{%
   \ifx\f@family\tud@dinbold%
     \expandafter\@firstoftwo%
@@ -2065,14 +2052,6 @@
     \sectfont#1%
   \fi%
 }
-\newcommand*\tud@raggedright{\raggedright}
-\newcommand*\tud@RaggedRight{\raggedright}
-\AfterPackage*{ragged2e}{%
-  \ifdef{\LaTeXraggedright}{%
-    \renewcommand*\tud@raggedright{\LaTeXraggedright}%
-  }{}%
-  \renewcommand*\tud@RaggedRight{\RaggedRight}%
-}
 \RequirePackage{textcase}[2004/10/07]
 \newcommand*\tud@makeuppercase[1]{%
   \ifdin{\begingroup\MakeTextUppercase{#1}\endgroup}{#1}%
@@ -2113,21 +2092,29 @@
     \let\footnote\@gobble%
     \def\newline{\space\ignorespaces}%
     \def\\{\space\ignorespaces}%
-    \def\@tempa##1{\csdef{##1}####1{\noexpand\relax}}%
+    \let\@tempc\relax%
+    \def\@tempa##1{\csedef{##1}####1{\@tempc}}%
     \let\@tempb\tud@split@author@list%
     \ifx\and\relax\else%
       \robustify\and%
     \fi%
     \expandafter\forcsvlist\expandafter\@tempa\expandafter{\@tempb}%
+    \def\@tempa##1##2{%
+      \def\@tempb####1##2####2\@nil{%
+        \IfArgIsEmpty{####2}{%
+          \def##1{####1}%
+        }{%
+          \@tempb####1####2\@nil%
+        }%
+      }%
+      \expandafter\@tempb##1##2\@nil%
+    }%
     \protected@edef\@@author{#1}%
-    \tud@replace\@@author{ \relax }{}%
-    \tud@replace\@@author{\relax }{}%
-    \tud@replace\@@author{ \relax}{}%
-    \tud@replace\@@author{\relax}{}%
-    \tud@replace\@@author{ \and }{\and}%
-    \tud@replace\@@author{ \and}{\and}%
-    \tud@replace\@@author{\and }{\and}%
-    \protected@xdef\@@author{\trim@spaces{\@@author}}%
+    \@tempa{\@@author}{ \@tempc }%
+    \@tempa{\@@author}{\@tempc }%
+    \@tempa{\@@author}{ \@tempc}%
+    \@tempa{\@@author}{\@tempc}%
+    \xdef\@@author{\expandonce\@@author}%
   \endgroup%
 }
 \newcommand*\@authormore{}
@@ -2140,6 +2127,7 @@
 \newcommand*\@thesis{}
 \newcommand*\@@thesis{}
 \newcommand*\thesis[1]{\tud@thesis@do{thesis}{#1}}
+\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\tud@thanks{}
 \newcommand*\tud@thesis@do[2]{%
   \begingroup%
@@ -2189,7 +2177,6 @@
   \fi%
   \protected@xdef\@@thesis{\trim@spaces{#2}}%
 }
-\renewcommand*\subject[1]{\tud@thesis@do{subject}{#1}}
 \newcommand*\@graduation{}
 \newcommand*\@@graduation{}
 \newcommand*\graduation[2][]{%
@@ -2671,6 +2658,22 @@
   \tud@locale@english{\@dotswap}{.}%
 }
 %%% From File: tudscr-area.dtx
+\newif\if@tud@x@crop@center
+\AfterPackage{crop}{%
+  \CheckCommand*\CROP@center{%
+    \voffset\stockheight
+    \advance\voffset-\paperheight
+    \voffset.5\voffset
+    \hoffset\stockwidth
+    \advance\hoffset-\paperwidth
+    \hoffset.5\hoffset
+  }%
+  \pretocmd{\CROP@center}{%
+    \@tud@x@crop@centertrue%
+  }{}{\tud@patch@wrn{CROP@center}}
+}
+\newif\if@tud@x@standalone@crop
+\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newlength\tud@len@widemargin
 \newlength\tud@len@slimmargin
 \newlength\tud@len@both
@@ -2860,22 +2863,6 @@
     \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}%
   \fi%
 }
-\newif\if@tud@x@crop@center
-\AfterPackage{crop}{%
-  \CheckCommand*\CROP@center{%
-    \voffset\stockheight
-    \advance\voffset-\paperheight
-    \voffset.5\voffset
-    \hoffset\stockwidth
-    \advance\hoffset-\paperwidth
-    \hoffset.5\hoffset
-  }%
-  \pretocmd{\CROP@center}{%
-    \@tud@x@crop@centertrue%
-  }{}{\tud@patch@wrn{CROP@center}}
-}
-\newif\if@tud@x@standalone@crop
-\AfterClass*{standalone}{\let\if@tud@x@standalone@crop\ifsa@crop}
 \newcommand*\tud@cdgeometry@process{}
 \newcommand*\tud@cdgeometry@@process{}
 \if@tud@x@standalone@crop
@@ -3670,19 +3657,6 @@
   \AtEndPreamble{%
     \if@tud@x@standalone@crop%
       \pagestyle{empty}%
-      \hoffset=-72.27pt%
-      \voffset=-72.27pt%
-      \topmargin=0pt%
-      \headheight=0pt%
-      \headsep=0pt%
-      \marginparsep=0pt%
-      \marginparwidth=0pt%
-      \footskip=0pt%
-      \marginparpush=0pt%
-      \oddsidemargin=0pt%
-      \evensidemargin=0pt%
-      \topskip=0pt%
-      \textheight=\maxdimen%
       \let\tud@AfterChangingArea\relax%
       \let\tud@cdgeometry@process\relax%
     \else%
@@ -4091,16 +4065,43 @@
   ]{tudheadings.pagecolor}%
   \AddLayersToPageStyle{@everystyle@}{tudheadings.pagecolor}%
 }
+\newcommand*\tud@ps@list{}
 \listadd\tud@ps@list{tudheadings}
 \listadd\tud@ps@list{plain.tudheadings}
 \listadd\tud@ps@list{empty.tudheadings}
-\PreventPackageFromLoading[%
-  \ClassWarning{\TUD@Class@Name}{%
-    The package `fancyhdr' must not be used with a\MessageBreak%
-    TUD-Script class. You should make use of the\MessageBreak%
-    capabilities of package `scrlayer-scrpage' instead%
-  }%
-]{fancyhdr}
+\newcommand*\tud@if@tudheadings[3]{%
+  \xifinlist{\GetRealPageStyle{#1}}{\tud@ps@list}{#2}{#3}%
+}
+\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
+  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
+}{}{\tud@patch@wrn{thispagestyle}}
+\newcommand*\tud@pagestyle{}
+\let\tud@pagestyle\pagestyle
+\pretocmd{\tud@pagestyle}{%
+  \tud@BeforeSelectAnyPageStyle{#1}%
+  \edef\currentpagestyle{#1}%
+}{}{\tud@patch@wrn{pagestyle}}
+\tud@cmd@store{pagestyle}
+\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
+\BeforePackage{scrlayer-scrpage}{%
+  \tud@cmd@restore{pagestyle}%
+  \undef\tud@pagestyle%
+}
+\TUD@UnwindPackage{scrlayer-scrpage}{%
+  \ifcsundef{if@chapter}{%
+    \newif\if@chapter%
+    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
+  }{}%
+  \cslet{ps@tudheadings}{\ps@headings}%
+  \cslet{ps@plain.tudheadings}{\ps@plain}%
+  \cslet{ps@empty.tudheadings}{\ps@empty}%
+  \providecommand*\currentpagestyle{plain}%
+  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
+  \providecommand*\GetRealPageStyle[1]{#1}%
+  \let\pagestyle\tud@pagestyle%
+  \undef\tud@pagestyle%
+  \tud@cdgeometry@init%
+}
 \newcommand*\tud@ps@onselect{%
   \DeclarePageStyleAlias{plain}{plain.tudheadings}%
   \DeclarePageStyleAlias{headings}{tudheadings}%
@@ -4176,36 +4177,6 @@
   \ifstr{\tud@head@fontcolor}{white}{\let\tud@len@line\tud@len@heavyline}{}%
   \global\let\tud@foot@fontcolor\tud@foot@fontcolor%
 }
-\newcommand*\tud@pagestyle{}
-\let\tud@pagestyle\pagestyle
-\pretocmd{\tud@pagestyle}{%
-  \tud@BeforeSelectAnyPageStyle{#1}%
-  \edef\currentpagestyle{#1}%
-}{}{\tud@patch@wrn{pagestyle}}
-\tud@cmd@store{pagestyle}
-\renewcommand*\pagestyle[1]{\AfterPackage!{scrlayer-scrpage}{\pagestyle{#1}}}
-\BeforePackage{scrlayer-scrpage}{%
-  \tud@cmd@restore{pagestyle}%
-  \undef\tud@pagestyle%
-}
-\TUD@UnwindPackage{scrlayer-scrpage}{%
-  \ifcsundef{if@chapter}{%
-    \newif\if@chapter%
-    \ifcsundef{chapter}{\@chapterfalse}{\@chaptertrue}%
-  }{}%
-  \cslet{ps@tudheadings}{\ps@headings}%
-  \cslet{ps@plain.tudheadings}{\ps@plain}%
-  \cslet{ps@empty.tudheadings}{\ps@empty}%
-  \providecommand*\currentpagestyle{plain}%
-  \providecommand*\BeforeSelectAnyPageStyle[1]{}%
-  \providecommand*\GetRealPageStyle[1]{#1}%
-  \let\pagestyle\tud@pagestyle%
-  \undef\tud@pagestyle%
-  \tud@cdgeometry@init%
-}
-\patchcmd{\thispagestyle}{\gdef\@specialstyle{#1}}{%
-  \xdef\@specialstyle{\GetRealPageStyle{#1}}%
-}{}{\tud@patch@wrn{thispagestyle}}
 \newcommand*\tud@head@fontsize{}
 \newcommand*\tud@head@font@light{}
 \newcommand*\tud@head@font@bold{}
@@ -4361,40 +4332,6 @@
   \endgroup%
   \vbox to #1{#2}%
 }
-\AtBeginDocument{%
-  \tud@if@v@lower{2.04}{%
-    \renewcommand*\tud@comp@clearpage{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
-      \fi%
-    }%
-    \renewcommand*\tud@comp@resetpagestyle{%
-      \if@tud@ddc@internal\else%
-        \tud@if@tudheadings{\currentpagestyle}{%
-          \expandafter\pagestyle\expandafter{\currentpagestyle}%
-        }{}%
-      \fi%
-    }%
-  }{}%
-}
-\newcommand*\tud@ddc@check{%
-  \let\@tempa\tud@ddc@head@num%
-  \let\@tempb\tud@ddc@foot@num%
-  \if@tud@ddc@auto%
-    \ifdefvoid{\tud@headlogo@filename}{%
-      \let\@tempa\tud@ddc@auto@num%
-      \let\@tempb\z@%
-    }{%
-      \let\@tempa\z@%
-      \let\@tempb\tud@ddc@auto@num%
-    }%
-  \fi%
-  \tud@if@v@lower{2.03}{%
-    \ifnum\@tempb=\z@\relax%
-      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
-    \fi%
-  }{}%
-}
 \tud@newlayerbox{main@black}
 \tud@newlayerbox{main@HKS41}
 \tud@newlayerbox{main@white}
@@ -4523,10 +4460,6 @@
     \ifnum\@tempa>\z@\relax\tud@headlogo@wrn\fi%
   }%
 }
-\tud@newlayerbox{foot@black}
-\tud@newlayerbox{foot@HKS41}
-\tud@newlayerbox{foot@white}
-\tud@newlayerbox{foot@option}
 \AtEndOfClass{%
   \ifdefvoid{\tud@dim@footlogoheight}{%
     \tud@if@v@lower{2.03}{%
@@ -4536,6 +4469,10 @@
     }%
   }{}%
 }
+\tud@newlayerbox{foot@black}
+\tud@newlayerbox{foot@HKS41}
+\tud@newlayerbox{foot@white}
+\tud@newlayerbox{foot@option}
 \newcommand*\tud@footlogo@ddc@set[2]{%
   \tud@savelayerbox{foot@#1}{%
     \includegraphics[keepaspectratio,totalheight=\tud@dim@footlogoheight]{#2}%
@@ -4749,6 +4686,40 @@
     \hbox to #2{}%
   \fi%
 }
+\AtBeginDocument{%
+  \tud@if@v@lower{2.04}{%
+    \renewcommand*\tud@comp@clearpage{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{\clearpage}{}%
+      \fi%
+    }%
+    \renewcommand*\tud@comp@resetpagestyle{%
+      \if@tud@ddc@internal\else%
+        \tud@if@tudheadings{\currentpagestyle}{%
+          \expandafter\pagestyle\expandafter{\currentpagestyle}%
+        }{}%
+      \fi%
+    }%
+  }{}%
+}
+\newcommand*\tud@ddc@check{%
+  \let\@tempa\tud@ddc@head@num%
+  \let\@tempb\tud@ddc@foot@num%
+  \if@tud@ddc@auto%
+    \ifdefvoid{\tud@headlogo@filename}{%
+      \let\@tempa\tud@ddc@auto@num%
+      \let\@tempb\z@%
+    }{%
+      \let\@tempa\z@%
+      \let\@tempb\tud@ddc@auto@num%
+    }%
+  \fi%
+  \tud@if@v@lower{2.03}{%
+    \ifnum\@tempb=\z@\relax%
+      \ifdefvoid{\tud@footlogo@filenames}{}{\let\@tempb\m@ne}%
+    \fi%
+  }{}%
+}
 \newcommand*\tud@ps@parameters[1]{%
   \TUD@parameter@def{cdfont}[true]{\TUDoption{cdfont}{#1}}%
   \TUD@parameter@def{cdhead}[true]{\TUDoption{cdhead}{#1}}%
@@ -4828,6 +4799,13 @@
   \tud@ps@parameters{#1}%
   \TUD@parameter@handler@default{}%
 }
+\PreventPackageFromLoading[%
+  \ClassWarning{\TUD@Class@Name}{%
+    The package `fancyhdr' must not be used with a\MessageBreak%
+    TUD-Script class. You should make use of the\MessageBreak%
+    capabilities of package `scrlayer-scrpage' instead%
+  }%
+]{fancyhdr}
 %%% From File: tudscr-layout.dtx
 \newcommand*\tud@x@scr@headings@current{}
 \newcommand*\tud@sec@fontsize{}
@@ -4868,6 +4846,11 @@
     \fi%
   ]%
 }
+\newcommand*\tud@headmidvskip@normal{\par\nobreak\vspace{.5\baselineskip}}
+\newcommand*\tud@headmidvskip@reverse{%
+  \setbox\z@\vbox{\tud@headmidvskip@normal}%
+  \vspace*{\dimexpr-\dp\strutbox-\ht\strutbox-\ht\z@\relax}%
+}
 \newcommand*\tud@title@fontcolor{}
 \newcommand*\tud@part@fontcolor{}
 \newcommand*\tud@chapter@fontcolor{}
@@ -4878,11 +4861,6 @@
   \tud@color{\tud@part@fontcolor}%
   \usesizeofkomafont{section}%
 }
-\newcommand*\tud@headmidvskip@normal{\par\nobreak\vspace{.5\baselineskip}}
-\newcommand*\tud@headmidvskip@reverse{%
-  \setbox\z@\vbox{\tud@headmidvskip@normal}%
-  \vspace*{\dimexpr-\dp\strutbox-\ht\strutbox-\ht\z@\relax}%
-}
 \newcommand*\tud@layout@process{%
   \ifcase\tud@layout@cover@num\relax% false
     \bool@std@lock{@tud@cdgeometry@cover}{false}%
@@ -5135,6 +5113,51 @@
   }%
   \tud@layout@specialpage@unset%
 }
+\newcommand*\tud@partpreamble{%
+  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
+    \renewcommand*\tud@abstract@level@num{1}%
+  \fi%
+  \KOMAoptions{titlepage=false}%
+  \addtokomafont{disposition}{\tud@color{\tud@part@fontcolor}}%
+  \addtokomafont{dictum}{\tud@color{\tud@part@fontcolor}}%
+  \tud@color{\tud@part@fontcolor}%
+  \vskip\dimexpr\topskip+.9\baselineskip\relax%
+  \@afterindentfalse\@afterheading%
+}
+\newcommand*\tud@chapterpreamble{%
+  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
+    \renewcommand*\tud@abstract@level@num{1}%
+  \fi%
+  \KOMAoptions{titlepage=false}%
+  \if@tud@chapterpage%
+    \ifcase\tud@cdfont@num\relax\or% true
+      \TUDoptions{cdfont=true}%
+    \or% heavy
+      \TUDoptions{cdfont=heavy}%
+    \fi%
+    \addtokomafont{disposition}{\tud@color{\tud@chapter@fontcolor}}%
+    \addtokomafont{dictum}{\tud@color{\tud@chapter@fontcolor}}%
+    \tud@color{\tud@chapter@fontcolor}%
+  \fi%
+  \@afterindentfalse\@afterheading%
+}
+\CheckCommand\set@@@@preamble[6]{%
+  \expandafter\gdef\csname #1@preamble\endcsname{%
+    \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
+  }%
+}
+\patchcmd{\set@@@@preamble}{%
+  \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
+}{%
+  \def\@tempa####1@####2{%
+    \@nameuse{tud@####1preamble}%
+    \KOMAoptionOf[\KOMAoption{parskip}]{\KOMAClassFileName}{parskip}%
+  }%
+  \hbox to\hsize{%
+    \let\phantomsection\relax%
+    #4\parbox[{#2}]{#3}{\@tempa#1#6\par}#5\par%
+  }%
+}{}{\tud@patch@wrn{set@@@@preamble}}
 \ifcsdef{scr@v@3.18}{\@tempswatrue}{\@tempswafalse}
 \if@tempswa
   \newcommand*\tud@@startpart{}%
@@ -5149,7 +5172,9 @@
       }{}%
     }{%
       \ifnumbered{#1}{%
-        \usekomafont{#1prefix}{\nobreak\tud@makeuppercase{\@nameuse{#1format}}}%
+        \usekomafont{#1prefix}{%
+          \nobreak\tud@makeuppercase{\@nameuse{#1format}}%
+        }%
         \if@tud@parttitle%
           \enskip%
         \else%
@@ -5235,17 +5260,6 @@
     \size@part%
   }{}{\tud@patch@wrn{@spart}}%
 \fi
-\newcommand*\tud@partpreamble{%
-  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
-    \renewcommand*\tud@abstract@level@num{1}%
-  \fi%
-  \KOMAoptions{titlepage=false}%
-  \addtokomafont{disposition}{\tud@color{\tud@part@fontcolor}}%
-  \addtokomafont{dictum}{\tud@color{\tud@part@fontcolor}}%
-  \tud@color{\tud@part@fontcolor}%
-  \vskip\dimexpr\topskip+.9\baselineskip\relax%
-  \@afterindentfalse\@afterheading%
-}
 \newcommand*\tud@chapterheadstartvskip{%
   \renewcommand*\tud@chapter@fontcolor{}%
   \ifcase\tud@layout@chapter@num\relax\or\else% *color
@@ -5289,40 +5303,6 @@
     \tud@headmidvskip@normal%
   }{}{\tud@patch@wrn{@@makechapterhead}}%
 \fi
-\newcommand*\tud@chapterpreamble{%
-  \ifnum\tud@abstract@level@num>\@ne\relax% sec/chap
-    \renewcommand*\tud@abstract@level@num{1}%
-  \fi%
-  \KOMAoptions{titlepage=false}%
-  \if@tud@chapterpage%
-    \ifcase\tud@cdfont@num\relax\or% true
-      \TUDoptions{cdfont=true}%
-    \or% heavy
-      \TUDoptions{cdfont=heavy}%
-    \fi%
-    \addtokomafont{disposition}{\tud@color{\tud@chapter@fontcolor}}%
-    \addtokomafont{dictum}{\tud@color{\tud@chapter@fontcolor}}%
-    \tud@color{\tud@chapter@fontcolor}%
-  \fi%
-  \@afterindentfalse\@afterheading%
-}
-\CheckCommand\set@@@@preamble[6]{%
-  \expandafter\gdef\csname #1@preamble\endcsname{%
-    \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
-  }%
-}
-\patchcmd{\set@@@@preamble}{%
-  \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
-}{%
-  \def\@tempa####1@####2{%
-    \@nameuse{tud@####1preamble}%
-    \KOMAoptionOf[\KOMAoption{parskip}]{\KOMAClassFileName}{parskip}%
-  }%
-  \hbox to\hsize{%
-    \let\phantomsection\relax%
-    #4\parbox[{#2}]{#3}{\@tempa#1#6\par}#5\par%
-  }%
-}{}{\tud@patch@wrn{set@@@@preamble}}
 \newcommand*\tud@chapter@pre{%
   \if@tud@chapterpage%
     \@restonecolfalse%
@@ -5487,83 +5467,10 @@
   \usekomafont{subject}%
   \mdseries%
   \large%
+  \tud@raggedright%
 }
 \robustify{\thanks}
 \robustify{\footnotemark}
-\newcommand*\tud@title@uppercase[1]{%
-  \let\@tempa\relax%
-  \begingroup%
-    \let\\\newline%
-    \def\thanks##1{\gdef\@tempa{##1}}%
-    \let\footnote\thanks%
-    \sbox\z@{#1}%
-    \let\thanks\@gobble%
-    \let\footnote\@gobble%
-    \tud@makeuppercase{#1}%
-  \endgroup%
-  \ifx\@tempa\relax\else\thanks\@tempa\fi%
-}
-\newcommand*\tud@title@delimiter{:\nobreakspace}
-\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
-\newcommand*\tud@newline@title{}
-\newcommand*\tud@split@author@title[2]{%
-  \tud@multiple@fields@store{@author}{#1}%
-  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
-  {\usekomafont{author}{\ignorespaces#1}}%
-  \if@tud@cover\else%
-    \ifx\@authormore\@empty\else%
-      \tud@newline@title%
-      \@authormore%
-    \fi%
-    \ifx\@dateofbirth\@empty\else%
-      \if@titlepage%
-        \tud@newline@title%
-        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
-        \@dateofbirth%
-        \ifx\@placeofbirth\@empty\else%
-          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
-        \fi%
-      \else%
-        \tud@title@wrn{dateofbirth}%
-      \fi%
-    \fi%
-    \def\@tempc##1{%
-      \ifstr{\csuse{@##1}}{}{}{%
-        \if@titlepage%
-          \tud@newline@title%
-          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
-          \csuse{@##1}%
-        \else%
-          \tud@title@wrn{##1}%
-        \fi%
-      }%
-    }%
-    \@tempc{course}%
-    \@tempc{discipline}%
-    \@tempc{matriculationnumber}%
-    \@tempc{matriculationyear}%
-  \fi%
-  \tud@multiple@fields@restore{@author}%
-  \tud@multiple@@@split{#2}{\vskip 2ex}%
-}
-\newcommand*\tud@title@wrn[1]{%
-  \ClassWarning{\TUD@Class@Name}{%
-    `\@backslashchar#1' has to be used with\MessageBreak%
-    activated titlepage option%
-  }%
-}
-\newcommand*\tud@thesis@tosubject{%
-  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
-    \ifx\@subject\@empty\else%
-      \ClassWarning{\TUD@Class@Name}{%
-        The option `subjectthesis' was activated, so\MessageBreak%
-        the field `subject' will be overwritten with the\MessageBreak%
-        given thesis%
-      }%
-    \fi%
-    \let\@subject\@thesis%
-  \fi\fi%
-}
 \newcommand*\tud@title@pagenumber{}
 \let\tud@title@pagenumber\relax
 \newcommand*\tud@maketitle[1][]{%
@@ -5829,21 +5736,6 @@
     \fi%
   \end{titlepage}%
 }
-\newcommand*\tud@title@names[1]{%
-  \letcs\@tempa{@#1}%
-  \ifx\@tempa\@empty\else%
-    \def\and{%
-      \ifcsvoid{#1othername}{\par}{%
-        \vskip 1ex\@plus.5ex\@minus.5ex%
-        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
-      }%
-      \let\and\par%
-    }%
-    \vskip 1ex\@plus.5ex\@minus.5ex%
-    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
-    {\usekomafont{author}{\csuse{@#1}\par}}%
-  \fi%
-}
 \newcommand*\tud@make@titlehead{%
   \renewcommand*\tud@title@fontcolor{}%
   \ifcase\tud@layout@title@num\relax\or\else% *color
@@ -5947,6 +5839,95 @@
     \tud@if@v@lower{2.03}{\tud@ddc@enlargepage[\titlepagestyle]}{}%
   \endgroup%
 }
+\newcommand*\tud@title@uppercase[1]{%
+  \let\@tempa\relax%
+  \begingroup%
+    \let\\\newline%
+    \def\thanks##1{\gdef\@tempa{##1}}%
+    \let\footnote\thanks%
+    \sbox\z@{#1}%
+    \let\thanks\@gobble%
+    \let\footnote\@gobble%
+    \tud@makeuppercase{#1}%
+  \endgroup%
+  \ifx\@tempa\relax\else\thanks\@tempa\fi%
+}
+\newcommand*\tud@thesis@tosubject{%
+  \if@tud@subjectthesis\ifx\@thesis\@empty\else%
+    \ifx\@subject\@empty\else%
+      \ClassWarning{\TUD@Class@Name}{%
+        The option `subjectthesis' was activated, so\MessageBreak%
+        the field `subject' will be overwritten with the\MessageBreak%
+        given thesis%
+      }%
+    \fi%
+    \let\@subject\@thesis%
+  \fi\fi%
+}
+\newcommand*\tud@title@names[1]{%
+  \letcs\@tempa{@#1}%
+  \ifx\@tempa\@empty\else%
+    \def\and{%
+      \ifcsvoid{#1othername}{\par}{%
+        \vskip 1ex\@plus.5ex\@minus.5ex%
+        {\usekomafont{titlepage}{\csuse{#1othername}\par}}%
+      }%
+      \let\and\par%
+    }%
+    \vskip 1ex\@plus.5ex\@minus.5ex%
+    {\usekomafont{titlepage}{\csuse{#1name}\par}}%
+    {\usekomafont{author}{\csuse{@#1}\par}}%
+  \fi%
+}
+\newcommand*\tud@title@delimiter{:\nobreakspace}
+\newcommand*\titledelimiter[1]{\gdef\tud@title@delimiter{#1}}
+\newcommand*\tud@newline@title{}
+\newcommand*\tud@split@author@title[2]{%
+  \tud@multiple@fields@store{@author}{#1}%
+  \renewcommand*\tud@newline@title{\vskip .5ex\let\tud@newline@title\newline}%
+  {\usekomafont{author}{\ignorespaces#1\unskip}}%
+  \if@tud@cover\else%
+    \ifx\@authormore\@empty\else%
+      \tud@newline@title%
+      \@authormore%
+    \fi%
+    \ifx\@dateofbirth\@empty\else%
+      \if@titlepage%
+        \tud@newline@title%
+        \ifxblank{\dateofbirthtext}{}{\dateofbirthtext\tud@title@delimiter}%
+        \@dateofbirth%
+        \ifx\@placeofbirth\@empty\else%
+          \nobreakspace\placeofbirthtext\nobreakspace\@placeofbirth%
+        \fi%
+      \else%
+        \tud@title@wrn{dateofbirth}%
+      \fi%
+    \fi%
+    \def\@tempc##1{%
+      \ifstr{\csuse{@##1}}{}{}{%
+        \if@titlepage%
+          \tud@newline@title%
+          \ifstr{\csuse{##1name}}{}{}{\csuse{##1name}\tud@title@delimiter}%
+          \csuse{@##1}%
+        \else%
+          \tud@title@wrn{##1}%
+        \fi%
+      }%
+    }%
+    \@tempc{course}%
+    \@tempc{discipline}%
+    \@tempc{matriculationnumber}%
+    \@tempc{matriculationyear}%
+  \fi%
+  \tud@multiple@fields@restore{@author}%
+  \tud@multiple@@@split{#2}{\vskip 2ex}%
+}
+\newcommand*\tud@title@wrn[1]{%
+  \ClassWarning{\TUD@Class@Name}{%
+    `\@backslashchar#1' has to be used with\MessageBreak%
+    activated titlepage option%
+  }%
+}
 \newcommand\maketitleonecolumn[2][]{%
   \if@twocolumn%
     \if@titlepage%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index 3513e931fdd..7964a6eab79 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
@@ -9,37 +9,30 @@
 %% tudscr-fields.dtx  (with options: `package,supervisor')
 %% tudscr-locale.dtx  (with options: `package,supervisor')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -61,11 +54,11 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
-\@ifundefined{TUD@Class@Name}{%
+\ifx\TUD@Class@Name\@undefined
   \PackageError{%
     tudscrsupervisor%
   }{Unsupported class found}{%
@@ -73,7 +66,7 @@
     tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl, tudscrposter).%
   }%
   \endinput
-}{}
+\fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
     \ifdin{TUD-SCRIPT}{%
@@ -83,12 +76,91 @@
 }{}
 %%% From File: tudscr-supervisor.dtx
 \ProvidesPackage{tudscrsupervisor}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (commands for supervisors)%
 ]
 \newcommand*\tud@multiple@fields@output{}
 \newcommand*\tud@multiple@fields@style{table}
+\newcommand*\student{\author}
+\newlength\tud@len@authortable
+\newcommand*\tud@authortable@set{%
+  \begingroup%
+  \let\thanks\@gobble%
+  \let\footnote\@gobble%
+  \tud@multiple@split{@author}%
+  \tud@multiple@fields@preset{@author}{\null}{}%
+  \setlength\tud@len@authortable{2em}%
+  \def\@tempb##1{%
+    \expandafter\ifx\csname @##1\endcsname\@empty\else%
+      \expandafter\appto\expandafter\@tempa\expandafter{%
+        \expandafter,\csname ##1name\endcsname%
+      }%
+    \fi%
+  }%
+  \def\@tempa{%
+    \namesname,\titlename,\issuedatetext,\duedatetext,\supervisorname%
+  }%
+  \tud@ifin@and{\@supervisor}{\appto\@tempa{,\supervisorothername}}{}%
+  \@tempb{referee}%
+  \tud@ifin@and{\@referee}{\appto\@tempa{,\refereeothername}}{}%
+  \@tempb{matriculationnumber}%
+  \@tempb{matriculationyear}%
+  \@tempb{course}%
+  \@tempb{discipline}%
+  \@for\@tempb:=\@tempa\do{%
+    \settowidth\@tempdima{\@tempb\tud@title@delimiter}%
+    \ifdim\@tempdima>\tud@len@authortable\relax%
+      \setlength\tud@len@authortable{\@tempdima}%
+    \fi%
+  }%
+  \global\tud@len@authortable=\tud@len@authortable%
+  \begingroup%
+  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative%
+  \begin{tabular}{@{}p{\tud@len@authortable}}%
+    \ifx\@course\@empty\else%
+      \coursename\tud@title@delimiter\tabularnewline%
+    \fi%
+    \ifx\@discipline\@empty\else%
+      \disciplinename\tud@title@delimiter\tabularnewline%
+    \fi%
+    \namesname\tud@title@delimiter\tabularnewline%
+    \ifx\@matriculationnumber\@empty\else%
+      \matriculationnumbername\tud@title@delimiter\tabularnewline%
+    \fi%
+    \ifx\@matriculationyear\@empty\else%
+      \matriculationyearname\tud@title@delimiter\tabularnewline%
+    \fi%
+  \end{tabular}%
+  \renewcommand*\tud@split@author@do[2]{%
+    \tud@multiple@fields@store{@author}{##1}%
+    \tud@multiple@fields@preset{@author}{\null}{##1}%
+    \begin{tabular}{l@{}}%
+      \ifx\@course\@empty\else\@course\tabularnewline\fi%
+      \ifx\@discipline\@empty\else\@discipline\tabularnewline\fi%
+      \textsf{\textbf{\ignorespaces##1}}\tabularnewline%
+      \ifx\@matriculationnumber\@empty\else%
+        \@matriculationnumber\tabularnewline%
+      \fi%
+      \ifx\@matriculationyear\@empty\else%
+        \@matriculationyear\tabularnewline%
+      \fi%
+    \end{tabular}%
+    \tud@multiple@fields@restore{@author}%
+    \tud@multiple@@@split{##2}{\enskip\hspace{\tabcolsep}}%
+  }%
+  \tud@multiple@split{@author}%
+  \vskip\smallskipamount%
+  \begin{tabular}{@{}p{\tud@len@authortable}%
+    p{\dimexpr\textwidth-\tud@len@authortable-2\tabcolsep\relax}@{}}%
+    \titlename\tud@title@delimiter & \tud@RaggedRight\textsf{\textbf{\@@title}}%
+  \end{tabular}%
+  \par%
+  \endgroup%
+  \ifdim\parskip>\z@\else\vskip\topsep\fi%
+  \endgroup%
+  \noindent\ignorespaces%
+}
 \newenvironment{task}[1][]{%
   \cleardoubleoddpage%
   \def\@headline{}%
@@ -233,85 +305,6 @@
     \ifblank{#5}{}{\def\@grade{#5}}%
   \end{evaluation}%
 }
-\newcommand*\student{\author}
-\newlength\tud@len@authortable
-\newcommand*\tud@authortable@set{%
-  \begingroup%
-  \let\thanks\@gobble%
-  \let\footnote\@gobble%
-  \tud@multiple@split{@author}%
-  \tud@multiple@fields@preset{@author}{\null}{}%
-  \setlength\tud@len@authortable{2em}%
-  \def\@tempb##1{%
-    \expandafter\ifx\csname @##1\endcsname\@empty\else%
-      \expandafter\appto\expandafter\@tempa\expandafter{%
-        \expandafter,\csname ##1name\endcsname%
-      }%
-    \fi%
-  }%
-  \def\@tempa{%
-    \namesname,\titlename,\issuedatetext,\duedatetext,\supervisorname%
-  }%
-  \tud@ifin@and{\@supervisor}{\appto\@tempa{,\supervisorothername}}{}%
-  \@tempb{referee}%
-  \tud@ifin@and{\@referee}{\appto\@tempa{,\refereeothername}}{}%
-  \@tempb{matriculationnumber}%
-  \@tempb{matriculationyear}%
-  \@tempb{course}%
-  \@tempb{discipline}%
-  \@for\@tempb:=\@tempa\do{%
-    \settowidth\@tempdima{\@tempb\tud@title@delimiter}%
-    \ifdim\@tempdima>\tud@len@authortable\relax%
-      \setlength\tud@len@authortable{\@tempdima}%
-    \fi%
-  }%
-  \global\tud@len@authortable=\tud@len@authortable%
-  \begingroup%
-  \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative%
-  \begin{tabular}{@{}p{\tud@len@authortable}}%
-    \ifx\@course\@empty\else%
-      \coursename\tud@title@delimiter\tabularnewline%
-    \fi%
-    \ifx\@discipline\@empty\else%
-      \disciplinename\tud@title@delimiter\tabularnewline%
-    \fi%
-    \namesname\tud@title@delimiter\tabularnewline%
-    \ifx\@matriculationnumber\@empty\else%
-      \matriculationnumbername\tud@title@delimiter\tabularnewline%
-    \fi%
-    \ifx\@matriculationyear\@empty\else%
-      \matriculationyearname\tud@title@delimiter\tabularnewline%
-    \fi%
-  \end{tabular}%
-  \renewcommand*\tud@split@author@do[2]{%
-    \tud@multiple@fields@store{@author}{##1}%
-    \tud@multiple@fields@preset{@author}{\null}{##1}%
-    \begin{tabular}{l@{}}%
-      \ifx\@course\@empty\else\@course\tabularnewline\fi%
-      \ifx\@discipline\@empty\else\@discipline\tabularnewline\fi%
-      \textsf{\textbf{\ignorespaces##1}}\tabularnewline%
-      \ifx\@matriculationnumber\@empty\else%
-        \@matriculationnumber\tabularnewline%
-      \fi%
-      \ifx\@matriculationyear\@empty\else%
-        \@matriculationyear\tabularnewline%
-      \fi%
-    \end{tabular}%
-    \tud@multiple@fields@restore{@author}%
-    \tud@multiple@@@split{##2}{\enskip\hspace{\tabcolsep}}%
-  }%
-  \tud@multiple@split{@author}%
-  \vskip\smallskipamount%
-  \begin{tabular}{@{}p{\tud@len@authortable}%
-    p{\dimexpr\textwidth-\tud@len@authortable-2\tabcolsep\relax}@{}}%
-    \titlename\tud@title@delimiter & \tud@RaggedRight\textsf{\textbf{\@@title}}%
-  \end{tabular}%
-  \par%
-  \endgroup%
-  \ifdim\parskip>\z@\else\vskip\topsep\fi%
-  \endgroup%
-  \noindent\ignorespaces%
-}
 \newenvironment{notice}[1][]{%
   \cleardoubleoddpage%
   \def\@headline{\noticename}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
index 6ef4e522a3a..406ddd406a8 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
@@ -10,39 +10,32 @@
 %% tudscr-manual.dtx  (with options: `package,tutorial,option')
 %% tudscr-misc.dtx  (with options: `package,tutorial,execute')
 %% tudscr-manual.dtx  (with options: `package,tutorial,body')
-%% tudscr-misc.dtx  (with options: `package,tutorial,xindy')
+%% tudscr-texindy.dtx  (with options: `package,tutorial')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-version.dtx
 \begingroup
   \catcode`\@11\relax
-  \ifx\TUD@Version\undefined
+  \ifx\TUD@Version\@undefined
     \newcommand*\TUD@Version@Check[1]{%
       \gdef\TUD@Version{#1}%
       \gdef\TUDScriptVersion{#1}%
@@ -64,11 +57,11 @@
       \fi%
     }
   \fi
-  \TUD@Version@Check{2016/10/12 v2.05f TUD-Script}
+  \TUD@Version@Check{2017/01/26 v2.05g TUD-Script}
 \endgroup
 \NeedsTeXFormat{LaTeX2e}
 \providecommand*\tudscrmail{tudscr@gmail.com}
-\@ifundefined{TUD@Class@Name}{%
+\ifx\TUD@Class@Name\@undefined
   \PackageError{%
     tudscrtutorial%
   }{Unsupported class found}{%
@@ -76,7 +69,7 @@
     tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl, tudscrposter).%
   }%
   \endinput
-}{}
+\fi
 \@ifundefined{TUDScript}{%
   \DeclareRobustCommand\TUDScript{%
     \ifdin{TUD-SCRIPT}{%
@@ -86,8 +79,9 @@
 }{}
 %%% From File: tudscr-manual.dtx
 \ProvidesPackage{tudscrtutorial}[%
-  2016/10/12 v2.05f TUD-Script
-  package (internal tutorials)%
+  2017/01/26 v2.05g TUD-Script
+  package
+  (internal tutorials)%
 ]
 %%% From File: tudscr-base.dtx
 \RequirePackage{tudscrbase}[\TUD@Version]
@@ -180,12 +174,7 @@
     \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}%
   }{}%
 }
-\RequirePackage{ifluatex}[2016/05/16]
-\ifluatex
-  \RequirePackage{pdftexcmds}[2016/05/21]
-  \let\pdfstrcmp\pdf@strcmp
-  \let\pdfshellescape\pdf@shellescape
-\fi
+\RequirePackage{pdftexcmds}[2016/05/21]
 \newcommand*\tud@templist{}
 \let\tud@templist\relax
 \newcommand*\tud@list@sort[1]{%
@@ -214,7 +203,7 @@
       \if@tud@list@sorted%
         \expandafter\edef\expandafter\@tempb\expandafter{\@tempb,\@tempa}%
       \else%
-        \expandafter\ifnum\pdfstrcmp{#1}{\@tempa}<\z@\relax%
+        \expandafter\ifnum\pdf@strcmp{#1}{\@tempa}<\z@\relax%
           \ifx\@tempb\@empty%
             \expandafter\edef\expandafter\@tempb\expandafter{%
               #1,\@tempa%
@@ -251,7 +240,6 @@
   \renewcaptionname{ngerman}{\sectionautorefname}{Unterkapitel}%
   \renewcaptionname{ngerman}{\subsectionautorefname}{Abschnitt}%
   \renewcaptionname{ngerman}{\subsubsectionautorefname}{Unterabschnitt}%
-  \newcommand*\Email[1]{\href{mailto:#1}{\nolinkurl{#1}}}%
   \newcommand*\tud@manualname{tudscr}%
   \newcommand*\tudhyperref[2]{%
     \hyperref{../\tud@manualname.pdf}{\tud@manualname}{#1}{#2}%
@@ -282,19 +270,20 @@
     Nevertheless, essential commands are rudimentarily\MessageBreak%
     defined. At least the package `url' is loaded.%
   }%
-  \RequirePackage{url}[2013/09/16]%
   \providecommand*\hypersetup[1]{}%
+  \providecommand*\href[3][]{#3}%
+  \providecommand*\phantomsection{}%
+  \providecommand*\texorpdfstring[2]{#1}%
+  \RequirePackage{url}[2013/09/16]%
+  \providecommand*\nolinkurl[1]{\url{#1}}%
+  \providecommand*\hyperpage[1]{#1}%
+  \providecommand*\autoref{??\xspace\kernel@ifstar{\ref}{\ref}}%
   \providecommand*\hyperdef[3]{\label{#1.#2}#3}%
   \providerobustcmd*\hyperref{%
     \kernel@ifnextchar[{\tud@hyperref@a}{\tud@hyperref@b}%
   }
   \newcommand*\tud@hyperref@a[2][]{#2}
   \newcommand*\tud@hyperref@b[4]{#4}
-  \providecommand*\href[3][]{#3}%
-  \providecommand*\hyperpage[1]{#1}%
-  \providecommand*\autoref{??\xspace\kernel@ifstar{\ref}{\ref}}%
-  \providecommand*\phantomsection{}%
-  \providecommand*\texorpdfstring[2]{#1}%
   \tud@locale@german{\partautorefname}{Teil}%
   \tud@locale@german{\chapterautorefname}{Kapitel}%
   \tud@locale@german{\sectionautorefname}{Unterkapitel}%
@@ -305,27 +294,27 @@
   \tud@locale@english{\sectionautorefname}{section}%
   \tud@locale@english{\subsectionautorefname}{subsection}%
   \tud@locale@english{\subsubsectionautorefname}{subsubsection}%
-  \providecommand*\Email[1]{\mbox{#1}}%
   \providecommand*\tudhyperref[2]{#2}%
   \providecommand*\autorefname[1][]{??\xspace}%
 }
-\RequirePackage{varioref}[2011/10/02]
-\renewcommand*\fullref[1]{\hyperref[#1]{\autoref*{#1} \vpageref{#1}}}
 \newcommand*\hrfn[2]{%
   \href{#1}{\trim@spaces{#2}}%
   \footnote{%
-    \scalebox{0.95}{%
+    \begingroup%
       \def\_{_}%
       \edef\@tempa{#1}%
       \strut\expandafter\url\expandafter{\@tempa}%
-    }%
+    \endgroup%
   }%
 }
+\newrobustcmd*\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}%
 \AfterPackage*{hyperref}{%
   \patchcmd{\pdfstringdef}{\csname HyPsd@babel@}{%
     \let\bbl@info\@gobble\csname HyPsd@babel@%
   }{}{\tud@patch@wrn{pdfstringdef}}%
 }
+\RequirePackage{varioref}[2011/10/02]
+\renewcommand*\fullref[1]{\hyperref[#1]{\autoref*{#1} \vpageref{#1}}}
 \AfterPackage*{hyperref}{\RequirePackage[babel]{microtype}[2013/05/23]}
 \TUD@UnwindPackage{hyperref}{\RequirePackage[babel]{microtype}[2013/05/23]}
 \newrobustcmd*\bsc{\@backslashchar}
@@ -555,7 +544,6 @@
     \let\POParameter\@firstofone%
     \let\textOR\relax%
     \let\hologoRobust\@firstofone%
-    \def\TUDScript{TUD-Script}%
     \def\_{-}%
     \protected\def~{~}%
   }%
@@ -787,19 +775,6 @@
     \fi%
   }{}{\tud@patch@wrn{theindex}}%
 \fi%
-\newrobustcmd*\cleversee{\tud@cleversee{\seename}}
-\newrobustcmd*\cleverseealso{%
-  \ClassWarning{tudscrmanual}{You should use `|see' instead of `|seealso'}%
-  \tud@cleversee{\alsoname}%
-}
-\newcommand*\tud@cleversee{}
-\def\tud@cleversee#1#2#3\relax{%
-  \IfArgIsEmpty{#3}{%
-    \emph{#1}\space#2%
-  }{%
-    #3, \emph{\alsoname}\space#2%
-  }%
-}
 \NewDocumentCommand\makexdyindex{somo}{%
   \let\@tempb\@empty%
   \protected@edef\@tempa{%
@@ -901,6 +876,19 @@
     }%
   \tud@reserved%
 }
+\newrobustcmd*\cleversee{\tud@cleversee{\seename}}
+\newrobustcmd*\cleverseealso{%
+  \ClassWarning{tudscrmanual}{You should use `|see' instead of `|seealso'}%
+  \tud@cleversee{\alsoname}%
+}
+\newcommand*\tud@cleversee{}
+\def\tud@cleversee#1#2#3\relax{%
+  \IfArgIsEmpty{#3}{%
+    \emph{#1}\space#2%
+  }{%
+    #3, \emph{\alsoname}\space#2%
+  }%
+}
 \NewDocumentCommand\Process@Index{mmd==od()d||}{%
   \ifboolexpr{%
     bool {@tud@index}%
@@ -988,7 +976,7 @@
 \edef\tud@tut@temp{\@currname-temp}
 \newcommand*\tud@tut@readtostream[2]{%
   \begingroup%
-    \endlinechar=-1\relax%
+    \endlinechar=\m@ne\relax%
     \openin\tud@read=#1%
     \@tempswafalse%
     \loop\unless\ifeof\tud@read%
@@ -1018,17 +1006,21 @@
   }%
 }
 \TUDoptions{headingsvskip=-10ex}
-\newcommand\StartTutorial[1][%
-  Bevor das eigentliche Tutorial beginnt, werden sowohl eine Dokumentklasse
-  als auch die f\"ur jedes \hologo{pdfLaTeX}-Dokument meiner Meinung nach
-  sinnvollen Pakete geladen.%
-]{%
-  \Hy@raisedlink{\hyperdef{\jobname}{tutorials:\jobname}{}}%
-  \faculty{}%
-  \maketitle\noindent#1%
+\newcommand\StartTutorial[1][]{%
   \immediate\openout\tud@write@a=\tud@tut@temp-preamble.tex\relax%
   \immediate\openout\tud@write@b=\tud@tut@temp-trunk.tex\relax%
-  \immediate\write\tud@write@b{^^J\string\begin{document}^^J}
+  \immediate\write\tud@write@b{^^J\string\begin{document}^^J}%
+  \Hy@raisedlink{\hyperdef{\jobname}{tutorials:\jobname}{}}%
+  \faculty{}%
+  \maketitle%
+  \ifblank{#1}{}{%
+    \noindent%
+    \begin{abstract}%
+    \noindent#1%
+    \end{abstract}%
+    \medskip%
+  }%
+  \noindent\ignorespaces%
 }
 \newcommand\FinishTutorial[1][]{%
   \immediate\write\tud@write@b{^^J\string\end{document}^^J}
@@ -1055,7 +1047,7 @@
   \lstinputlisting[style=tudscr]{\jobname-example.tex}%
   \end{quoting}%
   %
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \ifwindows%
       \def\@tempa{del}%
     \else%
@@ -1066,7 +1058,11 @@
 }
 \newcommand\Code@Preamble{}
 \let\Code@Preamble\relax
-\newcommand\CodePreamble[1]{\long\gdef\Code@Preamble{#1}}
+\newcommand\CodePreamble[1]{%
+  \long\gdef\Code@Preamble{%
+    \hskip.5\leftmargin\textit{Die resultierende Ausgabe:}\space#1%
+  }%
+}
 \newcommand*\Code@Hook{}
 \let\Code@Hook\relax
 \newcommand*\CodeHook[1]{\gdef\Code@Hook{#1}}
@@ -1238,7 +1234,7 @@
 \DeactivateWarningFilters[Tutorial]%
 \fi
 \newcommand*\tud@tut@pdf{%
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \filemodCmp{\jobname-standalone-\StandaloneFile.pdf}{\jobname.tex}{}{%
       \begingroup%
         \let\printdate\@firstofone%
@@ -1298,7 +1294,7 @@
   }%
 }
 \AfterPackage*{pstricks}{%
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \filemodCmp{\jobname-pics.pdf}{\jobname.tex}{%
       \PassOptionsToPackage{off}{auto-pst-pdf}%
     }{}%
@@ -1306,7 +1302,7 @@
     \PassOptionsToPackage{off}{auto-pst-pdf}%
   \fi%
   \RequirePackage{auto-pst-pdf}[2009/04/26]%
-  \ifnum\pdfshellescape=\@ne\relax%
+  \ifnum\pdf@shellescape=\@ne\relax%
     \edef\@tempa{\app@exe{\app@rm "*\app@suffix*"}}%
     \@tempa%
   \fi%
@@ -1396,15 +1392,43 @@
   \NewDocumentCommand\ToDo{somo}{}%
   \newcommand*\ListOfToDo{}%
 }
+\AfterPackage*{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
+\TUD@UnwindPackage{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
 \RequirePackage{textcomp}[2005/09/27]
 \RequirePackage{setspace}[2011/12/19]
 \setstretch{1.1}
-\AfterPackage*{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
-\TUD@UnwindPackage{inputenc}{\RequirePackage{csquotes}[2011/10/22]}
 \PassOptionsToPackage{vskip=\smallskipamount}{quoting}
 \RequirePackage{quoting}[2014/01/28]
 \RequirePackage{isodate}[2010/01/03]
 \RequirePackage{hologo}[2012/04/26]
+\newcommand*\tud@replace[3]{%
+  \begingroup%
+    \toks@{\def\@tempa##1}%
+    \eaddto@hook\toks@{\detokenize{#2}}%
+    \addto@hook\toks@{##2\@nil{\@tempb{##1}{##2}}}%
+    \the\toks@%
+    \def\@tempb##1##2{%
+      \IfArgIsEmpty{##2}{%
+        \appto#1{##1}%
+        \let\@tempc\relax%
+      }{%
+        \appto#1{##1#3}%
+        \def\@tempc{\@tempa##2\@nil}%
+      }%
+      \@tempc%
+    }%
+    \toks@{\@tempa}%
+    \edef\@tempc{\expandafter\detokenize\expandafter{#1}}%
+    \eaddto@hook\toks@{\@tempc}%
+    \eaddto@hook\toks@{\detokenize{#2}\@nil}%
+    \def#1{}%
+    \the\toks@%
+    \edef\tud@reserved{%
+      \noexpand\endgroup%
+      \def\noexpand#1{#1}%
+    }%
+  \tud@reserved%
+}
 \newcommand*\Attention[2][\z@]{%
   \marginnote{%
     \setlength\fboxsep{0.25em}
@@ -1447,6 +1471,13 @@
     D\kern.05em E\kern.05em N\kern.1em-\kern.1em concept%
   }\xspace%
 }
+\AfterPackage*{hyperref}{%
+  \pdfstringdefDisableCommands{%
+    \def\DDC{DRESDEN-concept}%
+    \def\TUDScript{TUD-Script}%
+    \def\KOMAScript{KOMA-Script}%
+  }%
+}
 \newcommand*\Univers{\texorpdfstring{\textubn{Univers}}{Univers}\xspace}
 \newcommand*\DIN{\texorpdfstring{\textdbn{DIN~BOLD}}{DIN BOLD}\xspace}
 \newcommand*\textsbn{}
@@ -1455,7 +1486,7 @@
 \newcommand*\textsbs{}
 \newrobustcmd*\sbsfont{\sffamily\bfseries\slshape}
 \DeclareTextFontCommand\textsbs{\sbsfont}
-%%% From File: tudscr-misc.dtx
+%%% From File: tudscr-texindy.dtx
 \begingroup
 \newcommand*\tud@write@xdy{}
 \newwrite\tud@write@xdy
@@ -1468,20 +1499,21 @@
   \write\tud@write@xdy{%
     (define-location-class^^J%
     \space\space"arabic-page-numbers" ("arabic-numbers")%
-    \space:min-range-length 1^^J%
+    \space:min-range-length 2^^J%
     )^^J%
     (markup-range :sep "--")%
   }%
   \write\tud@write@xdy{%
+    (merge-rule "\@backslashchar[(.*)\@backslashchar]" "" :eregexp)%
+  }%
+  \write\tud@write@xdy{%
     (markup-locclass-list%
     \space:open "\string\,\string\dotfill\string\,"%
     \space:close "\string\relax"%
+    \space:sep ",\space"%
     )%
   }%
   \write\tud@write@xdy{%
-    (merge-rule "\@backslashchar[(.*)\@backslashchar]" "" :eregexp)%
-  }%
-  \write\tud@write@xdy{%
     (define-attributes (("declare" "!" "important" "?" "default")))^^J%
     (markup-locref%
     \space:attr "declare"\space\space%
diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
index b7ba818f9c9..98224f3e4cd 100644
--- a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
@@ -6,37 +6,30 @@
 %%
 %% tudscr-twocolfix.dtx  (with options: `package')
 %% 
-%% ============================================================================
+%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
 %% 
-%%  TUD-Script
-%%  Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2016
+%%   2017/01/26 v2.05g TUD-Script
 %% 
-%% ============================================================================
-%% 
-%%  This work may be distributed and/or modified under the conditions of the
-%%  LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
-%%  or later and of this work. This work has the LPPL maintenance status
-%%  "author-maintained". The current maintainer and author of this work
-%%  is Falk Hanisch.
+%% Copyright (C) Falk Hanisch <tudscr@gmail.com>, 2012-2017
 %% 
+%% This file was generated from file(s) of the TUD-Script bundle.
 %% ----------------------------------------------------------------------------
 %% 
-%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
-%%  in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle
-%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
-%%  Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01
-%%  oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status
-%%  "author-maintained", wird somit allein durch den Autor verwaltet. Der
-%%  aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch.
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the license.
+%% 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 2005/12/01 or later and of this work.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% ============================================================================
+%% The current maintainer and author of this work is Falk Hanisch.
 %% 
 %%% From File: tudscr-twocolfix.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{twocolfix}[%
-  2016/10/12 v2.05f TUD-Script
+  2017/01/26 v2.05g TUD-Script
   package
   (twocolumn layout bugfix)%
 ]
@@ -136,13 +129,13 @@
     \@floatplacement
   \fi
 }
-\@ifundefined{scr@topnewpage}{%
+\ifx\scr@topnewpage\@undefined
   \@check@eq\@topnewpage\@tempb%
   \let\@topnewpage\@tempa%
-}{%
+\else
   \@check@eq\scr@topnewpage\@tempb%
   \let\scr@topnewpage\@tempa%
-}
+\fi
 \endinput
 %%
 %% End of file `twocolfix.sty'.