tuda-ci (9sep20)

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

1 files changed, 475 insertions, 427 deletions

diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
index 700fbd0c6af..f42c0378918 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 2.11 (2020/06/12),
+%% This is file `tudapub.cls' version 3.00 (2020/09/08),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,168 +26,189 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{2.11}
-\def\filedate{2020/06/12}
+\def\fileversion{3.00}
+\def\filedate{2020/09/08}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudapub}
-	{\filedate}{\fileversion}{Publications using TU Darmstadt's Coporate Design (TUDa-CI)}
+	{\filedate}{\fileversion}{Publications using TU Darmstadt's Corporate Design (TUDa-CI)}
 
 \RequirePackage{l3keys2e}
 \RequirePackage{URspecialopts}
 
-\Define@specialopt@Module[TUDa/special]
+\Define@specialopt@Module[ptxcd/pub]
 
 
+\str_const:Nn \c__ptxcd_base_str {pub}
+\tl_new:N \g_ptxcd_pub_class_tl
+\tl_new:N \g_ptxcd_thesis_options_tl
 
-\tl_new:N \g_TUDa_pub_class_tl
-\tl_new:N \g_TUDa_thesis_options_tl
+\prop_new:N \g_ptxcd_clsopts_prop
+\prop_new:N \g_ptxcd_unknown_clsopts_prop
+\prop_gput:Nnn \g_ptxcd_clsopts_prop {titlepage} {firstiscover}
+\prop_gput:Nnn \g_ptxcd_clsopts_prop {captions} {nooneline}
 
-\prop_new:N \g_TUDa_clsopts_prop
-\prop_new:N \g_TUDa_unknown_clsopts_prop
-\prop_gput:Nnn \g_TUDa_clsopts_prop {titlepage} {firstiscover}
-\prop_gput:Nnn \g_TUDa_clsopts_prop {captions} {nooneline}
-
-\int_new:N \g_TUDa_ruledheaders_int
-\int_new:N \g_TUDa_paper_int
-\msg_new:nnnn {TUDa} {compatibility-only} {
+\int_new:N \g_ptxcd_ruledheaders_int
+\int_new:N \g_ptxcd_paper_int
+\msg_new:nnnn {tudapub} {compatibility-only} {
 	You~used~the~outdated~#1~option.\\
 	This~only~exists~due~to~compatibility~reasons.
 }{
 	Please~look~at~tuda-ci~documentation~for~further~information~and~avoid~using~outdated~options.
 }
 
-\bool_new:N \g_TUDa_geometry_bool
-\bool_new:N \g_TUDa_custommargins_bool
+\bool_new:N \g_ptxcd_geometry_bool
+\bool_new:N \g_ptxcd_custommargins_bool
 
-\keys_define:nn {TUDa/pub} {
+\keys_define:nn {ptxcd/pub} {
 	%twoside -> geometry + class
 	class .choice:,
 	class/report .meta:n = {class=scrreprt},
-	class/scrreprt .code:n  = \tl_gset:Nn \g_TUDa_pub_class_tl {scrreprt},
+	class/scrreprt .code:n  = \tl_gset:Nn \g_ptxcd_pub_class_tl {scrreprt},
 	class/article .meta:n = {class=scrartcl},
-	class/scrartcl .code:n  = \tl_gset:Nn \g_TUDa_pub_class_tl {scrartcl},
+	class/scrartcl .code:n  = \tl_gset:Nn \g_ptxcd_pub_class_tl {scrartcl},
 	class/book .meta:n = {class=scrbook},
-	class/scrbook .code:n  = \tl_gset:Nn \g_TUDa_pub_class_tl {scrbook},
+	class/scrbook .code:n  = \tl_gset:Nn \g_ptxcd_pub_class_tl {scrbook},
 	class .initial:n = scrartcl,%MAYBE add custom values
 	color .meta:n = {accentcolor=#1},
 	accentcolor .code:n = {\PassOptionsToPackage{accentcolor=#1}{tudacolors}},
 	textaccentcolor .code:n = {\PassOptionsToPackage{textaccentcolor=#1}{tudacolors}},
 	identbarcolor .code:n = {\PassOptionsToPackage{identbarcolor=#1}{tudacolors}},
-	marginpar .tl_gset:N = \g_TUDa_marginpar_tl,
+	marginpar .tl_gset:N = \g_ptxcd_marginpar_tl,
 	marginpar .default:n = auto,
 	marginpar .initial:n = auto,
 	custommargins .choice:,
 	custommargins / true .code:n ={
-		\bool_gset_true:N \g_TUDa_custommargins_bool
-		\bool_gset_false:N \g_TUDa_geometry_bool
+		\bool_gset_true:N \g_ptxcd_custommargins_bool
+		\bool_gset_false:N \g_ptxcd_geometry_bool
 	},
 	custommargins / false .code:n ={
-		\bool_gset_false:N \g_TUDa_custommargins_bool
-		\bool_gset_true:N \g_TUDa_geometry_bool
+		\bool_gset_false:N \g_ptxcd_custommargins_bool
+		\bool_gset_true:N \g_ptxcd_geometry_bool
 	},
 	custommargins / geometry .code:n = {
-		\bool_gset_true:N \g_TUDa_custommargins_bool
-		\bool_gset_true:N \g_TUDa_geometry_bool
+		\bool_gset_true:N \g_ptxcd_custommargins_bool
+		\bool_gset_true:N \g_ptxcd_geometry_bool
 	},
 	custommargins .initial:n = false,
 	custommargins .default:n = true,
-	fontsize .code:n = \prop_gput:Nnn \g_TUDa_clsopts_prop {fontsize} {#1},
+	fontsize .code:n = \prop_gput:Nnn \g_ptxcd_clsopts_prop {fontsize} {#1},
 	fontsize .initial:n = {9pt},
 	ruledheaders .choices:nn = {false, none, chapter, section, true,  all}{
-		\int_gset:Nn \g_TUDa_ruledheaders_int {\l_keys_choice_int}
+		\int_gset:Nn \g_ptxcd_ruledheaders_int {\l_keys_choice_int}
 	},
 	ruledheaders .initial:n = all,
-	type .choices:nn = {publication, thesis} {\tl_gset_eq:NN \g_TUDa_pubType_tl \l_keys_choice_tl},
-	type / intern .code:n = {\keys_set:nn {TUDa/pub}  {titlepage=false, pdfa=false, IMRAD=false}},
+	type .choices:nn = {publication, thesis} {\tl_gset_eq:NN \g_ptxcd_pubType_tl \l_keys_choice_tl},
+	type / intern .code:n = {\keys_set:nn {ptxcd/pub}  {titlepage=false, pdfa=false, IMRAD=false}},
 	type .initial:n = publication,
-	unknown .code:n = {\prop_gput:NVn \g_TUDa_unknown_clsopts_prop \l_keys_key_tl {#1}},
+	unknown .code:n = {\prop_gput:NVn \g_ptxcd_unknown_clsopts_prop \l_keys_key_tl {#1}},
 	headline .choice:,
-	headline / true .code:n = \bool_gset_true:N \g_TUDa_headline_bool,
-	headline / false .code:n = \bool_gset_false:N \g_TUDa_headline_bool,
-	headline / automark .code:n = {\bool_gset_true:N \g_TUDa_headline_bool \PassOptionsToPackage{automark}{scrlayer-scrpage}},
+	headline / true .code:n = \bool_gset_true:N \g_ptxcd_headline_bool,
+	headline / false .code:n = \bool_gset_false:N \g_ptxcd_headline_bool,
+	headline / automark .code:n = {\bool_gset_true:N \g_ptxcd_headline_bool \PassOptionsToPackage{automark}{scrlayer-scrpage}},
 	automark .meta:n = {headline=automark},
 	headline .initial:n =false,
-	colorback .bool_gset:N = \g_TUDa_colorback_bool,
+	colorback .bool_gset:N = \g_ptxcd_colorback_bool,
 	colorback .initial:n = true,
-	colortitleback .code:n =  \msg_warning:nnx {TUDa} {compatibility-only} {\l_keys_key_tl}\keys_set:nn {TUDa/pub} {logo=head,colorback=false},
-	pdfa .bool_gset:N = \g_TUDa@pdfa_bool,
+	colortitleback .code:n =  \msg_warning:nnx {tudapub} {compatibility-only} {\l_keys_key_tl}
+		\keys_set:nn {ptxcd/pub} {logo=head,colorback=false},
+	pdfa .bool_gset:N = \g_ptxcd_pdfa_bool,
 	pdfa .initial:n = true,
-	twocolumn .bool_gset:N = \g_TUDa_twocolumn_bool,
+	twocolumn .bool_gset:N = \g_ptxcd_twocolumn_bool,
 	twocolumn .default:n = true,
 	twocolumn .initial:n = false,
 	BCOR .code:n = \PassOptionsToPackage{bindingoffset=#1}{geometry},
 	bindingoffset .meta:n = {BCOR=#1},
-	captions .code:n = {\prop_gput:Nnx \g_TUDa_clsopts_prop {captions} {
-		\use:n {\prop_item:Nn \g_TUDa_clsopts_prop {captions}}, #1}
+	captions .code:n = {\prop_gput:Nnx \g_ptxcd_clsopts_prop {captions} {
+		\use:n {\prop_item:Nn \g_ptxcd_clsopts_prop {captions}}, #1}
 	},
-	abstract .code:n = \prop_gput:Nnn \g_TUDa_unknown_clsopts_prop {abstract} {#1},
+	abstract .code:n = \prop_gput:Nnn \g_ptxcd_unknown_clsopts_prop {abstract} {#1},
 	abstract .initial:n =true,
 	logo .choice:,
-	logo / head .code:n = {\bool_gset_true:N \g_TUDa_logo@inhead_bool},
-	logo / body .code:n = {\bool_gset_false:N \g_TUDa_logo@inhead_bool},
-	logo / top .code:n = {\bool_gset_true:N \g_TUDa_logo@inhead_bool},
-	logo / bottom .code:n = {\bool_gset_false:N \g_TUDa_logo@inhead_bool},
+	logo / head .code:n = {\bool_gset_true:N \g_ptxcd_logo@inhead_bool},
+	logo / body .code:n = {\bool_gset_false:N \g_ptxcd_logo@inhead_bool},
+	logo / top .code:n = {\bool_gset_true:N \g_ptxcd_logo@inhead_bool},
+	logo / bottom .code:n = {\bool_gset_false:N \g_ptxcd_logo@inhead_bool},
 	logo .initial:n = {body},
 	paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{
-		\int_gset_eq:NN \g_TUDa_paper_int  \l_keys_choice_int
+		\int_gset_eq:NN \g_ptxcd_paper_int  \l_keys_choice_int
 		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
 		\PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
 		\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
 	},
 	paper .initial:n = a4,
-	IMRAD .bool_gset:N = \g_TUDa_IMRAD_bool,
+	IMRAD .bool_gset:N = \g_ptxcd_IMRAD_bool,
 	IMRAD .initial:n = true,
 	IMRAD .default:n = true,
-	instbox .code:n = {\tl_gput_right:Nn \g_TUDa_thesis_options_tl {,instbox=#1}},
-	noinstbox .code:n = {\tl_gput_right:Nn \g_TUDa_thesis_options_tl {,noinstbox=#1}},
-	logofile .tl_gset:N = \g_TUDa_logofile_tl,
+	instbox .code:n = {\tl_gput_right:Nn \g_ptxcd_thesis_options_tl {,instbox=#1}},
+	noinstbox .code:n = {\tl_gput_right:Nn \g_ptxcd_thesis_options_tl {,noinstbox=#1}},
+	logofile .tl_gset:N = \g_ptxcd_logofile_tl,
 	logofile .initial:n = tuda_logo,
 	title .choice:,
 	title / default .meta:n = {title=large},
-	title / large .code:n = \bool_gset_false:N \g_TUDa_smalltitle_bool,
-	title / small  .code:n = \bool_gset_true:N \g_TUDa_smalltitle_bool,
+	title / large .code:n = \bool_gset_false:N \g_ptxcd_smalltitle_bool,
+	title / small  .code:n = \bool_gset_true:N \g_ptxcd_smalltitle_bool,
 	title .initial:n = default,
+	department .choice:,
+	department / default .code:n = \str_gset:Nn \g_ptxcd_department_str {default},
+	department / mecheng .code:n = {
+		\str_gset:Nn \g_ptxcd_department_str {mecheng}
+		\keys_set:nn {ptxcd/pub}{colorback=false,ruledheaders=section,departmentlogofile=tuda_maschinenbau_logo}
+	},
+	department .initial:n = default,
+	mecheng .meta:n = {department=mecheng},
+	departmentlogofile .tl_gset:N = \g_ptxcd_departmentlogo_tl,
+	departmentlogofile .initial:n =,
+	BCORtitlepage .bool_gset:N = \g_ptxcd_BCOR_titlepage_bool,
+	BCORtitlepage .initial:n = false,
+	BCORtitlepage .default:n = true,
 }
 %
 %%special option handling grouped values
-\Module@DefineSpecialKey[TUDa/special]{thesis}{
-	\keys_set:nn {TUDa/pub}{type=thesis}
-	\tl_gput_right:No \g_TUDa_thesis_options_tl {#1}
+\Module@DefineSpecialKey[ptxcd/pub]{thesis}{
+	\keys_set:nn {ptxcd/pub}{type=thesis}
+	\tl_gput_right:No \g_ptxcd_thesis_options_tl {#1}
 }
 
-\Module@Process@SpecialOptions[TUDa/special]
+\Module@Process@SpecialOptions[ptxcd/pub]
 
-\ProcessKeysOptions{TUDa/pub}
+\ProcessKeysOptions{ptxcd/pub}
 
 
 %Option adjustments required for valid PDF/A
-\bool_if:NT  \g_TUDa@pdfa_bool {
+\bool_if:NT  \g_ptxcd_pdfa_bool {
   \PassOptionsToPackage{RGB}{xcolor}
   \PassOptionsToPackage{T1}{tudafonts}
 }
 
-\prop_gput:Nnx \g_TUDa_clsopts_prop {twocolumn} {\bool_if:NTF \g_TUDa_twocolumn_bool {true} {false}}
+\exp_args:Nx \tl_if_eq:nnT {\prop_item:Nn \g_ptxcd_clsopts_prop {fontsize}} {9pt}
+	{
+	\prop_if_in:NnF \g_ptxcd_unknown_clsopts_prop {DIV}
+		{\PassOptionsToPackage{DIV=calc}{typearea}}
+	}
 
-\prop_map_inline:Nn \g_TUDa_clsopts_prop {
+\prop_gput:Nnx \g_ptxcd_clsopts_prop {twocolumn} {
+	\bool_if:NTF \g_ptxcd_twocolumn_bool {true} {false}
+}
+
+\prop_map_inline:Nn \g_ptxcd_clsopts_prop {
 	\tl_if_empty:nTF {#2}
-		{\PassOptionsToClass  {#1} {\g_TUDa_pub_class_tl}}
+		{\PassOptionsToClass  {#1} {\g_ptxcd_pub_class_tl}}
 		{
-		\clist_map_inline:nn {#2} {\PassOptionsToClass  {#1=##1} {\g_TUDa_pub_class_tl}}
+		\clist_map_inline:nn {#2} {\PassOptionsToClass  {#1=##1} {\g_ptxcd_pub_class_tl}}
 		}
 }
 
 
 %Load tudasize clo file if available
-\file_if_exist:nT {tudasize\prop_item:Nn \g_TUDa_clsopts_prop {fontsize}.clo}
+\file_if_exist:nT {tudasize\prop_item:Nn \g_ptxcd_clsopts_prop {fontsize}.clo}
 	{\providecommand*{\@fontsizefilebase}{tudasize}}
 
-%\PassOptionsToPackage{DIV=7}{typearea}
+\LoadClass{\g_ptxcd_pub_class_tl}
 
-\LoadClass{\g_TUDa_pub_class_tl}
 
-\prop_map_inline:Nn \g_TUDa_unknown_clsopts_prop {
-	\cs_if_exist:cT {KV@KOMA.\g_TUDa_pub_class_tl.cls@#1} {
+\prop_map_inline:Nn \g_ptxcd_unknown_clsopts_prop {
+	\cs_if_exist:cT {KV@KOMA.\g_ptxcd_pub_class_tl.cls@#1} {
 	\tl_if_empty:nTF {#2}
 		{\KOMAoptions{#1}}
 		{\KOMAoption{#1}{#2}}
@@ -195,37 +216,37 @@
 }
 
 %ruled headers
-\int_compare:nT {\g_TUDa_ruledheaders_int>=3} {
+\int_compare:nT {\g_ptxcd_ruledheaders_int>=3} {
 	\cs_if_exist:NT \chapterlinesformat {
 		\renewcommand*{\chapterlinesformat}[3]{%
 			\@hangfrom{#2}{#3}
-			\smash{\raisebox{\depth}{\rule[\dp\strutbox]{\linewidth}{\g_TUDa_titlerule_dim}}}
+			\smash{\raisebox{\depth}{\rule[\dp\strutbox]{\linewidth}{\g_ptxcd_titlerule_dim}}}
 		}
 	}
 }
-\int_compare:nT {\g_TUDa_ruledheaders_int =4 }{
+\int_compare:nT {\g_ptxcd_ruledheaders_int =4 }{
 	\renewcommand*\sectionlinesformat[4]{%
 		\tl_if_eq:nnTF {#1} {section}
 		{
 		\parbox{\linewidth}{
-		\rule[5\g_TUDa_titlerule_dim]{\linewidth}{\g_TUDa_titlerule_dim}\par\nointerlineskip
+		\rule[5\g_ptxcd_titlerule_dim]{\linewidth}{\g_ptxcd_titlerule_dim}\par\nointerlineskip
 		\@hangfrom{%
 			\hskip #2#3\strut}{#4\rule[-\dp\strutbox]{0pt}{\dp\strutbox}\par}\nointerlineskip
-		\skip_vertical:n {\TUDa_titlerule_sep: -\dp\strutbox}
-		\smash{\rule{\linewidth}{\g_TUDa_titlerule_dim}}}
+		\skip_vertical:n {\ptxcd_titlerule_sep: -\dp\strutbox}
+		\smash{\rule{\linewidth}{\g_ptxcd_titlerule_dim}}}
 		}{
 		\@hangfrom{\hskip #2#3}{#4}
 		}
 	}
 }
-\int_compare:nT {\g_TUDa_ruledheaders_int>4} {
+\int_compare:nT {\g_ptxcd_ruledheaders_int>4} {
 	\renewcommand*\sectionlinesformat[4]{%
 	\parbox{\linewidth}{
-		\rule[5\g_TUDa_titlerule_dim]{\linewidth}{\g_TUDa_titlerule_dim}\par\nointerlineskip
+		\rule[5\g_ptxcd_titlerule_dim]{\linewidth}{\g_ptxcd_titlerule_dim}\par\nointerlineskip
 		\@hangfrom{%
 			\hskip #2#3\strut}{#4\rule[-\dp\strutbox]{0pt}{\dp\strutbox}\par}\nointerlineskip
-			\skip_vertical:n {\TUDa_titlerule_sep: -\dp\strutbox}
-		\smash{\rule{\linewidth}{\g_TUDa_titlerule_dim}}
+			\skip_vertical:n {\ptxcd_titlerule_sep: -\dp\strutbox}
+		\smash{\rule{\linewidth}{\g_ptxcd_titlerule_dim}}
 	}}
 }
 
@@ -234,144 +255,141 @@
 
 
 %,~ subsection,~
-
-
-%\newcommand{\chapterlineswithprefixformat}[3]{%
-%	#2#3%
-%}
-%
-%ngerman,article,dr=phil,type=drfinal,colorback,accentcolor=TUDa-9c, fontsize=9pt,twoside=true
-
 \usepackage{tudafonts}
 
 %Margin & titlefontsize setup setup
-\bool_new:N \g_TUDa_marginpar_bool
+\bool_new:N \g_ptxcd_marginpar_bool
 
-\dim_new:N \g_TUDa_marginpar_dim
-\dim_new:N \g_TUDa_innerMargin_dim
-\dim_new:N \g_TUDa_outerMargin_dim
-\dim_new:N \g_TUDa_bottomMargin_dim
-\dim_new:N \g_TUDa_topMargin_dim
+\dim_new:N \g_ptxcd_marginpar_dim
+\dim_new:N \g_ptxcd_innerMargin_dim
+\dim_new:N \g_ptxcd_outerMargin_dim
+\dim_new:N \g_ptxcd_bottomMargin_dim
+\dim_new:N \g_ptxcd_topMargin_dim
 
 
 	%a3,a4
-	\int_compare:nTF {4<=\g_TUDa_paper_int<=5}
+	\int_compare:nTF {4<=\g_ptxcd_paper_int<=5}
 	{
-		\dim_gset:Nn \g_TUDa_bottomMargin_dim {20mm}
-		\dim_gset:Nn \g_TUDa_outerMargin_dim {15mm}
-		\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
-		\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+		\dim_gset:Nn \g_ptxcd_bottomMargin_dim {20mm}
+		\dim_gset:Nn \g_ptxcd_outerMargin_dim {15mm}
+		\dim_gset_eq:NN \g_ptxcd_innerMargin_dim \g_ptxcd_outerMargin_dim
+		\dim_gset_eq:NN \g_ptxcd_topMargin_dim \g_ptxcd_outerMargin_dim
 	}{
 	%a0, a1, a2
-		\int_compare:nT {1<=\g_TUDa_paper_int<=3}
+		\int_compare:nT {1<=\g_ptxcd_paper_int<=3}
 		{
-			\dim_gset:Nn \g_TUDa_bottomMargin_dim {35mm}
-			\dim_gset:Nn \g_TUDa_outerMargin_dim {30mm}
-			\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
-			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset:Nn \g_ptxcd_bottomMargin_dim {35mm}
+			\dim_gset:Nn \g_ptxcd_outerMargin_dim {30mm}
+			\dim_gset_eq:NN \g_ptxcd_innerMargin_dim \g_ptxcd_outerMargin_dim
+			\dim_gset_eq:NN \g_ptxcd_topMargin_dim \g_ptxcd_outerMargin_dim
 		}
 		%a5
-		\int_compare:nT {\g_TUDa_paper_int<=6}
+		\int_compare:nT {\g_ptxcd_paper_int<=6}
 		{
-			\dim_gset:Nn \g_TUDa_bottomMargin_dim {16mm}
-			\dim_gset:Nn \g_TUDa_outerMargin_dim {12mm}
-			\dim_gset_eq:NN \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
-			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset:Nn \g_ptxcd_bottomMargin_dim {16mm}
+			\dim_gset:Nn \g_ptxcd_outerMargin_dim {12mm}
+			\dim_gset_eq:NN \g_ptxcd_innerMargin_dim \g_ptxcd_outerMargin_dim
+			\dim_gset_eq:NN \g_ptxcd_topMargin_dim \g_ptxcd_outerMargin_dim
 		}
 		%a6
-		\int_compare:nT {\g_TUDa_paper_int<=7}
+		\int_compare:nT {\g_ptxcd_paper_int<=7}
 		{
-			\dim_gset:Nn \g_TUDa_bottomMargin_dim {15mm}
-			\dim_gset:Nn \g_TUDa_outerMargin_dim {10mm}
-			\dim_gset_eq:NN	 \g_TUDa_innerMargin_dim \g_TUDa_outerMargin_dim
-			\dim_gset_eq:NN \g_TUDa_topMargin_dim \g_TUDa_outerMargin_dim
+			\dim_gset:Nn \g_ptxcd_bottomMargin_dim {15mm}
+			\dim_gset:Nn \g_ptxcd_outerMargin_dim {10mm}
+			\dim_gset_eq:NN	 \g_ptxcd_innerMargin_dim \g_ptxcd_outerMargin_dim
+			\dim_gset_eq:NN \g_ptxcd_topMargin_dim \g_ptxcd_outerMargin_dim
 		}
 	}
 
-\dim_new:N \g_TUDa_columnSep_dim
-\dim_gset:Nn \g_TUDa_columnSep_dim {10pt}
+\dim_new:N \g_ptxcd_columnSep_dim
+\dim_gset:Nn \g_ptxcd_columnSep_dim {10pt}
 
 %coverpage
-\edef\coverpageleftmargin{\dim_eval:n {\g_TUDa_outerMargin_dim}}
-\renewcommand*{\coverpagetopmargin}{\g_TUDa_outerMargin_dim}
-\edef\coverpagerightmargin{\dim_eval:n {\g_TUDa_outerMargin_dim}}
-\renewcommand*{\coverpagebottommargin}{\g_TUDa_outerMargin_dim}
-
-\str_case:onTF {\g_TUDa_marginpar_tl} {
-	{true} {\bool_gset_true:N \g_TUDa_marginpar_bool}
-	{false} {\bool_gset_false:N \g_TUDa_marginpar_bool}
-	{auto} {\bool_gset_true:N \g_TUDa_marginpar_bool}
+\edef\coverpageleftmargin{\dim_eval:n {\g_ptxcd_outerMargin_dim}}
+\renewcommand*{\coverpagetopmargin}{\g_ptxcd_outerMargin_dim}
+\edef\coverpagerightmargin{\dim_eval:n {\g_ptxcd_outerMargin_dim}}
+\renewcommand*{\coverpagebottommargin}{\g_ptxcd_outerMargin_dim}
+
+\str_case:onTF {\g_ptxcd_marginpar_tl} {
+	{true} {\bool_gset_true:N \g_ptxcd_marginpar_bool}
+	{false} {\bool_gset_false:N \g_ptxcd_marginpar_bool}
+	{auto} {\bool_gset_true:N \g_ptxcd_marginpar_bool}
 } {
-	\bool_if:NT  \g_TUDa_marginpar_bool {
-		\msg_new:nnnn {TUDa} {marginpar-auto} {Setting~up~marginpar~consistent~with~layout~guidelines.} {To~turn~this~off~use~marginpar=false~option.}
-		\msg_info:nn {TUDa} {marginpar-auto}
-		\dim_gset:Nn \g_TUDa_marginpar_dim {(\paperwidth - \g_TUDa_innerMargin_dim -\g_TUDa_outerMargin_dim - 4  \g_TUDa_columnSep_dim)/5}
+	\bool_if:NT  \g_ptxcd_marginpar_bool {
+		\msg_new:nnnn {tudapub} {marginpar-auto} {Setting~up~marginpar~consistent~with~layout~guidelines.}
+		{To~turn~this~off~use~marginpar=false~option.}
+		\msg_info:nn {tudapub} {marginpar-auto}
+		\dim_gset:Nn \g_ptxcd_marginpar_dim {(\paperwidth - \g_ptxcd_innerMargin_dim -\g_ptxcd_outerMargin_dim - 4  \g_ptxcd_columnSep_dim)/5}
 	}
 } {
-	\msg_new:nnn {TUDa} {marginpar-no-key} {I~did~not~find~a~text~key~for~marginpar~setup~will~use~the~value~#1~as~width.}
-	\msg_info:nnx {TUDa} {marginpar-no-key} {\g_TUDa_marginpar_tl}
-	\bool_gset_true:N \g_TUDa_marginpar_bool
-	\dim_gset:Nn \g_TUDa_marginpar_dim {\g_TUDa_marginpar_tl}
+	\msg_new:nnn {tudapub} {marginpar-no-key} {I~did~not~find~a~text~key~for~marginpar~setup~will~use~the~value~#1~as~width.}
+	\msg_info:nnx {tudapub} {marginpar-no-key} {\g_ptxcd_marginpar_tl}
+	\bool_gset_true:N \g_ptxcd_marginpar_bool
+	\dim_gset:Nn \g_ptxcd_marginpar_dim {\g_ptxcd_marginpar_tl}
 }
 
 
-\dim_new:N \g_TUDa_headheight_dim
-\dim_new:N \g_TUDa_headwidth_dim
+\dim_new:N \g_ptxcd_headheight_dim
+\dim_new:N \g_ptxcd_headwidth_dim
 
-\bool_if:NTF \g_TUDa_headline_bool
-	{\dim_gset:Nn \g_TUDa_headheight_dim {20pt +\c_TUDa_largerule_dim +\c_TUDa_rulesep_dim +\c_TUDa_smallrule_dim}}
-	{\dim_gset:Nn \g_TUDa_headheight_dim {1.25\baselineskip +\c_TUDa_largerule_dim +\c_TUDa_rulesep_dim +\c_TUDa_smallrule_dim}}
+\bool_if:NTF \g_ptxcd_headline_bool
+	{\dim_gset:Nn \g_ptxcd_headheight_dim {20pt +\c_ptxcd_largerule_dim +\c_ptxcd_rulesep_dim +\c_ptxcd_smallrule_dim}}
+	{\dim_gset:Nn \g_ptxcd_headheight_dim {1.25\baselineskip +\c_ptxcd_largerule_dim +\c_ptxcd_rulesep_dim +\c_ptxcd_smallrule_dim}}
 
 %%%%%Anfang Randeinstellungen Geometry
 
 %Has to be loaded here due to headwidth options
 \usepackage[draft=false]{scrlayer-scrpage}
 
-\bool_if:NTF  \g_TUDa_geometry_bool {
+\bool_if:NTF  \g_ptxcd_geometry_bool {
 	\RequirePackage{geometry}
 	\geometry{
-		top=\g_TUDa_topMargin_dim,
-		inner=\g_TUDa_innerMargin_dim,
-		outer=\dim_eval:n {\g_TUDa_outerMargin_dim},
-		bottom=\g_TUDa_bottomMargin_dim,
-		columnsep= \g_TUDa_columnSep_dim,
+		top=\g_ptxcd_topMargin_dim,
+		inner=\g_ptxcd_innerMargin_dim,
+		outer=\dim_eval:n {\g_ptxcd_outerMargin_dim},
+		bottom=\g_ptxcd_bottomMargin_dim,
+		columnsep= \g_ptxcd_columnSep_dim,
 		includehead,
 		includefoot,
 		includemp,
 		nomarginpar,
-		headheight=\g_TUDa_headheight_dim
+		headheight=\g_ptxcd_headheight_dim
 	}
-	\savegeometry{TUDa@nomarginpar}
-	\geometry{includemp, marginpar=\g_TUDa_marginpar_dim, marginparsep=\g_TUDa_columnSep_dim}
+	\savegeometry{TUDa-nomarginpar}
+	\geometry{includemp, marginpar=\g_ptxcd_marginpar_dim, marginparsep=\g_ptxcd_columnSep_dim}
 	\KOMAoptions{mpinclude}
-	\savegeometry{TUDa@marginpar}
+	\savegeometry{TUDa-marginpar}
 
-	\bool_if:NTF \g_TUDa_custommargins_bool {
-		\AtBeginDocument{\savegeometry{TUDa@default}}
-		\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@default}
+	\bool_if:NTF \g_ptxcd_custommargins_bool {
+		\AtBeginDocument{\savegeometry{TUDa-default}}
+		\tl_const:Nn \c_ptxcd_default_geometry_tl {TUDa-default}
 	}{
-		\bool_if:NTF  \g_TUDa_marginpar_bool {
-			\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@marginpar}
+		\bool_if:NTF  \g_ptxcd_marginpar_bool {
+			\tl_const:Nn \c_ptxcd_default_geometry_tl {TUDa-marginpar}
 		}  {
-			\tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@nomarginpar}
+			\tl_const:Nn \c_ptxcd_default_geometry_tl {TUDa-nomarginpar}
+		}
+		\AtBeginDocument{
+			\loadgeometry{\c_ptxcd_default_geometry_tl}
+			\bool_if:NT \g_ptxcd_BCOR_titlepage_bool {\xdef\coverpageleftmargin{\the\dimexpr\coverpageleftmargin+\the\ta@bcor}}
 		}
-		\AtBeginDocument{\loadgeometry{\c_TUDa_default_geometry_tl}}
 	}
 
-	\dim_gset:Nn \g_TUDa_headwidth_dim 			  {\paperwidth-\g_TUDa_innerMargin_dim-\g_TUDa_outerMargin_dim-\Gm@bindingoffset}
+	\dim_gset:Nn \g_ptxcd_headwidth_dim 			  {\paperwidth-\g_ptxcd_innerMargin_dim-\g_ptxcd_outerMargin_dim-\Gm@bindingoffset}
 
-	\cs_set:Nn \TUDa_disable_marginpar: {\loadgeometry{TUDa@nomarginpar}}
-	\cs_set:Nn \TUDa_restore_typearea: {\loadgeometry{\c_TUDa_default_geometry_tl}}
+	\cs_set:Nn \ptxcd_disable_marginpar: {\loadgeometry{TUDa-nomarginpar}}
+	\cs_set:Nn \ptxcd_restore_typearea: {\loadgeometry{\c_ptxcd_default_geometry_tl}}
 
 }{
-	\let\TUDa_disable_marginpar:\relax
-	\def\TUDa_restore_typearea:{
+	\let\ptxcd_disable_marginpar:\relax
+	\def\ptxcd_restore_typearea:{
 		\KOMAoptions{headinclude, footinclude}
-		\bool_if:NTF \g_TUDa_marginpar_bool {\KOMAoptions{headwidth=textwithmarginpar,footwidth=textwithmarginpar}}
+		\bool_if:NTF \g_ptxcd_marginpar_bool {\KOMAoptions{headwidth=textwithmarginpar,footwidth=textwithmarginpar}}
 		{\KOMAoptions{headwidth=text,footwidth=text}}
+		\bool_if:NT \g_ptxcd_headline_bool {\KOMAoptions{headheight=\g_ptxcd_headheight_dim}}
 		\recalctypearea
 	}
-	\TUDa_restore_typearea:
+	\ptxcd_restore_typearea:
 }
 
 
@@ -383,25 +401,13 @@
 
 
 \newcommand*{\institution}[1]{
-	\def\TUDa@institution{#1}
+	\def\ptxcd_institution{#1}
 }
 
-\gdef\TUDa@datename{Datum}
-\gdef\TUDa@dateseparator{:~}
-
-
-
-
-
-
-
+\gdef\ptxcd_datename{Datum}
+\gdef\ptxcd_dateseparator{:~}
 
-\dim_new:N \g_TUDa_titlerule_dim
-\dim_gset:Nn \g_TUDa_titlerule_dim {.5\c_TUDa_smallrule_dim}
-
-%\dim_new:N \g_TUDa_titlerule_sep_dim
-%\dim_set:Nn \g_TUDa_titlerule_sep_dim {1ex}
-\cs_new:Nn \TUDa_titlerule_sep: {\the\dp\strutbox}
+\cs_new:Nn \ptxcd_titlerule_sep: {\the\dp\strutbox}
 
 \usepackage{tudacolors}
 
@@ -412,13 +418,13 @@
 \addtokomafont{caption}{\sffamily}
 
 
-\KOMAoptions{footsepline=.5\c_TUDa_smallrule_dim}
-\bool_if:NT \g_TUDa_headline_bool {\KOMAoptions{headsepline=.5\c_TUDa_smallrule_dim}}
+\KOMAoptions{footsepline=.5\c_ptxcd_smallrule_dim}
+\setlength{\footheight}{\dimexpr\baselineskip+\c_ptxcd_rulesep_dim}
+\bool_if:NT \g_ptxcd_headline_bool {\KOMAoptions{headsepline=.5\c_ptxcd_smallrule_dim}}
 
 %Adjust headheight
 \AtBeginDocument{
-\KOMAoptions{headlines=1.5}
-\bool_if:NTF \g_TUDa_marginpar_bool
+\bool_if:NTF \g_ptxcd_marginpar_bool
 	{
 		\KOMAoptions {
 			headwidth=textwithmarginpar,
@@ -430,22 +436,22 @@
 			footwidth=text
 		}
 	}
-\box_if_exist:NF \TUDa@headline_box {
-	\TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline}
+\box_if_exist:NF \ptxcd_headrule_box {
+	\ptxcd_makeheadrule[color=identbarcolor, width=\sls@headwidth]{ptxcd_headrule}
 }
 }
 
 \newpairofpagestyles[scrheadings]{TUDa.headings}{
-	\KOMAoptions{headsepline, headlines=1.25, footlines=1.25}
+	\KOMAoptions{headsepline, headlines=1.25}
 	\setkomafont{pagehead}{}
 	\chead{}
 	\ohead{\headmark}
 }
 
-\newpairofpagestyles{TUDa}{
+\newpairofpagestyles{TUDa.pub}{
 	\KOMAoptions{plainfootsepline}
 
-	\bool_if:NTF \g_TUDa_marginpar_bool
+	\bool_if:NTF \g_ptxcd_marginpar_bool
 		{
 		\KOMAoptions {
 			headwidth=textwithmarginpar,
@@ -457,31 +463,37 @@
 			footwidth=text
 			}
 		}
-
-\setkomafont{pagehead}{\Large\bfseries}
 	\RedeclareLayer[
 		clone=scrheadings.head.above.line,
 		background,
 		contents={
-			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
-				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+			\dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} {
+				\ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule}
 			}
-			\smash{\TUDa@headline}
+			\smash{\ptxcd_headrule}
 		}
-	]{TUDa.head.above.line}
+	]{TUDa.pub.head.above.line}
 	\RedeclareLayer[
 		clone=plain.scrheadings.head.above.line,
 		background,
 		contents={
-			\dim_compare:nF {\box_wd:N \TUDa@headline_box=\layerwidth} {
-				\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@headline}
+			\dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} {
+				\ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule}
 			}
-			\smash{\TUDa@headline}
+			\smash{\ptxcd_headrule}
 		}
-	]{plain.TUDa.head.above.line}
-	\bool_if:NT \g_TUDa_headline_bool {
+	]{plain.TUDa.pub.head.above.line}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.even}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.odd}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.oneside}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.even}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.odd}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.oneside}
+	\bool_if:NT \g_ptxcd_headline_bool {
+		\setkomafont{pagehead}{\Large\bfseries}
+		\KOMAoptions{headlines=2}
 		\clist_map_variable:nNn {oneside, even, odd} \l_tmpa_tl {
-			\ModifyLayer[pretocontents={\rule[-6pt]{0pt}{\layerheight}}]{TUDa.head.\l_tmpa_tl}
+			\ModifyLayer[pretocontents={\rule[-6pt]{0pt}{\layerheight}}]{TUDa.pub.head.\l_tmpa_tl}
 		}
 		\lehead{\headmark}
 		\lohead{\headmark}
@@ -489,7 +501,12 @@
 	\ofoot[\pagemark]{\pagemark}
 }
 
-\cs_new:Nn \TUDa_sls@leftmargin: {%
+\DeclarePageStyleAlias{TUDa}{TUDa.pub}
+\DeclarePageStyleAlias{plain.TUDa}{plain.TUDa.pub}
+\pagestyle{TUDa}
+
+\renewcommand*{\titlepagestyle}{plain.TUDa}
+\cs_new:Nn \ptxcd_sls@leftmargin: {%
 	\dimexpr
 	\if@twoside
 	\ifodd\value{page}
@@ -500,41 +517,41 @@
 	\else
 	\oddsidemargin
 	\fi
-	\bool_if:NT \g_TUDa_twocolumn_bool {
+	\bool_if:NT \g_ptxcd_twocolumn_bool {
 	-\marginparwidth-\marginparsep
 	}
 	+1in\relax
 }
 
-\pagestyle{TUDa}
+
 
 %Titelseite
-\tl_new:N  \g_TUDa_titleimage_code_tl
-\tl_gset_eq:NN  \g_TUDa_titleimage_code_tl \c_empty_tl
-\newcommand{\titleimage}[1]{\tl_gset:Nn \g_TUDa_titleimage_code_tl {#1}}
+\tl_new:N  \g_ptxcd_titleimage_code_tl
+\tl_gset_eq:NN  \g_ptxcd_titleimage_code_tl \c_empty_tl
+\newcommand{\titleimage}[1]{\tl_gset:Nn \g_ptxcd_titleimage_code_tl {#1}}
+
+\box_new:N  \g_ptxcd_title_box
+\skip_new:N \g_ptxcd_title_fill_skip
 
-\box_new:N  \g_TUDa_title_box
-\skip_new:N \g_TUDa_title_fill_skip
 
-\renewcommand{\titlepagestyle}{TUDa}
 
 
-\seq_new:N \g_TUDa_author_seq
+\seq_new:N \g_ptxcd_author_seq
 
 \renewcommand*\author[1]{
-	\seq_gset_split:Nnn \g_TUDa_author_seq {\and} {#1}
+	\seq_gset_split:Nnn \g_ptxcd_author_seq {\and} {#1}
 }
 
-\msg_new:nnn {TUDaPub} {unknown-language} {
+\msg_new:nnn{tudapub} {unknown-language} {
 	You~selected~an~unknown~language~#1.\\
 	The~Variable~#2~does~not~have~a~predefined~value.\\
 	Ensure~to~redefine~#2~to~match~your~language.\\
 	Otherwise~the~ngerman~vaue~#3~will~be~used.
 }
 
-\cs_new:Nn \TUDa_define_captionFallback:Nn {
+\cs_new:Nn \ptxcd_define_captionFallback:Nn {
 	\providecommand*#1{
-	\msg_warning:nnxxx {TUDaPub} {unknown-language}
+	\msg_warning:nnxxx{tudapub} {unknown-language}
 		{\languagename} {\exp_not:N #1} {#2}
 	\def#1{#2}
 	}
@@ -543,129 +560,125 @@
 \renewcommand*{\@author}{
   \begingroup
   \hyphenpenalty=100000
-  \seq_use:Nnnn \g_TUDa_author_seq {~\authorandname{}~} {,~} {~\&~}
+  \seq_use:Nnnn \g_ptxcd_author_seq {~\authorandname{}~} {,~} {~\&~}
   \endgroup
 }
 
-\msg_new:nnn {TUDaPub} {infobox-too-high} {
+\msg_new:nnn{tudapub} {infobox-too-high} {
 	The~height~of~your~Infobox~exeeds~the~space~reserved~in~the~title~block.\\
 	You~should~probably~switch~to~logo=bottom~or~reduce~the~number/size~of~InfoBoxes.
 }
 
 
-\cs_set:Nn 	\TUDa_adjust_titlepage_style: {
-	\dim_set:Nn \l_tmpa_dim {\fp_to_dim:n {\expandafter \use_ii:nn\TUDa_title_fontsize: *2.8}}
-	\dim_compare:nT  {\box_ht:N \g_TUDa_title_box < \l_tmpa_dim} {
-		\skip_set:Nn \g_TUDa_title_fill_skip {\dim_eval:n {\l_tmpa_dim -  \box_ht:N \g_TUDa_title_box}}
+\cs_set:Nn 	\ptxcd_adjust_titlepage_style: {
+	\dim_set:Nn \l_tmpa_dim {\fp_to_dim:n {\expandafter \use_ii:nn\ptxcd_title_fontsize: *2.8}}
+	\dim_compare:nT  {\box_ht:N \g_ptxcd_title_box < \l_tmpa_dim} {
+		\skip_set:Nn \g_ptxcd_title_fill_skip {\dim_eval:n {\l_tmpa_dim -  \box_ht:N \g_ptxcd_title_box}}
 	}
 
 	\dim_set:Nn \l_tmpa_dim {
-		\box_ht:N \TUDa@headline_box+\box_dp:N \TUDa@headline_box-\g_TUDa_titlerule_dim
-		+\box_ht:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim+\g_TUDa_title_fill_skip+
-		\box_dp:N \g_TUDa_title_box
+		\box_ht:N \ptxcd_headrule_box+\box_dp:N \ptxcd_headrule_box-\g_ptxcd_titlerule_dim
+		+\box_ht:N \g_ptxcd_title_box+.5\c_ptxcd_logoheight_dim+\g_ptxcd_title_fill_skip+\box_dp:N \g_ptxcd_title_box
 	}
 
 	\ModifyLayer[
 		addvoffset=\l_tmpa_dim,
 		addheight=-\l_tmpa_dim
+		-\box_dp:N \g_ptxcd_sponsor_box
+		+\c_ptxcd_rulesep_dim
 	]{title.TUDa.image}
 
-	\bool_if:NT \g_TUDa_logo@inhead_bool {
+	\bool_if:NT \g_ptxcd_logo@inhead_bool {
 		\ModifyLayer[
-		addvoffset=\dim_eval:n {\box_ht:N \TUDa@headline_box+\box_dp:N \TUDa@headline_box-\g_TUDa_titlerule_dim},
-		height={\box_ht:N \g_TUDa_title_box+ \g_TUDa_title_fill_skip+.5\c_TUDa_logoheight_dim}
+		addvoffset=\dim_eval:n {\box_ht:N \ptxcd_headrule_box+\box_dp:N \ptxcd_headrule_box-\g_ptxcd_titlerule_dim},
+		height={\box_ht:N \g_ptxcd_title_box+ \g_ptxcd_title_fill_skip+.5\c_ptxcd_logoheight_dim
+	}
 		]{title.TUDa.background}
 
 		\AddLayersToPageStyle{title.TUDa}{title.TUDa.background}
 	}
-
-
-
-	\thispagestyle{title.TUDa}
-
 	\vspace*{\dim_eval:n {
 		-\topskip
-		-\g_TUDa_titlerule_dim
-		+\box_ht:N \TUDa@headline_box
-		+\box_dp:N \TUDa@headline_box
-		+.5\c_TUDa_logoheight_dim
+		-\g_ptxcd_titlerule_dim
+		+\box_ht:N \ptxcd_headrule_box
+		+\box_dp:N \ptxcd_headrule_box
+		+.5\c_ptxcd_logoheight_dim
 	}}
 	\nointerlineskip
-	\TUDa_Setup_Title_box:
+	\ptxcd_setup_title_box:
 
-	\bool_if:NT \g_TUDa_logo@inhead_bool {
-		\dim_compare:nT {\box_ht:N \g_TUDa_title_info_box+ \box_dp:N \g_TUDa_title_info_box  > \box_ht:N \g_TUDa_title_box}
-			{\msg_warning:nn {TUDaPub} {infobox-too-high}}
+	\bool_if:NT \g_ptxcd_logo@inhead_bool {
+		\dim_compare:nT {\box_ht:N \g_ptxcd_title_info_box+ \box_dp:N \g_ptxcd_title_info_box  > \box_ht:N \g_ptxcd_title_box}
+			{\msg_warning:nn{tudapub} {infobox-too-high}}
 		\makebox[\linewidth][r]{\smash{
 				\raisebox{-\height}{
-					\makebox[2.2\c_TUDa_logoheight_dim][l]{
+					\makebox[2.2\c_ptxcd_logoheight_dim][l]{
 						%				}
-						\box_use:N \g_TUDa_title_info_box
+						\box_use:N \g_ptxcd_title_info_box
 				}}
 		}}
 	}
 	\par
-	\vspace*{\skip_use:N \g_TUDa_title_fill_skip}
+	\vspace*{\skip_use:N \g_ptxcd_title_fill_skip}
 	\setlength{\fboxsep}{\z@}
 }
 
 
 \newkomafont{institution}{\sffamily}
+\newkomafont{titleinfo}{\sffamily}
 \setkomafont{subtitle}{\bfseries}
 \setkomafont{subject}{}
 \setkomafont{publishers}{}
 \setkomafont{author}{}
 \setkomafont{date}{}
 
-\bool_if:NF \g_TUDa_smalltitle_bool {
-	\int_gdecr:N \g_TUDa_paper_int
+\bool_if:NF \g_ptxcd_smalltitle_bool {
+	\int_gdecr:N \g_ptxcd_paper_int
 }
-\file_input:n {tuda-a\int_use:N \g_TUDa_paper_int paper.clo}
-\TUDa_setup_title_sizes:
+\file_input:n {tuda-a\int_use:N \g_ptxcd_paper_int paper.clo}
+\ptxcd_setup_title_sizes:
 
-\seq_new:N \g_TUDa_title_info_seq
-\box_new:N \g_TUDa_title_info_box
+\seq_new:N \g_ptxcd_title_info_seq
+\box_new:N \g_ptxcd_title_info_box
 
-\colorlet{TUDa@InfoBoxColor}{white}
-
-\cs_new:Nn \TUDa_make_title_info_box:n {
+\cs_new:Nn \ptxcd_make_title_info_box:n {
 	\setlength{\fboxsep}{1.5mm}%
-	\colorbox{TUDa@InfoBoxColor}{
-	\makebox[\dim_eval:n {2.2\c_TUDa_logoheight_dim-\fboxsep}][r]{
-		\parbox{2\c_TUDa_logoheight_dim}{
-		\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont\usekomafont{institution}%
+	\colorbox{InfoBox}{
+	\makebox[\dim_eval:n {2.2\c_ptxcd_logoheight_dim-\fboxsep}][r]{
+		\parbox{2\c_ptxcd_logoheight_dim}{
+		\expandafter\fontsize\ptxcd_titlethanks_fontsize:\selectfont\usekomafont{institution}%
 		\raggedright%
 	#1
 	}}}
 }
 
-\cs_new:Nn \TUDa_make_title_logo_box:n {
+\cs_new:Nn \ptxcd_make_title_logo_box:n {
 	\setlength{\fboxsep}{\z@}%
-	\parbox{2.2\c_TUDa_logoheight_dim}{
-		\colorbox{TUDa@InfoBoxColor}{
+	\parbox{2.2\c_ptxcd_logoheight_dim}{
+		\colorbox{InfoBox}{
 			\rlap{
-			\makebox[2.5\c_TUDa_logoheight_dim][r]{
-			\colorbox{TUDa@InfoBoxColor}{#1\hspace{.3\c_TUDa_logoheight_dim}}
+			\makebox[2.5\c_ptxcd_logoheight_dim][r]{
+			\colorbox{InfoBox}{#1\hspace{.3\c_ptxcd_logoheight_dim}}
 			}
 			}
 		}
 	}
 }
 
-\newcommand{\addTitleBox}[1]{\seq_gput_right:Nn \g_TUDa_title_info_seq {\TUDa_make_title_info_box:n {#1}}}
+\newcommand{\addTitleBox}[1]{\seq_gput_right:Nn \g_ptxcd_title_info_seq {\ptxcd_make_title_info_box:n {#1}}}
 
 \NewDocumentCommand{\addTitleBoxLogo}{sm}{
 	\IfBooleanTF{#1}{
-		\seq_gput_right:Nn \g_TUDa_title_info_seq {
-			\TUDa_make_title_logo_box:n {#2}
+		\seq_gput_right:Nn \g_ptxcd_title_info_seq {
+			\ptxcd_make_title_logo_box:n {#2}
 		}
 	}{
-		\seq_gput_right:Nn \g_TUDa_title_info_seq {
-		 \TUDa_make_title_logo_box:n {
+		\seq_gput_right:Nn \g_ptxcd_title_info_seq {
+		 \ptxcd_make_title_logo_box:n {
 			\hbox_set:Nn \l_tmpa_box {
-				\includegraphics[width=1.5\c_TUDa_logoheight_dim]{#2}
+				\includegraphics[width=1.5\c_ptxcd_logoheight_dim]{#2}
 			}
-			\dim_set:Nn \l_tmpa_dim {2\c_TUDa_logoheight_dim/3}
+			\dim_set:Nn \l_tmpa_dim {2\c_ptxcd_logoheight_dim/3}
 			\dim_compare:nTF {\box_ht:N \l_tmpa_box > \l_tmpa_dim}
 			{\includegraphics[width=\l_tmpa_dim]{#2}}
 			{\box_use:N \l_tmpa_box}
@@ -674,25 +687,26 @@
 	}
 }
 
-\addTitleBoxLogo*{\makebox[\linewidth][l]{\includegraphics[height=\c_TUDa_logoheight_dim]{\g_TUDa_logofile_tl}}}
+\addTitleBoxLogo*{\makebox[\linewidth][l]{\includegraphics[height=\c_ptxcd_logoheight_dim]{\g_ptxcd_logofile_tl}}}
 
 \DeclareNewLayer[textarea,background,mode=picture,
 	contents={
-		\tl_if_empty:NTF \g_TUDa_titleimage_code_tl
-		{\bool_if:NT \g_TUDa_colorback_bool {\putLL{\color{identbarcolor}\rule{\layerwidth}{\layerheight}}}}
-		{\putUL{\color{identbarcolor}\raisebox{-\height}{\parbox[t]{\textwidth}{
-					\let\width\layerwidth
-					\let\height\layerheight
-					\g_TUDa_titleimage_code_tl
+		\tl_if_empty:NTF \g_ptxcd_titleimage_code_tl
+		{\bool_if:NT \g_ptxcd_colorback_bool {\putLL{\color{identbarcolor}\rule{\layerwidth}{\layerheight}}}}
+		{\putUL{\color{identbarcolor}
+				\let\width\layerwidth
+				\let\height\layerheight
+				\raisebox{-\height}{\parbox[t]{\textwidth}{
+					\leavevmode\ignorespaces
+					\g_ptxcd_titleimage_code_tl
 					}}}}
-		\bool_if:NF \g_TUDa_logo@inhead_bool {
-			\put(\dim_to_decimal_in_unit:nn {\layerwidth-2.2\c_TUDa_logoheight_dim
+		\bool_if:NF \g_ptxcd_logo@inhead_bool {
+			\put(\dim_to_decimal_in_unit:nn {\layerwidth-2.2\c_ptxcd_logoheight_dim
 			} {\unitlength},
-			\dim_to_decimal_in_unit:nn {\layerheight-\box_ht:N \g_TUDa_title_info_box - .5\c_TUDa_logoheight_dim} {\unitlength}){
-				\rlap{\box_use:N \g_TUDa_title_info_box}
+			\dim_to_decimal_in_unit:nn {\layerheight-\box_ht:N \g_ptxcd_title_info_box - .5\c_ptxcd_logoheight_dim} {\unitlength}){
+				\rlap{\box_use:N \g_ptxcd_title_info_box}
 			}
 		}
-		\put(0,0){\rule{\linewidth}{\g_TUDa_titlerule_dim}}
 	}
 ]{title.TUDa.image}
 
@@ -701,28 +715,41 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 ]{title.TUDa.background}
 
 \DeclareNewLayer[
-	mode=picture,
-	align=tl,
+	clone=plain.TUDa.pub.head.above.line,
 	hoffset=\coverpageleftmargin,
-	voffset=\coverpagetopmargin,
 	width=\paperwidth-\coverpageleftmargin-\coverpagerightmargin,
-	contents={
-%		\box_if_exist:NF \TUDa@title_headline_box
-%		{}
-		\dim_compare:nF {\box_wd:N \TUDa@title_headline_box=\layerwidth} {
-			\TUDa@makeheadrule*[color=identbarcolor, width=\layerwidth]{TUDa@title_headline}
-		}
-		\putUL{\TUDa@title_headline}
-	}
 ]{title.TUDa.rule}
 
-\TUDa@makeheadrule[color=identbarcolor, width=\textwidth]{TUDa@title_headline}
 
-\cs_new:Nn \TUDa_Setup_Title_box: {
-	\hbox_gset:Nn \g_TUDa_title_info_box
+
+\ptxcd_makeheadrule[color=identbarcolor, width=\textwidth]{ptxcd_title_headline}
+
+\cs_new:Nn \ptxcd_setup_title_box: {
+	\hbox_gset:Nn \g_ptxcd_title_info_box
 	{
-		\parbox{\dimexpr2.5\c_TUDa_logoheight_dim}{
-		\seq_use:Nn \g_TUDa_title_info_seq  {\par\nointerlineskip\vspace{\dim_eval:n {\c_TUDa_largerule_dim+\c_TUDa_rulesep_dim}}}
+		\parbox{\dimexpr2.5\c_ptxcd_logoheight_dim}{
+		\seq_use:Nn \g_ptxcd_title_info_seq  {\par\nointerlineskip\vspace{\dim_eval:n {\c_ptxcd_largerule_dim+\c_ptxcd_rulesep_dim}}}
+		}
+	}
+}
+
+\cs_new:Nn \ptxcd_setup_sponsor_box: {
+	\bool_if:nF {\seq_if_empty_p:N \g_ptxcd_sponsors_seq &&  \tl_if_empty_p:N \@sponsors} {
+		\hbox_gset:Nn \g_ptxcd_sponsor_box {
+			\def\height{\dimexpr.8\c_ptxcd_logoheight_dim\relax}
+			\parbox[t]{\textwidth}{
+				\rule{\linewidth}{\g_ptxcd_titlerule_dim}\par\nointerlineskip
+				\addvspace{\c_ptxcd_rulesep_dim}
+				\seq_use:Nn \g_ptxcd_sponsors_seq {\hfill}
+				\ifhmode\par\fi
+				\ifx\@sponsors\@empty
+				\else
+					\addvspace{.1\c_ptxcd_logoheight_dim}
+					\@sponsors\par
+				\fi
+				\par\nointerlineskip\addvspace{\c_ptxcd_rulesep_dim}
+				\rule{\linewidth}{\g_ptxcd_titlerule_dim}
+			}
 		}
 	}
 }
@@ -732,9 +759,9 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 %Logos
 \RequirePackage{graphicx}
 
-\if_bool:N \g_TUDa@pdfa_bool
+\if_bool:N \g_ptxcd_pdfa_bool
 
-	\msg_new:nnn {TUDaPub} {prefer-lualatex} {
+	\msg_new:nnn{tudapub} {prefer-lualatex} {
 	You~use~pdfa-mode~in~#1.\\
 	This~can~lead~to~incompatiblities~especially~with~older~compiler~versions.\\
 	You~should~prefer~using~lualatex.
@@ -745,30 +772,30 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\RequirePackage{pdfx}
 
 	\sys_if_engine_pdftex:T {
-		\msg_warning:nnn {TUDaPub} {prefer-lualatex} {PDFTeX}
+		\msg_warning:nnn{tudapub} {prefer-lualatex} {PDFTeX}
 	}
 
 	\sys_if_engine_pdftex:T {
-		\msg_warning:nnn {TUDaPub} {prefer-lualatex} {XeTeX}
+		\msg_warning:nnn{tudapub} {prefer-lualatex} {XeTeX}
 	}
 
 
 
 	\@ifpackagelater{pdfx}{2018/12/01}{
 	}{
-		\msg_new:nnnn {TUDaPub} {outdated-pdfx} {
+		\msg_new:nnnn{tudapub} {outdated-pdfx} {
 			Your~Version~of~the~PDFx-package~is~too~old~to~support~all~methods~required~by~tudapubs~pdfa-mode.\\
 			Either~update~your~TeX-distribution~or~switch~to~pdfa=false.
-		}{See~DEMO-TUDaPub~for~further~information.}
-		\msg_error:nn {TUDaPub} {outdated-pdfx}
+		}{See~DEMO-tudapub~for~further~information.}
+		\msg_error:nn{tudapub} {outdated-pdfx}
 	}
 
 
 	%%hyperref
 	\hypersetup{hidelinks, unicode}
-	\iow_new:N \TUDa@xmpdata_stream
-	\tl_new:N \g_TUDa@xmp_title_tl
-	\tl_new:N \g_TUDa@xmp_author_tl
+	\iow_new:N \ptxcd_xmpdata_stream
+	\tl_new:N \g_ptxcd_xmp_title_tl
+	\tl_new:N \g_ptxcd_xmp_author_tl
 
 	\cs_if_exist:NF \prop_gput_if_new:Nnx {
 	\cs_generate_variant:Nn \prop_gput_if_new:Nnn {Nnx}
@@ -776,29 +803,29 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 
 	\cs_if_exist:NF \tl_to_str:V {\cs_generate_variant:Nn \tl_to_str:N {V}}
 
-	\cs_new:Nn \TUDa_pass_TitleData: {
-		\iow_open:Nn \TUDa@xmpdata_stream {\jobname.xmpdata}
+	\cs_new:Nn \ptxcd_pass_TitleData: {
+		\iow_open:Nn \ptxcd_xmpdata_stream {\jobname.xmpdata}
 		\begingroup
 		\def\newline{}
 		\def\\{}
 		\let\thanks\use_none:n
 		\cs_set:Npn \and {\exp_not:n {\exp_not:N \sep}}
 		\use:c {Hy@pdfstringtrue}
-		\tl_gset:Nf \g_TUDa@xmp_title_tl {\@title}
-		\prop_gput_if_new:Nnx \g_TUDa_MetaData_prop {title} {\tl_to_str:V \g_TUDa@xmp_title_tl}
-		\prop_if_in:NnF \g_TUDa_MetaData_prop {author} {
-			\tl_gset:Nx \g_TUDa@xmp_author_tl {\seq_use:Nn \g_TUDa_author_seq {\exp_not:N \sep}}
-			\tl_gset:Nx \g_TUDa@xmp_author_tl {\g_TUDa@xmp_author_tl}
-			\prop_gput:Nnx \g_TUDa_MetaData_prop {author} {\tl_to_str:V \g_TUDa@xmp_author_tl}
+		\tl_gset:Nf \g_ptxcd_xmp_title_tl {\@title}
+		\prop_gput_if_new:Nnx \g_ptxcd_MetaData_prop {title} {\tl_to_str:V \g_ptxcd_xmp_title_tl}
+		\prop_if_in:NnF \g_ptxcd_MetaData_prop {author} {
+			\tl_gset:Nx \g_ptxcd_xmp_author_tl {\seq_use:Nn \g_ptxcd_author_seq {\exp_not:N \sep}}
+			\tl_gset:Nx \g_ptxcd_xmp_author_tl {\g_ptxcd_xmp_author_tl}
+			\prop_gput:Nnx \g_ptxcd_MetaData_prop {author} {\tl_to_str:V \g_ptxcd_xmp_author_tl}
 		}
-		\prop_gput_if_new:Nnn \g_TUDa_MetaData_prop {publisher}{TU~Darmstadt}
-		\prop_gput_if_new:Nnn \g_TUDa_MetaData_prop {creator}{LaTeX~using~TUDa-CI}
+		\prop_gput_if_new:Nnn \g_ptxcd_MetaData_prop {publisher}{TU~Darmstadt}
+		\prop_gput_if_new:Nnn \g_ptxcd_MetaData_prop {creator}{LaTeX~using~TUDa-CI}
 		\use:c {pdfx@localcommands}%should be held inside group
-		\prop_map_function:NN \g_TUDa_MetaData_prop  \TUDa_write_xmp_line:nn
+		\prop_map_function:NN \g_ptxcd_MetaData_prop  \ptxcd_write_xmp_line:nn
 	\endgroup
-	\iow_close:N \TUDa@xmpdata_stream
+	\iow_close:N \ptxcd_xmpdata_stream
 	}
-	\cs_new:Nn \TUDa_write_xmp_line:nn {
+	\cs_new:Nn \ptxcd_write_xmp_line:nn {
 		\begingroup
 		\cs_set:Npn \sep {\exp_not:N \sep}
 		%Fallback test for older kernels
@@ -812,58 +839,58 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 			\tl_set:Nx \l_tmpa_tl {\tl_mixed_case:n {#1}}
 		}
 		\cs_if_exist:cTF {\l_tmpa_tl}{
-			\iow_now:Nx \TUDa@xmpdata_stream {
+			\iow_now:Nx \ptxcd_xmpdata_stream {
 				\c_backslash_str \l_tmpa_tl {\exp_not:n {#2}}
 			}
 		}{
-			\msg_error:nnn {TUDaPub} {unknown-metadata} {#1}
+			\msg_error:nnn{tudapub} {unknown-metadata} {#1}
 		}
 		\endgroup
 	}
 
-\prop_new:N \g_TUDa_MetaData_prop
+\prop_new:N \g_ptxcd_MetaData_prop
 
 	\newcommand*{\Metadata}[1]{
-		\keyval_parse:NNn  \use_none:n \TUDa_set_metadata_prop:nn
+		\keyval_parse:NNn  \use_none:n \ptxcd_set_metadata_prop:nn
 		{#1}
 	}
 
-	\cs_set:Nn \TUDa_set_metadata_prop:nn {
-	\exp_args:NNf \prop_gput:Nnn \g_TUDa_MetaData_prop {\tl_lower_case:n{#1}}  {#2}
+	\cs_set:Nn \ptxcd_set_metadata_prop:nn {
+	\exp_args:NNf \prop_gput:Nnn \g_ptxcd_MetaData_prop {\tl_lower_case:n{#1}}  {#2}
 	}
 
-	\msg_new:nnnn {TUDaPub} {unknown-metadata} {
+	\msg_new:nnnn{tudapub} {unknown-metadata} {
 	You~ used~ the~ #1~ metadata~ entry.\\
 	I~ don't~ know~ how~ to~ handle~ that.\\
 	It~ will~ be~ ignored.
 	} {See~ TUDa-CI~ or~ pdfx~ documentation~ for~ details.}
 \else:
-	\msg_new:nnn {tudaPub} {no-pdfa}{The~ tudapub~ class~ won't~ create~ PDF/A-mode.}
-	\msg_info:nn {tudaPub} {no-pdfa}
+	\msg_new:nnn{tudapub} {no-pdfa}{The~ tudapub~ class~ won't~ create~ PDF/A-mode.}
+	\msg_info:nn{tudapub} {no-pdfa}
 	%%hyperref
 	\RequirePackage[hidelinks, unicode]{hyperref}
 
 	\newcommand{\Metadata}[1]{\ClassError{tudapub}{You~cannot~use~\string\Metadata\ ~with~pdfa=false.}{}}
 \fi:
 
-\csname if@TUDa@T1\endcsname
-\ifLuaTeX
-\RequirePackage[utf8]{luainputenc}
-\fi
-\fi
+\box_new:N  \g_ptxcd_sponsor_box
+\seq_new:N \g_ptxcd_sponsors_seq
+\def\AddSponsor{\seq_gput_right:Nn \g_ptxcd_sponsors_seq}
+\def\sponsors#1{\def\@sponsors{#1}}
+\sponsors{}
 
-\exp_args:NV \tl_if_eq:nnTF {\g_TUDa_pubType_tl}  {thesis} {
+\str_if_eq:VnTF \g_ptxcd_pubType_tl  {thesis} {
 	\input{tudathesis.cfg}
 } {
 
-\msg_new:nnnn {TUDa/pub} {only-thesis} {You~tried~to~use~\use:c { #1}.~This~macro~is~only~available~for~publications~of~type~thesis}{See~tuda-ci~documentation~for~further~information}
+\msg_new:nnnn {tudapub} {only-thesis} {You~tried~to~use~\use:c { #1}.~This~macro~is~only~available~for~publications~of~type~thesis}{See~tuda-ci~documentation~for~further~information}
 
 \clist_map_inline:nn {birthplace, group, examdate, submissiondate, tuprints, urn, reviewer} {
 	\expandafter\newcommand\csname #1\endcsname[2][]{
-		\msg_error:nnn {TUDa/pub} {only-thesis} {#1}
+		\msg_error:nnn {tudapub} {only-thesis} {#1}
 	}
 }
-\newcommand*{\TUDa@title@footnote}[2][1]{
+\newcommand*{\ptxcd_title@footnote}[2][1]{
 \textsuperscript{\@fnsymbol{#1}}#2
 }
 
@@ -871,9 +898,9 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 % Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
 \renewcommand*{\maketitle}[1][1]{
 	\def\and{,~ }
-	\cs_if_exist_use:N \TUDa_pass_TitleData:
+	\cs_if_exist_use:N \ptxcd_pass_TitleData:
 	\if@titlepage
-	\TUDa_disable_marginpar:
+	\ptxcd_disable_marginpar:
 	\begin{titlepage}
 		\setcounter{page}{%
 			#1%
@@ -909,24 +936,34 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 		\let\titlepage@restore\relax
 		\fi
 		\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-		\hbox_gset:Nn \g_TUDa_title_box {
+		\ptxcd_setup_sponsor_box:
+		\hbox_gset:Nn \g_ptxcd_title_box {
 			\parbox[t]{\linewidth}{
-				\begin{minipage}[b]{\bool_if:NT \g_TUDa_logo@inhead_bool {.75}\linewidth}
-					\bool_if:NT \g_TUDa_logo@inhead_bool {\color{textonaccentcolor}}
-					\begin{addmargin}{3mm}
+				\begin{minipage}[b]{\bool_if:NT \g_ptxcd_logo@inhead_bool {.75}\linewidth}
+					\bool_if:NT \g_ptxcd_logo@inhead_bool {\color{textonaccentcolor}}
+					\tl_if_empty:NF \@titlehead {
+						\begin{addmargin}{3mm}
+							{\usekomafont{titlehead}{\@titlehead\par}}
+						\end{addmargin}
+					}
+					\begin{addmargin}[\dim_eval:n {\box_if_empty:NF \g_ptxcd_PaperID_box {\box_wd:N\g_ptxcd_PaperID_box+.5\c_ptxcd_logoheight_dim} +3mm}]{3mm}
 						\raggedright
-						\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
 						\leavevmode\usekomafont{title}%
-						\expandafter\fontsize\TUDa_title_fontsize:
+						\expandafter\fontsize\ptxcd_title_fontsize:
 						\selectfont
-						\@title\strut\par
-						\vskip0pt
+						\llap{\raisebox{\dimexpr-\height+.5\baselineskip}[0pt][0pt]{\box_use:N \g_ptxcd_PaperID_box}\hspace{.5\c_ptxcd_logoheight_dim}}
+						\@title\strut
+						\par
+						\box_if_empty:NTF \g_ptxcd_PaperID_box
+						{\vskip0pt}
+						{\rule{0pt}{.5\c_ptxcd_logoheight_dim}}
 					\end{addmargin}
 				\end{minipage}%
 				\par\nointerlineskip
-				\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
+				\rule{\linewidth}{\g_ptxcd_titlerule_dim}\par\vspace{\c_ptxcd_rulesep_dim}
 				\begin{addmargin}{3mm}
-					\expandafter\fontsize\TUDa_titleinfo_fontsize:
+					\usekomafont{titleinfo}
+					\expandafter\fontsize\ptxcd_titleinfo_fontsize:
 					\selectfont
 					{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
 					{\ifx\@subject\@empty\else\usekomafont{subject}{\@subject\par}\fi}
@@ -936,29 +973,31 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 						\@author
 						\par
 					}%
-					{\usekomafont{date}{\@date\par}}%
-					{\usekomafont{publishers}{\@publishers \par}}%
+					{\ifx\@date\@empty\else\usekomafont{date}{\@date\par}\fi}%
+					{\ifx\@publishers\@empty\else\usekomafont{publishers}{\@publishers \par}\fi}%
 				\end{addmargin}
-			\tl_if_empty:NF \@thanks {
-			\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont\par
-			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par
-			\begin{addmargin}{3mm}
-				\let\footnotetext\TUDa@title@footnote
-				\@thanks
-			\end{addmargin}
-				\par\vspace{-\dp\strutbox}
-				\let\@thanks\@empty
-			}
-			\rule{\linewidth}{\g_TUDa_titlerule_dim}\par}
-
+				\tl_if_empty:NF \@thanks {
+					\expandafter\fontsize\ptxcd_titlethanks_fontsize:\selectfont\par
+					\rule{\linewidth}{\g_ptxcd_titlerule_dim}\par
+					\begin{addmargin}{3mm}
+						\let\footnotetext\ptxcd_title@footnote
+						\@thanks
+					\end{addmargin}
+					\par\vspace{-\dp\strutbox}
+					\let\@thanks\@empty
+				}
+				\rule{\linewidth}{\g_ptxcd_titlerule_dim}\par}
 		}
-
-		\TUDa_adjust_titlepage_style:
-
-
-		\nointerlineskip\box_use:N \g_TUDa_title_box
+		\ptxcd_adjust_titlepage_style:
+		\thispagestyle{title.TUDa}
+		\nointerlineskip\box_use:N \g_ptxcd_title_box
 		\par
-		\vfill\null
+		\vfill
+		\box_if_empty:NTF \g_ptxcd_sponsor_box {
+				\raisebox{-\c_ptxcd_rulesep_dim}[0pt][0pt]{\rule{\linewidth}{\g_ptxcd_titlerule_dim}}
+		}{
+			\box_use:N \g_ptxcd_sponsor_box
+		}
 		\if@twoside
 		\@tempswatrue
 		\expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
@@ -992,8 +1031,8 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\setcounter{footnote}{0}%
 	\global\let\and\relax
 	\cleardoublepage
-	\TUDa_restore_typearea:
-	\aftergroup\TUDa_restore_typearea:
+	\ptxcd_restore_typearea:
+	\aftergroup\ptxcd_restore_typearea:
 	\else
 	\par
 	\@tempcnta=%
@@ -1022,26 +1061,40 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\let\titlepage@restore\relax
 	\def\thefootnote{\fnsymbol{footnote}}
 	\next@tdpage
-		\ifx\@extratitle\@empty
-			\ifx\@frontispiece\@empty\else \mbox{}\fi
-		\else
-		\@makeextratitle
-		\fi
-		\ifx\@frontispiece\@empty
-		\ifx\@extratitle\@empty\else\next@tdpage\fi
-		\else
-		\next@tpage
-		\@makefrontispiece
-		\next@tdpage
-		\fi
+	\ifx\@extratitle\@empty
+		\ifx\@frontispiece\@empty\else \mbox{}\fi
+	\else
+	\@makeextratitle
+	\fi
+	\ifx\@frontispiece\@empty
+	\ifx\@extratitle\@empty\else\next@tdpage\fi
+	\else
+	\next@tpage
+	\@makefrontispiece
+	\next@tdpage
+	\fi
+	\if@twocolumn
+	\twocolumn[\@maketitle]
+	\else
 	\@maketitle
+	\fi
 	\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
 	\@thanks\global\let\@thanks\@empty
 	\endgroup
 	\fi
 }
+}
 
-
+\newkomafont{paperid}{\sffamily}
+\box_new:N \g_ptxcd_PaperID_box
+\newcommand*{\SetPaperID}[2]{
+	\hbox_gset:Nn \g_ptxcd_PaperID_box {
+		\usekomafont{paperid}
+		\dim_set:Nn \l_tmpa_dim {\exp_last_unbraced:No \use_i:nn \ptxcd_title_fontsize: + \exp_last_unbraced:No \use_ii:nn \ptxcd_title_fontsize:}
+		\fontsize{1.1\l_tmpa_dim}{1.1\l_tmpa_dim}
+		\selectfont
+		#1{\Huge #2}
+	}
 }
 
 \renewcommand*{\@maketitle}{%
@@ -1051,28 +1104,22 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 			\headheight
 			+\headsep
 			+\topskip
-			-\box_ht:N\TUDa@headline_box
-			-\box_dp:N \TUDa@headline_box
-%			-\dp\strutbox
+			-\box_ht:N\ptxcd_headrule_box
+			-\box_dp:N \ptxcd_headrule_box
 	}}
 	\par
 	\nointerlineskip
 	\begingroup
 	\usekomafont{disposition}
-	\hsize=\g_TUDa_headwidth_dim
-	\raisebox{\dim_eval:n {
-			-.5\c_TUDa_logoheight_dim
-	}}[0pt][.5\c_TUDa_logoheight_dim]{
-		\bool_if:NT \g_TUDa_colorback_bool {\color{accentcolor}\rule{\g_TUDa_headwidth_dim}{.5\c_TUDa_logoheight_dim}}
-	}
-	\par\nointerlineskip
+	\hsize=\g_ptxcd_headwidth_dim
 	\setlength{\fboxsep}{\z@}
-	\bool_if:NT \g_TUDa_colorback_bool {\colorbox{accentcolor}}{\parbox[t]{\g_TUDa_headwidth_dim}{
+	\bool_if:NT \g_ptxcd_colorback_bool {\colorbox{accentcolor}}{\parbox[t]{\g_ptxcd_headwidth_dim}{
+			\rule{\z@}{.5\c_ptxcd_logoheight_dim}\par\nointerlineskip
 			\raisebox{-\height}{%
-				\begin{minipage}[t]{\dimexpr\linewidth-2.2\c_TUDa_logoheight_dim-1ex}
-					\bool_if:NT \g_TUDa_colorback_bool  {\begin{addmargin}{.5\c_TUDa_largerule_dim}}
+				\begin{minipage}[t]{\dimexpr\linewidth-2.2\c_ptxcd_logoheight_dim-1ex}
+					\bool_if:NT \g_ptxcd_colorback_bool  {\begin{addmargin}{.5\c_ptxcd_largerule_dim}}
 						\raggedright
-						\bool_if:NT \g_TUDa_colorback_bool {\color{textonaccentcolor}}
+						\bool_if:NT \g_ptxcd_colorback_bool {\color{textonaccentcolor}}
 						\tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}}
 						\leavevmode
 						{\Huge\usekomafont{title}{
@@ -1080,49 +1127,49 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 						\@title \par
 						}}%
 						\vskip 1em
-						\bool_if:NTF \g_TUDa_colorback_bool {\end{addmargin}} {\par}
-			\vspace{\dim_eval:n {\c_TUDa_largerule_dim+\c_TUDa_rulesep_dim}}
+						\bool_if:NTF \g_ptxcd_colorback_bool {\end{addmargin}} {\par}
+			\vspace{\dim_eval:n {\c_ptxcd_largerule_dim+\c_ptxcd_rulesep_dim}}
 			\end{minipage}
 		}
 		\hfill
 		\raisebox{-\height}{
-		\TUDa_Setup_Title_box:
-		\makebox[2.2\c_TUDa_logoheight_dim][l]{
-		\box_use:N \g_TUDa_title_info_box
+		\ptxcd_setup_title_box:
+		\makebox[2.2\c_ptxcd_logoheight_dim][l]{
+		\box_use:N \g_ptxcd_title_info_box
 		}
 		}
-		\dim_compare:nNnTF {\box_ht:N \g_TUDa_title_info_box + \box_ht:N \g_TUDa_title_info_box} > {1.1\c_TUDa_logoheight_dim}
-				{\vspace{\c_TUDa_largerule_dim}}
-				{\vspace{.5\c_TUDa_logoheight_dim}}
+		\dim_compare:nNnTF {\box_ht:N \g_ptxcd_title_info_box + \box_ht:N \g_ptxcd_title_info_box} > {1.1\c_ptxcd_logoheight_dim}
+				{\vspace{\c_ptxcd_largerule_dim}}
+				{\vspace{.5\c_ptxcd_logoheight_dim}}
 
 		\par
 	}}
 	\par
 	\nointerlineskip
-	\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
-	\begin{addmargin}{.5\c_TUDa_largerule_dim}
+	\rule{\g_ptxcd_headwidth_dim}{\g_ptxcd_titlerule_dim}
+	\begin{addmargin}{.5\c_ptxcd_largerule_dim}
 	\Large
 	\clist_map_inline:nn {subtitle, subject, author, date, publishers}
 		{\tl_if_empty:cF {@##1} {{\usekomafont{##1}\use:c {@##1}\par}}}
-	\vspace{\c_TUDa_rulesep_dim}
+	\vspace{\c_ptxcd_rulesep_dim}
 	\end{addmargin}
 	\tl_if_empty:NF \@thanks {
 	\par\nointerlineskip
-	\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
-	\expandafter\fontsize\TUDa_titlethanks_fontsize:\selectfont
-	\begin{addmargin}{.5\c_TUDa_largerule_dim}
-		\let\footnotetext\TUDa@title@footnote
+	\rule{\g_ptxcd_headwidth_dim}{\g_ptxcd_titlerule_dim}
+	\expandafter\fontsize\ptxcd_titlethanks_fontsize:\selectfont
+	\begin{addmargin}{.5\c_ptxcd_largerule_dim}
+		\let\footnotetext\ptxcd_title@footnote
 		\@thanks
-		\vspace{\c_TUDa_rulesep_dim}
+		\vspace{\c_ptxcd_rulesep_dim}
 	\end{addmargin}
 	\par
 	\let\@thanks\@empty
 	}
 	\par\nointerlineskip
-		\rule{\g_TUDa_headwidth_dim}{\g_TUDa_titlerule_dim}
+		\rule{\g_ptxcd_headwidth_dim}{\g_ptxcd_titlerule_dim}
 	\par
 	\endgroup
-	\vskip .5\c_TUDa_logoheight_dim
+	\vskip .5\c_ptxcd_logoheight_dim
 }%
 
 %%Abstract anpassungen mit Sprache
@@ -1154,17 +1201,17 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 
 
 %Anpassungen marginpar
-\cs_set_eq:NN\TUDa_orig@marginpar:\marginpar
+\cs_set_eq:NN\ptxcd_orig@marginpar:\marginpar
 \newkomafont{marginpar}{\accentfont\color{textaccentcolor}}
 \RenewDocumentCommand{\marginpar}{om}{
 	\IfNoValueTF{#1}{
-		\TUDa_orig@marginpar:{\leavevmode\usekomafont{marginpar}#2}
+		\ptxcd_orig@marginpar:{\leavevmode\usekomafont{marginpar}#2}
 	}{
-		\TUDa_orig@marginpar:[\leavevmode\usekomafont{marginpar}#1]{\leavevmode\usekomafont{marginpar}#2}
+		\ptxcd_orig@marginpar:[\leavevmode\usekomafont{marginpar}#1]{\leavevmode\usekomafont{marginpar}#2}
 	}
 }
 
-\TUDa_define_captionFallback:Nn \authorandname {and}
+\ptxcd_define_captionFallback:Nn \authorandname {and}
 \defcaptionname{ngerman, german}{\authorandname}{und}
 \defcaptionname{english, USenglish, american, UKenglish, british}{\authorandname}{and}
 
@@ -1186,37 +1233,37 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 
 %IMRAD:Introduction
 \seq_if_exist:NTF \seq_const_from_clist:Nn {
-	\seq_const_from_clist:Nn \c_TUDa_IMRAD_seq {introduction, methods, results, discussion}
+	\seq_const_from_clist:Nn \c_ptxcd_IMRAD_seq {introduction, methods, results, discussion}
 } {
-	\seq_new:N \c_TUDa_IMRAD_seq
-	\seq_gset_from_clist:Nn \c_TUDa_IMRAD_seq {introduction, methods, results, discussion}
+	\seq_new:N \c_ptxcd_IMRAD_seq
+	\seq_gset_from_clist:Nn \c_ptxcd_IMRAD_seq {introduction, methods, results, discussion}
 }
 
 \newcommand*{\IMRADlabel}[1]{
-	\seq_if_in:NnTF \c_TUDa_IMRAD_seq  {#1}
+	\seq_if_in:NnTF \c_ptxcd_IMRAD_seq  {#1}
 		{\label{IMRAD:#1}}
-		{\msg_error:nnnn {TUDaPub}{undefined-IMRADlabel}{#1}{\seq_use:Nn \c_TUDa_IMRAD_seq {,}}}
+		{\msg_error:nnnn {tudapub} {undefined-IMRADlabel}{#1}{\seq_use:Nn \c_ptxcd_IMRAD_seq {,}}}
 }
 
 
-\bool_if:NT \g_TUDa_IMRAD_bool {
+\bool_if:NT \g_ptxcd_IMRAD_bool {
 	\AtEndDocument{
-		\seq_map_inline:Nn \c_TUDa_IMRAD_seq {
+		\seq_map_inline:Nn \c_ptxcd_IMRAD_seq {
 			\cs_if_exist:cF {r@IMRAD:#1} {
-			\msg_warning:nnn {TUDaPub}{missing-IMRADlabel} {#1}
+			\msg_warning:nnn {tudapub} {missing-IMRADlabel} {#1}
 			}
 	 	}
 	}
 }
 
-\msg_new:nnn {TUDaPub}{undefined-IMRADlabel} {
+\msg_new:nnn {tudapub} {undefined-IMRADlabel} {
 	You~tried~to~set~an~IMRAD~label~with~key~#1.\\
 	This~label~type~is~not~declared.\\
 	Possible~labels~are:~#2
 }
 
 
-\msg_new:nnn {TUDaPub} {missing-IMRADlabel} {
+\msg_new:nnn{tudapub} {missing-IMRADlabel} {
 	You~did~not~provide~a~Label~for~key~#1.\\
 	Either~you~need~to~recompile~your~document~or~add~a~label~using~\string\IMRADlabel.
 }
@@ -1226,5 +1273,6 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
 	\let\Iftocfeature\iftocfeature
 }
 
+\file_if_exist_input:n {tuda\g_ptxcd_department_str.cfg}
 \endinput
 %End of class tudapub.cls