urcls (10apr17)

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

11 files changed, 1846 insertions, 666 deletions

diff --git a/Master/texmf-dist/tex/latex/urcls/URbeamer.cls b/Master/texmf-dist/tex/latex/urcls/URbeamer.cls
index 29c56696049..7db69d285c0 100644
--- a/Master/texmf-dist/tex/latex/urcls/URbeamer.cls
+++ b/Master/texmf-dist/tex/latex/urcls/URbeamer.cls
@@ -1,76 +1,72 @@
-% Copyright 2014-2015 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% under the LaTeX Project Public License
+%% 
+%%  This is file `URbeamer.cls' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.6}
-\def\filedate{2015/06/15}
-\ProvidesClass{URbeamer}
- [\filedate\space\fileversion\space
-   beamer basierte Dokumentenklasse im Corporate Design der Universität Regensburg]
-
-\RequirePackage{ifthen}
-\newboolean{UR@draft}
-
-
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %5 % % % % % % % % % % % % %
-
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-
-%Hausschriftart
-%\RequirePackage{frutigernext}
-\renewcommand*\familydefault{\sfdefault}
-
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%%Optionen zum aktivieren einzelner Farben
-\DeclareOption{lov}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{ffg}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{asz}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{rw}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{ww}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{kt}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{pkgg}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{pps}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{slk}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{bvm}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{mat}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{ph}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{chp}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{med}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{ub}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{zsk}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{eur}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{zhw}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{rul}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{zfw}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{spo}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{rz}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{fsimphy}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{externalize}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-%%Sammelaktivierung: all=alle Farben, faculties=alle 11 Fakultäten
-\DeclareOption{all}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{faculties}{\PassOptionsToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{coloredboxes}{\PassOptionesToPackage{\CurrentOption}{beamerouterthemeUR}}
-\DeclareOption{draft}{\setboolean{UR@draft}{true}\PassOptionsToClass{draft}{beamer}}
-\DeclareOption{handout}{\PassOptionsToClass{handout}{beamer}}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplClass {URbeamer} {\filedate} {\fileversion} {beamer based document class for the University of Regensburg}
+
+\RequirePackage{URoptions}
+
+\Define@specialopt@Module
+
+\UR@DeclareColorOptions
+\UR@define@draftfinalkeys
+
+\clist_map_inline:nn {headline,logotext,alignwithbar,framenumber,externalize,coloredboxes,depcaps,cdlayout} {\Module@DeclarePassOption {#1} {beamerouterthemeUR}}
+
+\Module@DeclarePassOption {logo} [] {URrules}
+\Module@DeclarePassOption {intern} {URrules}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{beamer}}
-\ProcessOptions\relax
-\LoadClass[xcolor=table,covered,hyperref={bookmarks,colorlinks}]{beamer}
-%Laden der notwendigen Ergänzungspakete
-\RequirePackage{graphicx}
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %5
-\mode<presentation>%refers to the first four modes (beamer,handout,second and trans). That is, to all modes except the article mode
-{
-   \usetheme{UR}
-%    	
-%    	
-   	\def\maketitle{
-   		\ifbeamer@inframe\titlepage\else\frame{\titlepage}\fi}
-   	
 
 
+\Module@Process@SpecialOptions
+
+\ProcessOptions\relax
+
+\edef\UR@beamer@saveclsopts{\@classoptionslist}
+\LoadClass[xcolor=table,hyperref={bookmarks,hidelinks}]{beamer}
+\edef\@classoptionslist{\UR@beamer@saveclsopts}
 
-\setbeamertemplate{navigation symbols}{}
+\mode<presentation>{
+   \usetheme{UR}
 }
 
 \mode<all>
diff --git a/Master/texmf-dist/tex/latex/urcls/URcolors.sty b/Master/texmf-dist/tex/latex/urcls/URcolors.sty
index 2875bbaaf33..ad3d1ea57f8 100644
--- a/Master/texmf-dist/tex/latex/urcls/URcolors.sty
+++ b/Master/texmf-dist/tex/latex/urcls/URcolors.sty
@@ -1,107 +1,142 @@
-% Copyright 2013 by Marei Peischl
-%
-% This file may be distributed and/or modified
-%
-% under the LaTeX Project Public License
+%% 
+%%  This is file `URcolors.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
 
-%Definiert Farbwerte nach den Gestaltungsrichtlinien der Corporate Design der Universität Regensburg
-\def\fileversion{1.1}
-\def\filedate{2013/06/04}
+\def\fileversion{2.0}
+\def\filedate{2016/07/21}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{URcolors}[\filedate\space\fileversion\space]
 
-\RequirePackage{xcolor}
-\RequirePackage{ifthen}
+\RequirePackage{expl3}
+\ProvidesExplPackage{URcolors}{\filedate}{\fileversion}{Color definitions for the urcls-bundle}
+
+\RequirePackage{URoptions}
+
 %Deklaration der Paketoptionen für die Unterscheidung der Farbwerte je nach Anwendung
 %Option "coated" für gestrichenes Papier
-\newboolean{coated}
-\DeclareOption{coated}{\setboolean{coated}{true}}
+\UR_new@BoolOpt{coated}
 %Option RGB für Bildschirmdarstellungen
-\newboolean{RGB}
-\DeclareOption{RGB}{\setboolean{RGB}{true}}
-\ProcessOptions\relax
+\UR_new@BoolOpt{RGB}
+
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+
+\RequirePackage{xcolor}
 
 %Farbedfinitionen
 %Abfrage RGB oder cmyk
-\ifthenelse{\boolean{RGB}}{
-%RGB-Farbdefinitionen
-\definecolor{UR@reingrau}{RGB}{142,142,141}
-\definecolor{UR@color@1}{RGB}{29,63,75} %LOV - Blaugrau
-\definecolor{UR@color@2}{RGB}{95,0,47} %FFg Schwarzrot
-\definecolor{UR@color@3}{RGB}{61,65,0} %ASZ Schilfgrün
-\definecolor{UR@color@4}{RGB}{205,211,15}%RWS, urangelb
-\definecolor{UR@color@5}{RGB}{174,167,0}%WiWi lärchennadelgrün
-\definecolor{UR@color@6}{RGB}{236,188,00}%KT	vatikangelb
-\definecolor{UR@color@7}{RGB}{236,98,0}%PKGGorangerot
-\definecolor{UR@color@8}{RGB}{191,0,42}%PPSheucherarot
-\definecolor{UR@color@9}{RGB}{156,0,75}%SLKheidenelkenrot
-\definecolor{UR@color@10}{RGB}{79,184,0}%Bioblattgrün
-\definecolor{UR@color@11}{RGB}{0,155,119}%mathematiktürkisgrün
-\definecolor{UR@color@12}{RGB}{0,137,147}%physik eisvogelblau
-\definecolor{UR@color@13}{RGB}{0,135,178}%Chem spektralblau
-\definecolor{UR@color@14}{RGB}{0,85,106}%Medi capriblau
-\definecolor{UR@color@15}{RGB}{164,102,116} %UB dianthusrot
-\definecolor{UR@color@16}{RGB}{114,75,81}%ZSK rotbraun
-\definecolor{UR@color@17}{RGB}{86,78,111}%EUR perlviolett
-\definecolor{UR@color@18}{RGB}{59,0,65}%ZHW violettrot
-\definecolor{UR@color@19}{RGB}{134,104,0}%RUL grünbraun
-\definecolor{UR@color@20}{RGB}{65,98,36}%ZFW farngrün
-\definecolor{UR@color@21}{RGB}{0,129,123}%SPO wasserblau
-\definecolor{UR@color@22}{RGB}{3,35,82}%RZ saphirblau
-\definecolor{UR@color@23}{RGB}{0,146,133} %FSImphy 
-}
-{
-%cmyk-Farbdefinitionen
-\definecolor{UR@reingrau}{cmyk}{0,0,0,0.5}
-\ifthenelse{\boolean{coated}}{
-%Farbwerte für gestrichenes Papier
-\definecolor{UR@color@1}{cmyk}{0.6,0,0,0.7} %LOV - Blaugrau
-\definecolor{UR@color@2}{cmyk}{0,0.5,0,0.7} %FFg Schwarzrot
-\definecolor{UR@color@3}{cmyk}{0,0,0.5,0.7} %ASZ Schilfgrün
-\definecolor{UR@color@4}{cmyk}{0.3,0,1,0}%RWS, urangelb
-\definecolor{UR@color@5}{cmyk}{0,0,1,0.35}%WiWi lärchennadelgrün
-\definecolor{UR@color@6}{cmyk}{0,0.3,1,0}%KT	vatikangelb
-\definecolor{UR@color@7}{cmyk}{0,0.6,1,0}%PKGGorangerot
-\definecolor{UR@color@8}{cmyk}{0,1,0.6,0}%PPSheucherarot
-\definecolor{UR@color@9}{cmyk}{0,1,0,0.3}%SLKheidenelkenrot
-\definecolor{UR@color@10}{cmyk}{0.6,0,1,0}%Bioblattgrün
-\definecolor{UR@color@11}{cmyk}{1,0,0.6,0}%mathematiktürkisgrün
-\definecolor{UR@color@12}{cmyk}{1,0,0.3,0}%physik eisvogelblau
-\definecolor{UR@color@13}{cmyk}{1,0.3,0,0}%Chem spektralblau
-\definecolor{UR@color@14}{cmyk}{1,0,0,0.5}%Medi capriblau
-\definecolor{UR@color@15}{cmyk}{0,0.6,0.3,0.3} %UB dianthusrot
-\definecolor{UR@color@16}{cmyk}{0,0.6,0.3,0.6}%ZSK rotbraun
-\definecolor{UR@color@17}{cmyk}{0.6,0.6,0.15,0.3}%EUR perlviolett
-\definecolor{UR@color@18}{cmyk}{0.6,1,0,0.6}%ZHW violettrot
-\definecolor{UR@color@19}{cmyk}{0,0.3,1,0.6}%RUL grünbraun
-\definecolor{UR@color@20}{cmyk}{0.6,0,1,0.6}%ZFW farngrün
-\definecolor{UR@color@21}{cmyk}{1,0,0.3,0.3}%SPO wasserblau
-\definecolor{UR@color@22}{cmyk}{1,0.6,0,0.6}%RZ saphirblau
-\definecolor{UR@color@23}{cmyk}{1,0,0.45,0} %FSImphy 
+\bool_if:NTF \g_UR@RGB_bool {
+	%RGB-Farbdefinitionen
+	\definecolor{UR@reingrau}{RGB}{142,142,141}
+	\definecolor{UR@hellgrau}{RGB}{191,191,191}
+	\definecolor{UR@dunkelgrau}{RGB}{89,89,88}
+	\definecolor{UR@color@1}{RGB}{29,63,75} %LOV - Blaugrau
+	\definecolor{UR@color@2}{RGB}{95,0,47} %FFg Schwarzrot
+	\definecolor{UR@color@3}{RGB}{61,65,0} %ASZ Schilfgrün
+	\definecolor{UR@color@4}{RGB}{205,211,15}%RWS, urangelb
+	\definecolor{UR@color@5}{RGB}{174,167,0}%WiWi lärchennadelgrün
+	\definecolor{UR@color@6}{RGB}{236,188,00}%KT	vatikangelb
+	\definecolor{UR@color@7}{RGB}{236,98,0}%PKGGorangerot
+	\definecolor{UR@color@8}{RGB}{191,0,42}%PPSheucherarot
+	\definecolor{UR@color@9}{RGB}{156,0,75}%SLKheidenelkenrot
+	\definecolor{UR@color@10}{RGB}{79,184,0}%Bioblattgrün
+	\definecolor{UR@color@11}{RGB}{0,155,119}%mathematiktürkisgrün
+	\definecolor{UR@color@12}{RGB}{0,137,147}%physik eisvogelblau
+	\definecolor{UR@color@13}{RGB}{0,135,178}%Chem spektralblau
+	\definecolor{UR@color@14}{RGB}{0,85,106}%Medi capriblau
+	\definecolor{UR@color@15}{RGB}{164,102,116} %UB dianthusrot
+	\definecolor{UR@color@16}{RGB}{114,75,81}%ZSK rotbraun
+	\definecolor{UR@color@17}{RGB}{86,78,111}%EUR perlviolett
+	\definecolor{UR@color@18}{RGB}{59,0,65}%ZHW violettrot
+	\definecolor{UR@color@19}{RGB}{134,104,0}%RUL grünbraun
+	\definecolor{UR@color@20}{RGB}{65,98,36}%ZFW farngrün
+	\definecolor{UR@color@21}{RGB}{0,129,123}%SPO wasserblau
+	\definecolor{UR@color@22}{RGB}{3,35,82}%RZ saphirblau
+	\definecolor{UR@color@23}{RGB}{0,146,133} %FSImphy 
 }{
-%Farbwerte für ungestrichenes Papier
-\definecolor{UR@color@1}{cmyk}{0.9,0.3,0.2,0.5} %LOV - Blaugrau
-\definecolor{UR@color@2}{cmyk}{0.4,0.9,0.2,0.5} %FFg Schwarzrot
-\definecolor{UR@color@3}{cmyk}{0.2,0.05,0.7,0.5} %ASZ Schilfgrün
-\definecolor{UR@color@4}{cmyk}{0.2,0,1,0}%RWS, urangelb
-\definecolor{UR@color@5}{cmyk}{0.1,0.1,1,0.2}%WiWi lärchennadelgrün
-\definecolor{UR@color@6}{cmyk}{0,0.2,1,0}%KT	vatikangelb
-\definecolor{UR@color@7}{cmyk}{0,0.5,1,0}%PKGGorangerot
-\definecolor{UR@color@8}{cmyk}{0,1,0.6,0}%PPSheucherarot
-\definecolor{UR@color@9}{cmyk}{0.1,1,0.1,0.1}%SLKheidenelkenrot
-\definecolor{UR@color@10}{cmyk}{0.5,0,1,0}%Bioblattgrün
-\definecolor{UR@color@11}{cmyk}{1,0.1,0.5,0}%mathematiktürkisgrün
-\definecolor{UR@color@12}{cmyk}{0.9,0,0.3,0}%physik eisvogelblau
-\definecolor{UR@color@13}{cmyk}{1,0.2,0,0}%Chem spektralblau
-\definecolor{UR@color@14}{cmyk}{1,0.2,0.1,0.3}%Medi capriblau
-\definecolor{UR@color@15}{cmyk}{0.1,0.6,0.4,0.1} %UB dianthusrot
-\definecolor{UR@color@16}{cmyk}{0.2,0.7,0.5,0.4}%ZSK rotbraun
-\definecolor{UR@color@17}{cmyk}{0.68,0.73,0.18,0.18}%EUR perlviolett
-\definecolor{UR@color@18}{cmyk}{0.7,0.9,0.1,0.4}%ZHW violettrot
-\definecolor{UR@color@19}{cmyk}{0.11,0.36,1,0.44}%RUL grünbraun
-\definecolor{UR@color@20}{cmyk}{0.6,0.2,1,0.4}%ZFW farngrün
-\definecolor{UR@color@21}{cmyk}{1,0,0.3,0.2}%SPO wasserblau
-\definecolor{UR@color@22}{cmyk}{1,0.7,0.1,0.4}%RZ saphirblau
-\definecolor{UR@color@23}{cmyk}{0.95,0.05,0.45,0} %FSIpmphy
-}
+	%cmyk-Farbdefinitionen
+	\definecolor{UR@reingrau}{cmyk}{0,0,0,0.5}
+	\bool_if:NTF \g_UR@coated_bool {
+		%Farbwerte für gestrichenes Papier
+		\definecolor{UR@color@1}{cmyk}{0.6,0,0,0.7} %LOV - Blaugrau
+		\definecolor{UR@color@2}{cmyk}{0,0.5,0,0.7} %FFg Schwarzrot
+		\definecolor{UR@color@3}{cmyk}{0,0,0.5,0.7} %ASZ Schilfgrün
+		\definecolor{UR@color@4}{cmyk}{0.3,0,1,0}%RWS, urangelb
+		\definecolor{UR@color@5}{cmyk}{0,0,1,0.35}%WiWi lärchennadelgrün
+		\definecolor{UR@color@6}{cmyk}{0,0.3,1,0}%KT	vatikangelb
+		\definecolor{UR@color@7}{cmyk}{0,0.6,1,0}%PKGGorangerot
+		\definecolor{UR@color@8}{cmyk}{0,1,0.6,0}%PPSheucherarot
+		\definecolor{UR@color@9}{cmyk}{0,1,0,0.3}%SLKheidenelkenrot
+		\definecolor{UR@color@10}{cmyk}{0.6,0,1,0}%Bioblattgrün
+		\definecolor{UR@color@11}{cmyk}{1,0,0.6,0}%mathematiktürkisgrün
+		\definecolor{UR@color@12}{cmyk}{1,0,0.3,0}%physik eisvogelblau
+		\definecolor{UR@color@13}{cmyk}{1,0.3,0,0}%Chem spektralblau
+		\definecolor{UR@color@14}{cmyk}{1,0,0,0.5}%Medi capriblau
+		\definecolor{UR@color@15}{cmyk}{0,0.6,0.3,0.3} %UB dianthusrot
+		\definecolor{UR@color@16}{cmyk}{0,0.6,0.3,0.6}%ZSK rotbraun
+		\definecolor{UR@color@17}{cmyk}{0.6,0.6,0.15,0.3}%EUR perlviolett
+		\definecolor{UR@color@18}{cmyk}{0.6,1,0,0.6}%ZHW violettrot
+		\definecolor{UR@color@19}{cmyk}{0,0.3,1,0.6}%RUL grünbraun
+		\definecolor{UR@color@20}{cmyk}{0.6,0,1,0.6}%ZFW farngrün
+		\definecolor{UR@color@21}{cmyk}{1,0,0.3,0.3}%SPO wasserblau
+		\definecolor{UR@color@22}{cmyk}{1,0.6,0,0.6}%RZ saphirblau
+		\definecolor{UR@color@23}{cmyk}{1,0,0.45,0} %FSImphy 
+	}{
+		%Farbwerte für ungestrichenes Papier
+		\definecolor{UR@color@1}{cmyk}{0.9,0.3,0.2,0.5} %LOV - Blaugrau
+		\definecolor{UR@color@2}{cmyk}{0.4,0.9,0.2,0.5} %FFg Schwarzrot
+		\definecolor{UR@color@3}{cmyk}{0.2,0.05,0.7,0.5} %ASZ Schilfgrün
+		\definecolor{UR@color@4}{cmyk}{0.2,0,1,0}%RWS, urangelb
+		\definecolor{UR@color@5}{cmyk}{0.1,0.1,1,0.2}%WiWi lärchennadelgrün
+		\definecolor{UR@color@6}{cmyk}{0,0.2,1,0}%KT	vatikangelb
+		\definecolor{UR@color@7}{cmyk}{0,0.5,1,0}%PKGGorangerot
+		\definecolor{UR@color@8}{cmyk}{0,1,0.6,0}%PPSheucherarot
+		\definecolor{UR@color@9}{cmyk}{0.1,1,0.1,0.1}%SLKheidenelkenrot
+		\definecolor{UR@color@10}{cmyk}{0.5,0,1,0}%Bioblattgrün
+		\definecolor{UR@color@11}{cmyk}{1,0.1,0.5,0}%mathematiktürkisgrün
+		\definecolor{UR@color@12}{cmyk}{0.9,0,0.3,0}%physik eisvogelblau
+		\definecolor{UR@color@13}{cmyk}{1,0.2,0,0}%Chem spektralblau
+		\definecolor{UR@color@14}{cmyk}{1,0.2,0.1,0.3}%Medi capriblau
+		\definecolor{UR@color@15}{cmyk}{0.1,0.6,0.4,0.1} %UB dianthusrot
+		\definecolor{UR@color@16}{cmyk}{0.2,0.7,0.5,0.4}%ZSK rotbraun
+		\definecolor{UR@color@17}{cmyk}{0.68,0.73,0.18,0.18}%EUR perlviolett
+		\definecolor{UR@color@18}{cmyk}{0.7,0.9,0.1,0.4}%ZHW violettrot
+		\definecolor{UR@color@19}{cmyk}{0.11,0.36,1,0.44}%RUL grünbraun
+		\definecolor{UR@color@20}{cmyk}{0.6,0.2,1,0.4}%ZFW farngrün
+		\definecolor{UR@color@21}{cmyk}{1,0,0.3,0.2}%SPO wasserblau
+		\definecolor{UR@color@22}{cmyk}{1,0.7,0.1,0.4}%RZ saphirblau
+		\definecolor{UR@color@23}{cmyk}{0.95,0.05,0.45,0} %FSIpmphy
+	}
 }
diff --git a/Master/texmf-dist/tex/latex/urcls/URletter.cls b/Master/texmf-dist/tex/latex/urcls/URletter.cls
index 4a0b13bde1a..a2b70af898a 100644
--- a/Master/texmf-dist/tex/latex/urcls/URletter.cls
+++ b/Master/texmf-dist/tex/latex/urcls/URletter.cls
@@ -1,310 +1,301 @@
-% Copyright 2014-2015 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% under the LaTeX Project Public License
-
-% urletter ist eine Briefklasse, nach den momentenen (Januar 2015) Gestaltungsrichtlinien zum Corporate Design der Universität Regensburg
-% Sie basiert auf der Dokumentenklasse scrlettr2.
-% Diese Klasse wird in ihrer aktuellen Form bereitgestellt, allerdings übernimmt die Autorin keinerlei Verantwortung für die Verwendung.
-% Bei Fragen, Wünschen oder Anregungen freue ich mich über eine Email: TeX@mareipeischl.de
+%% 
+%%  This is file `URletter.cls' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
 
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.5}
-\def\filedate{2015/01/28}
-\ProvidesClass{URletter}
- [\filedate\space\fileversion\space
-   Briefklasse im Corporate Design der Universität Regensburg]
-   
-%Lade scrlttr2 als Basisklasse mit KOMA-Script
-\LoadClass[backaddress=plain,fontsize=11pt,parskip=half]{scrlttr2}
-   
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%Lade notwendige Pakete
-\RequirePackage[utf8]{inputenc} %Eingabekodierung utf8
-\RequirePackage[T1]{fontenc} %T1-Vektorschrift
-%\RequirePackage{frutigernext} %UR-Hausschrift
-\RequirePackage{babel}%Übersetzte captions
-
-\RequirePackage{ifthen}%if-Abfragen und while-Schleifen
-
-\RequirePackage{URcolors}%Farbdefinitionen der CD der UR, lädt automatisch xcolor
-
-\RequirePackage{calc} %Rechnen bei Längenangaben und Countern
-\RequirePackage{graphicx} %Grafikeinbindung
-\RequirePackage{tikz,pgf} %Grafikerstellung mit pgf
-\usetikzlibrary{calc}
-
-\RequirePackage{kvoptions} %Keyval-Options
-
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%Counter-Definitionen
-\newcounter{UR@dep}
-\newcounter{UR@temp} %temporärer counter zum Abtasten
-\newcounter{UR@color}
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%Boolean-Definitionen
-%22 Booleans zum aktivieren/deaktivieren der einzelnen Abteilungsfarben
-\newcounter{UR@runner}
-%Create Booleans UR@Dep@\the\value{UR@runner}
-\def\newdep#1{\expandafter\@ifdefinable\csname ifUR@dep@#1\endcsname{%
-		\expandafter\newif\csname ifUR@dep@#1\endcsname}}
-\whiledo{\value{UR@runner}<23}{\stepcounter{UR@runner}\newdep{\the\value{UR@runner}}}
-\newboolean{fsimphy}
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%Optionen zum aktivieren einzelner Farben
-\DeclareOption{lov}{\setboolean{UR@dep@1}{true}\stepcounter{UR@dep}}
-\DeclareOption{ffg}{\setboolean{UR@dep@2}{true}\stepcounter{UR@dep}}
-\DeclareOption{asz}{\setboolean{UR@dep@3}{true}\stepcounter{UR@dep}}
-\DeclareOption{rw}{\setboolean{UR@dep@4}{true}\stepcounter{UR@dep}}
-\DeclareOption{ww}{\setboolean{UR@dep@5}{true}\stepcounter{UR@dep}}
-\DeclareOption{kt}{\setboolean{UR@dep@6}{true}\stepcounter{UR@dep}}
-\DeclareOption{pkgg}{\setboolean{UR@dep@7}{true}\stepcounter{UR@dep}}
-\DeclareOption{pps}{\setboolean{UR@dep@8}{true}\stepcounter{UR@dep}}
-\DeclareOption{slk}{\setboolean{UR@dep@9}{true}\stepcounter{UR@dep}}
-\DeclareOption{bvm}{\setboolean{UR@dep@10}{true}\stepcounter{UR@dep}}
-\DeclareOption{mat}{\setboolean{UR@dep@11}{true}\stepcounter{UR@dep}}
-\DeclareOption{ph}{\setboolean{UR@dep@12}{true}\stepcounter{UR@dep}}
-\DeclareOption{chp}{\setboolean{UR@dep@13}{true}\stepcounter{UR@dep}}
-\DeclareOption{med}{\setboolean{UR@dep@14}{true}\stepcounter{UR@dep}}
-\DeclareOption{ub}{\setboolean{UR@dep@15}{true}\stepcounter{UR@dep}}
-\DeclareOption{zsk}{\setboolean{UR@dep@16}{true}\stepcounter{UR@dep}}
-\DeclareOption{eur}{\setboolean{UR@dep@17}{true}\stepcounter{UR@dep}}
-\DeclareOption{zhw}{\setboolean{UR@dep@18}{true}\stepcounter{UR@dep}}
-\DeclareOption{rul}{\setboolean{UR@dep@19}{true}\stepcounter{UR@dep}}
-\DeclareOption{zfw}{\setboolean{UR@dep@20}{true}\stepcounter{UR@dep}}
-\DeclareOption{spo}{\setboolean{UR@dep@21}{true}\stepcounter{UR@dep}}
-\DeclareOption{rz}{\setboolean{UR@dep@22}{true}\stepcounter{UR@dep}}
-\DeclareOption{fsimphy}{\setboolean{UR@dep@23}{true}\setboolean{fsimphy}{true}\stepcounter{UR@dep}}
-%Sammelaktivierung: all=alle Farben, faculties=alle 11 Fakultäten
-\DeclareOption{all}{\setcounter{UR@temp}{1}\whiledo{\value{UR@temp}<23}{\setboolean{UR@dep@\arabic{UR@temp}}{true}\stepcounter{UR@dep}\stepcounter{UR@temp}}}
-\DeclareOption{faculties}{\setcounter{UR@temp}{4}\whiledo{\value{UR@temp}<15}{\setboolean{UR@dep@\arabic{UR@temp}}{true}\stepcounter{UR@dep}\stepcounter{UR@temp}}}
-
-\newboolean{UR@intern} %Tonersparender Briefkopf
-\DeclareOption{intern}{\setboolean{UR@intern}{true}}
-\newboolean{UR@dekanat}
-\newboolean{UR@dekan}
-\DeclareOption{dekan}{\setboolean{UR@dekan}{true}}
-\DeclareOption{dekanat}{\setboolean{UR@dekanat}{true}}
-\newboolean{UR@noheadline}
-\DeclareOption{noheadline}{\setboolean{UR@noheadline}{true}}
-
-\newboolean{norefline} %Keine Geschäftszeile -> Datum horizontal bündig mit Absenderergänzung
-\DeclareOption{norefline}{\PassOptionsToClass{refline=nodate}{scrlttr2}\setboolean{norefline}{true}}
-
-%LCO-Option for LoadLetterOptions
-\SetupKeyvalOptions{
-family=UR,
-prefix=UR@
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplClass {URletter} {\filedate} {\fileversion} {scrlttr2 based document class for the University of Regensburg}
+
+\RequirePackage{URoptions}
+\Define@specialopt@Module
+
+
+
+\clist_map_inline:nn {intern,dean,deanery,babel} {\UR_new@BoolOpt {#1}}
+\UR_set@InitialValue:nn {babel}{true}
+\UR_new@BoolOpt [dean] {dekan}
+\UR_new@BoolOpt [deanery] {dekanat}
+
+\Module@DeclarePassOption{logo}{URrules}
+\Module@DeclarePassOption{intern}[true]{URrules}
+\Module@DeclarePassOption{draft}[true]{URrules}
+\Module@DeclarePassOption{final}[true]{URrules}
+
+\UR@create@ChoiceKey{headline}[true]{
+	{true}{
+		\bool_gset_true:N \g_UR@ShowHeadline_bool
+	},
+	{false}{
+		\bool_gset_false:N \g_UR@ShowHeadline_bool
+	},
+	{intern}{
+		\bool_gset_true:N \g_UR@ShowHeadline_bool
+		\PassOptionsToPackage{intern}{URrules}
+	}
+}<true>
+
+
+\UR_Define@Key:n {
+	headline / draft .meta:n = {headline=intern},
+	headline / empty .meta:n = {headline=false},
+	headline / color .meta:n = {headline=true}
 }
-\DeclareStringOption{lco}
 
-\ProcessKeyvalOptions*
 
-\ifx\UR@lco\@empty
-%\@empty predefined empty, wenn das argument leer ist, wollen wir keine umdefinition
-\else
-\AtBeginDocument{\LoadLetterOption{\UR@lco}}
-\fi
+\UR@create@ChoiceKey{refline}{
+	{nodate}{
+		\bool_gset_true:N \g_UR@locdate_bool
+		\PassOptionsToClass{refline=nodate}{scrlttr2}
+	},
+	{false}{
+		\bool_gset_true:N \g_UR@locdate_bool
+		\AtEndOfClass{\removereffields}
+		\PassOptionsToClass{refline=nodate}{scrlttr2}
+	},
+	{unknown}{
+		\PassOptionsToClass{\l_keys_key_tl\tl_if_blank:nF{#1}{=#1}}{scrlttr2}
+	}
+}
+
+
+
+%lco-Option for LoadLetterOptions
+\Module@DefineSpecialKey{lco}{\AtEndOfClass{\expandafter\LoadLetterOptions{#1}}}
 
+%Optionsvariante aus Kompatibilitätsgründen:
+\DeclareOption{noheadline}{\UR_set@Key:n{headline=false}}
 
+\UR@DeclareColorOptions
+
+\Module@DefineSpecialPassKey{URrules}
+\Module@DefineSpecialPassKey{URcolors}
+
+\PassOptionsToClass{backaddress=plain}{scrlttr2}
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrlttr2}}
+
+
+\Module@Process@SpecialOptions
+
+
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+
+
 \ProcessOptions\relax
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
+
+\LoadClass{scrlttr2}
+
+\RequirePackage{iftex}
+\ifPDFTeX
+\RequirePackage[utf8]{inputenc}
+\fi
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\providecaptionname{german,ngerman}{\chairname}{Lehrstuhl}%Lehrstuhl}%Lehrstuhl für...
+\providecaptionname{german,ngerman}{\facultyname}{Fakultät}%Fakultät für...
+\providecaptionname{german,ngerman}{\institutename}{Institut}%Institut für...
+\providecaptionname{german,ngerman}{\roomname}{Zimmer}
+
+
+\providecommand*{\chairname}{Lehrstuhl}
+\providecommand*{\facultyname}{Fakultät}
+\providecommand*{\institutename}{Institut}
+\providecommand*{\roomname}{Zimmer}
+
+%% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
 %Neue Komavars
 \newkomavar[\phonename\usekomavar{phoneseparator}]{officephone}%Telefon Sekretariat
 \newkomavar[\faxname\usekomavar{phoneseparator}]{officefax}%Fax Sekretariat
-
-\newkomavar{department}%Einrichtung
-
-\newcaptionname{ngerman}{\chairname}{Lehrstuhl} %Lehrstuhl}%Lehrstuhl für...
 \newkomavar[\chairname\chairseparator]{chair}
 \newcommand{\chairseparator}{~für~}
-
-\newcaptionname{ngerman}{\facultyname}{Fakultät}%Fakultät für...
 \newkomavar[\facultyname\facultyseparator]{faculty}
 \newcommand{\facultyseparator}{~für~}
-
-\newcaptionname{ngerman}{\institutename}{}%Institut für...
 \newkomavar[\institutename\instituteseparator]{institute}
-\newcommand{\instituteseparator}{}
-
-\newcaptionname{ngerman}{\roomname}{Zimmer}
-\newcommand{\roomseparator}{:~}
+\newcommand{\instituteseparator}{~für~}
+\newcommand{\roomseparator}{~}
 \newkomavar[\roomname\roomseparator]{fromroom}
+\newkomavar{department}%Einrichtung
+
+\newcommand{\UR@dean}{Der~Dekan}
+\newcommand{\UR@deanery}{Dekanat}
+\newcommand{\UR@deanery@label}{Fakultätsverwaltung}
 
 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
 %Pseudolängen und Längen
-%%%Skalierung des Logos
-\newlength{\x}%halber Radius der Kugel
-\setlength{\x}{0.5cm}
-\setlength{\unitlength}{\x}
-%Definition damit Text Bündig mit Adresse
-\@setplength{refwidth}{\textwidth}
+%Erstellung des Farbbalkens
+\bool_if:NTF \g_UR@ShowHeadline_bool {
+	\RequirePackage{URrules}
+	\UR@create@titlebox{UR@letter@titlebox}
+	\setkomavar{firsthead}{\usebox{\UR@letter@titlebox}}
+}{
+	\RequirePackage{URcolors}
+	\newlength{\UR@title@halfradius}
+	\setlength{\UR@title@halfradius}{\dimexpr\paperwidth/42\relax}
+	\setkomavar{firsthead}{} 
+}
+
 \@setplength{refhpos}{\useplength{toaddrhpos}}
-\setlength{\oddsidemargin}{\useplength{toaddrhpos}-1in}
-%Breite der Farbstreifen festlegen
-\newlength{\streifen}	
-\setlength{\streifen}{\paperwidth-10\x}
-\setlength{\streifen}{0.5\streifen}
+\setlengthtoplength{\oddsidemargin}{toaddrhpos}
+\addtolength{\oddsidemargin}{-1in}
+\setlength{\textwidth}{\paperwidth}
+\addtolengthplength[-2]{\textwidth}{toaddrhpos}
+\@setplength{refwidth}{\textwidth}
 %Positionierung des Kopfes
-\@setplength{firstheadhpos}{2.75\x}
-\@setplength{firstheadvpos}{\x} %-1pt}
-\@setplength{firstheadwidth}{2\streifen}
+\@setplength{firstheadhpos}{0pt}
+\@setplength{firstheadvpos}{0pt} %-1pt}
+\@setplength{firstheadwidth}{\paperwidth}
 %Positionierung der Absenderergänzung
-\@setplength{lochpos}{\useplength{refhpos}-.5em}
-\@setplength{locvpos}{5.4\x}
-\@setplength[1]{locwidth}{\streifen-\useplength{refhpos}}
-\@setplength[1]{locheight}{\useplength{toaddrheight}}
-
-% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%Briefkopf
-\setcounter{UR@temp}{1}
-\newcommand{\tikzmark}[1]{\tikz[overlay,remember picture] \node (#1) {};}
-\ifthenelse{\boolean{UR@intern}}
-	{
-	%schwarz-weißer Briefkopf für Interna
-	\setkomavar{firsthead}
-		{
-		\tikzmark{mark} \usekomavar{fromlogo}%\ifthenelse{\boolean{fsimphy}}{\includegraphics[width=12\x]{fsilogotext}}{\includegraphics[width=12\x]{urlogotextintern}}
-		\begin{tikzpicture}[overlay, remember picture,]
-			\draw(mark.north)++(7\x,3.2\x)--+(0,2\x)+(0,0)--++(.98\streifen,0)++(.02\streifen,0)--+(0,2\x)+(0,0)--++(\streifen,0);
-		\end{tikzpicture}
-		}
-	}
-	{
-	%Farbiger Briefkopf
-	\setkomavar{firsthead}{
-	\ifthenelse{\boolean{UR@noheadline}}{}{
-		\tikzmark{mark} \usekomavar{fromlogo}%\ifthenelse{\boolean{fsimphy}}{\includegraphics[width=12\x]{fsilogotext}}{\includegraphics[width=12\x]{urlogotext}}
-		%grauer Balken
-		\begin{tikzpicture}[overlay, remember picture,line width=0pt]
-			\filldraw(mark.north)++(7\x,3.2\x)node[anchor=south west,fill=UR@reingrau,draw=UR@reingrau, rectangle,minimum width=\streifen, minimum height=3\x]{} ++(\streifen,0);
-		\end{tikzpicture}
-		%Taste nun alle Einrichtungen ab
-		\whiledo{\value{UR@temp}<24}{
-			\ifthenelse{\boolean{UR@dep@\value{UR@temp}}}{
-				\begin{tikzpicture}[overlay,remember picture,line width=0pt]
-				\filldraw[UR@color@\arabic{UR@temp}]($(mark.north)+(7\x,3.2\x)+(\streifen,0)+\arabic{UR@color}*(\streifen/\arabic{UR@dep},0)$)node[anchor=south west , rectangle,minimum width=\streifen/\arabic{UR@dep}, minimum height=3\x,fill=UR@color@\arabic{UR@temp},draw=UR@color@\arabic{UR@temp}]{};
-				\end{tikzpicture}
-				\stepcounter{UR@color}}
-				{}
-			\stepcounter{UR@temp}
-			}
-		}}
-
-%evtl setcounter hier
-	}
-\AtEndLetter{\setcounter{UR@color}{0}\setcounter{UR@temp}{1}}
-%Ende Briefkopf
-\AtEndLetter{\setcounter{UR@temp}{1}\setcounter{UR@color}{0}}
-%% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
-%%Rücksendeadresse
-\setkomavar{backaddress}{Universität Regensburg $\cdot$ 93040 Regensburg}
+\@setplength{lochpos}{\useplength{toaddrhpos}}
+\@setplength{locvpos}{6\UR@title@halfradius}
+\@setplength{locwidth}{\dimexpr(\paperwidth-10\UR@title@halfradius)/2-\useplength{lochpos}\relax}
+\@setplength{locheight}{\dimexpr\useplength{toaddrheight}+\useplength{toaddrvpos}-\useplength{locvpos}\relax}
+
 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
 %Absenderergänzung
 
-\ifthenelse{\boolean{UR@dekanat}}{
+\bool_if:NTF \g_UR@deanery_bool {
 \setkomavar{location}{
-		\sffamily\flushleft
-		\fontsize{12}{0}\selectfont Dekanat\\[1em]
-		\fontsize{8}{0}\selectfont\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[1em]}
-		\fontsize{8}{0}\selectfont
-				\textbf{Fakultätsverwaltung\\\usekomavar{fromname}}
-				%Absendertelefonnummer
-				\ifkomavarempty{fromphone}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromphone}\usekomavar{fromphone}} 
-				\ifkomavarempty{fromroom}{}{\usekomavar*{fromroom} \usekomavar{fromroom}\\}
-				\ifkomavarempty{fromfax}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]} %Absenderfax
+		\setlength{\parskip}{0pt}
+		\setlength{\parindent}{0pt}
+		\sffamily\raggedright\par
+		\fontsize{12}{12}\selectfont\UR@deanery\\[1em]
+		\fontsize{8}{8}\selectfont\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[1.5em]}
+		\fontsize{8}{8}\selectfont
+				\textbf{\UR@deanery@label\\[1.5pt]\usekomavar{fromname}}\\[1.5pt]
+				\ifkomavarempty{fromphone}{}{\usekomavar*{fromphone}\usekomavar{fromphone}\\[1.5pt]%
+				\ifkomavarempty{fromfax}{\null\hspace*{0cm}\\[1em]}{\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]}}
+				\ifkomavarempty{fromroom}{}{\usekomavar*{fromroom} \usekomavar{fromroom}\\[1.5pt]}
 				\usekomavar{fromaddress}\\[1.5em]
-				\ifkomavarempty{fromemail}{}{\usekomavar{fromemail}\\[1.5pt]}
-				\ifkomavarempty{fromurl}{}{\usekomavar{fromurl}}
-				\ifthenelse{\boolean{norefline}}{\\[1.5em]
+				\ifkomavarempty{fromemail}{}{\usekomavar*{fromemail}\usekomavar{fromemail}\\[1.5pt]}
+				\ifkomavarempty{fromurl}{}{\usekomavar*{fromemail}\usekomavar{fromurl}}
+				\bool_if:NT \g_UR@locdate_bool {
+				\\[1.5em]
 				\vfill
-				\usekomavar{place},~den~\usekomavar{date}}{}
+		    	{\ifkomavarempty{place}{}{%
+						\usekomavar{place}\usekomavar{placeseparator}}%
+					\usekomavar{date}}%
+				}
 		
 		
 		}
 }{
-\ifthenelse{\boolean{UR@dekan}}{
+	\bool_if:NTF \g_UR@dean_bool {
 		\setkomavar{location}{
-		\sffamily\flushleft
-		\fontsize{12}{0}\selectfont Der Dekan\\[1em]
-		\fontsize{8}{0}\selectfont\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[1em]}
+		\setlength{\parskip}{0pt}
+		\sffamily\raggedright\par
+		\fontsize{12}{0}\selectfont\UR@dean\\[1.5em]
+		\fontsize{8}{0}\selectfont\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[1.5em]}
 		\fontsize{8}{0}\selectfont
-				\textbf{\usekomavar{fromname}}
+				\textbf{\usekomavar{fromname}}\\[1.5pt]
 				%Absendertelefonnummer
-				\ifkomavarempty{fromphone}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromphone}\usekomavar{fromphone}} 
-				\ifkomavarempty{fromfax}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]} %Absenderfax
+				\ifkomavarempty{fromphone}{}{\usekomavar*{fromphone}\usekomavar{fromphone}\\[1.5pt]} 
+				\ifkomavarempty{fromfax}{}{\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]} %Absenderfax
 				\ifkomavarempty{fromroom}{}{\usekomavar*{fromroom} \usekomavar{fromroom}\\}
-
 				%Sekretariat:
-				\ifkomavarempty{officephone}{\null\hspace*{0cm}\\[3em]}{Sekretariat:\\[1.5pt]
-				\usekomavar*{officephone}\usekomavar{officephone}
-				\ifkomavarempty{officefax}{\null\hspace*{0cm}\\[1em]}{\\[1.5pt]\usekomavar*{officefax}\usekomavar{officefax}\\[1.5pt]}}
+				\ifkomavarempty{officephone}{}{Sekretariat:\\[1.5pt]
+				\usekomavar*{officephone}\usekomavar{officephone}\\[1.5pt]
+				\ifkomavarempty{officefax}{}{\usekomavar*{officefax}\usekomavar{officefax}\\[1.5pt]}}
 				\usekomavar{fromaddress}\\[1.5em]
 				\ifkomavarempty{fromemail}{}{\usekomavar{fromemail}\\[1.5pt]}
 				\ifkomavarempty{fromurl}{}{\usekomavar{fromurl}}
-				\ifthenelse{\boolean{norefline}}{\\[1.5em]
+				\bool_if:NT \g_UR@locdate_bool {
+				\\[1.5em]
 				\vfill
-				\usekomavar{place},~den~\usekomavar{date}}{}
-		
-		
+		    	{\ifkomavarempty{place}{}{%
+						\usekomavar{place}\usekomavar{placeseparator}}%
+					\usekomavar{date}}%
+				}
 		}
-		
-		}{
+	}{
 		\setkomavar{location}{
-			\sffamily\flushleft
-				{	
+			\setlength{\parskip}{0pt}
+			\setlength{\parindent}{0pt}
+			\fontsize{6}{0}\selectfont
+			\sffamily\raggedright\par
 		%Einrichtung 
 		\ifkomavarempty{department}
 				{\ifkomavarempty{faculty}
-										{\hspace{0pt}\\[2.1cm]}
-										{\fontsize{6}{0}\selectfont\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[5pt]}}}
-				{\fontsize{6}{0}\selectfont\textbf{\usekomavar*[\MakeUppercase]{department}\usekomavar[\MakeUppercase]{department}\\[5pt]}}
+										{\vspace*{\baselineskip}}
+										{\textbf{\usekomavar*[\MakeUppercase]{faculty}\usekomavar[\MakeUppercase]{faculty}\\[5pt]}}}
+				{\textbf{\usekomavar*[\MakeUppercase]{department}\usekomavar[\MakeUppercase]{department}\\[5pt]}}
 					\fontsize{12}{0}\selectfont
 					\ifkomavarempty{chair}
 									{
 									\ifkomavarempty{institute}
-										{\null\hspace*{0cm}\\[2.2cm]}
+										{\par\vspace{2.2cm}}
 										{\usekomavar*{institute}\usekomavar{institute}\\[1.5em]}
 									}
 									{\usekomavar*{chair}\usekomavar{chair}\\[1.5em]}
-				
-				
-		}
 		\fontsize{8}{0}\selectfont
-		\textbf{\usekomavar{fromname}}
+		\ifkomavarempty{fromname}{}{\textbf{\usekomavar{fromname}}\\[1.5pt]}
 		%Absendertelefonnummer
-		\ifkomavarempty{fromphone}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromphone}\usekomavar{fromphone}} 
-		\ifkomavarempty{fromfax}{\null\hspace*{0cm}\\[1em]}{\null\hspace*{0cm}\\[1.5pt]\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]} %Absenderfax
-		\ifkomavarempty{fromroom}{}{\usekomavar*{fromroom} \usekomavar{fromroom}\\}
+		\ifkomavarempty{fromphone}{}{\usekomavar*{fromphone}\usekomavar{fromphone}\\[1.5pt] 
+		\ifkomavarempty{fromfax}{}{\usekomavar*{fromfax}\usekomavar{fromfax}\\[1.5pt]}}%Absenderfax
+		\ifkomavarempty{fromroom}{}{\usekomavar*{fromroom} \usekomavar{fromroom}\\[1.5pt]}
 		%Sekretariat:
-		\ifkomavarempty{officephone}{\null\hspace*{0cm}\\[3em]}{\null\hspace*{0cm}\\[3pt]Sekretariat:\\[1.5pt]
+		\ifkomavarempty{officephone}{}{Sekretariat:\\[1.5pt]
 		\usekomavar*{officephone}\usekomavar{officephone}
 		\ifkomavarempty{officefax}{\null\hspace*{0cm}\\[1em]}{\\[1.5pt]\usekomavar*{officefax}\usekomavar{officefax}\\[1.5pt]}}
-		\usekomavar{fromaddress}\\[1.5em]
-		\ifkomavarempty{fromemail}{}{\usekomavar{fromemail}\\[1.5pt]}
-		\ifkomavarempty{fromurl}{}{\usekomavar{fromurl}}
-		\ifthenelse{\boolean{norefline}}{\\[1.5em]
+		\usekomavar{fromaddress}\\[1em]
+		\ifkomavarempty{fromemail}%
+			{\ifkomavarempty{fromurl}{}{\usekomavar{fromurl}}}%
+			{\usekomavar{fromemail}%
+				\ifkomavarempty{fromurl}{}{\\[1.5pt]\usekomavar{fromurl}}}
+		\bool_if:NT \g_UR@locdate_bool {
+		\\[1.5em]
 		\vfill
-		\usekomavar{place},~den~\usekomavar{date}}{}
-		}}}
+    	{\ifkomavarempty{place}{}{%
+					\usekomavar{place}\usekomavar{placeseparator}}%
+				\usekomavar{date}}%
+		}
+		}
+	}
+}
+
 %Defaultwerte für komavar
-\setkomavar{fromaddress}{Universitätsstraße 31\\[1.5pt]93053 Regensburg}
-%  \newcommand{\faxname}%
-%    {Telefax}
-%  \newcommand{\datename}{\ifkomavaremplty{place}{Datum}{\usekomavar{place}, den}}
-  
-
-%\captionname{ngerman}{\faxname}{Telefax}
-%\newcaptionname{ngerman}{\datename}{\ifkomavarempty{place}{Datum}{\usekomavar{place}, den}}
-
-\setkomavar{phoneseparator}{ +49 941 943-}
-\setkomavar{faxseparator}{ +49 941 943-}
-\renewcommand{\familydefault}{\sfdefault}
-
-\pgfdeclareimage[width=12\x]{logo}{urlogotext}
-\pgfdeclareimage[width=12\x]{logointern}{urlogotextintern}
-\ifthenelse{\boolean{UR@intern}}{\setkomavar{fromlogo}{\pgfuseimage{logointern}}}{\setkomavar{fromlogo}{\pgfuseimage{logo}}}
+\setkomavar{fromaddress}{Universitätsstraße~31\\[1.5pt]93053~Regensburg}
+\setkomavar{backaddress}{Universität~Regensburg~$\cdot$~93040~Regensburg}
+\setkomavar{phoneseparator}{~+49\,941\,943-}
+\setkomavar{faxseparator}{~+49\,941\,943-}
+
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/URoptions.sty b/Master/texmf-dist/tex/latex/urcls/URoptions.sty
new file mode 100644
index 00000000000..39b1cb162f4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/urcls/URoptions.sty
@@ -0,0 +1,127 @@
+%% 
+%%  This is file `URoptions.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2016--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage{URoptions}{\filedate}{\fileversion}{Implementation of keyval-options for the urcls bundle}
+
+\RequirePackage{URspecialopts}
+
+
+%Define the departments
+\clist_new:N \g_UR@dep_clist
+\clist_gset:Nn \g_UR@dep_clist {lov,ffg,asz,rw,ww,kt,pkgg,pps,slk,bvm,mat,ph,chp,med,ub,zsk,eur,zhw,rul,zfw,spo,rz,fsimphy}
+
+
+\cs_new:Nn \UR_Define@Key:n {
+	\exp_args:Nx \keys_define:nn { \@currname.\@currext }
+	{#1}
+}
+
+\cs_new:Nn \UR_Define@Key:nnn {
+	\exp_args:Nx \keys_define:nn { \@currname.\@currext }
+	{#1#2=#3}
+}
+
+\cs_generate_variant:Nn \UR_Define@Key:nnn {xno,xnn}% {xo,xn}
+
+\cs_new:Nn \UR_set@Key:n {
+	\exp_args:Nx \keys_set:nn { \@currname.\@currext }
+	{#1}
+}
+
+\cs_new:Npn \UR_Define@BoolKey [#1]#2 {
+	\UR_Define@Key:n {
+		#2 .bool_gset:c = {g_UR@#1_bool},
+		#2 .default:n = {true}
+	}
+}
+
+\cs_new:Nn \UR_set@InitialValue:nn {
+	\UR_Define@Key:n {
+		#1 .initial:n = #2
+	}
+}
+
+
+
+
+%\NewDocumentCommand{\UR_Define@ComplementaryKey}{smmD<>{}}{
+\cs_new:Npn \UR_Define@ComplementaryKey [#1]#2 {
+	\UR_Define@Key:n 
+	{
+		#2 .bool_gset_inverse:c = {g_UR@#1_bool},
+		#2 .default:n = {true},
+	}
+}
+
+
+\newcommand*{\UR_new@BoolOpt}{
+	\@dblarg\UR_Define@BoolKey
+}
+
+
+\newcommand*{\UR@define@draftfinalkeys}{
+	\UR_new@BoolOpt{draft}
+	\UR_Define@ComplementaryKey[draft]{final}
+}
+
+%\UR@create@ChoiceKey{key}[default]{{value}{code},{value}{code}}<initial value>
+\NewDocumentCommand\UR@create@ChoiceKey{momd<>}{
+	\UR_Define@Key:n{
+		#1 .choice:
+	}
+	\clist_map_inline:nn {#3} {
+		\UR_Define@Key:xnn {#1 / \use_i:nn ##1} { .code:n} {\use_ii:nn ##1}
+	}
+	\IfNoValueF{#4}{
+		\UR_set@InitialValue:nn {#1}{#4}
+	}
+	\IfNoValueF{#2}{\UR_Define@Key:n { #1 .default:n = #2}}
+}
+
+\newcommand*{\UR@DeclareColorOptions}{
+	\Module@DefineSpecialPassKey{colors}<URrules>
+	\clist_map_inline:Nn \g_UR@dep_clist  {\Module@DeclarePassOption{##1}[true]{URrules}}
+	\clist_map_inline:nn {all,faculties} {\Module@DeclarePassOption{##1}[true]{URrules}}
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/URpagestyles.sty b/Master/texmf-dist/tex/latex/urcls/URpagestyles.sty
new file mode 100644
index 00000000000..8e1fd4a540f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/urcls/URpagestyles.sty
@@ -0,0 +1,169 @@
+%% 
+%%  This is file `URpagestyles.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2016--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage{URpagestyles}{\filedate}{\fileversion}{Pagestyles adapting the corporate design of the University of Regensburg}
+
+\RequirePackage{URoptions}
+
+\Define@specialopt@Module
+
+\UR_new@BoolOpt{origlayout}
+
+
+\Module@DeclarePassOption{automark}{scrlayer-scrpage}
+
+\clist_map_inline:nn {logo,draft,intern,final}{\Module@DeclarePassOption{#1}{URrules}}
+
+%KeyVal-Options for passing on to automatically loaded packages
+\Module@DefineSpecialPassKey{URrules}
+\Module@DefineSpecialPassKey{URcolors}
+\Module@DefineSpecialPassKey{scrlayer-scrpage}
+\Module@DefineSpecialPassKey{scrlayer}
+
+\UR@DeclareColorOptions
+
+
+
+%Key=Value Passing to Package
+\clist_map_inline:nn {headsepline,headtopline,footsetline,footbotline}{\Module@DeclarePassOption{#1}{scrlayer-scrpage}}
+
+
+\Module@Process@SpecialOptions
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+
+	
+\RequirePackage{URrules}
+\RequirePackage{scrlayer-scrpage}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Titelseitenstil
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\UR@create@titlebox{UR@titlebox}
+
+\DeclareNewLayer[align=lt,area={0pt}{0pt}{\paperwidth}{7\UR@title@halfradius},foreground,contents={
+	\usebox\UR@titlebox
+}]{UR.titlehead}
+
+\DeclareNewPageStyleByLayers{URtitle}{UR.titlehead}
+	
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Seitenstile URheadings und plain.URheadings
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newpairofpagestyles[scrheadings]{URheadings}{}
+
+\newcommand{\UR@koma@rule}[1]{%
+	 \begingroup
+	 \normalfont
+	    	\vbox to \z@{%
+	    		\kern -\dimexpr \csname sls@#1@linethickness\endcsname\relax%height
+	    		\ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi
+	    		\if@twoside\ifodd\value{page}\else
+	    		\ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi
+	    		\fi\fi
+	    		\if@tempswa
+	    		\hskip \z@\@plus 1fill\@minus \paperwidth
+	    		\fi
+	    		\if@twoside\ifodd\value{page}
+	    		\expandafter\usebox\csname UR@koma@#1\endcsname
+	    		\else
+	    		\reflectbox{\expandafter\usebox\csname UR@koma@#1\endcsname}
+	    		\fi
+	    		\else
+	    		\expandafter\usebox\csname UR@koma@#1\endcsname
+	    		\fi
+	    		\ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi
+	    		\if@twoside\ifodd\value{page}\else
+	    		\ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi
+	    		\fi\fi
+	    		\if@tempswa
+	    		\hskip \z@\@plus 1fill\@minus \paperwidth\null
+	    		\fi
+	 }%
+	 \endgroup
+	}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Linienebenendeklaration
+\NewDocumentCommand{\UR@line@DeclareLayer}
+{mm}{%head/foot; above/below;%opt:align tl bei headsepline; 4background/forground; voffset
+\AtBeginDocument{
+\expandafter\ifdim\dimexpr\csname sls@#1#2@linethickness\endcsname\relax=\z@
+	\expandafter\newsavebox\csname UR@koma@#1#2\endcsname
+\else
+	\bool_if:NTF \g_UR@origlayout_bool
+		{\UR@create@linebox*[\csname sls@#1#2@linethickness\endcsname]{UR@koma@#1#2}}
+		{\UR@create@linebox[\csname sls@#1#2@linethickness\endcsname]<\csname sls@#1#2@linelength\endcsname>{UR@koma@#1#2}}
+\fi
+}
+\ModifyLayer[contents={\UR@koma@rule{#1#2}}]{URheadings.#1.#2.line}
+\ModifyLayer[contents={\UR@koma@rule{#1#2}}]{plain.URheadings.#1.#2.line}
+}
+
+\UR@line@DeclareLayer{head}{above}
+\UR@line@DeclareLayer{head}{below}
+\UR@line@DeclareLayer{foot}{above}
+\UR@line@DeclareLayer{foot}{below}
+
+\AtEndOfPackage{
+	\pagestyle{URheadings}
+	\clearpairofpagestyles
+	\ohead{\headmark}
+	\ofoot[\if@twoside\pagemark\fi]{\if@twoside\pagemark\fi}%
+	\cfoot[\if@twoside\else\pagemark\fi]{\if@twoside\else\pagemark\fi}%
+	}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%origlayout: Linien so positioniert, wie auf der Titelseite
+\bool_if:NT \g_UR@origlayout_bool {\KOMAoptions{ilines}} 
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/URrules.sty b/Master/texmf-dist/tex/latex/urcls/URrules.sty
new file mode 100644
index 00000000000..b677d607487
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/urcls/URrules.sty
@@ -0,0 +1,304 @@
+%% 
+%%  This is file `URrules.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2016--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage{URrules}{\filedate}{\fileversion}{Creation of colored bars for urcls-bundle}
+   
+\RequirePackage{URoptions}
+
+\ExplSyntaxOn
+
+
+\Define@specialopt@Module
+
+\int_new:N \g_UR@dep_int
+\int_new:N \l_UR@temp_int
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Optionen zum aktivieren einzelner Farben
+
+\int_zero:N \l_UR@temp_int
+\prop_new:N \g_UR@DepNumKeys_prop
+
+
+\clist_map_inline:Nn \g_UR@dep_clist {
+	\int_incr:N \l_UR@temp_int
+	\UR_Define@BoolKey [dep\int_use:N \l_UR@temp_int] {#1}
+	\prop_put:Nnx \g_UR@DepNumKeys_prop	{#1} {\int_use:N \l_UR@temp_int}
+}
+
+%Sammelaktivierung: all=alle Farben, faculties=alle 11 Fakultäten
+\UR_new@BoolOpt{all}
+\UR_new@BoolOpt{faculties}
+
+\UR_Define@Key:n {
+	logo .code:n = {\def\UR@opt@logo{#1}},
+	colors .code:n = {\UR_Set@Key:n {#1}}
+}
+
+\UR_new@BoolOpt{beamer}%beamerspezifische Definitionen
+
+%Tonersparender Briefkopf oder draft
+\UR_new@BoolOpt{intern}
+\UR_new@BoolOpt[intern]{draft}
+\UR_Define@ComplementaryKey[intern]{final}
+
+\UR_new@BoolOpt{origlayout}%Linien mit demselben Spacing, wie die Titelseitenlayouts
+
+\UR_Define@Key:n {
+	all .code:n = {\clist_map_inline:nn 
+		{lov,ffg,asz,rw,ww,kt,pkgg,pps,slk,bvm,mat,ph,chp,med,ub,zsk,eur,zhw,rul,zfw,spo,rz}
+		{\bool_gset_true:c {g_UR@dep\prop_item:Nn \g_UR@DepNumKeys_prop {##1}_bool}}
+	},
+	faculties .code:n = {\clist_map_inline:nn 
+		{rw,ww,kt,pkgg,pps,slk,bvm,mat,ph,chp,med}
+		{\bool_gset_true:c {g_UR@dep\prop_item:Nn \g_UR@DepNumKeys_prop {##1}_bool}}
+	}
+}
+
+
+\Module@Process@SpecialOptions
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+
+
+
+\int_set:Nn \l_UR@temp_int {1}
+\int_while_do:nn {\l_UR@temp_int<\clist_count:N \g_UR@dep_clist} {%
+	\bool_if:cT{g_UR@dep\int_use:N\l_UR@temp_int _bool}{\int_gincr:N \g_UR@dep_int
+		}
+	\int_incr:N \l_UR@temp_int
+}
+
+
+\RequirePackage{tikz}
+\RequirePackage{URcolors}
+
+%Längen
+%%%Skalierung des Logos & Titelblocks
+%%halber Radius der Kugel
+\expandafter\ifx\csname UR@title@halfradius\endcsname\relax
+\newlength{\UR@title@halfradius}
+\setlength{\UR@title@halfradius}{\dimexpr\paperwidth/42\relax}
+\fi
+
+\box_new:N \UR@titlelogo@box
+\cs_if_exist:NTF \UR@opt@logo
+	{\exp_args:Nx \tl_if_eq:nnTF {\UR@opt@logo} {fsimphy}
+		{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{FSIlogotext}}}
+		{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{\UR@opt@logo}}}
+	}
+	{\bool_if:NTF \g_UR@intern_bool
+		{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{urlogotextintern}}}
+		{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{urlogotext}}}
+	}
+%		\bool_if:cTF {g_UR@dep23_bool}
+%		{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{FSIlogotext}}}
+%		{\bool_if:NTF \g_UR@intern_bool
+%			{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{urlogotextintern}}}
+%			{\hbox_set:Nn \UR@titlelogo@box {\includegraphics[width=12\UR@title@halfradius]{urlogotext}}}
+%		}
+%	}
+	
+
+
+
+%Style für die Logos
+\tikzset{UR@logo/.style={inner~sep=0pt, anchor=north~west, outer~sep=0pt},
+	UR@linewidth/.style={line~width=.4pt}
+	}
+
+
+%Warning bei fehlender Farboptionenangabe
+\int_compare:nT {\g_UR@dep_int = 0}{
+	\msg_new:nnn {URrules.sty} {nocolor} {You~didn't~specify~a~color~option.~The~usually~colored~area~is~set~empty.}
+	\msg_warning:nn {URrules.sty} {nocolor}
+}
+
+%Definition der Längen für die Konstruktion der Boxen & Linien
+\dim_new:N \l_UR@linelength_dim
+\dim_new:N \l_UR@linewidth_dim
+\dim_new:N \l_UR@colorlength_dim
+\int_new:N \l_UR@color_int
+
+%Definition von \UR@create@linebox*[Dicke]<Länge>{csname}
+\NewDocumentCommand\UR@create@linebox{sO{3pt}D<>{\paperwidth-10\UR@title@halfradius}m}{
+	\dim_set:Nn \l_UR@linewidth_dim {#2}
+	\dim_set:Nn \l_UR@linelength_dim {#3}
+	\dim_set:Nn \l_UR@linelength_dim {.5\l_UR@linelength_dim}
+	\box_new:c {#4}
+	\if_bool:N \g_UR@intern_bool
+			\hbox_gset:cn {#4}{
+				\begin{tikzpicture}[UR@linewidth]
+				\IfBooleanTF{#1}
+					{\useasboundingbox (0,0) rectangle (-\dimexpr 10\UR@title@halfradius-1in-\hoffset-\oddsidemargin\relax,-\l_UR@linewidth_dim);}
+					{\useasboundingbox (0,0) rectangle (2\l_UR@linelength_dim,-\l_UR@linewidth_dim);}
+				\fill[UR@reingrau](0,0)rectangle(\l_UR@linelength_dim,-\l_UR@linewidth_dim);
+				\draw[UR@reingrau](\l_UR@linelength_dim,\dimexpr-\l_UR@linewidth_dim+.5\pgflinewidth\relax)--(\dimexpr2\l_UR@linelength_dim-.5\pgflinewidth\relax,\dimexpr-\l_UR@linewidth_dim+.5\pgflinewidth\relax)--(\dimexpr2\l_UR@linelength_dim-.5\pgflinewidth\relax,-.5\pgflinewidth)--(\l_UR@linelength_dim,-.5\pgflinewidth);
+				\end{tikzpicture}
+				}
+	\else:
+		\int_zero:N \l_UR@color_int
+		\int_set:Nn \l_UR@temp_int {1}
+		\hbox_gset:cn {#4}
+		{
+			\begin{tikzpicture}[baseline=(current~bounding~box.center)]
+			\IfBooleanTF{#1}
+				{\useasboundingbox (0,0) rectangle (-\dimexpr 10\UR@title@halfradius-1in-\hoffset-\oddsidemargin\relax,-\l_UR@linewidth_dim);}
+				{\useasboundingbox (0,0) rectangle (2\l_UR@linelength_dim,-\l_UR@linewidth_dim);}
+			\fill[UR@reingrau](0,0)rectangle+(\l_UR@linelength_dim,-\l_UR@linewidth_dim);
+			\coordinate(grauerstreifen) at (\l_UR@linelength_dim,-\l_UR@linewidth_dim);
+			\int_compare:nF {\g_UR@dep_int = 0}
+			{
+				\dim_set:Nn \l_UR@colorlength_dim {\l_UR@linelength_dim/\g_UR@dep_int}
+				\int_while_do:nn {\l_UR@temp_int<24}{%
+					\exp_after:wN \if_bool:N \cs:w g_UR@dep\int_use:N\l_UR@temp_int _bool\cs_end:
+						\fill[UR@color@\int_use:N \l_UR@temp_int](grauerstreifen)++(\l_UR@color_int\l_UR@colorlength_dim,0)rectangle+(\l_UR@colorlength_dim,\l_UR@linewidth_dim);
+						\int_incr:N \l_UR@color_int
+					\fi:
+					\int_incr:N \l_UR@temp_int
+				}
+			}
+			\end{tikzpicture}%
+		}
+	\fi:
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Definition von \UR@create@colorlinebox[Dicke]<Länge>{csname}
+\NewDocumentCommand\UR@create@colorlinebox{O{3pt}D<>{\paperwidth-10\UR@title@halfradius}m}{
+	\dim_set:Nn \l_UR@linewidth_dim {#1}
+	\dim_set:Nn \l_UR@linelength_dim {#2}
+	\box_new:c {#3}
+	\if_bool:N \g_UR@intern_bool
+	\hbox_gset:cn {#3}
+	{
+		\begin{tikzpicture}[UR@linewidth]
+		\useasboundingbox[clip] (0,0) rectangle (\l_UR@linelength_dim,-\l_UR@linewidth_dim);
+		\draw(.5\pgflinewidth,.5\pgflinewidth) rectangle (\dimexpr\l_UR@linelength_dim-.5\pgflinewidth,\dimexpr-\l_UR@linewidth_dim+.5\pgflinewidth\relax);
+		\end{tikzpicture}
+	}
+	\else:
+	\int_compare:nF {\g_UR@dep_int = 0}{\dim_set:Nn \l_UR@colorlength_dim {\l_UR@linelength_dim/\g_UR@dep_int}
+	\int_zero:N \l_UR@color_int
+	\int_set:Nn \l_UR@temp_int {1}
+	\hbox_gset:cn {#3}
+	{
+		\begin{tikzpicture}
+		\useasboundingbox (0,0) rectangle (\l_UR@linelength_dim,-\l_UR@linewidth_dim);
+		\int_while_do:nn {\l_UR@temp_int<24}{%
+			\exp_after:wN \if_bool:N \cs:w g_UR@dep\int_use:N\l_UR@temp_int _bool\cs_end:
+			\path[fill=UR@color@\int_use:N \l_UR@temp_int](\l_UR@color_int\l_UR@colorlength_dim,0)rectangle++(\l_UR@colorlength_dim,-\l_UR@linewidth_dim);
+			\int_incr:N \l_UR@color_int
+			\fi:
+			\int_incr:N \l_UR@temp_int
+		}
+		\end{tikzpicture}%
+	}
+	}
+	\fi:
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Definition von \UR@create@titlebox{csname}
+\NewDocumentCommand\UR@create@titlebox{m}{
+	\dim_set:Nn \l_UR@linelength_dim {(\paperwidth-10\UR@title@halfradius)/2}
+%	\int_compare:nT {\g_UR@dep_int != 0}{\dim_set:Nn \l_UR@colorlength_dim {\l_UR@linelength_dim/\g_UR@dep_int}}
+	\box_new:c {#1}
+\if_bool:N \g_UR@intern_bool
+			\hbox_gset:cn {#1} 
+	{
+			%schwarz weißer Kopf für interne Verwendung
+			\begin{tikzpicture}[UR@linewidth]
+			\useasboundingbox (0,0) rectangle (\paperwidth,-7\UR@title@halfradius);
+			\draw(10\UR@title@halfradius,-\UR@title@halfradius)--++(0,-2\UR@title@halfradius)--++(.98\l_UR@linelength_dim,0)++(.02\l_UR@linelength_dim,2\UR@title@halfradius)--++(0,-2\UR@title@halfradius)--++(\l_UR@linelength_dim,0);
+			\draw(3\UR@title@halfradius,-1\UR@title@halfradius)node[UR@logo]{\usebox\UR@titlelogo@box};%\pgfuseimage{titlelogo}};
+			\end{tikzpicture}
+	}
+\else:
+		\int_zero:N \l_UR@color_int
+		\int_set:Nn \l_UR@temp_int {1}
+		\hbox_gset:cn {#1} 
+		{
+%		%Farbiger Kopf
+			\begin{tikzpicture}
+			\useasboundingbox (0,0) rectangle (\paperwidth,-7\UR@title@halfradius);
+			\path[fill=UR@reingrau](10\UR@title@halfradius,0)rectangle++(\l_UR@linelength_dim,-3\UR@title@halfradius);
+			\coordinate(grauerstreifen) at (10\UR@title@halfradius+\l_UR@linelength_dim,-3\UR@title@halfradius);
+			\node[UR@logo] at (3\UR@title@halfradius,-\UR@title@halfradius) {\usebox\UR@titlelogo@box};%\pgfuseimage{titlelogo}};
+			\int_compare:nF {\g_UR@dep_int = 0}
+%			{\UR@nocolorwarn}
+			{
+				\dim_set:Nn \l_UR@colorlength_dim {\l_UR@linelength_dim/\g_UR@dep_int}
+				\int_while_do:nn {\l_UR@temp_int<24}
+				{
+					\exp_after:wN \if_bool:N \cs:w g_UR@dep\int_use:N\l_UR@temp_int _bool\cs_end:
+						\path[fill=UR@color@\int_use:N \l_UR@temp_int](grauerstreifen)++(\l_UR@color_int\l_UR@colorlength_dim,0)rectangle+(\l_UR@colorlength_dim,3\UR@title@halfradius);
+						\int_incr:N \l_UR@color_int
+					\fi:
+				\int_incr:N \l_UR@temp_int
+				}
+			}
+			\end{tikzpicture}
+		}
+\fi:
+	}
+
+%\URrule{department clist}{width}{height}
+\NewDocumentCommand\URrule{mmm}{
+	\bool_if:NTF \g_UR@intern_bool {
+		\textcolor{UR@reingrau}{\rule{#2}{#3}}
+	}{
+	\begin{tikzpicture}
+	\coordinate(nextpos) at (0,0);
+	\clist_map_inline:nn {#1} {
+		\prop_get:NnN \g_UR@DepNumKeys_prop {##1} \l_tmpa_tl
+		\path[fill=UR@color@\csname l_tmpa_tl\endcsname](nextpos)rectangle++({#2/\clist_count:n {#1}},#3)++(0,-#3)coordinate(nextpos);
+	}
+	\end{tikzpicture}
+	}
+}
+
+
+\ExplSyntaxOff
+
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/urcls/URspecialopts.sty b/Master/texmf-dist/tex/latex/urcls/URspecialopts.sty
new file mode 100644
index 00000000000..f2342e45edd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/urcls/URspecialopts.sty
@@ -0,0 +1,172 @@
+%% 
+%%  This is file `URspecialopts.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2016--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage{URspecialopts}{\filedate}{\fileversion}{Implementation of keyval-options accepting multiple values as grouped clists}
+
+\RequirePackage{l3keys2e}
+\RequirePackage{xparse}
+
+%defining Keys for specialopts own Options:
+\keys_define:nn { specialopts.sty }
+{
+	%enabling passkeyprocessing (initially true)
+	passkey .bool_set:N = \l_specialopts@PassKey_bool,
+	passkey .default:n = true,
+	passkey .initial:n = true,
+
+	special .bool_set:N = \l_specialopts@Special_bool,
+	special .default:n = true,
+	special .initial:n = true
+}
+
+
+\ProcessKeysPackageOptions{ specialopts.sty }
+
+\NewDocumentCommand\Define@specialopt@Module{O{\@currname.\@currext}}{
+	\bool_if:NT \l_specialopts@Special_bool {\clist_new:c {l_#1@SpecialKey_clist}}
+	\bool_if:NT \l_specialopts@PassKey_bool {\clist_new:c {l_#1@PassKey_clist}}
+}
+
+\NewDocumentCommand\Module@DefineSpecialPassKey{O{\@currname.\@currext}md<>}{
+	\clist_put_right:cx {l_#1@PassKey_clist} {#2}
+	\tl_new:c {l_#1@#2@values_tl}
+	\IfNoValueF{#3}{\tl_new:c {l_#1@#2@package_tl} \tl_set:cn {l_#1@#2@package_tl} {#3}}
+}
+
+\cs_new:Nn \specialopt_Parse@OptionValue:n {\tl_if_empty:nF {#1} {=#1}}
+
+\NewDocumentCommand\Module@DeclarePassOption{sO{\@currname.\@currext}mO{}m}{
+	\exp_args:Nx	\keys_define:nn {#2} {
+		#3 .code:n = {\IfBooleanTF{#1}
+			{\PassOptionsToClass{#3\specialopt_Parse@OptionValue:n {##1}}{#5}}
+			{\PassOptionsToPackage{#3\specialopt_Parse@OptionValue:n {##1}}{#5}}
+		},
+	}
+}
+
+% Define a SpecialKey (#2) using code (#3) 
+% the code inside #3 can use one Argument   (#1) 
+% the Argument will be the token list containing the values
+\NewDocumentCommand\Module@DefineSpecialKey{O{\@currname.\@currext}mm}{
+	\clist_put_right:cx {l_#1@SpecialKey_clist} {#2}
+	\tl_new:c {l_#1@#2@values_tl}
+	\cs_new:cpn {SpecialKey_#1@#2_code:c} ##1 {#3} 
+}
+
+
+%[Module]{clist-item: Names to Filter}{clist-item: unprocessed Options}
+% remove all specialopts from unprocessed options
+\cs_new:Npn \Module@Options@Filter:xcc [#1]#2#3 {
+%	\clist_show:c {#2}
+%	\clist_show:c {#3}
+	\clist_set_eq:Nc \l_specialopts_Compare@Key_clist {#2}
+	\clist_clear:N \l_specialopts_unprocessed@Key_clist
+	\tl_set:Nx \l_specialopts_CompareModule_tl {#1}
+	\exp_args:NNNx \keyval_parse:NNn  \specialopts_Compare@KeyLists:n \specialopts_Compare@KeyLists:nn {\clist_use:cn {#3} {,}}
+	\clist_set_eq:cN {#3} \l_specialopts_unprocessed@Key_clist
+%	\clist_show:c {#3}
+}
+
+\msg_new:nnn {URspecialopts.sty} {no-specialopt-value} {You entered a specialopt or pass key (#1) without any value. \\\\
+	Ignoring this key.
+}
+
+%Variant for Keys without values
+\cs_new:Nn \specialopts_Compare@KeyLists:n {
+	\clist_if_in:NnTF \l_specialopts_Compare@Key_clist {#1} 
+		{\msg_warning:nnn {URspecialopts.sty} {no-specialopt-value} {#1}}
+		{\clist_put_right:Nx \l_specialopts_unprocessed@Key_clist {#1}}
+	}
+
+%Variante for Keys with values
+\cs_new:Nn \specialopts_Compare@KeyLists:nn {
+	\clist_if_in:NnTF \l_specialopts_Compare@Key_clist {#1}
+		{\tl_put_right:cx {l_\l_specialopts_CompareModule_tl @#1@values_tl}{#2}}
+		{
+			\tl_if_in:nnTF {#2} {,}
+				{\clist_put_right:Nx \l_specialopts_unprocessed@Key_clist {#1={#2}}}
+				{\clist_put_right:Nx \l_specialopts_unprocessed@Key_clist {#1=#2}}
+		}
+	}
+
+
+%Create Module@Process@SpecialOptions [module]
+\bool_lazy_any:nTF {{\l_specialopts@PassKey_bool} {\l_specialopts@Special_bool}}
+{
+	\NewDocumentCommand{\Module@Process@SpecialOptions}{O{\@currname.\@currext}}{
+		\clist_new:c {l_#1@unprocessed_clist}
+		\clist_set:cx {l_#1@unprocessed_clist} {\@ptionlist{\@currname.\@currext}}
+		\bool_if:NTF \l_specialopts@PassKey_bool {
+			\clist_if_empty:cF {l_#1@PassKey_clist}{
+				\Module@Options@Filter:xcc [#1]{l_#1@PassKey_clist}{l_#1@unprocessed_clist}
+				\clist_map_inline:cn {l_#1@PassKey_clist} {
+					\exp_args:Nc \tl_if_blank:VF {l_#1@##1@values_tl}{
+						\PassOptionsToPackage{\tl_use:c {l_#1@##1@values_tl}}{
+							\tl_if_exist:cTF {l_#1@##1@package_tl}
+								{\tl_use:c {l_#1@##1@package_tl}}
+								{##1}
+						}
+					}
+				}
+			}
+		}
+		{\clist_if_empty:cF {l_#1@PassKey_clist}}
+	\bool_if:NT \l_specialopts@Special_bool {
+		\clist_if_empty:cF {l_#1@SpecialKey_clist}{
+			\Module@Options@Filter:xcc [#1]{l_#1@SpecialKey_clist}{l_#1@unprocessed_clist}
+			\clist_map_inline:cn {l_#1@SpecialKey_clist} {
+				\exp_args:Nnc \use:c {SpecialKey_#1@##1_code:c} {l_#1@##1@values_tl}
+			}
+		}
+	}
+	\expandafter\edef\csname opt@\@currname.\@currext\endcsname{\clist_use:cn {l_#1@unprocessed_clist} {,}}%{\tl_use:N \l_tmpb_tl}
+	\if_meaning:w\@currext\@clsextension
+	\edef\@classoptionslist{\clist_use:cn {l_#1@unprocessed_clist} {,}}
+	\fi:	
+	}
+}{
+	\let\Module@Process@SpecialOptions\relax
+}
+\ExplSyntaxOff
+
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/urcls/beamercolorthemeUR.sty b/Master/texmf-dist/tex/latex/urcls/beamercolorthemeUR.sty
index 05b70863c35..0700295b2e7 100644
--- a/Master/texmf-dist/tex/latex/urcls/beamercolorthemeUR.sty
+++ b/Master/texmf-dist/tex/latex/urcls/beamercolorthemeUR.sty
@@ -1,23 +1,50 @@
-% Copyright 2015 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% under the LaTeX Project Public License
-%
-\def\fileversion{1.0}
-\def\filedate{2013/03/16}
-\ProvidesPackage{beamercolorthemeUR}[\filedate\space\fileversion\space colortheme for URbeamer.cls]
+%% 
+%%  This is file `beamercolorthemeUR.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\ProvidesPackage{beamercolorthemeUR}[\filedate\space v\fileversion\space colortheme for URbeamer.cls]
 
 \mode<presentation>
 
-%\definecolor{UR@reingrau}{RGB}{142,142,141}
-\definecolor{UR@hellgrau}{RGB}{191,191,191}
-\definecolor{UR@dunkelgrau}{RGB}{89,89,88}
-%\definecolor{URph}{RGB}{0,137,147}
-%\definecolor{URorange}{RGB}{248,96,0}
-%\definecolor{URblauhell}{RGB}{8,116,170}
-%\colorlet\departmentcolor\URph
-%
-\setbeamercolor*{frametitle}{fg=UR@dunkelgrau,bg=white}
+\setbeamercolor*{frametitle}{fg=UR@dunkelgrau,bg=}
 \setbeamercolor*{normal text}{fg=black,bg=white}
 \setbeamercolor*{alerted text}{fg=UR@color@alert!80!UR@reingrau,bg=white}
 \setbeamercolor*{footline}{fg=black,bg=white}
@@ -37,7 +64,12 @@
 \setbeamercolor{title}{fg=black}
 \setbeamercolor{subtitle}{fg=white}
 
-\mode
-<all>
+\setbeamercolor{headline}{fg=blue}
+
+\setbeamercolor{headline framenumber}{fg=white}
+
+\setbeamercolor{draftblocks}{bg=UR@hellgrau!50,fg=black}
+
+\mode<all>
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/beamerfontthemeUR.sty b/Master/texmf-dist/tex/latex/urcls/beamerfontthemeUR.sty
index 8a9c953141d..180f6cf383b 100644
--- a/Master/texmf-dist/tex/latex/urcls/beamerfontthemeUR.sty
+++ b/Master/texmf-dist/tex/latex/urcls/beamerfontthemeUR.sty
@@ -1,26 +1,71 @@
-% Copyright 2014 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% 1. under the LaTeX Project Public License
-\def\fileversion{1.0}
-\def\filedate{2014/02/14}
-\ProvidesPackage{beamerfontthemeUR}[\filedate\space\fileversion\space fonttheme for URbeamer.cls]
+%% 
+%%  This is file `beamerfontthemeUR.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\ProvidesPackage{beamerfontthemeUR}[\filedate\space v\fileversion\space fonttheme for URbeamer.cls]
 
 \mode<presentation>
 
-\beamer@suppressreplacementstrue% no special font settings
-\setbeamerfont{tiny structure}{series=\mdseries,size=\tiny}
-\setbeamerfont{frametitle}{size=\large,series=\bfseries}
-\setbeamerfont{framesubtitle}{size=\footnotesize}
+\setbeamerfont*{tiny structure}{series=\mdseries,size=\tiny}
+\setbeamerfont*{frametitle}{size=\large,series=\bfseries}
+\setbeamerfont*{framesubtitle}{size=\normalsize}
 \setbeamerfont*{footline}{size=\Tiny}
-\setbeamerfont{title}{size*={16}{18},series=\bfseries}
-\setbeamerfont{subtitle}{size*={16}{18},series=\bfseries}
-\setbeamerfont*{author}{size*={10}{11}}
-\setbeamerfont{institute}{size*={10}{11}}
-\setbeamerfont{date}{size*={10}{9.8}}
+\setbeamerfont*{title}{size*={16}{18},series=\bfseries}
+\setbeamerfont*{subtitle}{parent={title}}
+
+\setbeamerfont*{author}{size*={10}{10.8}}
+\setbeamerfont*{institute}{parent={author}}
+\setbeamerfont*{chair}{parent={author}}
+\setbeamerfont*{date}{parent={author}}
+
+\setbeamerfont*{department}{size*={7.7}{8},series=\bfseries}
+
+
+\setbeamerfont*{shortauthor}{size*={6}{6},series=\bfseries}
+\setbeamerfont*{shortinstitute}{size*={6}{6}}
+\setbeamerfont*{shortchair}{size*={6}{6}}
+\setbeamerfont*{shortdepartment}{size*={5}{6},series=\bfseries}
 
+\setbeamerfont{framenumber}{size=\large}
 
-\mode
-<all>
+\mode<all>
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/beamerouterthemeUR.sty b/Master/texmf-dist/tex/latex/urcls/beamerouterthemeUR.sty
index 5bc50593c24..4dbccd65b41 100644
--- a/Master/texmf-dist/tex/latex/urcls/beamerouterthemeUR.sty
+++ b/Master/texmf-dist/tex/latex/urcls/beamerouterthemeUR.sty
@@ -1,230 +1,483 @@
-% Copyright 2015 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% under the LaTeX Project Public License
-%
-
-\def\fileversion{1.4}
-\def\filedate{2015/06/15}
-\ProvidesPackage{beamerouterthemeUR}[\filedate\space\fileversion\space
-beamer-outertheme im Corporate Design der Universität Regensburg]
-
-%Booleans
-%22 Booleans zum aktivieren/deaktivieren der einzelnen Abteilungsfarben
-\newcounter{UR@runner}
-\RequirePackage{ifthen}
-%Create Booleans UR@Dep@\the\value{UR@runner}
-\def\newdep#1{\expandafter\@ifdefinable\csname ifUR@dep@#1\endcsname{%
-		\expandafter\newif\csname ifUR@dep@#1\endcsname}}
-\whiledo{\value{UR@runner}<23}{\stepcounter{UR@runner}\newdep{\the\value{UR@runner}}}
-\newboolean{UR@coloredboxes}
-%\newboolean{UR@draft}
-\newboolean{fsimphy}
-\newboolean{UR@externalize}
-
-%Counter-Definitionen
-\newcounter{UR@dep}
-\newcounter{UR@temp} %temporärer counter zum Abtasten
-\newcounter{UR@color}
-%Optionen zum aktivieren einzelner Farben
-\DeclareOption{lov}{\setboolean{UR@dep@1}{true}\stepcounter{UR@dep}}
-\DeclareOption{ffg}{\setboolean{UR@dep@2}{true}\stepcounter{UR@dep}}
-\DeclareOption{asz}{\setboolean{UR@dep@3}{true}\stepcounter{UR@dep}}
-\DeclareOption{rw}{\setboolean{UR@dep@4}{true}\stepcounter{UR@dep}}
-\DeclareOption{ww}{\setboolean{UR@dep@5}{true}\stepcounter{UR@dep}}
-\DeclareOption{kt}{\setboolean{UR@dep@6}{true}\stepcounter{UR@dep}}
-\DeclareOption{pkgg}{\setboolean{UR@dep@7}{true}\stepcounter{UR@dep}}
-\DeclareOption{pps}{\setboolean{UR@dep@8}{true}\stepcounter{UR@dep}}
-\DeclareOption{slk}{\setboolean{UR@dep@9}{true}\stepcounter{UR@dep}}
-\DeclareOption{bvm}{\setboolean{UR@dep@10}{true}\stepcounter{UR@dep}}
-\DeclareOption{mat}{\setboolean{UR@dep@11}{true}\stepcounter{UR@dep}}
-\DeclareOption{ph}{\setboolean{UR@dep@12}{true}\stepcounter{UR@dep}}
-\DeclareOption{chp}{\setboolean{UR@dep@13}{true}\stepcounter{UR@dep}}
-\DeclareOption{med}{\setboolean{UR@dep@14}{true}\stepcounter{UR@dep}}
-\DeclareOption{ub}{\setboolean{UR@dep@15}{true}\stepcounter{UR@dep}}
-\DeclareOption{zsk}{\setboolean{UR@dep@16}{true}\stepcounter{UR@dep}}
-\DeclareOption{eur}{\setboolean{UR@dep@17}{true}\stepcounter{UR@dep}}
-\DeclareOption{zhw}{\setboolean{UR@dep@18}{true}\stepcounter{UR@dep}}
-\DeclareOption{rul}{\setboolean{UR@dep@19}{true}\stepcounter{UR@dep}}
-\DeclareOption{zfw}{\setboolean{UR@dep@20}{true}\stepcounter{UR@dep}}
-\DeclareOption{spo}{\setboolean{UR@dep@21}{true}\stepcounter{UR@dep}}
-\DeclareOption{rz}{\setboolean{UR@dep@22}{true}\stepcounter{UR@dep}}
-\DeclareOption{fsimphy}{\setboolean{UR@dep@23}{true}\stepcounter{UR@dep}\setboolean{fsimphy}{true}}
-\DeclareOption{externalize}{\setboolean{UR@externalize}{true}}
-\DeclareOption{coloredboxes}{\setboolean{UR@coloredboxes}{true}}
-\DeclareOption{all}{\setcounter{UR@temp}{1}\whiledo{\value{UR@temp}<23}{\setboolean{UR@dep@\arabic{UR@temp}}{true}\stepcounter{UR@dep}\stepcounter{UR@temp}}}
-\DeclareOption{faculties}{\setcounter{UR@temp}{4}\whiledo{\value{UR@temp}<15}{\setboolean{UR@dep@\arabic{UR@temp}}{true}\stepcounter{UR@dep}\stepcounter{UR@temp}}}
-\ProcessOptions\relax
-%Notwendige Pakete
-\RequirePackage{calc}
-\RequirePackage{tikz,pgf}
-\usetikzlibrary{calc}
-\RequirePackage[RGB]{URcolors}
-
-
-\setcounter{UR@temp}{1}
-\setcounter{UR@color}{0}
-\ifthenelse{\boolean{UR@coloredboxes}}{
-	\ifnum\value{UR@dep}=1
+%% 
+%%  This is file `beamerouterthemeUR.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage{beamerouterthemeUR}{\filedate}{\fileversion}{beameroutertheme for the University of Regensburg}
+
+\RequirePackage{URoptions}
+
+\Define@specialopt@Module
+
+\clist_map_inline:nn {logotext,alignwithbar,framenumber,externalize,coloredboxes,depcaps} {\UR_new@BoolOpt {#1}}
+
+\UR@define@draftfinalkeys
+
+\bool_new:N \g_UR@ShowHeadline_bool
+\bool_new:N \g_UR@ShowHeadauthor_bool
+
+\UR@create@ChoiceKey{headline}[true]{
+	{true}{
+		\bool_gset_true:N \g_UR@ShowHeadline_bool
+		\bool_gset_true:N \g_UR@ShowHeadauthor_bool
+		\def\UR@headline@setting{true/author}
+	},
+	{false}{
+		\bool_gset_false:N \g_UR@ShowHeadline_bool
+		\bool_gset_false:N \g_UR@ShowHeadauthor_bool
+		\def\UR@headline@setting{false/empty}	
+	},
+	{plain}{
+		\bool_gset_true:N \g_UR@ShowHeadline_bool
+		\bool_gset_false:N \g_UR@ShowHeadauthor_bool
+		\def\UR@headline@setting{plain/noauthor}
+	},
+	{default}{
+		\bool_gset_true:N \g_UR@ShowHeadline_bool
+		\bool_gset_true:N \g_UR@ShowHeadauthor_bool
+		\def\UR@headline@setting{default (true)}
+	}
+}<default>
+
+\UR_Define@Key:n {
+	headline / noauthor .meta:n = {headline=plain},
+	headline / empty .meta:n = {headline=false},
+	headline / author .meta:n = {headline=true}
+}
+
+\UR_Define@Key:n {
+	cdlayout .meta:n = {depcaps=#1,logotext=#1,alignwithbar=#1},
+	cdlayout .default:n = true
+}
+
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+
+
+\PassOptionsToPackage{RGB}{URcolors}
+\RequirePackage{URrules}
+
+% New Variables
+%Headlineboxes
+\box_new:N \g_UR@headline@author_box
+\box_new:N \g_UR@headline_box
+\dim_new:N \l_UR@halfradius_dim
+
+
+%Additional Title Definitions
+
+% \author command
+\newcommand*{\URbeamerIgnoreMeta}[1]{\texorpdfstring{#1}{}}
+
+\def\author{\@dblarg\UR@beamer@author}
+\long\def\UR@beamer@author[#1]#2{%
+	\def\insertauthor{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}#2}%
+	\def\beamer@shortauthor{#1}%
+	\ifbeamer@autopdfinfo%	
+	{
+	\let\URbeamerIgnoreMeta\use_none:n\let\inst=\@gobble\let\thanks=\@gobble\def\and{, }
+	\tl_set:Nx \l_tmpa_tl {#2}
+	\tl_if_empty:NF \l_tmpa_tl  {
+		\seq_set_split:NnV \l_tmpa_seq {\and} \l_tmpa_tl
+		\hypersetup{pdfauthor={\seq_use:Nn \l_tmpa_seq {, }}}
+		}
+	}
+	\fi%
+}
+
+\author{}
+%end of \author command
+
+%institude command
+\def\institute{\@dblarg\beamer@institute}
+\long\def\beamer@institute[#1]#2{%
+	\def\beamer@temp{#2}%
+	\ifx\beamer@temp\@empty
+	\def\insertinstitute{}
 	\else
-	\ClassError{urbeamer}{You selected more than one department}{coloredboxes are not available if more than one color has been choosen}
-	\fi}{}
+	\def\insertinstitute{\def\inst{\beamer@instinst}\def\and{\beamer@andinst}#2}%
+	\fi
+	\def\beamer@shortinstitute{#1}
+	\def\UR@beamer@insertinstitute{#2}}
+\institute{}
+%end of institute command
+
+%\department command
+\def\department{\@dblarg\UR@beamer@department}
 
-\ifnum\value{UR@dep}=1
-\whiledo{\value{UR@temp}<23}{
-	\ifthenelse{\boolean{UR@dep@\value{UR@temp}}}{\colorlet{UR@color@basic}{UR@color@\arabic{UR@temp}}
+\if_bool:N \g_UR@depcaps_bool
+\RequirePackage{textcase}
+\newcommand{\UR@depcaps}[1]{\MakeTextUppercase{#1}}
+
+\long\def\UR@beamer@department[#1]#2{%
+	\def\beamer@temp{#2}
+	\ifx\beamer@temp\@empty
+	\def\insertdepartment{}
+	\else
+	\def\insertdepartment{%
+		\cs_set_protected:Npn \and {\newline}
+		\cs_set_protected:Npn \inst ####1 {
+			\beamer@instinst{####1}
+		}
+		\UR@depcaps{#2}
+	}%
+	\fi
+	\def\beamer@shortdepartment{
+		\let\inst\use_none:n
+		\def\and{\quad}
+		\UR@depcaps{#1}
 	}
-	{}
-	\stepcounter{UR@temp}
-}\setcounter{UR@temp}{1}
-\hypersetup{allcolors=UR@color@basic}
-\else
-\definecolor{UR@color@basic}{RGB}{142,142,141}
-\fi
-
-\ifnum\value{UR@dep}=1
-\whiledo{\value{UR@temp}<24}{
-	\ifthenelse{\boolean{UR@dep@\value{UR@temp}}}{\colorlet{UR@color@alert}{-UR@color@\arabic{UR@temp}}\colorlet{UR@color@example}{UR@color@\arabic{UR@temp}}}
-	{}
-	\stepcounter{UR@temp}
-}
-\setcounter{UR@temp}{1}
-\else
-\colorlet{UR@color@alert}{red}
-\colorlet{UR@color@example}{green}
-\fi
+}
+
+\else:
+\long\def\UR@beamer@department[#1]#2{%
+	\def\beamer@temp{#2}%
+	\ifx\beamer@temp\@empty
+	\def\insertdepartment{}
+	\else
+	\def\insertdepartment{\def\inst{\beamer@instinst}\def\and{\qquad}#2}%
+	\fi
+	\def\beamer@shortdepartment{#1}}
+\fi:
+\department{}
+
+\newcommand\insertshortdepartment[1][]{%
+	{%
+		\let\thanks=\@gobble%
+		\beamer@setupshort{#1}%
+		\beamer@insertshort{\beamer@shortdepartment}%
+}}
+%end of \department command
+
+% \chair command
+\def\chair{\@dblarg\UR@beamer@chair}
+\long\def\UR@beamer@chair[#1]#2{%
+	\def\beamer@temp{#2}%
+	\ifx\beamer@temp\@empty
+	\def\insertchair{}
+	\else
+	\def\insertchair{#2}%
+	\fi
+	\def\beamer@shortchair{#1}}
+\chair{}
+
+\newcommand\insertshortchair[1][]{%
+	{%
+		\beamer@setupshort{#1}%
+		\beamer@insertshort{\beamer@shortchair}%
+}}
+% end of \chair command
 
 \mode<presentation>
-%Notwendige Definitionen
-\newlength{\x}%halber Radius der Kugel
-\setlength{\x}{0.43cm}
-\setlength{\unitlength}{\x}
-%%    Breite der Farbstreifen festlegen
-\newlength{\streifen}	
-\setlength{\streifen}{\paperwidth-10\x}
-%    \ifthenelse{\boolean{fsimphy}}{
-%    \pgfdeclareimage[width=12\x]{titlepagelogo}{FSIlogotext}
-%    }{
-%    \pgfdeclareimage[width=12\x]{titlepagelogo}{urlogotext}} % placed on the title page
-\newlength{\y} %halber radius kleine kugel in kopfzeile
-\setlength{\y}{0.5\x}
-%  	\ifthenelse{\boolean{fsimphy}}{\pgfdeclareimage[height=4\y]{headlinelogo}{FSIlogo}}{
-%  	\pgfdeclareimage[height=4\y]{headlinelogo}{urlogo.pdf}}
-\newlength{\hstreifen}
-\setlength{\hstreifen}{0.5\paperwidth}
-\addtolength{\hstreifen}{-3.75\y}
-\pgfdeclareimage[height=4\y]{headlinelogo}{urlogo}
-\pgfdeclareimage[width=12\x]{titlepagelogo}{urlogotext}
-%\logo{\pgfuseimage{headlinelogo}}
-\titlegraphic{\pgfuseimage{titlepagelogo}}
-
-\newcommand{\tikzmark}[1]{\tikz[overlay,remember picture] \node (#1) {};}
-
-%   	
-%Option für tikzexternalize 
-\ifthenelse{\boolean{UR@externalize}}{\usetikzlibrary{external}}{\newcommand\tikzexternalenable\relax\newcommand\tikzexternaldisable\relax} 
-
-%
-%Headline & Footline
-
-\defbeamertemplate*{headline}{URtheme}{\tikzexternaldisable%
-	\vspace*{-1mm}
-	\begin{tikzpicture}[remember picture,line width=0pt]
-	\node at (0,0) {};
-	\node[anchor=north west] at (0.5\y,-0.5\y) {\pgfuseimage{headlinelogo}};
-	\coordinate (NWHB) at ($(0.5\y,0)+7*(\y,0)$);
-	\coordinate (SMHB) at ($0.5*(\paperwidth,-5\y)+3.5*(\y,0)$);
-	\coordinate (NEHB) at (\paperwidth,0);
-	\node[anchor=north west] at ($(SMHB)$){\hspace*{-.5\fboxsep}\parbox{0.4\paperwidth}{
-			{\fontsize{6}{6.6}\selectfont\bfseries\insertshortauthor}\vspace*{1pt}
-			
-			{\fontsize{6}{6.6}\selectfont\insertshortinstitute}
-		}};
-		\end{tikzpicture}
-		\ifthenelse{\boolean{UR@draft}}{
-			\begin{tikzpicture}[overlay,remember picture,line width=0pt]
-			\draw (NWHB)rectangle(SMHB)rectangle(NEHB);
-			\end{tikzpicture}
-		}{
-		\begin{tikzpicture}[overlay,remember picture,line width=0pt]
-		\filldraw[UR@reingrau] (NWHB)rectangle(SMHB);
+
+\cs_new:Nn \UR_setup@author@headline: {
+	\UR@tikzexternaldisable
+	\hbox_gset:Nn \g_UR@headline@author_box {
+		\begin{tikzpicture}
+		\UR_beamer@headline:
+		\node[anchor=north~west,inner~ysep=1.5pt, inner~xsep=0pt, outer~sep=0pt] at (grauerstreifen) {
+			\parbox[t][\dimexpr3.2\UR@beamer@halfradius-3pt\relax][t]{\dimexpr\l_UR@linelength_dim-1.5pt\relax}{
+				{\usebeamerfont{shortauthor}
+					\insertshortauthor[width=\linewidth]\par}
+				\expandafter\ifx\csname beamer@shortinstitute\endcsname\empty
+				\expandafter\ifx\csname beamer@shortchair\endcsname\empty
+				\else%
+				{\usebeamerfont{shortchair}\insertshortchair[width=\linewidth]\par}
+				\fi%
+				\else%
+				{\usebeamerfont{shortinstitute}\insertshortinstitute[width=\linewidth]\par}
+				\fi%
+				\usebeamerfont{shortdepartment}\insertshortdepartment[width=\linewidth]
+			}
+		};
+		\useasboundingbox(0,0)rectangle(\paperwidth,-6.2\UR@beamer@halfradius);
 		\end{tikzpicture}
-		\ifthenelse{\boolean{UR@draft}}{}{
-			\setcounter{UR@temp}{1}
-			\setcounter{UR@color}{0}
-			\whiledo{\value{UR@temp}<24}{
-				\ifthenelse{\boolean{UR@dep@\value{UR@temp}}}{
-					\begin{tikzpicture}[overlay,remember picture,line width=0pt]
-					\filldraw[UR@color@\arabic{UR@temp}]($(SMHB)+\arabic{UR@color}*(\hstreifen/\arabic{UR@dep},0)$)rectangle ($(SMHB)+\arabic{UR@color}*(\hstreifen/\arabic{UR@dep},0)+(0,5\y)+(\streifen/\arabic{UR@dep},0)$);
-					\end{tikzpicture}
-					\stepcounter{UR@color}}
-				{}
-				\stepcounter{UR@temp}
+	}
+	\UR@tikzexternalenable
+}
+
+
+
+\setbeamertemplate{navigation symbols}{}
+
+%End of additional Title definitions and adjustments
+
+
+\int_while_do:nn {\l_UR@temp_int<\clist_count:N \g_UR@dep_clist} {
+	\int_incr:N \l_UR@temp_int
+	\bool_if:cT{g_UR@dep\int_use:N\l_UR@temp_int _bool}{\colorlet{UR@color@basic}{UR@color@\int_use:N\l_UR@temp_int}}
+}
+
+\bool_if:NTF \g_UR@coloredboxes_bool {
+	\int_compare:nTF {\g_UR@dep_int =  1} {
+	\int_zero:N \l_UR@temp_int
+	\int_while_do:nn {\l_UR@temp_int<\clist_count:N \g_UR@dep_clist} {
+		\int_incr:N \l_UR@temp_int
+		\bool_if:cT{g_UR@dep\int_use:N\l_UR@temp_int _bool}{\colorlet{UR@color@basic}{UR@color@\int_use:N\l_UR@temp_int}}
+		}
+	}{
+		\msg_new:nnn {beamerouterthemeUR}{coloredboxes_multiple}{You~ must~ not~ select~ multiple~ color~ options~ with~ coloredboxes.\\\\
+			coloredboxes~ is~ only~ available~ for~ single~ color~ setup.\\\\
+			Disabling~ coloredboxes.
+		}
+		\msg_warning:nn {beamerouterthemeUR}{coloredboxes_multiple}
+		\colorlet{UR@color@basic}{UR@reingrau}
+	}
+	}
+	{\colorlet{UR@color@basic}{UR@reingrau}}
+
+\int_compare:nTF {\g_UR@dep_int =  1} {
+\int_zero:N \l_UR@temp_int
+\int_while_do:nn {\l_UR@temp_int<\clist_count:N \g_UR@dep_clist} {
+	\int_incr:N \l_UR@temp_int
+	\bool_if:cT{g_UR@dep\int_use:N\l_UR@temp_int _bool}{
+		\colorlet{UR@color@alert}{-UR@color@\int_use:N\l_UR@temp_int}
+		\colorlet{UR@color@example}{UR@color@\int_use:N\l_UR@temp_int}
+	}
+}
+}{
+\colorlet{UR@color@alert}{red}
+\colorlet{UR@color@example}{green}
+}
+
+\dim_set:Nn \l_UR@halfradius_dim {.215cm}
+\newlength{\UR@beamer@halfradius}
+\setlength{\UR@beamer@halfradius}{\l_UR@halfradius_dim}
+
+\UR@create@colorlinebox[3\UR@beamer@halfradius]<(\paperwidth-10\UR@beamer@halfradius)/2>{UR_beamer@headbar}
+
+\cs_new:Nn \UR_beamer@headline:
+{	
+	\dim_set:Nn \l_UR@linelength_dim {(\paperwidth-10\UR@beamer@halfradius)/2}
+	\fill[UR@reingrau](10\UR@beamer@halfradius,0)rectangle++(\l_UR@linelength_dim,-3\UR@beamer@halfradius);
+	\coordinate(grauerstreifen) at (10\UR@beamer@halfradius+\l_UR@linelength_dim,-3\UR@beamer@halfradius);
+	\node[UR@logo] at (3\UR@beamer@halfradius,-\UR@beamer@halfradius) {\UR_beamer@headlinelogo:};
+	\node[anchor=south~west,inner~sep=0pt,outer~sep=0pt] at (grauerstreifen) {\box_use:N \UR_beamer@headbar};
+}
+
+%Logo Declaration
+%\if option fsimphy is active use corresponding logo instead of UR
+
+
+\bool_if:NTF \g_UR@draft_bool {
+	\cs_new:Nn \UR_beamer@headlinelogo: {\tikz\draw(0,0)rectangle(12\UR@beamer@halfradius,4\UR@beamer@halfradius);}
+	\cs_new:Nn \UR_beamer@titlelogo: {\tikz\draw(0,0)rectangle(24\UR@beamer@halfradius,8\UR@beamer@halfradius);}
+}{
+	\cs_new:Nn \UR_beamer@headlinelogo: {\pgfuseimage{UR@beamer@headlinelogo}}
+	\cs_new:Nn \UR_beamer@titlelogo: {\pgfuseimage{UR@beamer@titlepagelogo}}
+	\cs_if_exist:NTF \UR@opt@logo {
+		\exp_args:Nx \tl_if_eq:nnTF {\UR@opt@logo} {fsimphy}
+			{\pgfdeclareimage[width=24\UR@beamer@halfradius]{UR@beamer@titlepagelogo}{FSIlogotext}
+				\bool_if:NTF \g_UR@logotext_bool
+				{\pgfdeclareimage[width=12\UR@beamer@halfradius]{UR@beamer@headlinelogo}{FSIlogotext}}
+				{\pgfdeclareimage[height=4\UR@beamer@halfradius]{UR@beamer@headlinelogo}{FSIlogo}}
+			}{
+			\pgfdeclareimage[width=24\UR@beamer@halfradius]{UR@beamer@titlepagelogo}{\UR@opt@logo}
+			\pgfdeclareimage[width=12\UR@beamer@halfradius]{UR@beamer@headlinelogo}{\UR@opt@logo}
 			}
-		}}\tikzexternalenable} 
-	
-\setbeamertemplate*{footline}{}
-% Sidebar
+	}{
+		\pgfdeclareimage[width=24\UR@beamer@halfradius]{UR@beamer@titlepagelogo}{urlogotext}
+		\bool_if:NTF \g_UR@logotext_bool
+			{\pgfdeclareimage[width=12\UR@beamer@halfradius]{UR@beamer@headlinelogo}{urlogotext}}
+			{\pgfdeclareimage[height=4\UR@beamer@halfradius]{UR@beamer@headlinelogo}{urlogo}}
+	}
+}
 
-\setbeamertemplate*{sidebar left}{}
-\setbeamertemplate*{sidebar right}{}
-\setbeamertemplate*{sidebar canvas left}{}
-\setbeamertemplate*{sidebar canvas right}{}
 
-% Frame title
-\defbeamertemplate*{frametitle}{UR}{\parbox{\textwidth}{\usebeamerfont*{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle}\hfill}
+\titlegraphic{\UR_beamer@titlelogo:}
 
-%Title Page
-\defbeamertemplate*{title page}{URtheme}{
-	\tikzexternaldisable%
-	\begin{tikzpicture}[shift={(-1,3.7)},remember picture,overlay]  %($(a) + 1/3*(1cm,0)$)
-	\coordinate (NWC) at (0,0); % North West Corner of the slide
-	\coordinate (NEC) at (\paperwidth,0); %North East Corner of the slide
-	\coordinate (LC) at (0,-\paperheight); %lower left corner of the slide
-	\coordinate (NWB) at ($10*(\x,0)-2/3*(0,\paperheight)$); %north west corner of the bar
-	\coordinate (NEB) at ($(\paperwidth,0)-2/3*(0,\paperheight)$);
-	\coordinate (SWB) at (10\x,-2/3\paperheight-3\x);
-	\coordinate (SEB) at ($(\paperwidth,0)-2/3*(0,\paperheight)-(0,3\x)$);
-	\coordinate (NWL) at (3\x,-2/3*\paperheight-\x);%north west corner of the logo
-	\coordinate (NWT) at ($10*(\x,0)-1/3*(0,\paperheight)$); %north west of the title box
-	\coordinate (SWA) at ($10*(\x,0)-2/3*(0,\paperheight)$); %south west of the author box
-	\fill[UR@hellgrau](NWC)rectangle(NEB);
-	\node[anchor=north west] at ($3*(\x,0)-2/3*(0,\paperheight)-(0,\x)$) {\inserttitlegraphic};
+%Option für tikzexternalize
+\bool_if:NTF \g_UR@externalize_bool{
+	\ExplSyntaxOff
+    \usetikzlibrary{external}
+    \ExplSyntaxOn
+    \newcommand*\UR@tikzexternalenable{\tikzexternalenable}
+    \newcommand*\UR@tikzexternaldisable{\tikzexternaldisable}
+}{
+    \newcommand*\UR@tikzexternalenable{\relax}
+    \newcommand*\UR@tikzexternaldisable{\relax}
+}
+
+
+\hbox_gset:Nn \g_UR@headline_box {
+	\UR@tikzexternaldisable
+	\begin{tikzpicture}
+	\UR_beamer@headline:
+	\useasboundingbox(0,0)rectangle(\paperwidth,-6.2\UR@beamer@halfradius);
 	\end{tikzpicture}
-	\ifthenelse{\boolean{UR@draft}}{}{
-		%Taste nun alle Einrichtungen ab
-		\setcounter{UR@temp}{1}
-		\setcounter{UR@color}{0}
-		\whiledo{\value{UR@temp}<24}{
-			\ifthenelse{\boolean{UR@dep@\value{UR@temp}}}{
-				\begin{tikzpicture}[overlay,remember picture,line width=0pt]
-				\filldraw[UR@color@\arabic{UR@temp}]($(NWB)+\arabic{UR@color}*(\streifen/\arabic{UR@dep},0)$)rectangle ($(NWB)+\arabic{UR@color}*(\streifen/\arabic{UR@dep},0)-(0,3\x)+(\streifen/\arabic{UR@dep},0)$);
-				\end{tikzpicture}
-				\stepcounter{UR@color}}
-			{}
-			\stepcounter{UR@temp}
+	\UR@tikzexternalenable
+}
+
+\AtBeginDocument{\UR_setup@author@headline:}
+
+\defbeamertemplate{headline}{URtheme~author}{
+	\UR@tikzexternaldisable
+	\box_use:N \g_UR@headline@author_box
+	\bool_if:NT \g_UR@framenumber_bool {
+		\par
+		\usebeamercolor[fg]{headline~framenumber}\usebeamerfont{framenumber}
+		\tikz{
+			\useasboundingbox (0,0) -- (\paperwidth,0);
+			\node[anchor=east, outer~sep=0pt,inner~ysep=0pt,inner~xsep=3pt] at 
+			(\paperwidth, \dim_eval:n {\box_ht:N\g_UR@headline@author_box +\box_dp:N\g_UR@headline@author_box - 1.5\UR@beamer@halfradius})
+			{\insertframenumber};
 		}
 	}
-	\vspace*{-1.3mm}\par
-	\begin{tikzpicture}[overlay,remember picture]
-	\node[anchor=north west] at ($(NWT)-(\fboxsep,0)$) {%
+	\UR@tikzexternalenable
+}
+
+\defbeamertemplate{headline}{URtheme~plain}{%
+	\UR@tikzexternaldisable
+	\box_use:N \g_UR@headline_box
+	\bool_if:NT \g_UR@framenumber_bool {
+		\par
+		\usebeamercolor[fg]{headline~framenumber}\usebeamerfont{framenumber}
+		\tikz{
+			\useasboundingbox (0,0) -- (\paperwidth,0);
+			\node[anchor=east, outer~sep=0pt,inner~ysep=0pt,inner~xsep=3pt] at 
+			(\paperwidth, \dim_eval:n {\box_ht:N\g_UR@headline_box +\box_dp:N\g_UR@headline_box - 1.5\UR@beamer@halfradius})
+			{\insertframenumber};
+		}
+	}
+}
+
+%Set default headline template
+\bool_if:NTF \g_UR@ShowHeadline_bool {
+	\bool_if:NTF \g_UR@ShowHeadauthor_bool {
+		\defbeamertemplatealias{headline}{URtheme}{URtheme~author}
+	}{
+		\defbeamertemplatealias{headline}{URtheme}{URtheme~plain}
+	}
+}{
+	\defbeamertemplatealias{headline}{URtheme}{URtheme~empty}
+}
+
+
+\setbeamertemplate{headline}[URtheme]
+
+
+% Frame title
+\defbeamertemplate*{frametitle}{URtheme}[1][left]
+{
+\nointerlineskip
+  \@tempdima=\textwidth%
+  \begin{beamercolorbox}[#1,wd=\the\@tempdima]{frametitle}
+    \usebeamerfont{frametitle}%
+    \vbox{}\vskip-1ex%
+    \if@tempswa\else\csname beamer@fte#1\endcsname\fi%
+    \strut\insertframetitle\strut\par%
+    {%
+      \ifx\insertframesubtitle\@empty%
+      \else%
+      {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle\strut\par}%
+      \fi
+    }%
+    \vskip-1ex%
+    \if@tempswa\else\vskip-.3cm\fi% set inside beamercolorbox... evil here...
+  \end{beamercolorbox}%
+}
+
+\UR@create@colorlinebox[-6\UR@beamer@halfradius]<\paperwidth-20\UR@beamer@halfradius>{UR@beamer@titlecolorbox}
+
+%Title Page
+\defbeamertemplate*{title~page}{URtheme}{
+	\UR_setup@author@headline:
+	\begin{beamercolorbox}[wd=\paperwidth,ht=\paperheight]{title~page}
+	\UR@tikzexternaldisable%
+	\begin{tikzpicture}
+	\useasboundingbox (0,0) rectangle (\paperwidth,-\paperheight);
+	\coordinate (NWB) at (20\UR@beamer@halfradius,-2\paperheight/3); %north west corner of the bar
+	\coordinate (NEB) at (\paperwidth,-2\paperheight/3);%north east corner of the bar
+	\coordinate (NWL) at (6\UR@beamer@halfradius,-2\paperheight/3-2\UR@beamer@halfradius);%north west corner of the logo
+	\coordinate (NWT) at (20\UR@beamer@halfradius,-\paperheight/3); %north west of the title box
+	\coordinate (SWA) at (20\UR@beamer@halfradius,-2\paperheight/3); %south west of the author box
+	\fill[UR@hellgrau](current~bounding~box.north~ west)rectangle(NEB);
+	\node[UR@logo] at (NWL) {\inserttitlegraphic};%(6\UR@beamer@halfradius,-2\paperheight/3-\UR@beamer@halfradius)
+	\node[UR@logo] at (NWB) {\usebox{\UR@beamer@titlecolorbox}};
+		\node[anchor=south~west,inner~xsep=0pt, inner~ysep=.2em,outer~sep=0pt] (authordata) at (SWA)
+		{\begin{minipage}[b]{.65\paperwidth}
+			\usebeamerfont{author}
+			{\usebeamerfont{date}\usebeamercolor[fg]{date}\insertdate\par}%
+			{\usebeamerfont{author}\usebeamercolor[fg]{author}\insertauthor\par}%
+			\ifx\insertdepartment\empty
+				\ifx\insertchair\empty
+				\else
+					{\usebeamerfont{chair}\usebeamercolor[fg]{chair}\insertchair\par}%
+				\fi
+				\par\vspace{.2\baselineskip}
+				{\usebeamerfont{department}\usebeamercolor[fg]{department}\insertinstitute\par}%
+			\else%
+				\ifx\insertinstitute\empty
+					{\usebeamerfont{chair}\usebeamercolor[fg]{chair}\insertchair\par}%
+				\else%
+					{\usebeamerfont{institute}\usebeamercolor[fg]{institute}\insertinstitute\par}%
+				\fi%
+			\par\vspace{.2\baselineskip}
+			{\usebeamerfont{department}\usebeamercolor[fg]{department}\insertdepartment\par}
+			\fi
+		\end{minipage}
+		};
+		\node[inner~sep=0pt,outer~sep=0pt,anchor=south~west] at (authordata.north~west) {%
 		\begin{minipage}[t]{.65\paperwidth}
-		{\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle}\vspace*{1pt}
-		
+		{\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle}
+		\par
+		\vspace{.2\baselineskip}
 		{\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle}
 		\end{minipage}
 	};
-	\node[anchor=south west] at ($(SWA)+(-\fboxsep,0)$)
-	{\begin{minipage}[b]{.65\paperwidth}
-		{\usebeamerfont{date}\usebeamercolor[fg]{date}\insertdate}
-		
-		{\usebeamerfont{author}\usebeamercolor[fg]{author}\insertauthor}
-		
-		{\usebeamerfont{institute}\usebeamercolor[fg]{institute}\fontsize{9}{9.6}\selectfont\bfseries\insertinstitute}
-		\end{minipage}
-	};
-	\end{tikzpicture}\tikzexternalenable
-}%
+	\end{tikzpicture}
+	\end{beamercolorbox}
+\UR@tikzexternalenable
+}
+
+\bool_if:NTF \g_UR@alignwithbar_bool
+	{\setbeamersize{text~ margin~ left=10\UR@beamer@halfradius,text~ margin~ right=3\UR@beamer@halfradius}}
+	{\setbeamersize{text~ margin~ left=3\UR@beamer@halfradius,text~ margin~ right=3\UR@beamer@halfradius}}
+	
+\def\maketitle{
+	\ifbeamer@inframe\titlepage\else\frame{\titlepage}\fi
+}
+
+
+\setbeamertemplate{navigation~symbols}{}
 
+\mode<all>
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/tex/latex/urcls/beamerthemeUR.sty b/Master/texmf-dist/tex/latex/urcls/beamerthemeUR.sty
index 0a85d9ca9af..ce8eaa07623 100644
--- a/Master/texmf-dist/tex/latex/urcls/beamerthemeUR.sty
+++ b/Master/texmf-dist/tex/latex/urcls/beamerthemeUR.sty
@@ -1,19 +1,75 @@
-% Copyright 2015 by Marei Peischl
-%
-% This file may be distributed and/or modified
-% under the LaTeX Project Public License
-%
+%% 
+%%  This is file `beamerthemeUR.sty' version 2.0 (2017/04/05),
+%%	it is part of
+%%  urcls -- Corporate Design for the University of Regensburg
+%% ----------------------------------------------------------------------------
+%%
+%%  Copyright (C) 2014--2017 by Marei Peischl <TeX@mareipeischl.de>
+%%
+%% ----------------------------------------------------------------------------
+%%  License information
+%% ----------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Marei Peischl.
+%%
+%% ============================================================================
+%%
+%%  Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+%%  in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+%%  Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+%%  Version 1.3c oder neuer ist Teil aller LaTeX-Distributionen ab 2005/12/01. 
+%%  Dieses Werk hat den LPPL-Verwaltungs-Status "maintained". 
+%%  Die Verwaltung liegt aktuell bei der Autorin, Marei Peischl.
+%%
+%% ----------------------------------------------------------------------------
+%%  End of license information
+%% ----------------------------------------------------------------------------
+%%
+
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.0}
+\def\filedate{2017/04/05}
+
+\RequirePackage{expl3}
+\ProvidesExplPackage {beamerthemeUR} {\filedate} {\fileversion} {beamer theme for the University of Regensburg}
+
+\RequirePackage{URoptions}
+\Define@specialopt@Module
+
+\UR@DeclareColorOptions
+\UR@define@draftfinalkeys
+
+\clist_map_inline:nn {headline,logotext,alignwithbar,framenumber,externalize,coloredboxes,depcaps,cdlayout} {\Module@DeclarePassOption {#1} {beamerouterthemeUR}}
 
-\def\fileversion{1.0}
-\def\filedate{2015/01/28}
-\ProvidesPackage{beamerthemeUR}[\filedate\space\fileversion\space
-beamer-theme im Corporate Design der Universität Regensburg]
+\Module@DeclarePassOption {logo} [] {URrules}
+\Module@DeclarePassOption {intern} {URrules}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{beamer}}
+
+
+\Module@Process@SpecialOptions
+\exp_args:Nx \ProcessKeysOptions { \@currname.\@currext }
+\ProcessOptions*
 
 \mode<presentation>
 %
+
 \usecolortheme{UR}
 \usefonttheme{UR}
 \useoutertheme{UR}
 
+
 \setbeamertemplate{blocks}[rounded][shadow=true]
+
+\mode<all>
+
 \endinput
\ No newline at end of file