uantwerpendocs (13jul21)

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

16 files changed, 1859 insertions, 2089 deletions

diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty
index ca9717b6be2..f3a209c68c2 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty
@@ -24,91 +24,17 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+
 
 
 \mode<presentation>
 
-\if@cmyk
-
-%% UAntwerpen
-\definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01}
-\definecolor{uauaside}{cmyk}{1.00,0.71,0.00,0.51}
-%% Faculteit Bedrijfswetenschappen en Economie
-\definecolor{uabemain}{cmyk}{0.58,0.00,1.00,0.04}
-\definecolor{uabeside}{cmyk}{0.29,0.04,0.41,0.00}
-%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
-\definecolor{uafbdmain}{cmyk}{0.65,0.03,0.00,0.00}
-\definecolor{uafbdside}{cmyk}{0.33,0.03,0.00,0.00}
-%% Faculteit Geneeskunde en Gezondheidswetenschappen
-\definecolor{uaggwmain}{cmyk}{0.61,0.55,0.00,0.00}
-\definecolor{uaggwside}{cmyk}{0.21,0.27,0.03,0.00}
-%% Faculteit Letteren en Wijsbegeerte
-\definecolor{ualwmain}{cmyk}{0.00,0.27,0.85,0.00}
-\definecolor{ualwside}{cmyk}{0.00,0.16,0.51,0.00}
-%% Faculteit Ontwerpwetenschappen
-\definecolor{uaowmain}{cmyk}{0.53,0.25,0.26,0.05}
-\definecolor{uaowside}{cmyk}{0.25,0.08,0.16,0.00}
-%% Faculteit Rechten
-\definecolor{uaremain}{cmyk}{0.10,1.00,0.90,0.05}
-\definecolor{uareside}{cmyk}{0.04,0.45,0.36,0.00}
-%% Faculteit Sociale Wetenschappen
-\definecolor{uaswmain}{cmyk}{0.08,0.00,1.00,0.26}
-\definecolor{uaswside}{cmyk}{0.20,0.11,0.50,0.00}
-%% Faculteit Toegepaste Ingenieurswetenschappen
-\definecolor{uatimain}{cmyk}{0.31,1.00,0.00,0.01}
-\definecolor{uatiside}{cmyk}{0.11,0.30,0.02,0.00}
-%% Faculteit Wetenschappen
-\definecolor{uawemain}{cmyk}{1.00,0.20,0.00,0.25}
-\definecolor{uaweside}{cmyk}{0.40,0.08,0.00,0.10}
-%% IOB
-\definecolor{uaiobmain}{cmyk}{0.05,0.75,1.00,0.00}
-\definecolor{uaiobside}{cmyk}{0.40,0.08,0.00,0.10}
-
-\else
-
-%% UAntwerpen
-\definecolor{uauamain}{RGB}{234,44,56}
-\definecolor{uauaside}{RGB}{0,46,101}
-%% Faculteit Bedrijfswetenschappen en Economie
-\definecolor{uabemain}{RGB}{101,168,18}
-\definecolor{uabeside}{RGB}{185,213,169}
-%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
-\definecolor{uafbdmain}{RGB}{68,184,243}
-\definecolor{uafbdside}{RGB}{181,221,247}
-%% Faculteit Geneeskunde en Gezondheidswetenschappen
-\definecolor{uaggwmain}{RGB}{117,117,203}
-\definecolor{uaggwside}{RGB}{198,182,210}
-%% Faculteit Letteren en Wijsbegeerte
-\definecolor{ualwmain}{RGB}{241,181,61}
-\definecolor{ualwside}{RGB}{255,218,145}
-%% Faculteit Ontwerpwetenschappen
-\definecolor{uaowmain}{RGB}{130,161,173}
-\definecolor{uaowside}{RGB}{200,217,216}
-%% Faculteit Rechten
-\definecolor{uaremain}{RGB}{210,8,36}
-\definecolor{uareside}{RGB}{237,157,144}
-%% Faculteit Sociale Wetenschappen
-\definecolor{uaswmain}{RGB}{173,165,0}
-\definecolor{uaswside}{RGB}{215,211,148}
-%% Faculteit Toegepaste Ingenieurswetenschappen
-\definecolor{uatimain}{RGB}{177,0,151}
-\definecolor{uatiside}{RGB}{221,184,210}
-%% Faculteit Wetenschappen
-\definecolor{uawemain}{RGB}{0,108,169}
-\definecolor{uaweside}{RGB}{151,192,223}
-%% IOB
-\definecolor{uaiobmain}{RGB}{230,98,8}
-\definecolor{uaiobside}{RGB}{151,192,223}
-
-\fi
+\RequirePackage{uantwerpencolorlogoscheme}
 
 %% define main color
-\colorlet{maincolor}{\maincolor}
-\colorlet{sidecolor}{\sidecolor}
-\colorlet{basecolor}{\basecolor}
-
 \setbeamercolor{palette primary}{fg=maincolor}
 \setbeamercolor{palette secondary}{fg=sidecolor}
 \setbeamercolor{palette tertiary}{fg=uauaside}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty
index 3eb240521af..d78ed057167 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty
@@ -24,15 +24,17 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+
 
 
 \usetikzlibrary{calc}
 
 \if@nofonts
 \else
-  \RequirePackage{iftex}
+\RequirePackage{iftex}
   % Uncomment the following line if in MiKTeX you get the error
   % message that \ifluatex is already defined.
   % You first option is to update all your packages both in user as in
@@ -105,7 +107,7 @@
 \setbeamerfont{footline}{parent={tiny structure}}
 
 \setbeamerfont{frametitle}
-  {parent=structure,size=\renewcommand{\baselinestretch}{0.85}\LARGE\bfseries}
+  {parent=structure,size=\renewcommand*{\baselinestretch}{0.85}\LARGE\bfseries}
 \setbeamerfont{framesubtitle}{parent=frametitle,size=\normalsize\bfseries}
 
 \setbeamerfont{caption}{size=\small}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty
index 05f6c2c01e8..2a7e7d48d20 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty
@@ -24,8 +24,10 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+
 
 
 \mode<presentation>
@@ -40,7 +42,7 @@
 \newif\if@noround
 \@noroundfalse
 
-\newcommand\uantwerpenleftshape[3][]{
+\newcommand*\uantwerpenleftshape[3][]{
   \newcommand\mycradius{0.05*(\getlength{\paperheight}-1.6)}%
   \coordinate (bl) at #2;
   \coordinate (tr) at #3;
@@ -51,7 +53,7 @@
   arc(-90:-180:{\mycradius}) -- cycle;
   \fi
 }
-\newcommand\uantwerpenrightshape[3][]{
+\newcommand*\uantwerpenrightshape[3][]{
   \newcommand\mycradius{0.05*(\getlength{\paperheight}-1.6)}%
   \coordinate (bl) at #2;
   \coordinate (tr) at #3;
@@ -63,7 +65,7 @@
   \fi
 }
 
-\newcommand\darken[2][0.5]{%
+\newcommand*\darken[2][0.5]{%
   \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
     \node (a) {#2};
     \fill[fill=black,opacity=#1] (a.south west) rectangle (a.north east);
@@ -92,7 +94,7 @@
   \end{tikzpicture}
 }
 
-\newcommand\uantwerpenicon[1][scale=1]{
+\newcommand*\uantwerpenicon[1][scale=1]{
   \includegraphics[#1]{\iconfile}
 }
 
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty
index 505458f5799..42f835e138b 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty
@@ -24,15 +24,17 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+
 
 
 \mode<presentation>
 
 \newcommand*\getlength[1]{\strip@pt#1/28.45274}
-\newcommand\pw{\getlength{\paperwidth}}%
-\newcommand\ph{\getlength{\paperheight}}%
+\newcommand*\pw{\getlength{\paperwidth}}%
+\newcommand*\ph{\getlength{\paperheight}}%
 
 \newif\if@rhtext
 \@rhtextfalse
@@ -647,9 +649,9 @@
 \newdimen\yupright
 \newdimen\xcurrent
 \newdimen\ycurrent
-\newcommand\extractloleft[1]{\path  (#1);\pgfgetlastxy{\xloleft}{\yloleft};}
-\newcommand\extractupright[1]{\path (#1);\pgfgetlastxy{\xupright}{\yupright};}
-\newcommand\extractcurrent[1]{\path (#1);\pgfgetlastxy{\xcurrent}{\ycurrent};}
+\newcommand*\extractloleft[1]{\path  (#1);\pgfgetlastxy{\xloleft}{\yloleft};}
+\newcommand*\extractupright[1]{\path (#1);\pgfgetlastxy{\xupright}{\yupright};}
+\newcommand*\extractcurrent[1]{\path (#1);\pgfgetlastxy{\xcurrent}{\ycurrent};}
 
 \DeclareRobustCommand\place{\@ifnextchar[{\@place}{\@place[align=left] }}
 \def\@place[#1] at (#2,#3)#4{
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
index 274a2c3c0a5..416d1cb900d 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
@@ -26,99 +26,30 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{beamerthemeuantwerpen}
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+
 
 
 \newif\if@nofonts
 \@nofontsfalse
 \DeclareOption{nofonts}{\@nofontstrue}
-\newif\if@neutralcolors
-\@neutralcolorsfalse
-\DeclareOption{neutralcolors}{\@neutralcolorstrue}
 
-\newcommand\colormodel{rgb}
-\newif\if@cmyk
-\@cmykfalse
-\DeclareOption{cmyk}{\renewcommand\colormodel{cmyk}\@cmyktrue}
-\DeclareOption{rgb}{\renewcommand\colormodel{rgb}\@cmykfalse}
+\input{uantwerpencommonoptions.clo}
 
-\newcommand\fselector{ua}
-\newcommand\lselector{en}
-\newlength\logounitheight
-\setlength\logounitheight{0.8cm}
-\DeclareOption{be}{
-  \renewcommand\fselector{be}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{fbd}{
-  \renewcommand\fselector{fbd}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{ggw}{
-  \renewcommand\fselector{ggw}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{lw}{
-  \renewcommand\fselector{lw}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{ow}{
-  \renewcommand\fselector{ow}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{re}{
-  \renewcommand\fselector{re}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{sw}{
-  \renewcommand\fselector{sw}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{ti}{
-  \renewcommand\fselector{ti}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{we}{
-  \renewcommand\fselector{we}
-  \setlength\logounitheight{1cm}
-}
-\DeclareOption{iob}{
-  \renewcommand\fselector{iob}
-  \setlength\logounitheight{1cm}
-}
+\ProcessOptions
 
-\AtBeginDocument{
-  \makeatother
-  \@ifpackageloaded{babel}{
-    \addto\captionsdutch{
-      \renewcommand\lselector{nl}
-    }
-  }
-  \makeatletter
+\RequirePackage{uantwerpencolorlogoscheme}
 
-  \newcommand\logopos{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-pos}
-  \newcommand\logoneg{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-neg}
-  \newcommand\logomonowhite{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-mono-white}
-  \newcommand\iconfile{Logos/icon-uantwerpen-\fselector-\colormodel}
+\AtBeginDocument{
   \def\appropriatelogo{\logopos}
   \def\appropriateslidenumber{%
     \usebeamercolor{pageno in head/foot}%
     \insertframenumber/\inserttotalframenumber}%
 }
 
-\ProcessOptions
-
-\if@neutralcolors
-\newcommand\maincolor{uauaside}
-\newcommand\sidecolor{uauamain}
-\newcommand\basecolor{uauaside}
-\else
-\newcommand\maincolor{ua\fselector main}
-\newcommand\sidecolor{ua\fselector side}
-\newcommand\basecolor{uauaside}
-\fi
-
 \mode<presentation>
 
 \RequirePackage{tikz}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
index 2201309781e..1916a9d2c58 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
@@ -26,22 +26,21 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenbamathesis}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
-\newif\if@titlepagenoartwork
-\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
-\newif\if@titlepagetableonly
-\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
 \newif\if@filled
 \DeclareOption{filled}{\@filledtrue}
+\input{uantwerpencommonoptions.clo}
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions\relax
 \LoadClassWithOptions{book}
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -49,10 +48,13 @@
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
 \RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
+\RequirePackage{uantwerpencolorlogoscheme}
+
 \RequirePackage{fancyhdr}
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
@@ -63,240 +65,123 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand\uaname{University of Antwerp}
-\newcommand\arrname{All rights reserved}
-\newcommand\orname{of}
-\newcommand\domainname{uantwerp.be}
-\newcommand\datename{Date}
-\newcommand\subjectname{Subject}
-\newcommand\academicyearname{Academic year}
-\newcommand\masterthesisname{Master's thesis}
-\newcommand\bachelorthesisname{Bachelor's thesis}
-\newcommand\supervisorsname{Supervisors}
-\newcommand\juryname{Jury}
-\newcommand\jurymembersname{Members}
-\newcommand\jurychairmanname{Chairman}
-\newcommand\bmthesisname{Thesis to obtain the degree of}
-\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand\pthesisnameii{at University of Antwerp}
-\newcommand\@faculty{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
-  \renewcommand\@faculty{Centre Pieter Gillis}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
-  \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
-    Veterinary Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
-  \renewcommand\@faculty{Insitute of Development Policy}
-  \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
-  \renewcommand\@faculty{Antwerp School of Education}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
-  \renewcommand\@faculty{Faculty of Arts}
-  \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
-  \renewcommand\@faculty{Faculty of Design Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
-  \renewcommand\@faculty{Faculty of Social Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
-  \renewcommand\@faculty{Faculty of Law}
-  \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
-  \renewcommand\@faculty{Faculty of Business and Economics}
-  \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
-  \renewcommand\@faculty{Faculty of Applied Engineering}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
-  \renewcommand\@faculty{Faculty of Science}
-  \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
 \AtBeginDocument{
+  \makeatother
   \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
     \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\bachelorthesisname{Bachelorproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}
-        \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
-      \renewcommand\asoe{
-        \renewcommand\@faculty{Antwerp School of Education}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}
-        \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
-      \renewcommand\facow{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
-      \renewcommand\facsw{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
-     \renewcommand\facre{
-        \renewcommand\@faculty{Faculteit Rechten}
-        \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
-      \renewcommand\facbe{
-        \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
-        \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
-      \renewcommand\facti{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
-      \renewcommand\facwe{
-        \renewcommand\@faculty{Faculteit Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
-      \renewcommand\weightname{Gewicht}
+      \uantwerpendocspropread{nl}
     }
   }
   {}
+  \makeatletter
 }
-\newcommand{\@facultyacronym}{~}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{RE}}{\facre}{
-    \ifthenelse{\equal{#1}{BE}}{\facbe}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WE}}{\facwe}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
 }
-\newcommand{\@subtitle}{Master's thesis}
-\newcommand\@supervisori{\errmessage{Please define a supervisor of
-    your thesiswork using the \textbackslash{}supervisori to iv
-    commands} in the preamble of your document.}
-\newcommand\@supervisoriaff{}
-\newcommand\@supervisorii{}
-\newcommand\@supervisoriiaff{}
-\newcommand\@supervisoriii{}
-\newcommand\@supervisoriiiaff{}
-\newcommand\@supervisoriv{}
-\newcommand\@supervisorivaff{}
-\newcommand{\supervisori}[2]{
-  \renewcommand\@supervisori{#1}\renewcommand\@supervisoriaff{#2}}
-\newcommand{\supervisorii}[2]{
-  \renewcommand\@supervisorii{#1}\renewcommand\@supervisoriiaff{#2}}
-\newcommand{\supervisoriii}[2]{
-  \renewcommand\@supervisoriii{#1}\renewcommand\@supervisoriiiaff{#2}}
-\newcommand{\supervisoriv}[2]{
-  \renewcommand\@supervisoriv{#1}\renewcommand\@supervisorivaff{#2}}
-\newcommand{\@diplomalevel}{ERROR}
-\newcommand{\@diploma}{ERROR}
-\newcommand{\diploma}[1]{
-  \newcommand{\MoS}{Master of Science}
-  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
-  \newcommand{\BoSIW}{Bachelor of Science in de industri\"ele wetenschappen}
-  \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
-  \renewcommand{\@diploma}{
-    \ifthenelse{\equal{#1}{BA-IW-BK}}
-                          {\BoSIW: bouwkunde}{
-    \ifthenelse{\equal{#1}{BA-IW-BCH}}
-                          {\BoSIW: biochemie}{
-    \ifthenelse{\equal{#1}{BA-IW-CH}}
-                          {\BoSIW: chemie}{
-    \ifthenelse{\equal{#1}{BA-IW-EI}}
-                          {\BoSIW: elektronica-ICT}{
-    \ifthenelse{\equal{#1}{BA-IW-EM}}
-                          {\BoSIW: elektromechanica}{
-    \ifthenelse{\equal{#1}{MA-IW-BK}}
-                          {\MoSIW: bouwkunde}{
-    \ifthenelse{\equal{#1}{MA-IW-BCH}}
-                          {\MoSIW: biochemie}{
-    \ifthenelse{\equal{#1}{MA-IW-CH}}
-                          {\MoSIW: chemie}{
-    \ifthenelse{\equal{#1}{MA-IW-EI}}
-                          {\MoSIW: elektronica-ICT}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-CPS}}
-                          {\MoSIW:\\elektronica-ICT, optie
-                            Cyber-Physical Systems}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-IOT}}
-                          {\MoSIW:\\elektronica-IOT, optie Internet of
-                          Things}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-DAI}}
-                          {\MoSIW:\\elektronica-IOT, optie Distributed
-                            Artificial Intelligence}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-OE}}
-                          {\MoSIW:\\elektromechanica, optie Offshore
-                            Engineering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-EN}}
-                          {\MoSIW:\\elektromechanica, optie Energie}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-OP}}
-                          {\MoSIW:\\elektromechanica, optie Ontwerp en
-                          Productie}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-AU}}
-                          {\MoSIW:\\elektromechanica, optie Automatisering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM}}
-                          {\MoSIW:\\elektromechanica}{
-    \ifthenelse{\equal{#1}{MA-BE-HI}}
-                          {\MoS handelsingenieur}{
-    \ifthenelse{\equal{#1}{MA-BE-HIBI}}
-                          {\MoS handelsingenieur in de beleidsinformatica}{
-    \ifthenelse{\equal{#1}{MA-BE-EB}}
-                          {\MoSTEW: economisch beleid}{
-    \ifthenelse{\equal{#1}{MA-BE-BK}}
-                          {\MoSTEW: bedrijfskunde}
-    {\errmessage{Error in argument to macro diploma: must be one of
-        BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX
-        with XXX one of BK, BCH, CH, EI, EI-CPS, EI-IOT, EI-DAI,
-        EM-OE, EM-AU, EM-OP, EM-EN, MA-BE-YYY with YYY one of HI,
-        HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}}
-  }
-  \newcommand\thesisname{ERROR}
-  \IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
-  \IfSubStr{#1}{BA-}{\renewcommand\thesisname{\bachelorthesisname}}{}
+\ExplSyntaxOn
+\NewDocumentCommand{\@subtitle}{m}{
+  \tl_new:N \l__uantwerpendocs_degree
+  \tl_set:Nx \l__uantwerpendocs_degree { \tl_head:N \@degree }
+  \tl_if_eq:NnTF \l__uantwerpendocs_degree { B } {\uantwerpendocsprop{bthesisname}} {
+    \tl_if_eq:NnTF \l__uantwerpendocs_degree { M } {\uantwerpendocsprop{mthesisname}}
+    {\uantwerpendocsprop{thesisname}}}
+}
+\ExplSyntaxOff
+\ExplSyntaxOn
+
+\seq_new:N \g__uantwerpendocs_supervisors
+\seq_new:N \g__uantwerpendocs_supervisorswithaffiliation
+\cs_new:Nn \__uantwerpendocs_addsupervisor:nn {
+  \seq_gpush:Nn \g__uantwerpendocs_supervisors { #1 }
+  \seq_gpush:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1,~#2 }
+}
+\NewDocumentCommand{\supervisor}{mm}{
+  \__uantwerpendocs_addsupervisor:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointsupervisors}{m}{
+  \seq_use:Nn \g__uantwerpendocs_supervisors { #1 }
+}
+\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{
+  \seq_use:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1 }
+}
+\NewDocumentCommand{\supervisorsname}{}{
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 1
+  \uantwerpendocsprop{supervisorsname}
+  \else:
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 1
+  \uantwerpendocsprop{supervisorname}
+  \else:
+  \fi:
+  \fi:
+}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_supervisors
+  \seq_greverse:N \g__uantwerpendocs_supervisorswithaffiliation
 }
-\newcommand\@defensedate{ERROR}
-\newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
-\newcommand\@defenselocation{Antwerpen}
-\newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
-\newcommand{\@academicyear}{XXX-YYYY}
-\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
+\ExplSyntaxOff
+\newcommand*\@degree{
+  \PackageError{uantwerpendocs}
+  {Please, specify the offical degree description using
+    the '\protect\degree{}'  macro in the preamble of your document.}
+  {See the uantwerpendocs manual}
+}
+\newcommand*\degree[1]{\renewcommand*\@degree{#1}}
+\newcommand*{\diploma}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\diploma{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
+}
+\newcommand*\@defensedate{ERROR}
+\newcommand*{\defensedate}[1]{\renewcommand*\@defensedate{#1}}
+\newcommand*\@defenselocation{Antwerpen}
+\newcommand*{\defenselocation}[1]{\renewcommand*\@defenselocation{#1}}
+\newcommand*{\@academicyear}{XXX-YYYY}
+\newcommand*{\academicyear}[1]{\renewcommand*{\@academicyear}{#1}}
 \if@twoside
   \lhead[\thepage]{\slshape\rightmark}
   \chead[]{}
@@ -313,72 +198,67 @@
   \rfoot[]{}
 \fi
 
-\pgfmathsetmacro{\ua@Wh}{\paperwidth}
-\pgfmathsetmacro{\ua@Xh}{0.2\paperheight}
-\pgfmathsetmacro{\ua@Yh}{0.125\paperheight}
-\pgfmathsetmacro{\ua@XMYh}{\ua@Xh-\ua@Yh}
-\pgfmathsetmacro{\ua@Rh}{0.5*\ua@Wh/\ua@XMYh*\ua@Wh+0.5*\ua@XMYh}
-\pgfmathsetmacro{\ua@Qh}{\ua@Rh-\ua@Xh+\paperheight}
-\pgfmathsetmacro{\ua@Wba}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@Sba}{0.125*\paperheight}
-\pgfmathsetmacro{\ua@XMYba}{0.02\paperheight}
-\pgfmathsetmacro{\ua@Rba}{0.5*\ua@Wba/\ua@XMYba*\ua@Wba+0.5*\ua@XMYba}
-\pgfmathsetmacro{\ua@Qba}{\ua@Rba+\ua@Sba}
-\pgfmathsetmacro{\ua@Wbb}{0.65*\paperwidth}
-\pgfmathsetmacro{\ua@Sbb}{0.14*\paperheight}
-\pgfmathsetmacro{\ua@XMYbb}{0.06\paperheight}
-\pgfmathsetmacro{\ua@Rbb}{0.5*\ua@Wbb/\ua@XMYbb*\ua@Wbb+0.5*\ua@XMYbb}
-\pgfmathsetmacro{\ua@Qbb}{\ua@Rbb+\ua@Sbb}
-\pgfmathsetmacro{\ua@ll}{0.15*\paperwidth}
-\pgfmathsetmacro{\ua@l}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@d}{0.1in}
-\pgfmathsetmacro{\ua@rr}{0.85*\paperwidth}
 \renewcommand\maketitle{%
   \pagestyle{empty}
   \begin{titlepage}
-    \begin{tikzpicture}[remember picture,overlay]
-      \node at (current page.center) {
-        \begin{tikzpicture}[inner sep=0pt]
+    \AddToShipoutPicture*{%
+      \put(0,0){%
+        \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
           \clip (0,0) rectangle(\paperwidth,\paperheight);
-          \if@titlepagenoartwork\else
-          \filldraw [lightgray]
-          (0.55\paperwidth,\ua@Qba pt) circle (\ua@Rba pt);
-          \filldraw [white] (0.35\paperwidth,\ua@Qbb pt) circle (\ua@Rbb pt);
-          \filldraw [lightgray] (0,\ua@Qh pt) circle (\ua@Rh pt);
-          \path
-          (0.95\paperwidth,0.1\paperheight)
-          node [anchor=north east] {
-            \includegraphics[width=0.25\paperwidth]{\@logo}};
-          \fi
-          \path
-          (\ua@ll pt,0.77\paperheight)
-          node [anchor=north west, text width=0.7\paperwidth] {
-            \uppercase\expandafter{\uaname}\\~\\
-            \academicyearname{} \@academicyear\\~\\
-            {\large \@faculty{}}\\~\\
-            \thesisname{}\\[0.05\paperheight]
-            {\Large \bf \@title{}}}
-          (\ua@ll pt,0.55\paperheight)
-          node [anchor = north west, text width = 0.7\paperwidth] {
-            {\large \bf \@author{}}\\~\\~\\
-            \begin{tabular}{@{}p{2.7cm}p{10.8cm}}
-              \textbf{\supervisorsname{}:}
-              & \@supervisori \\
-              & \@supervisorii \\
-              & \@supervisoriii \\
-              & \@supervisoriv
+          \fill[lightgray]
+          (2.125,{\paperheight-7.5cm}) rectangle (\paperwidth,6);
+
+          \node
+          [anchor=west,text width={\paperwidth-5cm},align=left,font=\Huge,uauaside]
+          at (2.125,{\paperheight-3cm})
+          {
+            \textsf{\textbf{\@title}}
+          };
+
+          \node
+          [anchor=west,text width={\paperwidth-5cm},align=left,font=\Large,uauaside]
+          at (2.125,{\paperheight-5cm})
+          {
+            \textsf{\textbf{\@subtitle}}
+          };
+
+          \node
+          [anchor=base west,uauamain,
+          text width={\paperwidth-5cm},align=left,font=\LARGE]
+          at (2.125,{\paperheight-6.5cm})
+          {\textsf{\textbf{\@author}}};
+
+          \fill[gray] (2.125,6)
+          -- (\paperwidth,6)
+          -- (\paperwidth,2.625)
+          -- (2.55,2.625)
+          arc (-90:-180:0.425)
+          -- cycle;
+
+          \node[white,anchor=west,align=left,font=\large]
+          (SN) at (2.55,4.9)
+          {
+            \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+              \textsf{\supervisorsname}
+              & \textsf{\textbf{\jointsupervisors{ | }}}
             \end{tabular}
-          }
-          (\ua@ll pt,0.3\paperheight)
-          node [anchor=north west, text width = 0.7\paperwidth]{%
-            \bmthesisname\\
-            \@diploma\\
-            \@defenselocation, \@defensedate
           };
+
+          \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+          at (2.55,3.7)
+          {\textsf{\uantwerpendocsprop{bmthesisname}
+              \@degree{}}\\
+            \textsf{\textbf{\@faculty{}
+                | \@defenselocation, \@defensedate}}};
+
+          \node[anchor=west] at
+          (2.125,1.313)
+          {\includegraphics[width=4.75cm]{\logoposua}};
         \end{tikzpicture}
-      };
-    \end{tikzpicture}
+      }
+    }
   \end{titlepage}%
+  ~\par\relax
   \clearpage
   \setcounter{footnote}{0}%
   \global\let\thanks\relax
@@ -394,21 +274,24 @@
 \newcommand\makefinalpage{
   \cleardoublepage
   \thispagestyle{empty}
+  ~% intentionally blank page
+  \clearpage
+  \thispagestyle{empty}
   \begin{tikzpicture}[remember picture,overlay]
     \node at (current page.center) {
       \begin{tikzpicture}[inner sep=0pt]
         \clip (0,0) rectangle(\paperwidth,\paperheight);
-        \if@titlepagenoartwork\else
-        \filldraw [lightgray] (\paperwidth,\ua@Qh pt) circle (\ua@Rh pt);
-        \fi
+        \fill[lightgray] (0,0) rectangle (2.125cm,2.625cm);
       \end{tikzpicture}
     };
   \end{tikzpicture}
 }
-\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-\IfFileExists{hyperref.sty}{
-    \RequirePackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+\AtBeginDocument{
+  \@ifpackageloaded{hyperref}{
     \hypersetup{
+      backref=true,
+      hyperindex=true,
+      pagebackref=true,
       breaklinks=true,
       colorlinks=true,
       citecolor=black,
@@ -416,16 +299,13 @@
       linkcolor=black,
       pageanchor=true,
       pdfpagemode=UseOutlines,
-      urlcolor=black
-    }
-    \AtBeginDocument{
-      \hypersetup{
-        pdftitle={\@title},
-        pdfsubject={\@subtitle},
-        pdfauthor={\@author}
-      }
+      urlcolor=black,
+      pdftitle={\@title},
+      pdfsubject={\@subtitle},
+      pdfauthor={\@author}
     }
-}{}
+  }{}
+}
 \endinput
 %%
 %% End of file `uantwerpenbamathesis.cls'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty
new file mode 100644
index 00000000000..d3f234c1b98
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty
@@ -0,0 +1,115 @@
+%%
+%% This is file `uantwerpencolorlogoscheme.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uantwerpendocs.dtx  (with options: `cls')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2013-2021  by Walter Daems <walter.daems@uantwerpen.be>
+%% 
+%% 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 Walter Daems.
+%% 
+\ProvidesPackage{uantwerpencolorlogoscheme}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+\if@cmyk
+%% UAntwerpen
+\definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01}
+\definecolor{uauaside}{cmyk}{1.00,0.71,0.00,0.51}
+%% Faculteit Bedrijfswetenschappen en Economie
+\definecolor{uabemain}{cmyk}{0.58,0.00,1.00,0.04}
+\definecolor{uabeside}{cmyk}{0.29,0.04,0.41,0.00}
+%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+\definecolor{uafbdmain}{cmyk}{0.65,0.03,0.00,0.00}
+\definecolor{uafbdside}{cmyk}{0.33,0.03,0.00,0.00}
+%% Faculteit Geneeskunde en Gezondheidswetenschappen
+\definecolor{uaggwmain}{cmyk}{0.61,0.55,0.00,0.00}
+\definecolor{uaggwside}{cmyk}{0.21,0.27,0.03,0.00}
+%% Faculteit Letteren en Wijsbegeerte
+\definecolor{ualwmain}{cmyk}{0.00,0.27,0.85,0.00}
+\definecolor{ualwside}{cmyk}{0.00,0.16,0.51,0.00}
+%% Faculteit Ontwerpwetenschappen
+\definecolor{uaowmain}{cmyk}{0.53,0.25,0.26,0.05}
+\definecolor{uaowside}{cmyk}{0.25,0.08,0.16,0.00}
+%% Faculteit Rechten
+\definecolor{uaremain}{cmyk}{0.10,1.00,0.90,0.05}
+\definecolor{uareside}{cmyk}{0.04,0.45,0.36,0.00}
+%% Faculteit Sociale Wetenschappen
+\definecolor{uaswmain}{cmyk}{0.08,0.00,1.00,0.26}
+\definecolor{uaswside}{cmyk}{0.20,0.11,0.50,0.00}
+%% Faculteit Toegepaste Ingenieurswetenschappen
+\definecolor{uatimain}{cmyk}{0.31,1.00,0.00,0.01}
+\definecolor{uatiside}{cmyk}{0.11,0.30,0.02,0.00}
+%% Faculteit Wetenschappen
+\definecolor{uawemain}{cmyk}{1.00,0.20,0.00,0.25}
+\definecolor{uaweside}{cmyk}{0.40,0.08,0.00,0.10}
+%% IOB
+\definecolor{uaiobmain}{cmyk}{0.05,0.75,1.00,0.00}
+\definecolor{uaiobside}{cmyk}{0.40,0.08,0.00,0.10}
+\else
+%% UAntwerpen
+\definecolor{uauamain}{RGB}{234,44,56}
+\definecolor{uauaside}{RGB}{0,46,101}
+%% Faculteit Bedrijfswetenschappen en Economie
+\definecolor{uabemain}{RGB}{101,168,18}
+\definecolor{uabeside}{RGB}{185,213,169}
+%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+\definecolor{uafbdmain}{RGB}{68,184,243}
+\definecolor{uafbdside}{RGB}{181,221,247}
+%% Faculteit Geneeskunde en Gezondheidswetenschappen
+\definecolor{uaggwmain}{RGB}{117,117,203}
+\definecolor{uaggwside}{RGB}{198,182,210}
+%% Faculteit Letteren en Wijsbegeerte
+\definecolor{ualwmain}{RGB}{241,181,61}
+\definecolor{ualwside}{RGB}{255,218,145}
+%% Faculteit Ontwerpwetenschappen
+\definecolor{uaowmain}{RGB}{130,161,173}
+\definecolor{uaowside}{RGB}{200,217,216}
+%% Faculteit Rechten
+\definecolor{uaremain}{RGB}{210,8,36}
+\definecolor{uareside}{RGB}{237,157,144}
+%% Faculteit Sociale Wetenschappen
+\definecolor{uaswmain}{RGB}{173,165,0}
+\definecolor{uaswside}{RGB}{215,211,148}
+%% Faculteit Toegepaste Ingenieurswetenschappen
+\definecolor{uatimain}{RGB}{177,0,151}
+\definecolor{uatiside}{RGB}{221,184,210}
+%% Faculteit Wetenschappen
+\definecolor{uawemain}{RGB}{0,108,169}
+\definecolor{uaweside}{RGB}{151,192,223}
+%% IOB
+\definecolor{uaiobmain}{RGB}{230,98,8}
+\definecolor{uaiobside}{RGB}{151,192,223}
+\fi
+%%
+\if@neutralcolors
+\colorlet{maincolor}{uauaside}
+\colorlet{sidecolor}{uauamain}
+\colorlet{basecolor}{uauaside}
+\else
+\colorlet{maincolor}{ua\fselector main}
+\colorlet{sidecolor}{ua\fselector side}
+\colorlet{basecolor}{uauaside}
+\fi
+
+
+
+\endinput
+%%
+%% End of file `uantwerpencolorlogoscheme.sty'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo
new file mode 100644
index 00000000000..307ec0e1d47
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo
@@ -0,0 +1,143 @@
+%%
+%% This is file `uantwerpencommonoptions.clo',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uantwerpendocs.dtx  (with options: `clo')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2013-2021  by Walter Daems <walter.daems@uantwerpen.be>
+%% 
+%% 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 Walter Daems.
+%% 
+\ProvidesFile{uantwerpencommonoptions.clo}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+\newif\if@neutralcolors
+\@neutralcolorsfalse
+\DeclareOption{neutralcolors}{\@neutralcolorstrue}
+
+\newcommand*\colormodel{rgb}
+\newif\if@cmyk
+\@cmykfalse
+\DeclareOption{cmyk}{\renewcommand*\colormodel{cmyk}\@cmyktrue}
+\DeclareOption{rgb}{\renewcommand*\colormodel{rgb}\@cmykfalse}
+
+\newcommand*\facinenglish[1]{\renewcommand\@faculty{#1}}
+\newcommand*\facindutch[1]{
+  \AtBeginDocument{
+    \makeatother
+    \@ifpackageloaded{babel}{
+      \addto\captionsdutch{\renewcommand*\@faculty{#1}}
+    }{}
+    \makeatletter
+  }
+}
+\newcommand*\fselector{ua}
+\newcommand*\lselector{en}
+\newlength\logounitheight
+\setlength\logounitheight{0.8cm}
+
+\newcommand*\@faculty{~}
+\DeclareOption{be}{
+  \renewcommand*\fselector{be}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Business and Economics}
+  \facindutch{Faculteit Bedrijfswetenschappen en Economie}
+}
+\DeclareOption{fbd}{
+  \renewcommand*\fselector{fbd}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}
+  \facindutch{Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+      Wetenschappen}
+}
+\DeclareOption{ggw}{
+  \renewcommand*\fselector{ggw}
+  \setlength\logounitheight{1cm}
+  \facinenglish{
+    Faculty of Medicine and Health Sciences}
+  \facindutch{Faculteit Geneeskunde en Gezondheidswetenschappen}
+}
+\DeclareOption{lw}{
+  \renewcommand*\fselector{lw}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Arts}
+  \facindutch{Faculteit Letteren en Wijsbegeerte}
+}
+\DeclareOption{ow}{
+  \renewcommand*\fselector{ow}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Design Sciences}
+  \facindutch{Faculteit Ontwerpwetenschappen}
+}
+\DeclareOption{re}{
+  \renewcommand*\fselector{re}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Law}
+  \facindutch{Faculteit Rechten}
+}
+\DeclareOption{sw}{
+  \renewcommand*\fselector{sw}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Social Sciences}
+  \facindutch{Faculteit Sociale Wetenschappen}
+ }
+\DeclareOption{ti}{
+  \renewcommand*\fselector{ti}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Applied Engineering}
+  \facindutch{Faculteit Toegepaste Ingenieurswetenschappen}
+}
+\DeclareOption{we}{
+  \renewcommand*\fselector{we}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Faculty of Science}
+  \facindutch{Faculteit Wetenschappen}
+}
+\DeclareOption{iob}{
+  \renewcommand*\fselector{iob}
+  \setlength\logounitheight{1cm}
+  \facinenglish{Institute of Development Policy}
+  \facindutch{Instituut voor Ontwikkelingsbeleid- en beheer}
+}
+\newcommand*\@facultyacronym{\expandafter\uppercase\expandafter{\fselector}}
+
+\AtBeginDocument{
+  \makeatother
+  \@ifpackageloaded{babel}{
+    \addto\captionsdutch{
+      \renewcommand*\lselector{nl}
+    }{}
+  }
+  \makeatletter
+
+  \newcommand*\logopos{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-pos}
+  \newcommand*\logoposua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-pos}
+  \newcommand*\logoneg{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-neg}
+  \newcommand*\logonegua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-neg}
+  \newcommand*\logomonowhite{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-mono-white}
+  \newcommand*\logomonowhiteua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-mono-white}
+  \newcommand*\iconfile{Logos/icon-uantwerpen-\fselector-\colormodel}
+  \newcommand*\iconfileua{Logos/icon-uantwerpen-ua-\colormodel}
+}
+
+
+
+\endinput
+%%
+%% End of file `uantwerpencommonoptions.clo'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
index 5dfc66b313a..06f21f823cf 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
@@ -26,26 +26,23 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpencoursetext}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
 \newif\if@copyright
 \DeclareOption{copyright}{\@copyrighttrue}
-\newif\if@qr
-\DeclareOption{qr}{\@qrtrue}
-\newif\if@titlepagenoartwork
-\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
-\newif\if@titlepagetableonly
-\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
 \newif\if@filled
 \DeclareOption{filled}{\@filledtrue}
+\input{uantwerpencommonoptions.clo}
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions\relax
 \LoadClassWithOptions{book}
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -53,18 +50,16 @@
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
 \RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
 \if@copyright
-\RequirePackage[firstpage=false,contents={Copyright University of
-  Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
-\fi
-\if@qr
-\RequirePackage{auto-pst-pdf}
-\RequirePackage{pst-barcode}
+\RequirePackage[contents={},color=lightgray,scale=3]{background}
 \fi
+\RequirePackage{uantwerpencolorlogoscheme}
+
 \RequirePackage{fancyhdr}
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
@@ -75,366 +70,151 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand\uaname{University of Antwerp}
-\newcommand\arrname{All rights reserved}
-\newcommand\orname{of}
-\newcommand\domainname{uantwerp.be}
-\newcommand\datename{Date}
-\newcommand\subjectname{Subject}
-\newcommand\academicyearname{Academic year}
-\newcommand\masterthesisname{Master's thesis}
-\newcommand\bachelorthesisname{Bachelor's thesis}
-\newcommand\supervisorsname{Supervisors}
-\newcommand\juryname{Jury}
-\newcommand\jurymembersname{Members}
-\newcommand\jurychairmanname{Chairman}
-\newcommand\bmthesisname{Thesis to obtain the degree of}
-\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand\pthesisnameii{at University of Antwerp}
-\newcommand\@faculty{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
-  \renewcommand\@faculty{Centre Pieter Gillis}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
-  \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
-    Veterinary Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
-  \renewcommand\@faculty{Insitute of Development Policy}
-  \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
-  \renewcommand\@faculty{Antwerp School of Education}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
-  \renewcommand\@faculty{Faculty of Arts}
-  \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
-  \renewcommand\@faculty{Faculty of Design Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
-  \renewcommand\@faculty{Faculty of Social Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
-  \renewcommand\@faculty{Faculty of Law}
-  \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
-  \renewcommand\@faculty{Faculty of Business and Economics}
-  \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
-  \renewcommand\@faculty{Faculty of Applied Engineering}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
-  \renewcommand\@faculty{Faculty of Science}
-  \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
 \AtBeginDocument{
+  \makeatother
   \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
     \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\bachelorthesisname{Bachelorproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}
-        \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
-      \renewcommand\asoe{
-        \renewcommand\@faculty{Antwerp School of Education}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}
-        \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
-      \renewcommand\facow{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
-      \renewcommand\facsw{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
-     \renewcommand\facre{
-        \renewcommand\@faculty{Faculteit Rechten}
-        \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
-      \renewcommand\facbe{
-        \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
-        \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
-      \renewcommand\facti{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
-      \renewcommand\facwe{
-        \renewcommand\@faculty{Faculteit Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
-      \renewcommand\weightname{Gewicht}
+      \uantwerpendocspropread{nl}
     }
   }
   {}
+  \makeatletter
 }
-\newcommand{\@facultyacronym}{~}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{RE}}{\facre}{
-    \ifthenelse{\equal{#1}{BE}}{\facbe}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WE}}{\facwe}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
-}
-\newcommand{\@qrtitle}{}
-\renewcommand{\title}[1]{%
-  \renewcommand\@title{#1}
-  \ifx\@qrtitle\@emptymacro
-  \renewcommand\@qrtitle{#1}
-  \fi
-}
-\newcommand{\qrtitle}[1]{%
-  \renewcommand\@qrtitle{#1}
-}
-\newcommand{\@subtitle}{~}
-\newcommand{\@qrsubtitle}{}
-\newcommand{\subtitle}[1]{%
-  \renewcommand\@subtitle{#1}
-  \ifx\@qrsubtitle\@emptymacro
-    \renewcommand\@qrsubtitle{#1}
-  \fi
-}
-\newcommand{\qrsubtitle}[1]{%
-  \renewcommand\@qrsubtitle{#1}
-}
-\newcommand{\@qrauthor}{}
-\renewcommand{\author}[1]{%
-  \renewcommand\@author{#1}
-  \ifx\@qrauthor\@emptymacro
-  \renewcommand\@qrauthor{#1}
-  \fi
-}
-\newcommand{\qrauthor}[1]{%
-  \renewcommand\@qrauthor{#1}
-}
-\newcommand{\@courseversion}{}
-\newcommand{\courseversion}[1]{\renewcommand{\@courseversion}{#1}}
-\newcommand{\@versionyear}{}
-\newcommand{\versionyear}[1]{\renewcommand{\@versionyear}{#1}}
-\newcommand{\@publisher}{Universitas Cursusdienst\\
-  Prinsesstraat 16\\
-  2000 Antwerpen\\
-  T +32 3 233 23 73\\
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
+}
+\newcommand*{\@subtitle}{~}
+\newcommand*{\subtitle}[1]{%
+  \renewcommand*\@subtitle{#1}
+}
+\newcommand*{\@courseversion}{}
+\newcommand*{\courseversion}[1]{\renewcommand*{\@courseversion}{#1}}
+\newcommand*{\@versionyear}{}
+\newcommand*{\versionyear}[1]{\renewcommand*{\@versionyear}{#1}}
+\newcommand{\@publisher}{Universitas Cursusdienst |
+  Prinsesstraat 16 |
+  2000 Antwerpen |
+  T +32 3 233 23 73 |
   E info@cursusdienst.be}
-\newcommand{\publisher}[1]{\renewcommand{\@publisher}{#1}}
-\newcommand{\@publishercode}{}
-\newcommand{\publishercode}[1]{\renewcommand{\@publishercode}{#1}}
-\newcommand{\@lectureri}{}
-\newcommand{\@lecturerii}{}
-\newcommand{\@lectureriii}{}
-\newcommand{\@lectureriv}{}
-\newcommand{\@qrlectureri}{}
-\newcommand{\@qrlecturerii}{}
-\newcommand{\@qrlectureriii}{}
-\newcommand{\@qrlectureriv}{}
-\newcommand{\lecturer}[1]{
-  \renewcommand{\@lectureri}{#1}
-  \ifx\@qrlectureri\@emptymacro
-  \renewcommand\@qrlectureri{#1}
-  \fi
-}
-\newcommand{\qrlecturer}[1]{
-  \renewcommand\@qrlectureri{#1}
-}
-\newcommand{\lectureri}[1]{
-  \renewcommand{\@lectureri}{#1}
-  \ifx\@qrlectureri\@emptymacro
-  \renewcommand\@qrlectureri{#1}
-  \fi
-}
-\newcommand{\qrlectureri}[1]{
-  \renewcommand\@qrlectureri{#1}
-}
-\newcommand{\lecturerii}[1]{
-  \renewcommand{\@lecturerii}{#1}
-  \ifx\@qrlecturerii\@emptymacro
-  \renewcommand\@qrlecturerii{#1}
-  \fi
-}
-\newcommand{\qrlecturerii}[1]{
-  \renewcommand\@qrlecturerii{#1}
-}
-\newcommand{\lectureriii}[1]{
-  \renewcommand{\@lectureriii}{#1}
-  \ifx\@qrlectureriii\@emptymacro
-  \renewcommand\@qrlectureriii{#1}
-  \fi
-}
-\newcommand{\qrlectureriii}[1]{
-  \renewcommand\@qrlectureriii{#1}
-}
-\newcommand{\lectureriv}[1]{
-  \renewcommand{\@lectureriv}{#1}
-  \ifx\@qrlectureriv\@emptymacro
-  \renewcommand\@qrlectureriv{#1}
-  \fi
-}
-\newcommand{\qrlectureriv}[1]{
-  \renewcommand\@qrlectureriv{#1}
-}
-\newcommand{\@programmet}{} % type
-\newcommand{\@programmec}{} % class
-\newcommand{\@programmecqr}{} % class for qr code
-\newcommand{\@programmes}{} % class
-\newcommand{\@programmeq}{} % qualifier
-\newcommand{\programme}[3]{%
-    \ifthenelse{\equal{#1}{BA}}%
-    {\renewcommand{\@programmet}{Bachelor of Science in de }}{%
-    \ifthenelse{\equal{#1}{MA}}%
-    {\renewcommand{\@programmet}{Master of Science in de }}{%
-    \ifthenelse{\equal{#1}{PHD}}%
-    {\renewcommand{\@programmet}{Doctor in de }}{%
-    \ifthenelse{\equal{#1}{VP}}%
-    {\renewcommand{\@programmet}{Voorbereidingsprogramma in de }}{%
-    \ifthenelse{\equal{#1}{SP}}%
-    {\renewcommand{\@programmet}{Schakelprogramma in de }}{%
-    \ifthenelse{\equal{#1}{FREE}}%
-    {}{
-    \errmessage{Error in 1st arg of macro programme[3]: invalid
-      programme type!}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}}%
-    {\renewcommand{\@programmec}{industri\"ele wetenschappen}
-     \renewcommand{\@programmecqr}{industriële wetenschappen}}{
-    \ifthenelse{\equal{#2}{}}%
-    {}{
-    \errmessage{{Error in 2nd arg of macro programme[3]: invalid
-      programme class! }}}}%
-    %
-    \ifthenelse{\equal{#3}{BK}}%
-    {\renewcommand{\@programmeq}{Bouwkunde}}{%
-    \ifthenelse{\equal{#3}{CH}}%
-    {\renewcommand{\@programmeq}{Chemie}}{%
-    \ifthenelse{\equal{#3}{BCH}}%
-    {\renewcommand{\@programmeq}{Biochemie}}{%
-    \ifthenelse{\equal{#3}{EM}}%
-    {\renewcommand{\@programmeq}{Elektromechanica}}{%
-    \ifthenelse{\equal{#3}{EI}}%
-    {\renewcommand{\@programmeq}{Elektronica-ICT}}{%
-    \ifthenelse{\equal{#3}{}}%
-    {}{%
-    \ifthenelse{\equal{#1}{FREE}}
-    {\renewcommand{\@programmeq}{#3}}{
-    \errmessage{Error in 3rd arg to macro programme[3]: invalid
-      programme qualifier}}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}\and\not\equal{#3}{}}
-    {\renewcommand{\@programmes}{: }}{}
-}
-\newcommand{\@coursecodei}{}
-\newcommand{\@coursecodeii}{}
-\newcommand{\@coursecodeiii}{}
-\newcommand{\@coursecodeiv}{}
-\newcommand{\@coursei}{}
-\newcommand{\@courseii}{}
-\newcommand{\@courseiii}{}
-\newcommand{\@courseiv}{}
-\newcommand{\@qrcoursei}{}
-\newcommand{\@qrcourseii}{}
-\newcommand{\@qrcourseiii}{}
-\newcommand{\@qrcourseiv}{}
-\newcommand{\course}[2]{
-  \renewcommand{\@coursecodei}{#1}
-  \renewcommand{\@coursei}{#2}
-  \ifx\@qrcoursei\@emptymacro
-  \renewcommand{\@qrcoursei}{#2}
-  \fi
-}
-\newcommand{\qrcourse}[1]{
-  \renewcommand{\@qrcoursei}{#1}
-}
-\newcommand{\coursei}[2]{
-  \renewcommand{\@coursecodei}{#1}
-  \renewcommand{\@coursei}{#2}
-  \ifx\@qrcoursei\@emptymacro
-  \renewcommand{\@qrcoursei}{#2}
-  \fi
-}
-\newcommand{\qrcoursei}[1]{
-  \renewcommand{\@qrcoursei}{#1}
+\newcommand*{\publisher}[1]{\renewcommand*{\@publisher}{#1}}
+\newcommand*{\@publishercode}{}
+\newcommand*{\publishercode}[1]{\renewcommand*{\@publishercode}{#1}}
+\ExplSyntaxOn
+\seq_new:N \g__uantwerpendocs_lecturers
+\cs_new:Nn \__uantwerpendocs_addlecturer:n {
+  \seq_gpush:Nn \g__uantwerpendocs_lecturers { #1 }
+}
+\NewDocumentCommand{\lecturer}{m}{
+  \__uantwerpendocs_addlecturer:n { #1 }
+}
+\NewDocumentCommand{\jointlecturers}{m}{
+  \seq_use:Nn \g__uantwerpendocs_lecturers { #1 }
+}
+\NewDocumentCommand{\lecturersname}{}{
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 1
+  \uantwerpendocsprop{lecturersname}
+  \else:
+  \uantwerpendocsprop{lecturername}
+  \fi:
 }
-\newcommand{\courseii}[2]{
-  \renewcommand{\@coursecodeii}{#1}
-  \renewcommand{\@courseii}{#2}
-  \ifx\@qrcourseii\@emptymacro
-  \renewcommand{\@qrcourseii}{#2}
-  \fi
-}
-\newcommand{\qrcourseii}[1]{
-  \renewcommand{\@qrcourseii}{#1}
-}
-\newcommand{\courseiii}[2]{
-  \renewcommand{\@coursecodeiii}{#1}
-  \renewcommand{\@courseiii}{#2}
-  \ifx\@qrcourseiii\@emptymacro
-  \renewcommand{\@qrcourseiii}{#2}
-  \fi
-}
-\newcommand{\qrcourseiii}[1]{
-  \renewcommand{\@qrcourseiii}{#1}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_lecturers
 }
-\newcommand{\courseiv}[2]{
-  \renewcommand{\@coursecodeiv}{#1}
-  \renewcommand{\@courseiv}{#2}
-  \ifx\@qrcourseiv\@emptymacro
-  \renewcommand{\@qrcourseiv}{#2}
-  \fi
+
+\ExplSyntaxOff
+\newcommand*\@degree{
+  \PackageError{uantwerpendocs}
+  {Please, specify the offical degree description using
+    the '\protect\degree{}'  macro in the preamble of your document.}
+  {See the uantwerpendocs manual}
+}
+\newcommand*\degree[1]{\renewcommand*\@degree{#1}}
+\newcommand*{\programme}[3]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\programme{}{}{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
+}
+\newcommand*\coursei[2]{
+  PackageError{uantwerpendocs}
+  {The '\protect\coursei{}' macro is no longer available. Use
+    '\protect\course{}' instead (multiple times if you need to)}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\course macro instead of the \protect\coursei,
+    \protect\courseii, \protect\courseiii and \protect\courseiv macros
+    that existed earlier (see
+    the uantwerpendocs manual)'}
+}
+\ExplSyntaxOn
+\seq_new:N \g__uantwerpendocs_courseswithcodes
+\cs_new:Nn \__uantwerpendocs_addcourse:nn {
+  \seq_gpush:Nn \g__uantwerpendocs_courseswithcodes{ \texttt{#1}~#2 }
+}
+\NewDocumentCommand{\course}{mm}{
+  \__uantwerpendocs_addcourse:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointcourseswithcodes}{m}{
+  \seq_use:Nn \g__uantwerpendocs_courseswithcodes { #1 }
 }
-\newcommand{\qrcourseiv}[1]{
-  \renewcommand{\@qrcourseiv}{#1}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_courseswithcodes
 }
-\newcommand{\@academicyear}{XXX-YYYY}
-\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
+\ExplSyntaxOff
+\newcommand*\@titlepageimage{}
+\newcommand*\titlepageimage[1]{\renewcommand*\@titlepageimage{#1}}
+\newcommand*{\@academicyear}{XXX-YYYY}
+\newcommand*{\academicyear}[1]{\renewcommand*{\@academicyear}{#1}}
 \newcommand{\@copyrightnotices}{}
 \newcommand{\copyrightnotices}[1]{\renewcommand{\@copyrightnotices}{#1}}
 \if@twoside
 \lhead[\thepage]{\slshape\rightmark}
 \chead[]{}
 \rhead[\slshape\leftmark]{\thepage}
-\lfoot[\uaname{} -- \@facultyacronym]{\@courseversion}
+\lfoot[\uantwerpendocsprop{org-ua} -- \@facultyacronym]{\@courseversion}
 \cfoot[]{}
 \rfoot[]{\@title{}\ifdefvoid{\@subtitle}{}{ --- \@subtitle}}
 \else
@@ -447,8 +227,8 @@
 \fi
 
 \setlength{\headheight}{13.7pt}
-\renewcommand{\headrulewidth}{1pt}
-\renewcommand{\footrulewidth}{1pt}
+\renewcommand*{\headrulewidth}{1pt}
+\renewcommand*{\footrulewidth}{1pt}
 \pagenumbering{arabic}
 \if@filled\else
   \raggedright
@@ -457,160 +237,96 @@
 \onecolumn
 \newcommand{\@crnotice}{
   This document has been typeset using \LaTeX{} and the
-  \texttt{uantwerpencoursetext} class.\\
+  \texttt{uantwerpendocs} package.\\
   \@copyrightnotices
 
   \@courseversion
 
   CONFIDENTIAL AND PROPRIETARY.
 
-  \copyright{} \@versionyear{} University of Antwerp, \arrname.
+  \copyright{} \@versionyear{} \uantwerpendocsprop{org-ua}, \uantwerpendocsprop{arr}.
 }
-\pgfmathsetmacro{\ua@Wh}{\paperwidth}
-\pgfmathsetmacro{\ua@Xh}{0.2\paperheight}
-\pgfmathsetmacro{\ua@Yh}{0.125\paperheight}
-\pgfmathsetmacro{\ua@XMYh}{\ua@Xh-\ua@Yh}
-\pgfmathsetmacro{\ua@Rh}{0.5*\ua@Wh/\ua@XMYh*\ua@Wh+0.5*\ua@XMYh}
-\pgfmathsetmacro{\ua@Qh}{\ua@Rh-\ua@Xh+\paperheight}
-\pgfmathsetmacro{\ua@Wba}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@Sba}{0.125*\paperheight}
-\pgfmathsetmacro{\ua@XMYba}{0.02\paperheight}
-\pgfmathsetmacro{\ua@Rba}{0.5*\ua@Wba/\ua@XMYba*\ua@Wba+0.5*\ua@XMYba}
-\pgfmathsetmacro{\ua@Qba}{\ua@Rba+\ua@Sba}
-\pgfmathsetmacro{\ua@Wbb}{0.65*\paperwidth}
-\pgfmathsetmacro{\ua@Sbb}{0.14*\paperheight}
-\pgfmathsetmacro{\ua@XMYbb}{0.06\paperheight}
-\pgfmathsetmacro{\ua@Rbb}{0.5*\ua@Wbb/\ua@XMYbb*\ua@Wbb+0.5*\ua@XMYbb}
-\pgfmathsetmacro{\ua@Qbb}{\ua@Rbb+\ua@Sbb}
-\pgfmathsetmacro{\ua@ll}{0.15*\paperwidth}
-\pgfmathsetmacro{\ua@l}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@d}{0.1in}
-\pgfmathsetmacro{\ua@rr}{0.85*\paperwidth}
-\newcommand\sprtr{ / }
-\newcommand\myqrdata{
-I: Universiteit Antwerpen\string\n
-F: \@faculty\string\n
-P: \@programmet\ \@programmecqr\ \@programmeq\string\n
-C: \@coursecodei\ \@qrcoursei
-\sprtr
-\@coursecodeii\ \@qrcourseii
-\sprtr
-\@coursecodeiii\ \@qrcourseiii
-\sprtr
-\@coursecodeiv\ \@qrcourseiv
-\string\n
-Y: \@academicyear\string\n
-T: \@qrtitle\string\n
-S: \@qrsubtitle\string\n
-A: \@qrauthor\string\n
-L: \@qrlectureri
-\sprtr
-\@qrlecturerii
-\sprtr
-\@qrlectureriii
-\sprtr
-\@qrlectureriv}
-\newsavebox{\myqrcode}
 \renewcommand\maketitle{%
   \pagestyle{empty}
-  \if@qr
-  \savebox{\myqrcode}[2.7in][t]{
-    \begin{pspicture}(2.7in,2.7in)
-      \psbarcode{\myqrdata}
-      {width=1.0 height=1.0 encoding=byte eclevel=M}
-      {qrcode}
-    \end{pspicture}
-  }
-  \fi
   \begin{titlepage}
-    \if@titlepagetableonly
-    Dit is een cursustekst van Universiteit Antwerpen.\\
-    Het titelblad dient opgemaakt te worden met de volgende gegevens:
-    \begin{center}
-      \begin{tabular}{|l|l|}
-        \hline
-        \bfseries I & Universiteit Antwerpen \\\hline
-        \bfseries F & \@faculty \\\hline
-        \bfseries P & \parbox[t]{14cm}{\@programmet
-          \@programmec\@programmes \@programmeq}  \\\hline
-        \bfseries C & \parbox[t]{14cm}{
-          \texttt{\@coursecodei} \@coursei\\
-          \texttt{\@coursecodeii} \@courseii\\
-          \texttt{\@coursecodeiii} \@courseiii\\
-          \texttt{\@coursecodeiv} \@courseiv} \\\hline
-        \bfseries Y & \@academicyear \\\hline
-        \bfseries T & \parbox[t]{14cm}{\@title}\\\hline
-        \bfseries S & \parbox[t]{14cm}{\@subtitle}\\\hline
-        \bfseries A & \parbox[t]{14cm}{\@author}\\\hline
-        \bfseries L & \parbox[t]{14cm}{\@lectureri\\
-                                       \@lecturerii\\
-                                       \@lectureriii\\
-                                       \@lectureriv} \\\hline
-      \end{tabular}
-    \end{center}
-    ~\\
-    Waarbij: I = instelleng, F = faculteit, P = programma, C =
-    cursusmodule, T = titel, S = subtitel, A = auteur(s), L =
-    lesgever(s)\\~\\
-    \if@qr
-    Deze informatie is ook gecodeerd in de onderstaande QR-code.\\
-    \vspace*{1cm}
-    \usebox{\myqrcode}
-    \fi
-    \else
-    \begin{tikzpicture}[remember picture,overlay]
-      \node at (current page.center) {
-        \begin{tikzpicture}[inner sep=0pt]
+    \AddToShipoutPicture*{%
+      \put(0,0){%
+        \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
           \clip (0,0) rectangle(\paperwidth,\paperheight);
-          \if@titlepagenoartwork\else
-          \filldraw [uacorpbord] (0.55\paperwidth,\ua@Qba pt) circle (\ua@Rba pt);
-          \filldraw [white] (0.35\paperwidth,\ua@Qbb pt) circle (\ua@Rbb pt);
-          \filldraw [uacorpblue] (0,\ua@Qh pt) circle (\ua@Rh pt);
-          \path
-          (0.95\paperwidth,0.1\paperheight)
-          node [anchor=north east] {
-            \includegraphics[width=0.25\paperwidth]{\@logo}};
-          \fi
-          \path
-          (\ua@l pt -\ua@d pt,0.77\paperheight)
-          node [anchor=north east, text width=0.35\paperwidth] {
-            \begin{flushright}
-              \uppercase\expandafter{\uaname}\\~\\
-              \academicyearname{} \@academicyear
-            \end{flushright}}
-          (\ua@l pt +\ua@d pt,0.65\paperheight)
-          node [anchor = north west, text width = 0.55\paperwidth] {
-            {\large \@faculty{}}\\[0.05\paperheight]
-            {\huge \bf \@title{}}\\[2ex]
-            {\Large \bf \@subtitle{}}\\[3ex]
-            {\Large \bf \@author{}}}
-          (\ua@l pt +\ua@d pt,0.45\paperheight)
-          node [anchor = north west, text width = 0.55\paperwidth] {
-            \@lectureri~\\
-            \@lecturerii~\\
-            \@lectureriii~\\
-            \@lectureriv}
-          (\ua@l pt +\ua@d pt,0.35\paperheight)
-          node [anchor = north west, text width = 0.55\paperwidth] {
-            {\bf \@programmet \\ \@programmec\@programmes  \@programmeq}}
-          (\ua@l pt +\ua@d pt,0.30\paperheight)
-          node [anchor = north west, text width = 0.55\paperwidth] {
-            \texttt{\@publishercode}~\\~\\
-            \texttt{\@coursecodei{}} \@coursei~\\
-            \texttt{\@coursecodeii{}} \@courseii~\\
-            \texttt{\@coursecodeiii{}} \@courseiii~\\
-            \texttt{\@coursecodeiv{}} \@courseiv}
-          (\ua@l pt - 2\ua@d pt, 0.368\paperheight)
-          node [anchor = north east, text width = 0.35\paperwidth] {
-            {\normalsize\begin{flushright}
-                \@publisher{}
-              \end{flushright}}};
+
+          \begin{scope}
+            \clip (2.125,20.192) rectangle (\paperwidth,6);
+            \fill[sidecolor]
+            (2.125,20.192) rectangle (\paperwidth,6);
+            \node[anchor=south west]
+            at (2.125,6)
+            {\ifx\@titlepageimage\@empty
+              \else
+              \includegraphics[keepaspectratio,
+              scale=0.01,
+              min size={18.875cm}{14.192cm}]{\@titlepageimage}
+              \fi};
+          \end{scope}
+
+           \node
+           [anchor=west,text width=13.75cm,align=left,font=\Huge,uauaside]
+          at (2.125,27)
+          {
+            \textsf{\textbf{\@title}}
+          };
+
+          \node
+          [anchor=west,text width=13.75cm,align=left,font=\Large,uauaside]
+          at (2.125,25.5)
+          {
+            \textsf{\textbf{\@subtitle}}
+          };
+
+          \node
+          [anchor=base west,maincolor,text width=13.75cm,align=left,font=\LARGE]
+          at (2.125,24)
+          {\textsf{\textbf{\@author}}};
+
+          \node
+          [anchor=west,text width=13.75cm,align=left,font=\large,uauaside]
+          at (2.125,22)
+          {\textsf{\jointcourseswithcodes{\\}}};
+
+         \fill[maincolor] (2.125,6)
+          -- (\paperwidth,6)
+          -- (\paperwidth,2.625)
+          -- (2.55,2.625)
+          arc (-90:-180:0.425)
+          -- cycle;
+
+          \node[white,anchor=west,align=left,font=\large]
+          (SN) at (2.55,5.1)
+          {
+            \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+              \textsf{\lecturersname}
+              & \textsf{\textbf{\jointlecturers{ | }}}
+            \end{tabular}
+          };
+
+          \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+          at (2.55,3.7)
+          {\textsf{\@degree{}}\\
+            \textsf{\textbf{\@faculty{} | \@academicyear \hfill
+                \@publishercode}}\\
+          \textsf{\@publisher}};
+
+          \node[anchor=west] at (2.125,1.313)
+          {\includegraphics[width=4.75cm]{\logopos}};
         \end{tikzpicture}
-      };
-    \end{tikzpicture}
-    \fi
+      }
+    }
   \end{titlepage}%
+  ~\par\relax
   \clearpage
+  \if@copyright
+  \backgroundsetup{contents={Copyright University of Antwerp, All
+      Rights Reserved}}
+  \fi
   \vspace*{\stretch{1}}
   \@crnotice
   \clearpage
@@ -626,8 +342,6 @@ L: \@qrlectureri
   \thispagestyle{empty}
 }
 \newcommand\makefinalpage{
-  \if@titlepagetableonly
-  \else
   \cleardoublepage
   \thispagestyle{empty}
   ~% intentionally blank page
@@ -637,29 +351,17 @@ L: \@qrlectureri
     \node at (current page.center) {
       \begin{tikzpicture}[inner sep=0pt]
         \clip (0,0) rectangle(\paperwidth,\paperheight);
-        \if@titlepagenoartwork\else
-        \filldraw [uacorpblue] (\paperwidth,\ua@Qh pt) circle (\ua@Rh pt);
-        \fi
-        \path
-        (0.1\paperwidth,0.1\paperheight)
-        node [anchor = south west, text width = 0.6\paperwidth] {
-          CONFIDENTIAL AND PROPRIETARY\\~\\
-
-          \copyright{} \@versionyear{} \uaname,
-          \arrname.}
-        (0.9\paperwidth,0.1\paperwidth)
-        node [anchor = south east] {
-          \usebox{\myqrcode}
-        };
+        \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
       \end{tikzpicture}
     };
   \end{tikzpicture}
-  \fi
 }
-\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-\IfFileExists{hyperref.sty}{
-    \RequirePackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+\AtBeginDocument{
+  \@ifpackageloaded{hyperref}{
     \hypersetup{
+      backref=true,
+      hyperindex=true,
+      pagebackref=true,
       breaklinks=true,
       colorlinks=true,
       citecolor=black,
@@ -667,16 +369,13 @@ L: \@qrlectureri
       linkcolor=black,
       pageanchor=true,
       pdfpagemode=UseOutlines,
-      urlcolor=black
-    }
-    \AtBeginDocument{
-      \hypersetup{
-        pdftitle={\@title},
-        pdfsubject={\@subtitle},
-        pdfauthor={\@author}
-      }
+      urlcolor=black,
+      pdftitle={\@title},
+      pdfsubject={\@subtitle},
+      pdfauthor={\@author}
     }
-}{}
+  }{}
+}
 \endinput
 %%
 %% End of file `uantwerpencoursetext.cls'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data
new file mode 100644
index 00000000000..520ccaca15f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data
@@ -0,0 +1,51 @@
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+org-be           = Faculty of Business and Economics
+org-fbd          = Faculty of Pharmaceutical, Biomedical and Veterinary Sciences
+org-ggw          = Medicine and Health Sciences
+org-lw           = Faculty of Arts
+org-ow           = Faculty of Design Sciences
+org-re           = Faculty of Law
+org-sw           = Faculty of Social Sciences
+org-ti           = Faculty of Applied Engineering
+org-we           = Faculty of Science
+org-iob          = Institute of Development Policy
+org-ua           = University of Antwerp
+arr              = All rights reserved
+of               = of
+domainname       = uantwerp.be
+datename         = Date
+subjectname      = Subject
+acyearname       = Academic year
+baname           = Bachelor of Science
+spname           = Switching Programme
+vpname           = Preparatory Programme
+maname           = Master of Science
+phdname          = PhD
+thesisname       = Thesis
+mthesisname      = Master's thesis
+bthesisname      = Bachelor's thesis
+lecturername     = Lecturer
+lecturersname    = Lecturers
+supervisorname   = Supervisor
+supervisorsname  = Supervisors
+examname         = Exam --- Examen
+seriesname       = Series
+lastname         = Last name --- Naam
+firstname        = First name --- Voornaam
+docketname       = Docket No. --- Rolnr.
+roomname         = Room --- Lokaal
+roomsname        = Rooms --- Lokalen
+examstartname    = Start --- Begin
+examendname      = End --- Einde
+examdurationname = Exam duration --- Duur van het examen
+juryname         = Jury
+jurymembersname  = Members
+jurychairmanname = Chairman
+bmthesisname     = Thesis to obtain the degree of
+pthesisnamei     = Thesis submitted in fulfilment of the requirements for the degree of
+pthesisnameii    = at University of Antwerp
+weightname       = Weight
+
+
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data
new file mode 100644
index 00000000000..628c129bb6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data
@@ -0,0 +1,51 @@
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+
+org-be           = Faculteit Bedrijfswetenschappen en Economie
+org-fbd          = Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+org-ggw          = Faculteit Geneeskunde en Gezondheidswetenschappen
+org-lw           = Faculteit Letteren en Wijsbegeerte
+org-ow           = Faculteit Ontwerpwetenschappen
+org-re           = Faculteit Rechten
+org-sw           = Faculteit Sociale Wetenschappen
+org-ti           = Faculteit Toegepaste Ingenieurswetenschappen
+org-we           = Faculteit Wetenschappen
+org=iob          = Instituut voor Ontwikkelingsbeleid- en beheer
+org-ua           = Universiteit Antwerpen
+arr              = Alle rechten voorbehouden
+of               = van
+domainname       = uantwerpen.be
+datename         = Onderwerp
+subjectname      = Datum
+acyearname       = Academiejaar
+baname           = Bachelor of Science
+spname           = Schakelprogramma
+vpname           = Voorbereidingsprogramma
+maname           = Master of Science
+phdname          = Doctoraat
+thesisname       = Afstudeerproef
+mthesisname      = Masterproef
+bthesisname      = Bachelorproef
+lecturername     = Titularis
+lecturersname    = Titularissen
+supervisorname   = Promotor
+supervisorsname  = Promotoren
+examname         = Examen
+seriesname       = Reeks
+lastname         = Naam
+firstname        = Voornaam
+docketname       = Rolnr.
+roomname         = Lokaal
+roomsname        = Lokalen
+examstartname    = Begin
+examendname      = Einde
+examdurationname = Duur van het examen
+juryname         = Jury
+jurymembersname  = Leden
+jurychairmanname = Voorzitter
+bmthesisname     = Proefschrift tot het behalen van de graad van
+pthesisnamei     = Proefschrift voorgelegd tot het behalen van de graad van
+pthesisnameii    = aan de Universiteit Antwerpen te verdedigen door
+weightname       = Gewicht
+
+
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
index 975152c74c8..b927ff62cfc 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
@@ -26,18 +26,21 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenexam}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
 \newif\if@examiner
 \DeclareOption{examiner}{\@examinertrue}
+\input{uantwerpencommonoptions.clo}
 \ExecuteOptions{a4paper,twoside,10pt}
 \ProcessOptions
 \LoadClassWithOptions{article}
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -45,10 +48,13 @@
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
 \RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
+\RequirePackage{uantwerpencolorlogoscheme}
+
 \RequirePackage{fancyhdr}
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
@@ -59,226 +65,147 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand\uaname{University of Antwerp}
-\newcommand\arrname{All rights reserved}
-\newcommand\orname{of}
-\newcommand\domainname{uantwerp.be}
-\newcommand\datename{Date}
-\newcommand\subjectname{Subject}
-\newcommand\academicyearname{Academic year}
-\newcommand\masterthesisname{Master's thesis}
-\newcommand\bachelorthesisname{Bachelor's thesis}
-\newcommand\supervisorsname{Supervisors}
-\newcommand\juryname{Jury}
-\newcommand\jurymembersname{Members}
-\newcommand\jurychairmanname{Chairman}
-\newcommand\bmthesisname{Thesis to obtain the degree of}
-\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand\pthesisnameii{at University of Antwerp}
-\newcommand\@faculty{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
-  \renewcommand\@faculty{Centre Pieter Gillis}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
-  \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
-    Veterinary Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
-  \renewcommand\@faculty{Insitute of Development Policy}
-  \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
-  \renewcommand\@faculty{Antwerp School of Education}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
-  \renewcommand\@faculty{Faculty of Arts}
-  \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
-  \renewcommand\@faculty{Faculty of Design Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
-  \renewcommand\@faculty{Faculty of Social Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
-  \renewcommand\@faculty{Faculty of Law}
-  \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
-  \renewcommand\@faculty{Faculty of Business and Economics}
-  \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
-  \renewcommand\@faculty{Faculty of Applied Engineering}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
-  \renewcommand\@faculty{Faculty of Science}
-  \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
 \AtBeginDocument{
+  \makeatother
   \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
     \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\bachelorthesisname{Bachelorproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}
-        \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
-      \renewcommand\asoe{
-        \renewcommand\@faculty{Antwerp School of Education}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}
-        \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
-      \renewcommand\facow{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
-      \renewcommand\facsw{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
-     \renewcommand\facre{
-        \renewcommand\@faculty{Faculteit Rechten}
-        \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
-      \renewcommand\facbe{
-        \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
-        \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
-      \renewcommand\facti{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
-      \renewcommand\facwe{
-        \renewcommand\@faculty{Faculteit Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
-      \renewcommand\weightname{Gewicht}
+      \uantwerpendocspropread{nl}
     }
   }
   {}
+  \makeatletter
+}
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
+}
+\newcommand*{\@shorttitle}{}
+\newcommand*{\shorttitle}[1]{%
+  \renewcommand*\@shorttitle{#1}
+}
+\ExplSyntaxOn
+\seq_new:N \g__uantwerpendocs_lecturers
+\cs_new:Nn \__uantwerpendocs_addlecturer:n {
+  \seq_gpush:Nn \g__uantwerpendocs_lecturers { #1 }
+}
+\NewDocumentCommand{\lecturer}{m}{
+  \__uantwerpendocs_addlecturer:n { #1 }
+}
+\NewDocumentCommand{\jointlecturers}{m}{
+  \seq_use:Nn \g__uantwerpendocs_lecturers { #1 }
+}
+\NewDocumentCommand{\lecturersname}{}{
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 1
+  \uantwerpendocsprop{lecturersname}
+  \else:
+  \uantwerpendocsprop{lecturername}
+  \fi:
+}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_lecturers
+}
+
+\ExplSyntaxOff
+\newcommand*\@degree{
+  \PackageError{uantwerpendocs}
+  {Please, specify the offical degree description using
+    the '\protect\degree{}'  macro in the preamble of your document.}
+  {See the uantwerpendocs manual}
 }
-\newcommand{\@facultyacronym}{~}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{RE}}{\facre}{
-    \ifthenelse{\equal{#1}{BE}}{\facbe}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WE}}{\facwe}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
+\newcommand*\degree[1]{\renewcommand*\@degree{#1}}
+\newcommand*{\programme}[3]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\programme{}{}{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
 }
-\newcommand{\@shorttitle}{}
-\newcommand{\shorttitle}[1]{%
-  \renewcommand\@shorttitle{#1}
+\newcommand*{\@coursecode}{}
+\newcommand*{\@course}{}
+\newcommand*{\course}[2]{
+  \renewcommand*{\@coursecode}{#1}
+  \renewcommand*{\@course}{#2}
 }
-\newcommand{\@programmet}{} % type
-\newcommand{\@programmec}{} % class
-\newcommand{\@programmecqr}{} % class for qr code
-\newcommand{\@programmes}{} % class
-\newcommand{\@programmeq}{} % qualifier
-\newcommand{\programme}[3]{%
-    \ifthenelse{\equal{#1}{BA}}%
-    {\renewcommand{\@programmet}{Bachelor of Science in de }}{%
-    \ifthenelse{\equal{#1}{MA}}%
-    {\renewcommand{\@programmet}{Master of Science in de }}{%
-    \ifthenelse{\equal{#1}{PHD}}%
-    {\renewcommand{\@programmet}{Doctor in de }}{%
-    \ifthenelse{\equal{#1}{VP}}%
-    {\renewcommand{\@programmet}{Voorbereidingsprogramma in de }}{%
-    \ifthenelse{\equal{#1}{SP}}%
-    {\renewcommand{\@programmet}{Schakelprogramma in de }}{%
-    \ifthenelse{\equal{#1}{FREE}}%
-    {}{
-    \errmessage{Error in 1st arg of macro programme[3]: invalid
-      programme type!}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}}%
-    {\renewcommand{\@programmec}{industri\"ele wetenschappen}
-     \renewcommand{\@programmecqr}{industriële wetenschappen}}{
-    \ifthenelse{\equal{#2}{}}%
-    {}{
-    \errmessage{{Error in 2nd arg of macro programme[3]: invalid
-      programme class! }}}}%
-    %
-    \ifthenelse{\equal{#3}{BK}}%
-    {\renewcommand{\@programmeq}{Bouwkunde}}{%
-    \ifthenelse{\equal{#3}{CH}}%
-    {\renewcommand{\@programmeq}{Chemie}}{%
-    \ifthenelse{\equal{#3}{BCH}}%
-    {\renewcommand{\@programmeq}{Biochemie}}{%
-    \ifthenelse{\equal{#3}{EM}}%
-    {\renewcommand{\@programmeq}{Elektromechanica}}{%
-    \ifthenelse{\equal{#3}{EI}}%
-    {\renewcommand{\@programmeq}{Elektronica-ICT}}{%
-    \ifthenelse{\equal{#3}{}}%
-    {}{%
-    \ifthenelse{\equal{#1}{FREE}}
-    {\renewcommand{\@programmeq}{#3}}{
-    \errmessage{Error in 3rd arg to macro programme[3]: invalid
-      programme qualifier}}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}\and\not\equal{#3}{}}
-    {\renewcommand{\@programmes}{: }}{}
+\newcommand*{\@academicyear}{XXX-YYYY}
+\newcommand*{\academicyear}[1]{\renewcommand*{\@academicyear}{#1}}
+\newcommand*{\logo}[1]{\renewcommand*{\@logo}{#1}}
+\newcommand*{\@exampart}{}
+\newcommand*{\exampart}[1]{\renewcommand*{\@exampart}{#1}}
+\newcommand*{\@examgroupnumber}{}
+\newcommand*{\examgroupnumber}[1]{\renewcommand*{\@examgroupnumber}{#1}}
+\newcommand*{\@examdate}{TBD}
+\newcommand*{\examdate}[1]{\renewcommand*{\@examdate}{#1}}
+\newcommand*{\@examlength}{TBD}
+\newcommand*{\examlength}[1]{\renewcommand*{\@examlength}{#1}}
+\newcommand*{\@tstart}{TBD}
+\newcommand*{\tstart}[1]{\renewcommand*{\@tstart}{#1}}
+\newcommand*{\@tend}{TBD}
+\newcommand*{\tend}[1]{\renewcommand*{\@tend}{#1}}
+\ExplSyntaxOn
+\seq_new:N \g__uantwerpendocs_rooms
+\cs_new:Nn \__uantwerpendocs_addroom:n {
+  \seq_gpush:Nn \g__uantwerpendocs_rooms { #1 }
 }
-\newcommand{\@coursecodei}{}
-\newcommand{\@coursei}{}
-\newcommand{\course}[2]{
-  \renewcommand{\@coursecodei}{#1}
-  \renewcommand{\@coursei}{#2}
+\NewDocumentCommand{\room}{m}{
+  \__uantwerpendocs_addroom:n { #1 }
 }
-\newcommand{\@academicyear}{XXX-YYYY}
-\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
-\newcommand{\logo}[1]{\renewcommand{\@logo}{#1}}
-\newcommand{\@exampart}{}
-\newcommand{\exampart}[1]{\renewcommand{\@exampart}{#1}}
-\newcommand{\@examgroupnumber}{}
-\newcommand{\examgroupnumber}[1]{\renewcommand{\@examgroupnumber}{#1}}
-\newcommand{\@examdate}{TBD}
-\newcommand{\examdate}[1]{\renewcommand{\@examdate}{#1}}
-\newcommand{\@examlength}{TBD}
-\newcommand{\examlength}[1]{\renewcommand{\@examlength}{#1}}
-\newcommand{\@tstart}{TBD}
-\newcommand{\tstart}[1]{\renewcommand{\@tstart}{#1}}
-\newcommand{\@tend}{TBD}
-\newcommand{\tend}[1]{\renewcommand{\@tend}{#1}}
-\newcommand{\@rooms}{TBD}
-\newcommand{\rooms}[1]{\renewcommand{\@rooms}{#1}}
+\NewDocumentCommand{\jointrooms}{m}{
+  \seq_use:Nn \g__uantwerpendocs_rooms { #1 }
+}
+\NewDocumentCommand{\roomsname}{}{
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_rooms > 1
+  \uantwerpendocsprop{roomsname}
+  \else:
+  \uantwerpendocsprop{roomname}
+  \fi:
+}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_rooms
+}
+
+\ExplSyntaxOff
 \newcommand{\@extrainfo}{}
 \newcommand\extrainfo[2][separatepage]{
   \ifthenelse{\equal{#1}{separatepage}}{
@@ -292,15 +219,18 @@
       \renewcommand{\@extrainfo}{#2}
     }
     {
-      \errmessage{Error: '\extrainfo' - first (optional) argument can
+      \PackageError{uantwerpendocs}
+      {The first (optional) argument of '\protect\extrainfo' can
         only be 'separatepage' or 'firstpage'}
+      {See the uantwerpendocs manual)'}
     }
   }
 }
-\newcommand{\@studentnr}{0}
-\newcommand{\studentnr}[1]{\renewcommand{\@studentnr}{#1}}
+\newcommand*{\@studentnr}{0}
+\newcommand*{\studentnr}[1]{\renewcommand*{\@studentnr}{#1}}
 \lhead[]{}
 \chead[]{}
+\cfoot[\small \thepage/\pageref{lastpage}]{\small\thepage/\pageref{lastpage}}
 \if@examiner
 \rhead[\small EXAMINER VERSION]{\small EXAMINER VERSION}
 \AddToShipoutPicture{
@@ -310,164 +240,161 @@
 \else
 \rhead[\small Student nr. \@studentnr]{\small Student nr. \@studentnr}
 \fi
-\lfoot[\small \@shorttitle]{\small \@shorttitle}
-\cfoot[\small \thepage/\pageref{lastpage}]{\small\thepage/\pageref{lastpage}}
-\rfoot[\small Groep \@examgroupnumber{} ---
-\@academicyear]{\small Groep \@examgroupnumber{} --- \@academicyear}
 
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{1pt}
+\renewcommand*{\headrulewidth}{0pt}
+
 \renewcommand\maketitle{%
   \pagestyle{fancy}
   \AddToShipoutPicture*{%
     \put(0,0){%
-      \begin{tikzpicture}[remember picture,overlay]
-        \node at (current page.center) {
-          \begin{tikzpicture}
-            \clip (0,0) rectangle (21,29.7);
-            \draw
-            ( 3,9.7) -- ( 3,23.7)
-            ( 0,23.7) -- +(21,0)
-            ( 3,20.8) -- +(21,0)
-            ( 3,18.8) -- +(21,0)
-            ( 3,16.8) -- +(21,0)
-            (14,9.7) -- (14,13.7)
-            ( 3,13.7) -- +(21,0)
-            ( 3,11.7) -- +(21,0)
-            ( 0,9.7) -- +(21,0);
+      \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+        \clip (0,0) rectangle(\paperwidth,\paperheight);
+        \fill[lightgray]
+        (2.125,{\paperheight-7cm}) rectangle (\paperwidth,6);
 
-            \draw[ultra thick]
-            ( 3,16.8) +(0,-0.5) -- +(0,0) -- +(0.5,0)
-            ( 3,13.7) +(0,+0.5) -- +(0,0) -- +(0.5,0)
-            (21,16.8) +(0,-0.5) -- +(0,0) -- +(-0.5,0)
-            (21,13.7) +(0,+0.5) -- +(0,0) -- +(-0.5,0);
+        \node
+        [anchor=west,text width={\paperwidth-5cm},align=left]
+        at (2.125,{\paperheight-3cm})
+        {%
+          \fontfamily{phv}\fontsize{18}{22}\fontseries{b}%
+          \fontshape{n}\selectfont%
+          \@course{}
+          \ifx\@exampart\@emptymacro
+          \else --- \@exampart\fi
+        };
+        \node
+        [anchor=west,text width={\paperwidth-5cm},align=left]
+        at (2.125,{\paperheight-4cm})
+        {%
+          \fontfamily{phv}\fontsize{12}{18}\fontseries{b}%
+          \fontshape{n}\selectfont%
+          \@coursecode
+        };
 
-            \foreach \nn in {0,1,...,7} {
-              \draw (16.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
-            }
+        \node
+        [anchor=west,text width={\paperwidth-5cm},align=left,font=\large]
+        at (2.125,{\paperheight-5cm})
+        {%
+          \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{seriesname} \@examgroupnumber{} \hfill \@examdate{}
+        };
 
-            \foreach \nn in {0,1,...,33} {
-              \draw (3.5,15.3) ++({0.5*\nn},0) rectangle +(0.5,0.8);
-            }
-            \foreach \nn in {0,1,...,23} {
-              \draw (3.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
-            }
+        \node[anchor=south west,align=left,inner sep=0pt] at (3,21)
+        {%
+          \fontfamily{phv}\fontsize{14}{19}\fontseries{b}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{examname}
+        };
 
-            \path
-            (3,25.2) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{b}\selectfont
-                \@faculty\\
-                \fontfamily{phv}\fontsize{11}{14}\fontseries{m}\selectfont
-                \@programmet \@programmec\
-                \ifx\@programmeq\@emptymacro\else--- \@programmeq\fi
-              }
-            }
-            (3.3,23) node[anchor=north west] {
-              \parbox{16cm}{
-                \fontfamily{phv}\fontsize{18}{22}\fontseries{b}
-                \fontshape{n}\selectfont
-                \raggedright \@coursei{}
-                \ifx\@exampart\@emptymacro
-                \else --- \@exampart\fi
-                \fontfamily{phv}\fontsize{12}{18}\fontseries{m}
-                \fontshape{n}\selectfont\\
-                Reeks \@examgroupnumber{} \hfill \@examdate{} }
-            }
-            (3.3,20.1) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\selectfont
-                \@coursecodei
-              }
-            }
-            (3.3,18.6) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{18}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Professor(s) --- }
-                {}Titularis(sen):\\
-                \fontfamily{phv}\fontsize{14}{20}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \@author{}
-              }
-            }
-            (3.3,16.7) node[anchor=north west] {
-              \parbox{10cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Last name
-                  --- }{}
-                Naam:}
-            }
-            (3.3,15.25) node[anchor=north west] {
-              \parbox{10cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{First name
-                  --- }{}
-                Voornaam:}
-            }
-            (16.3,15.25) node[anchor=north west] {
-              \parbox{5cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Docket No. --- }
-                {}Rolnr.:}
-            }
+        \node[anchor=south west,align=left,inner sep=0pt] at (3,19)
+        {%
+          \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{lastname}
+        };
+        \foreach \nn in {0,1,...,33} {
+          \draw[fill=white] (3,18) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+        }
 
-            (3.3,11.5) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{21}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Exam duration --- }
-                {}Duur van het examen: \@examlength\\
-              }
-            }
-            (14.3,11.5) node[anchor=north west] {
-              \parbox{5cm}{
-                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Start --- }
-                {}Begin: \@tstart \\[1ex]
-                \raggedright \ifdef{\dateenglish}{End --- }
-                {}Einde~: \@tend
-              }
-            }
-            (3.3,13.5) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{21}\fontseries{m}
-                \fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Room --- }
-                {}Lokaal: \@rooms
+        \node[anchor=south west,align=left,inner sep=0pt] at (3,17)
+        {%
+          \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{firstname}
+        };
 
-              }
-            }
-            (3,27.7) node[anchor=north west] {
-              \includegraphics[width=7cm]{\@logo}
-            };
-          \end{tikzpicture}
+        \foreach \nn in {0,1,...,23} {
+          \draw[fill=white] (3,16) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+        }
+
+        \node[anchor=south west,align=left,inner sep=0pt] at (16,17)
+        {%
+          \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{docketname}
+        };
+        \foreach \nn in {0,1,...,7} {
+          \draw[fill=white] (16,16) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+        }
+
+        \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+        at (3,14)
+        {%
+          \fontfamily{phv}\fontsize{12}{21}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \uantwerpendocsprop{examdurationname}: \@examlength
+        };
+        \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+        at (3,11)
+        {%
+          \fontfamily{phv}\fontsize{12}{15}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \begin{tabular}{@{}l@{}ll}%
+            \uantwerpendocsprop{examstartname}& : & \@tstart\\
+            \uantwerpendocsprop{examendname}  & : & \@tend
+          \end{tabular}
         };
+
+        \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+        at (3,8)
+        {%
+          \fontfamily{phv}\fontsize{12}{21}\fontseries{m}%
+          \fontshape{n}\selectfont%
+          \roomsname: \jointrooms{, }
+        };
+
+        \node
+        [anchor=base west,uauamain,
+        text width={\paperwidth-5cm},align=left,font=\LARGE]
+        at (2.125,{\paperheight-6.5cm})
+        {\textsf{\textbf{\@author}}};
+
+        \fill[gray] (2.125,6)
+        -- (\paperwidth,6)
+        -- (\paperwidth,2.625)
+        -- (2.55,2.625)
+        arc (-90:-180:0.425)
+        -- cycle;
+
+        \node[white,anchor=west,align=left,font=\large]
+        (SN) at (2.55,4.9)
+        {
+          \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+            \textsf{\lecturersname}
+            & \textsf{\textbf{\jointlecturers{ | }}}
+          \end{tabular}
+        };
+
+        \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+        at (2.55,3.7)
+        {\textsf{\@degree{}}\\
+          \textsf{\textbf{\@faculty{}}}};
+
+        \node[anchor=west] at (2.125,1.313)
+        {\includegraphics[width=4.75cm]{\logopos}};
       \end{tikzpicture}
     }
   }
-  \vspace*{17cm}
-  \ifx\@qrtitle\@emptymacro
-  \else
-  \@extrainfo
-  \fi
+  ~\par\relax
+  \clearpage
+  \lfoot[\small \@shorttitle]{\small \@shorttitle}
+  \rfoot[\small Groep \@examgroupnumber{} ---
+  \@academicyear]{\small Groep \@examgroupnumber{} --- \@academicyear}
+  \renewcommand*{\footrulewidth}{1pt}
 }
 \newcounter{question}
 \setcounter{question}{0}
-\renewcommand\thequestion{\@arabic\c@question}
+\renewcommand*\thequestion{\@arabic\c@question}
 \newcommand{\question}[1]{
   \stepcounter{question}
   \thequestion.~#1%
 }
-\newcommand{\questionweight}[1]{%
+\newcommand*{\questionweight}[1]{%
   \hspace{\fill}
   \begin{tabular}{|c|}
     \hline
-    \small \weightname: #1\\
+    \small \uantwerpendocsprop{weightname}: #1\\
     \hline
   \end{tabular}\\
 }
@@ -478,60 +405,60 @@
       #1
     \end{minipage}%
     &~~~&
-    \selectlanguage{dutch}%
-    \begin{minipage}[t]{0.45\textwidth}%
-      #2
-    \end{minipage}%
+          \selectlanguage{dutch}%
+          \begin{minipage}[t]{0.45\textwidth}%
+            #2
+          \end{minipage}%
   \end{tabular}
   \selectlanguage{english}%
 }
-\newcommand\@mcsymbol{\square}
-\newcommand\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
+\newcommand*\@mcsymbol{\square}
+\newcommand*\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
 \newcommand\mc[1]{%
   \hfill\break\qquad\begin{tabular}{cc}
-    $\@mcsymbol$
-    &
-    \begin{minipage}[t]{0.9\textwidth}%
-      #1
-    \end{minipage}%
-  \end{tabular}
-}
+                      $\@mcsymbol$
+                      &
+                        \begin{minipage}[t]{0.9\textwidth}%
+                          #1
+                        \end{minipage}%
+                    \end{tabular}
+                  }
 \newcommand{\engdutmc}[2]{%
   \hfill\break\begin{tabular}{cccc}
-    $\@mcsymbol$
-    &
-    \selectlanguage{english}%
-    \begin{minipage}[t]{0.42\textwidth}%
-      #1
-    \end{minipage}%
-    &---&
-    \selectlanguage{dutch}%
-    \begin{minipage}[t]{0.42\textwidth}%
-        #2
-    \end{minipage}%
-  \end{tabular}
-  \selectlanguage{english}%
-}
+                $\@mcsymbol$
+                &
+                  \selectlanguage{english}%
+                  \begin{minipage}[t]{0.42\textwidth}%
+                    #1
+                  \end{minipage}%
+                &---&
+                      \selectlanguage{dutch}%
+                      \begin{minipage}[t]{0.42\textwidth}%
+                        #2
+                      \end{minipage}%
+              \end{tabular}
+              \selectlanguage{english}%
+            }
 \newcommand\insertsolutionspagepartial[1]{
   ~\relax
   \AddToShipoutPicture*{%
     \put(0,0){%
       \begin{tikzpicture}
         \clip (0,0) rectangle (21,#1);
-        \draw[densely dotted, step=0.5cm,black!20] (0.999,1.499) grid (2,2.5);
-        \draw[densely dotted, step=0.5cm,black!20] (18.999,1.499) grid (20,2.5);
+\draw[densely dotted, step=0.5cm,black!20] (0.999,1.499) grid (2,2.5);
+\draw[densely dotted, step=0.5cm,black!20] (18.999,1.499) grid (20,2.5);
 
-        \draw[densely dotted, step=0.5cm,black!20] (0.999,2.499) grid (20,27);
-        \draw[densely dotted, step=0.5cm,black!20] (0.999,27) grid (16,28);
-        \draw[densely dotted, step=0.5cm,black!20] (19.499,27) grid (20,28);
-        \draw[densely dotted, step=0.5cm,black!20] (0.99,27.999) grid
-        (20,28.5);
-        \draw[ultra thick] (1,#1) -- (20,#1);
-      \end{tikzpicture}
-    }
-  }%
-  \clearpage
-  \relax
+\draw[densely dotted, step=0.5cm,black!20] (0.999,2.499) grid (20,27);
+\draw[densely dotted, step=0.5cm,black!20] (0.999,27) grid (16,28);
+\draw[densely dotted, step=0.5cm,black!20] (19.499,27) grid (20,28);
+\draw[densely dotted, step=0.5cm,black!20] (0.99,27.999) grid
+(20,28.5);
+\draw[ultra thick] (1,#1) -- (20,#1);
+\end{tikzpicture}
+}
+}%
+\clearpage
+\relax
 }
 \newcommand\insertsolutionspage[1]{
   \clearpage
@@ -549,7 +476,7 @@
     }
     \put(120,150){\rotatebox{60}{\textcolor{watermark}{
           \fontfamily{phv}\fontsize{105}{130}\fontseries{m}\fontshape{n}\selectfont
-        #1}
+          #1}
       }
     }
   }%
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
index 29e1127ea60..28ba204ce81 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
@@ -26,21 +26,23 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenletter}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
 \newif\if@filled
 \DeclareOption{filled}{\@filledtrue}
+\input{uantwerpencommonoptions.clo}
 \ExecuteOptions{a4paper,10pt,final,oneside,openright}
 \ProcessOptions
 \LoadClassWithOptions{letter}
-\newcommand\tat{\makeatletter @\makeatother}
+\newcommand*\tat{\makeatletter @\makeatother}
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
 \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry}
 \RequirePackage[normalem]{ulem}
-\RequirePackage{atbegshi}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -48,10 +50,13 @@
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
 \RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
+\RequirePackage{uantwerpencolorlogoscheme}
+
 \RequirePackage{fancyhdr}
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
@@ -62,202 +67,116 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand\uaname{University of Antwerp}
-\newcommand\arrname{All rights reserved}
-\newcommand\orname{of}
-\newcommand\domainname{uantwerp.be}
-\newcommand\datename{Date}
-\newcommand\subjectname{Subject}
-\newcommand\academicyearname{Academic year}
-\newcommand\masterthesisname{Master's thesis}
-\newcommand\bachelorthesisname{Bachelor's thesis}
-\newcommand\supervisorsname{Supervisors}
-\newcommand\juryname{Jury}
-\newcommand\jurymembersname{Members}
-\newcommand\jurychairmanname{Chairman}
-\newcommand\bmthesisname{Thesis to obtain the degree of}
-\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand\pthesisnameii{at University of Antwerp}
-\newcommand\@faculty{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
-  \renewcommand\@faculty{Centre Pieter Gillis}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
-  \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
-    Veterinary Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
-  \renewcommand\@faculty{Insitute of Development Policy}
-  \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
-  \renewcommand\@faculty{Antwerp School of Education}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
-  \renewcommand\@faculty{Faculty of Arts}
-  \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
-  \renewcommand\@faculty{Faculty of Design Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
-  \renewcommand\@faculty{Faculty of Social Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
-  \renewcommand\@faculty{Faculty of Law}
-  \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
-  \renewcommand\@faculty{Faculty of Business and Economics}
-  \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
-  \renewcommand\@faculty{Faculty of Applied Engineering}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
-  \renewcommand\@faculty{Faculty of Science}
-  \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
 \AtBeginDocument{
+  \makeatother
   \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
     \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\bachelorthesisname{Bachelorproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}
-        \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
-      \renewcommand\asoe{
-        \renewcommand\@faculty{Antwerp School of Education}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}
-        \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
-      \renewcommand\facow{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
-      \renewcommand\facsw{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
-     \renewcommand\facre{
-        \renewcommand\@faculty{Faculteit Rechten}
-        \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
-      \renewcommand\facbe{
-        \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
-        \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
-      \renewcommand\facti{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
-      \renewcommand\facwe{
-        \renewcommand\@faculty{Faculteit Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
-      \renewcommand\weightname{Gewicht}
+      \uantwerpendocspropread{nl}
     }
   }
   {}
+  \makeatletter
 }
-\newcommand{\@facultyacronym}{~}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{RE}}{\facre}{
-    \ifthenelse{\equal{#1}{BE}}{\facbe}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WE}}{\facwe}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
 }
-\newcommand{\@sender}{< Specify sender using
+\newcommand*{\@sender}{< Specify sender using
   \textbackslash{}sender\{name\}\{role\} >}
-\newcommand{\@senderrole}{~}
-\newcommand{\sender}[2]{\renewcommand{\@sender}{#1}\renewcommand{\@senderrole}{#2}}
-\newcommand{\logo}[1]{\renewcommand{\@logo}{#1}}
-\newcommand{\@unit}{}
-\newcommand{\unit}[1]{\renewcommand{\@unit}{#1}}
-\newcommand{\@emailuser}{}
-\newcommand{\@emaildomain}{}
-\newcommand{\email}[2]{\renewcommand{\@emailuser}{#1}\renewcommand{\@emaildomain}{#2}}
-\newcommand{\@phone}{}
-\newcommand{\phone}[1]{\renewcommand{\@phone}{#1}}
-\newcommand{\@fax}{}
-\newcommand{\fax}[1]{\renewcommand{\@fax}{#1}}
-\newcommand{\@mobile}{}
-\newcommand{\mobile}[1]{\renewcommand{\@mobile}{#1}}
-\newcommand{\@returnaddress}{<specify return-address using \textbackslash\{single-line-return-address\}>}
-\renewcommand{\returnaddress}[1]{\renewcommand{\@returnaddress}{#1}}
-\newcommand{\@to}{<Specify addressee using \textbackslash{}to\{name\}>}
-\renewcommand{\to}[1]{\renewcommand{\@to}{#1}}
-\newcommand{\@toorganization}{<Specify organization using
+\newcommand*{\@senderrole}{~}
+\newcommand*{\sender}[2]{\renewcommand*{\@sender}{#1}\renewcommand*{\@senderrole}{#2}}
+\newcommand*{\logo}[1]{\renewcommand*{\@logo}{#1}}
+\newcommand*{\@unit}{}
+\newcommand*{\unit}[1]{\renewcommand*{\@unit}{#1}}
+\newcommand*{\@emailuser}{}
+\newcommand*{\@emaildomain}{}
+\newcommand*{\email}[2]{\renewcommand*{\@emailuser}{#1}\renewcommand*{\@emaildomain}{#2}}
+\newcommand*{\@phone}{}
+\newcommand*{\phone}[1]{\renewcommand*{\@phone}{#1}}
+\newcommand*{\@fax}{}
+\newcommand*{\fax}[1]{\renewcommand*{\@fax}{#1}}
+\newcommand*{\@mobile}{}
+\newcommand*{\mobile}[1]{\renewcommand*{\@mobile}{#1}}
+\newcommand*{\@returnaddress}{<specify return-address using \textbackslash\{single-line-return-address\}>}
+\renewcommand*{\returnaddress}[1]{\renewcommand*{\@returnaddress}{#1}}
+\newcommand*{\@to}{<Specify addressee using \textbackslash{}to\{name\}>}
+\renewcommand*{\to}[1]{\renewcommand*{\@to}{#1}}
+\newcommand*{\@toorganization}{<Specify organization using
   \textbackslash{}toorganization\{\}>}
-\newcommand{\toorganization}[1]{\renewcommand{\@toorganization}{#1}}
-\newcommand{\@toaddress}{<Specify (multiline) destination
+\newcommand*{\toorganization}[1]{\renewcommand*{\@toorganization}{#1}}
+\newcommand*{\@toaddress}{<Specify (multiline) destination
   address\\using \textbackslash{}toaddress\{\}>}
-\newcommand{\toaddress}[1]{\renewcommand{\@toaddress}{#1}}
-\newcommand{\@subject}{-}
-\newcommand*{\subject}[1]{\renewcommand{\@subject}{#1}}
+\newcommand*{\toaddress}[1]{\renewcommand*{\@toaddress}{#1}}
+\newcommand*{\@subject}{-}
+\newcommand*{\subject}[1]{\renewcommand*{\@subject}{#1}}
 \renewcommand*{\opening}[1]{#1}
-\newcommand{\@closing}{<specify a closing formula using
+\newcommand*{\@closing}{<specify a closing formula using
   \textbackslash{}closing\{\}>}
-\renewcommand*{\closing}[1]{\renewcommand{\@closing}{#1}}
-\newcommand{\@signature}{\vspace*{8ex}}
-\renewcommand*{\signature}[1]{\renewcommand{\@signature}{#1}}
-\newcommand{\@carboncopy}{}
-\newcommand{\carboncopy}[1]{\renewcommand{\@carboncopy}{#1}}
-\newcommand{\@enclosed}{}
-\newcommand{\enclosed}[1]{\renewcommand{\@enclosed}{#1}}
-\newcommand{\@address}{\errmessage{Please, set your multi-line address
-    and contact details using the \textbackslash{}address\{\} command
-    in the preamble of your document}}
-\renewcommand{\address}[1]{\renewcommand{\@address}{#1}}
+\renewcommand*{\closing}[1]{\renewcommand*{\@closing}{#1}}
+\newcommand*{\@signature}{\vspace*{8ex}}
+\renewcommand*{\signature}[1]{\renewcommand*{\@signature}{#1}}
+\newcommand*{\@carboncopy}{}
+\newcommand*{\carboncopy}[1]{\renewcommand*{\@carboncopy}{#1}}
+\newcommand*{\@enclosed}{}
+\newcommand*{\enclosed}[1]{\renewcommand*{\@enclosed}{#1}}
+\newcommand*{\@address}{
+  \PackageError{uantwerpendocs}
+  {Please, set your multi-line address and contact details using the
+    '\protect\address{}' command in the preamble of your document}
+  {See the uantwerpendocs manual}
+}
+\renewcommand*{\address}[1]{\renewcommand*{\@address}{#1}}
 \lhead[]{}
 \chead[]{}
 \rhead[]{}
 \lfoot[\small\textcolor{gray}{\@date}]{\textcolor{gray}{\@date}}
 \cfoot[]{}
-\rfoot[\small\textcolor{gray}{\pagename~\thepage~\orname~\pageref{lastpage}}]
-  {\small\textcolor{gray}{\pagename~\thepage~\orname~\pageref{lastpage}}}
+\rfoot[\small\textcolor{gray}{\pagename~\thepage~\uantwerpendocsprop{of}~\pageref{lastpage}}]
+  {\small\textcolor{gray}{\pagename~\thepage~\uantwerpendocsprop{of}~\pageref{lastpage}}}
 
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
+\renewcommand*{\headrulewidth}{0pt}
+\renewcommand*{\footrulewidth}{0pt}
 \if@filled\else
   \raggedright
 \fi
@@ -297,9 +216,9 @@
   \begin{tikzpicture}[anchor=north west,align=left,outer sep=0,inner sep=0]
     \path
     (0,0) node { \scriptsize \strut
-      \textcolor{gray}{\uppercase\expandafter{\datename} } }
+      \textcolor{gray}{\uppercase\expandafter{\uantwerpendocsprop{datename}} } }
     (4cm,0) node { \scriptsize \strut
-      \textcolor{gray}{\uppercase\expandafter{\subjectname} } }
+      \textcolor{gray}{\uppercase\expandafter{\uantwerpendocsprop{subjectname}} } }
     (0,-2.5ex) node { \strut \@date }
     (4cm,-2.5ex) node[align=left] { \strut \@subject };
   \end{tikzpicture}~\\[4ex]
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
deleted file mode 100644
index 059212dbcb5..00000000000
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
+++ /dev/null
@@ -1,43 +0,0 @@
-%%
-%% This is file `uantwerpenmasterthesis.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% uantwerpendocs.dtx  (with options: `mt')
-%% 
-%% This is a generated file.
-%% 
-%% Copyright (C) 2013-2021  by Walter Daems <walter.daems@uantwerpen.be>
-%% 
-%% 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 Walter Daems.
-%% 
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{uantwerpenmasterthesis}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
-
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-\if@filled\else
-  \raggedright
-\fi
-\raggedbottom
-\onecolumn
-\endinput
-%%
-%% End of file `uantwerpenmasterthesis.cls'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
index 57aa706f3e7..b0719dbe890 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
@@ -24,23 +24,25 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenphdthesis}
-    [2021/03/23 v3.2 .dtx skeleton file]
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
-\newif\if@titlepagenoartwork
-\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
-\newif\if@titlepagetableonly
-\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
 \newif\if@filled
 \DeclareOption{filled}{\@filledtrue}
+\input{uantwerpencommonoptions.clo}
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions\relax
 \LoadClassWithOptions{book}
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage[paperwidth=180mm,paperheight=260mm,
+                top=2.5cm,bottom=2.5cm,left=2.6cm,right=1.8cm,twoside]
+                {geometry}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -48,11 +50,14 @@
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
 \RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
 \usepackage{ean13isbn}
+\RequirePackage{uantwerpencolorlogoscheme}
+
 \RequirePackage{fancyhdr}
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
@@ -63,347 +68,178 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand\uaname{University of Antwerp}
-\newcommand\arrname{All rights reserved}
-\newcommand\orname{of}
-\newcommand\domainname{uantwerp.be}
-\newcommand\datename{Date}
-\newcommand\subjectname{Subject}
-\newcommand\academicyearname{Academic year}
-\newcommand\masterthesisname{Master's thesis}
-\newcommand\bachelorthesisname{Bachelor's thesis}
-\newcommand\supervisorsname{Supervisors}
-\newcommand\juryname{Jury}
-\newcommand\jurymembersname{Members}
-\newcommand\jurychairmanname{Chairman}
-\newcommand\bmthesisname{Thesis to obtain the degree of}
-\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand\pthesisnameii{at University of Antwerp}
-\newcommand\@faculty{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
-  \renewcommand\@faculty{Centre Pieter Gillis}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
-  \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
-    Veterinary Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
-  \renewcommand\@faculty{Insitute of Development Policy}
-  \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
-  \renewcommand\@faculty{Antwerp School of Education}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
-  \renewcommand\@faculty{Faculty of Arts}
-  \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
-  \renewcommand\@faculty{Faculty of Design Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
-  \renewcommand\@faculty{Faculty of Social Sciences}
-  \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
-  \renewcommand\@faculty{Faculty of Law}
-  \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
-  \renewcommand\@faculty{Faculty of Business and Economics}
-  \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
-  \renewcommand\@faculty{Faculty of Applied Engineering}
-  \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
-  \renewcommand\@faculty{Faculty of Science}
-  \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
 \AtBeginDocument{
+  \makeatother
   \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
     \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\bachelorthesisname{Bachelorproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}
-        \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
-      \renewcommand\asoe{
-        \renewcommand\@faculty{Antwerp School of Education}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
-      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}
-        \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
-      \renewcommand\facow{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
-      \renewcommand\facsw{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
-     \renewcommand\facre{
-        \renewcommand\@faculty{Faculteit Rechten}
-        \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
-      \renewcommand\facbe{
-        \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
-        \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
-      \renewcommand\facti{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
-      \renewcommand\facwe{
-        \renewcommand\@faculty{Faculteit Wetenschappen}
-        \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
-      \renewcommand\weightname{Gewicht}
+      \uantwerpendocspropread{nl}
     }
   }
   {}
+  \makeatletter
+}
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
+}
+\newcommand*{\@subtitle}{~}
+\newcommand*{\subtitle}[1]{%
+  \renewcommand*\@subtitle{#1}
+}
+\newcommand\@affiliation{
+  \PackageError{uantwerpendocs}
+  {Please, define the affiliation of the author using the
+    '\protect\affiliation{}' command in the preamble of your
+    document.}
+  {See the uantwerpendocs manual}
 }
-\newcommand{\@facultyacronym}{~}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{RE}}{\facre}{
-    \ifthenelse{\equal{#1}{BE}}{\facbe}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WE}}{\facwe}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
-}
-\newcommand{\@subtitle}{~}
-\newcommand{\@qrsubtitle}{}
-\newcommand{\subtitle}[1]{%
-  \renewcommand\@subtitle{#1}
-  \ifx\@qrsubtitle\@emptymacro
-    \renewcommand\@qrsubtitle{#1}
-  \fi
-}
-\newcommand{\qrsubtitle}[1]{%
-  \renewcommand\@qrsubtitle{#1}
-}
-\newcommand\@affiliation{\errmessage{Please, define the affiliation of
-    the author using the \textbackslash{}affiliation command in the
-  preamble of your document.}}
 \newcommand\affiliation[1]{\renewcommand\@affiliation{#1}}
-\newcommand\@supervisori{\errmessage{Please define a supervisor of
-    your thesiswork using the \textbackslash{}supervisori to iv
-    commands} in the preamble of your document.}
-\newcommand\@supervisoriaff{}
-\newcommand\@supervisorii{}
-\newcommand\@supervisoriiaff{}
-\newcommand\@supervisoriii{}
-\newcommand\@supervisoriiiaff{}
-\newcommand\@supervisoriv{}
-\newcommand\@supervisorivaff{}
-\newcommand{\supervisori}[2]{
-  \renewcommand\@supervisori{#1}\renewcommand\@supervisoriaff{#2}}
-\newcommand{\supervisorii}[2]{
-  \renewcommand\@supervisorii{#1}\renewcommand\@supervisoriiaff{#2}}
-\newcommand{\supervisoriii}[2]{
-  \renewcommand\@supervisoriii{#1}\renewcommand\@supervisoriiiaff{#2}}
-\newcommand{\supervisoriv}[2]{
-  \renewcommand\@supervisoriv{#1}\renewcommand\@supervisorivaff{#2}}
-\newcommand{\@jurychairman}{\errmessage{Please define a chairman of the jurya
-  using the \textbackslash{}jurychairman command in the preamble of
-  your document.}}
-\newcommand{\@jurychairmanaff}{}
-\newcommand{\jurychairman}[2]{
-  \renewcommand{\@jurychairman}{#1}\renewcommand{\@jurychairmanaff}{#2}}
-\newcommand{\@jurymemberi}{\errmessage{Please define jury members
-    using the \textbackslash{}jurymemberi to vi commands in the
-    preamble of your document.}}
-\newcommand\@jurymemberiaff{}
-\newcommand\@jurymemberii{}
-\newcommand\@jurymemberiiaff{}
-\newcommand\@jurymemberiii{}
-\newcommand\@jurymemberiiiaff{}
-\newcommand\@jurymemberiv{}
-\newcommand\@jurymemberivaff{}
-\newcommand\@jurymemberv{}
-\newcommand\@jurymembervaff{}
-\newcommand\@jurymembervi{}
-\newcommand\@jurymemberviaff{}
-\newcommand{\jurymemberi}[2]{
-  \renewcommand\@jurymemberi{#1}\renewcommand\@jurymemberiaff{#2}}
-\newcommand{\jurymemberii}[2]{
-  \renewcommand\@jurymemberii{#1}\renewcommand\@jurymemberiiaff{#2}}
-\newcommand{\jurymemberiii}[2]{
-  \renewcommand\@jurymemberiii{#1}\renewcommand\@jurymemberiiiaff{#2}}
-\newcommand{\jurymemberiv}[2]{
-  \renewcommand\@jurymemberiv{#1}\renewcommand\@jurymemberivaff{#2}}
-\newcommand{\jurymemberv}[2]{
-  \renewcommand\@jurymemberv{#1}\renewcommand\@jurymembervaff{#2}}
-\newcommand{\jurymembervi}[2]{
-  \renewcommand\@jurymembervi{#1}\renewcommand\@jurymemberviaff{#2}}
-\newcommand\@phddegree{\errmessage{Please, specify the offical PhD
-    degree description using the \textbackslash{}phddegree macro in
-    the preamble of your document.}}
-\newcommand\phddegree[1]{\renewcommand\@phddegree{#1}}
-\newcommand{\@programmet}{} % type
-\newcommand{\@programmec}{} % class
-\newcommand{\@programmecqr}{} % class for qr code
-\newcommand{\@programmes}{} % class
-\newcommand{\@programmeq}{} % qualifier
-\newcommand{\programme}[3]{%
-    \ifthenelse{\equal{#1}{BA}}%
-    {\renewcommand{\@programmet}{Bachelor of Science in de }}{%
-    \ifthenelse{\equal{#1}{MA}}%
-    {\renewcommand{\@programmet}{Master of Science in de }}{%
-    \ifthenelse{\equal{#1}{PHD}}%
-    {\renewcommand{\@programmet}{Doctor in de }}{%
-    \ifthenelse{\equal{#1}{VP}}%
-    {\renewcommand{\@programmet}{Voorbereidingsprogramma in de }}{%
-    \ifthenelse{\equal{#1}{SP}}%
-    {\renewcommand{\@programmet}{Schakelprogramma in de }}{%
-    \ifthenelse{\equal{#1}{FREE}}%
-    {}{
-    \errmessage{Error in 1st arg of macro programme[3]: invalid
-      programme type!}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}}%
-    {\renewcommand{\@programmec}{industri\"ele wetenschappen}
-     \renewcommand{\@programmecqr}{industriële wetenschappen}}{
-    \ifthenelse{\equal{#2}{}}%
-    {}{
-    \errmessage{{Error in 2nd arg of macro programme[3]: invalid
-      programme class! }}}}%
-    %
-    \ifthenelse{\equal{#3}{BK}}%
-    {\renewcommand{\@programmeq}{Bouwkunde}}{%
-    \ifthenelse{\equal{#3}{CH}}%
-    {\renewcommand{\@programmeq}{Chemie}}{%
-    \ifthenelse{\equal{#3}{BCH}}%
-    {\renewcommand{\@programmeq}{Biochemie}}{%
-    \ifthenelse{\equal{#3}{EM}}%
-    {\renewcommand{\@programmeq}{Elektromechanica}}{%
-    \ifthenelse{\equal{#3}{EI}}%
-    {\renewcommand{\@programmeq}{Elektronica-ICT}}{%
-    \ifthenelse{\equal{#3}{}}%
-    {}{%
-    \ifthenelse{\equal{#1}{FREE}}
-    {\renewcommand{\@programmeq}{#3}}{
-    \errmessage{Error in 3rd arg to macro programme[3]: invalid
-      programme qualifier}}}}}}}}%
-    %
-    \ifthenelse{\equal{#2}{IW}\and\not\equal{#3}{}}
-    {\renewcommand{\@programmes}{: }}{}
-}
-\newcommand{\@diplomalevel}{ERROR}
-\newcommand{\@diploma}{ERROR}
-\newcommand{\diploma}[1]{
-  \newcommand{\MoS}{Master of Science}
-  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
-  \newcommand{\BoSIW}{Bachelor of Science in de industri\"ele wetenschappen}
-  \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
-  \renewcommand{\@diploma}{
-    \ifthenelse{\equal{#1}{BA-IW-BK}}
-                          {\BoSIW: bouwkunde}{
-    \ifthenelse{\equal{#1}{BA-IW-BCH}}
-                          {\BoSIW: biochemie}{
-    \ifthenelse{\equal{#1}{BA-IW-CH}}
-                          {\BoSIW: chemie}{
-    \ifthenelse{\equal{#1}{BA-IW-EI}}
-                          {\BoSIW: elektronica-ICT}{
-    \ifthenelse{\equal{#1}{BA-IW-EM}}
-                          {\BoSIW: elektromechanica}{
-    \ifthenelse{\equal{#1}{MA-IW-BK}}
-                          {\MoSIW: bouwkunde}{
-    \ifthenelse{\equal{#1}{MA-IW-BCH}}
-                          {\MoSIW: biochemie}{
-    \ifthenelse{\equal{#1}{MA-IW-CH}}
-                          {\MoSIW: chemie}{
-    \ifthenelse{\equal{#1}{MA-IW-EI}}
-                          {\MoSIW: elektronica-ICT}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-CPS}}
-                          {\MoSIW:\\elektronica-ICT, optie
-                            Cyber-Physical Systems}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-IOT}}
-                          {\MoSIW:\\elektronica-IOT, optie Internet of
-                          Things}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-DAI}}
-                          {\MoSIW:\\elektronica-IOT, optie Distributed
-                            Artificial Intelligence}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-OE}}
-                          {\MoSIW:\\elektromechanica, optie Offshore
-                            Engineering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-EN}}
-                          {\MoSIW:\\elektromechanica, optie Energie}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-OP}}
-                          {\MoSIW:\\elektromechanica, optie Ontwerp en
-                          Productie}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-AU}}
-                          {\MoSIW:\\elektromechanica, optie Automatisering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM}}
-                          {\MoSIW:\\elektromechanica}{
-    \ifthenelse{\equal{#1}{MA-BE-HI}}
-                          {\MoS handelsingenieur}{
-    \ifthenelse{\equal{#1}{MA-BE-HIBI}}
-                          {\MoS handelsingenieur in de beleidsinformatica}{
-    \ifthenelse{\equal{#1}{MA-BE-EB}}
-                          {\MoSTEW: economisch beleid}{
-    \ifthenelse{\equal{#1}{MA-BE-BK}}
-                          {\MoSTEW: bedrijfskunde}
-    {\errmessage{Error in argument to macro diploma: must be one of
-        BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX
-        with XXX one of BK, BCH, CH, EI, EI-CPS, EI-IOT, EI-DAI,
-        EM-OE, EM-AU, EM-OP, EM-EN, MA-BE-YYY with YYY one of HI,
-        HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}}
-  }
-  \newcommand\thesisname{ERROR}
-  \IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
-  \IfSubStr{#1}{BA-}{\renewcommand\thesisname{\bachelorthesisname}}{}
-}
-\newcommand\@defensedate{ERROR}
-\newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
-\newcommand\@defenselocation{Antwerpen}
-\newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
-\newcommand\@titlepageimage{}
-\newcommand\titlepageimage[1]{\renewcommand\@titlepageimage{#1}}
-\newcommand{\@isbn}{}
-\newcommand{\isbn}[1]{\renewcommand{\@isbn}{#1}}
-\newcommand{\@depot}{}
-\newcommand{\depot}[1]{\renewcommand{\@depot}{#1}}
-\newcommand{\@address}{\errmessage{Please, set your multi-line address
-    and contact details using the \textbackslash{}address\{\} command
-    in the preamble of your document}}
-\newcommand{\address}[1]{\renewcommand{\@address}{#1}}
+\ExplSyntaxOn
+
+\seq_new:N \g__uantwerpendocs_supervisors
+\seq_new:N \g__uantwerpendocs_supervisorswithaffiliation
+\cs_new:Nn \__uantwerpendocs_addsupervisor:nn {
+  \seq_gpush:Nn \g__uantwerpendocs_supervisors { #1 }
+  \seq_gpush:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1,~#2 }
+}
+\NewDocumentCommand{\supervisor}{mm}{
+  \__uantwerpendocs_addsupervisor:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointsupervisors}{m}{
+  \seq_use:Nn \g__uantwerpendocs_supervisors { #1 }
+}
+\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{
+  \seq_use:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1 }
+}
+\NewDocumentCommand{\supervisorsname}{}{
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 1
+  \uantwerpendocsprop{supervisorsname}
+  \else:
+  \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 1
+  \uantwerpendocsprop{supervisorname}
+  \else:
+  \fi:
+  \fi:
+}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_supervisors
+  \seq_greverse:N \g__uantwerpendocs_supervisorswithaffiliation
+}
+\ExplSyntaxOff
+\newcommand*{\@jurychairman}{
+  \PackageError{uantwerpendocs}
+  {Please, define a chairman of the jury using the
+    '\protect\jurychairman{}' command in the preamble of your
+    document.}
+  {See the uantwerpendocs manual}
+}
+\newcommand*{\@jurychairmanaff}{}
+\newcommand*{\jurychairman}[2]{
+  \renewcommand*{\@jurychairman}{#1}\renewcommand*{\@jurychairmanaff}{#2}}
+\ExplSyntaxOn
+\seq_new:N \g__uantwerpendocs_jurymemberswithaffiliation
+\cs_new:Nn \__uantwerpendocs_addjurymember:nn {
+  \seq_gpush:Nn \g__uantwerpendocs_jurymemberswithaffiliation { #1,~#2 }
+}
+\NewDocumentCommand{\jurymember}{mm}{
+  \__uantwerpendocs_addjurymember:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointjurymembers}{m}{
+  \seq_use:Nn \g__uantwerpendocs_jurymemberswithaffiliation { #1 }
+}
+\AtBeginDocument{
+  \seq_greverse:N \g__uantwerpendocs_jurymemberswithaffiliation
+}
+\ExplSyntaxOff
+\newcommand*\phddegree{
+  \PackageError{uantwerpendocs}
+  {The '\protect\phddegree{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
+}
+\newcommand*\@degree{
+  \PackageError{uantwerpendocs}
+  {Please, specify the offical degree description using
+    the '\protect\degree{}'  macro in the preamble of your document.}
+  {See the uantwerpendocs manual}
+}
+\newcommand*\degree[1]{\renewcommand*\@degree{#1}}
+\newcommand*{\programme}[3]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\programme{}{}{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
+}
+\newcommand*{\diploma}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\diploma{}' macro is no longer available. Use
+    '\protect\degree{}' instead}
+  {The interface of uantwerpendocs 4.0 has been changed. Use the
+    '\protect\degree' macro to specify your degree in full text (see
+    the uantwerpendocs manual)'}
+}
+\newcommand*\@defensedate{ERROR}
+\newcommand*{\defensedate}[1]{\renewcommand*\@defensedate{#1}}
+\newcommand*\@defenselocation{Antwerpen}
+\newcommand*{\defenselocation}[1]{\renewcommand*\@defenselocation{#1}}
+\newcommand*\@titlepageimage{}
+\newcommand*\titlepageimage[1]{\renewcommand*\@titlepageimage{#1}}
+\newcommand*{\@isbn}{}
+\newcommand*{\isbn}[1]{\renewcommand*{\@isbn}{#1}}
+\newcommand*{\@depot}{}
+\newcommand*{\depot}[1]{\renewcommand*{\@depot}{#1}}
+\newcommand*{\@address}{
+  \PackageError{uantwerpendocs}
+  {Please, set your multi-line address and contact details using the
+    '\protect\address{}' command in the preamble of your document}
+  {See the uantwerpendocs manual}
+}
+\newcommand*{\address}[1]{\renewcommand*{\@address}{#1}}
 \if@twoside
   \lhead[\thepage]{\slshape\rightmark}
   \chead[]{}
@@ -420,8 +256,8 @@
   \rfoot[]{}
 \fi
 
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
+\renewcommand*{\headrulewidth}{0pt}
+\renewcommand*{\footrulewidth}{0pt}
 \if@filled\else
   \raggedright
 \fi
@@ -465,103 +301,93 @@
 \def\appendix{
   \setcounter{chapter}{0}
   \renewcommand*{\thechapter}{\Alph{chapter}}
-  \renewcommand\chaptername\appendixname
-}
-\pgfmathsetmacro{\ua@X}{\paperwidth}
-\pgfmathsetmacro{\ua@Y}{\paperheight}
-\pgfmathsetmacro{\ua@R}{6*\paperwidth}
-\pgfmathsetmacro{\ua@B}{(\ua@X+\ua@Y)/15}
-\pgfmathsetmacro{\ua@L}{0.25*\ua@X}
-\pgfmathsetmacro{\ua@Z}{0.1*\ua@L}
-\pgfmathsetmacro{\ua@H}{0.3*\ua@L}
-\pgfmathsetmacro{\ua@h}{0.5*(\ua@B-\ua@H)}
+  \renewcommand*\chaptername\appendixname
+}
 \renewcommand\maketitle{%
   \pagestyle{empty}
   \begin{titlepage}
-    \if@titlepagetableonly
-    Dit is een doctoraatsthesis van Universiteit Antwerpen.
-    \else
-    \begin{tikzpicture}[remember picture,overlay]
-      \node at (current page.center) {
-        \begin{tikzpicture}[inner sep=0pt]
+    \AddToShipoutPicture*{%
+      \put(0,0){%
+        \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
           \clip (0,0) rectangle(\paperwidth,\paperheight);
-
-          \filldraw[uacorpblue]
-          (0.5*\ua@X pt,\ua@B+\ua@R pt) circle (\ua@R pt)
-          (\ua@X pt, 0.25*\ua@Y+\ua@R pt) circle (\ua@R pt);
-
-          \node[anchor=south east] at (\ua@X-3*\ua@Z pt,\ua@h pt)
-          {\includegraphics[width=\ua@L pt]{\@logo}};
-
+          \fill[lightgray]
+          (2.125,19) rectangle (\paperwidth,6);
           \begin{scope}
-            \clip
-            (\ua@X pt, 0.25*\ua@Y+\ua@R pt) circle (\ua@R pt)
-            (0.375*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
-
-            \node[anchor=south] at (0.5*\ua@X pt, 2.1*\ua@B pt)
-            {\includegraphics[width=\ua@X pt]{\@titlepageimage}};
+            \clip (2.125,19) rectangle (\paperwidth,6);
+            \node[anchor=south west]
+            at (2.125,6)
+            {\ifx\@titlepageimage\@empty
+              \else
+              \includegraphics[keepaspectratio,
+              scale=0.01,
+              min size={15.875cm}{13cm}]{\@titlepageimage}
+              \fi};
           \end{scope}
 
-          \filldraw[uacorpbord]
-          (0.375*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
+          \node
+          [anchor=west,text width=13.75cm,align=left,font=\Huge,uauaside]
+          at (2.125,23.5)
+          {
+            \textsf{\textbf{\@title}}
+          };
 
-          \filldraw[white]
-          (0.1*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
+          \node
+          [anchor=west,text width=13.75cm,align=left,font=\Large,uauaside]
+          at (2.125,21.5)
+          {
+            \textsf{\textbf{\@subtitle}}
+          };
 
-          \node[anchor=north west,align=left,font=\large]
-          at (3*\ua@Z pt, \ua@B - \ua@h pt)
-          { \textcolor{uacorpblue}{\textsf{\@defenselocation,
-                \@defensedate}} };
+          \node
+          [anchor=base west,maincolor,
+          text width=13.75cm,align=left,font=\LARGE]
+          at (2.125,20)
+          {\textsf{\textbf{\@author}}};
 
-          \node[anchor=south west,text width=\textwidth,align=left,font=\large]
-          at (3*\ua@Z pt, 1.4*\ua@B pt)
-          { \textcolor{white}{\textsf{\@affiliation}} };
+          \fill[maincolor] (2.125,6)
+          -- (\paperwidth,6)
+          -- (\paperwidth,2.625)
+          -- (2.55,2.625)
+          arc (-90:-180:0.425)
+          -- cycle;
 
-          \node[anchor=south east,text width=\textwidth,align=right,font=\large]
-          at (\ua@X - 3*\ua@Z pt, 1.4*\ua@B pt)
-          { \textcolor{white}{\textsf{
-                \supervisorsname\\
-                \@supervisori%
-                \ifdefvoid{\@supervisorii}{}{\\\@supervisorii}%
-                \ifdefvoid{\@supervisoriii}{}{\\\@supervisoriii}%
-                \ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}}}
+          \node[white,anchor=west,align=left,font=\large]
+          (SN) at (2.55,4.9)
+          {
+            \begin{tabular}{@{}l@{~\,}p{11.5cm}}
+              \textsf{\supervisorsname}
+              & \textsf{\textbf{\jointsupervisors{ | }}}
+            \end{tabular}
           };
 
-          \node[anchor=north west,text
-          width=\ua@X-6*\ua@Z,align=left,font=\Huge]
-          (title)
-          at (3*\ua@Z pt,\ua@Y-4*\ua@Z pt)
-          { \textsf{\textbf{\@title}} };
-
-          \node[anchor=north west,below=2.5ex of title,
-          text width=\ua@X-6*\ua@Z,align=left,font=\large]
-          { \textsf{\textbf{\@subtitle}} };
-
-          \node[anchor=north west,text width=\ua@X-6*\ua@Z,align=left]
-          at (3*\ua@Z pt,\ua@Y - 12.5*\ua@Z pt)
-          { \textsf{\pthesisnamei{} \@phddegree{} \pthesisnameii{}} };
+          \node[white,anchor=west,text width=14.5cm,align=left,font=\small]
+          at (2.55,3.7)
+          {\textsf{\uantwerpendocsprop{pthesisnamei}
+              \@degree{}}\\
+          \textsf{\textbf{\@faculty{}
+            | \@defenselocation, \@defensedate}}};
 
-          \node[anchor=north west, text width=\textwidth,align=left,font=\LARGE]
-          at (3*\ua@Z pt, \ua@Y-15.5*\ua@Z pt)
-          { \textsf{\textbf{\@author}} };
+          \node[anchor=west] at
+          (2.125,1.313)
+          {\includegraphics[width=4.75cm]{\logoposua}};
         \end{tikzpicture}
-      };
-    \end{tikzpicture}
-    \fi
+      }
+    }
   \end{titlepage}%
+  ~\par\relax
   \cleardoublepage
   \begin{center}
-    \includegraphics[width=\ua@L pt]{\@logo}
+    \includegraphics[width=4.75cm]{\logoposua}
     \vfill
     \@faculty\\
-    \@programmeq\par
+    \@degree\par
     \vfill
     \Huge\textsf{\@title}\par
     \large\textsf{\@subtitle}\par
     \vfill
-    \normalsize\pthesisnamei\\
-    \@phddegree\\
-    \pthesisnameii\\
+    \normalsize\uantwerpendocsprop{pthesisnamei}\\
+    \@degree\\
+    \uantwerpendocsprop{pthesisnameii}\\
     \medskip
     \textbf{\@author}
     \vfill
@@ -572,40 +398,19 @@
     \begin{minipage}[b]{0.4\textwidth}
       \flushright
       \supervisorsname\\
-      \@supervisori%
-      \ifdefvoid{\@supervisorii}{}{\\\@supervisorii}%
-      \ifdefvoid{\@supervisoriii}{}{\\\@supervisoriii}%
-      \ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}
+      \jointsupervisors{\\}
     \end{minipage}
   \end{center}
   \clearpage
-  \textbf{\juryname}\hfill\par
-  \textbf{\jurychairmanname}\hfill\break
+  \textbf{\uantwerpendocsprop{juryname}}\hfill\par
+  \textbf{\uantwerpendocsprop{jurychairmanname}}\hfill\break
   \@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\
   \hfill\break
   \textbf{\supervisorsname}\hfill\break
-  \ifdefvoid{\@supervisori}{}{\@supervisori
-    \ifdefvoid{\@supervisoriaff}{}{, \@supervisoriaff}\\}
-  \ifdefvoid{\@supervisorii}{}{\@supervisorii
-    \ifdefvoid{\@supervisoriiaff}{}{, \@supervisoriiaff}\\}
-  \ifdefvoid{\@supervisoriii}{}{\@supervisoriii
-    \ifdefvoid{\@supervisoriiiaff}{}{, \@supervisoriiiaff}\\}
-  \ifdefvoid{\@supervisoriv}{}{\@supervisoriv
-    \ifdefvoid{\@supervisorivaff}{}{, \@supervisorivaff}\\}
+  \jointsupervisorswithaffiliation{\\}\\
   \hfill\break
-  \textbf{\jurymembersname}\hfill\break
-  \ifdefvoid{\@jurymemberi}{}{\@jurymemberi
-    \ifdefvoid{\@jurymemberiaff}{}{, \@jurymemberiaff\\}}
-  \ifdefvoid{\@jurymemberii}{}{\@jurymemberii
-    \ifdefvoid{\@jurymemberiiaff}{}{, \@jurymemberiiaff\\}}
-  \ifdefvoid{\@jurymemberiii}{}{\@jurymemberiii
-    \ifdefvoid{\@jurymemberiiiaff}{}{, \@jurymemberiiiaff\\}}
-  \ifdefvoid{\@jurymemberiv}{}{\@jurymemberiv
-    \ifdefvoid{\@jurymemberivaff}{}{, \@jurymemberivaff\\}}
-  \ifdefvoid{\@jurymemberv}{}{\@jurymemberv
-    \ifdefvoid{\@jurymembervaff}{}{, \@jurymembervaff\\}}
-  \ifdefvoid{\@jurymembervi}{}{\@jurymembervi
-    \ifdefvoid{\@jurymemberviaff}{}{, \@jurymemberviaff\\}}
+  \textbf{\uantwerpendocsprop{jurymembersname}}\hfill\break
+  \jointjurymembers{\\}
   \hfill\break
   \vfill
   \textbf{Contact}\\
@@ -615,7 +420,7 @@
   \@address\\
   \vfill
   \copyright{} \@defensedate{} \@author\\
-  \arrname.
+  \uantwerpendocsprop{arr}.
   \vfill
   \begin{minipage}[b]{.5\linewidth}
     \ifdefempty{\@isbn}{}{ISBN \@isbn}~\\
@@ -640,8 +445,6 @@
   \
 }
 \newcommand\makefinalpage{
-  \if@titlepagetableonly
-  \else
   \cleardoublepage
   \thispagestyle{empty}
   ~% intentionally blank page
@@ -651,19 +454,17 @@
     \node at (current page.center) {
       \begin{tikzpicture}[inner sep=0pt]
         \clip (0,0) rectangle(\paperwidth,\paperheight);
-        \fill[uacorpblue] (0,0) rectangle(\ua@X pt,\ua@Y pt);
-        \filldraw [white] (1.2*\ua@X pt,\ua@R+0.125*\ua@Y pt) circle (\ua@R pt);
-        \filldraw [uacorpbord] (1.375*\ua@X pt,\ua@R+0.666*\ua@Y pt)
-        circle (\ua@R pt);
+        \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
       \end{tikzpicture}
     };
   \end{tikzpicture}
-  \fi
 }
-\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-\IfFileExists{hyperref.sty}{
-    \RequirePackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+\AtBeginDocument{
+  \@ifpackageloaded{hyperref}{
     \hypersetup{
+      backref=true,
+      hyperindex=true,
+      pagebackref=true,
       breaklinks=true,
       colorlinks=true,
       citecolor=black,
@@ -671,16 +472,13 @@
       linkcolor=black,
       pageanchor=true,
       pdfpagemode=UseOutlines,
-      urlcolor=black
+      urlcolor=black,
+      pdftitle={\@title},
+      pdfsubject={\@subtitle},
+      pdfauthor={\@author}
     }
-    \AtBeginDocument{
-      \hypersetup{
-        pdftitle={\@title},
-        pdfsubject={\@subtitle},
-        pdfauthor={\@author}
-      }
-    }
-}{}
+  }{}
+}
 \endinput
 %%
 %% End of file `uantwerpenphdthesis.cls'.
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls
new file mode 100644
index 00000000000..46fa695a040
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls
@@ -0,0 +1,367 @@
+%%
+%% This is file `uantwerpenreport.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uantwerpendocs.dtx  (with options: `rp')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2013-2021  by Walter Daems <walter.daems@uantwerpen.be>
+%% 
+%% 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 Walter Daems.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{uantwerpenreport}
+    [2021/07/11 v4.0 .dtx skeleton file]
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
+\newif\if@copyright
+\DeclareOption{copyright}{\@copyrighttrue}
+\newif\if@filled
+\DeclareOption{filled}{\@filledtrue}
+\input{uantwerpencommonoptions.clo}
+\ExecuteOptions{a4paper,11pt,final,oneside,openright}
+\ProcessOptions\relax
+\LoadClassWithOptions{book}
+\setlength{\parindent}{0pt}
+\addtolength{\parskip}{0.75\baselineskip}
+\setcounter{secnumdepth}{3}
+\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+\RequirePackage{iftex}
+\RequirePackage{xstring}
+\RequirePackage{etoolbox}
+\RequirePackage{ifthen}
+\IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
+\newcommand{\@emptymacro}{}
+\RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
+\RequirePackage{color}
+\RequirePackage{tikz}
+\usetikzlibrary{positioning}
+\RequirePackage{eso-pic}
+\if@copyright
+\RequirePackage[contents={},color=lightgray,scale=3]{background}
+\fi
+\RequirePackage{uantwerpencolorlogoscheme}
+
+\RequirePackage{fancyhdr}
+\definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
+\definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
+\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13}
+\definecolor{uacorporange}{cmyk}   {0.00,0.32,1.00,0.09}
+\definecolor{uaftifresh}{cmyk}     {0.34,1.00,0.00,0.00}
+\definecolor{uaftisober}{cmyk}     {0.10,1.00,0.00,0.49}
+\definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
+\definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
+\definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
+\ExplSyntaxOn
+\prop_new:N \g__uantwerpendocs_data_prop
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+  \prop_item:Nn \g__uantwerpendocs_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+  \str_uppercase:f { \prop_item:Nn \g__uantwerpendocs_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\cs_new_nopar:Npn \__uantwerpendocs_dataparser:w #1 = #2!! {
+  \tl_set:Nn \l_tmpa_tl {#1}
+  \tl_set:Nn \l_tmpb_tl {#2}
+  \tl_trim_spaces:N \l_tmpa_tl
+  \tl_trim_spaces:N \l_tmpb_tl
+  \prop_gput:Nxx \g__uantwerpendocs_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+\ior_new:N \l__uantwerpendocs_data_ior
+\cs_new_nopar:Nn \__uantwerpendocs_datareader:n {
+  \ior_open:Nn \l__uantwerpendocs_data_ior { uantwerpendocs-#1.data }
+  \ior_str_map_inline:Nn \l__uantwerpendocs_data_ior {
+    \regex_match:nnTF {=} {##1} {
+      \__uantwerpendocs_dataparser:w ##1!!
+    }
+    {}
+  }
+  \ior_close:N \l__uantwerpendocs_data_ior
+}
+\clist_map_inline:nn {en} {
+  \__uantwerpendocs_datareader:n { #1 }
+}
+\ExplSyntaxOff
+\newcommand*\@logo{\logopos}
+\AtBeginDocument{
+  \makeatother
+  \@ifpackageloaded{babel}{
+    \addto\captionsenglish{%
+      \uantwerpendocspropread{en}
+    }
+    \addto\captionsdutch{%
+      \uantwerpendocspropread{nl}
+    }
+  }
+  {}
+  \makeatletter
+}
+
+\newcommand*{\facultyacronym}[1]{
+  \PackageError{uantwerpendocs}
+  {The '\protect\facultyacronym{}' macro is no longer available. Use
+    your faculty abbreviation in lowercase as class options instead}
+  {The interface of uantwerpendocs 4.0 has been changed. See
+    the uantwerpendocs manual under section '5.2 The class options explained'}
+}
+\newcommand*{\@subtitle}{~}
+\newcommand*{\subtitle}[1]{%
+  \renewcommand*\@subtitle{#1}
+}
+\newcommand*{\@versionyear}{}
+\newcommand*{\versionyear}[1]{\renewcommand*{\@versionyear}{#1}}
+\newcommand\@extra{}
+\newcommand\extra[1]{\renewcommand\@extra{#1}}
+\newcommand\@affiliation{
+  \PackageError{uantwerpendocs}
+  {Please, define the affiliation of the author using the
+    '\protect\affiliation{}' command in the preamble of your
+    document.}
+  {See the uantwerpendocs manual}
+}
+\newcommand\affiliation[1]{\renewcommand\@affiliation{#1}}
+\newcommand*\@titlepageimage{}
+\newcommand*\titlepageimage[1]{\renewcommand*\@titlepageimage{#1}}
+\newcommand{\@copyrightnotices}{}
+\newcommand{\copyrightnotices}[1]{\renewcommand{\@copyrightnotices}{#1}}
+\newcommand*{\@address}{
+  \PackageError{uantwerpendocs}
+  {Please, set your multi-line address and contact details using the
+    '\protect\address{}' command in the preamble of your document}
+  {See the uantwerpendocs manual}
+}
+\newcommand*{\address}[1]{\renewcommand*{\@address}{#1}}
+\if@twoside
+  \lhead[\thepage]{\slshape\rightmark}
+  \chead[]{}
+  \rhead[\slshape\leftmark]{\thepage}
+  \lfoot[]{}
+  \cfoot[]{}
+  \rfoot[]{}
+\else
+  \lhead[]{\leftmark}
+  \chead[]{}
+  \rhead[]{\thepage}
+  \lfoot[]{}
+  \cfoot[]{}
+  \rfoot[]{}
+\fi
+
+\renewcommand*{\headrulewidth}{0pt}
+\renewcommand*{\footrulewidth}{0pt}
+\if@filled\else
+  \raggedright
+\fi
+\raggedbottom
+\onecolumn
+\newcommand{\@crnotice}{
+  This document has been typeset using \LaTeX{} and the
+  \texttt{uantwerpendocs} package.\\
+  \@copyrightnotices
+
+
+  CONFIDENTIAL AND PROPRIETARY.
+
+  \copyright{} \@versionyear{} \uantwerpendocsprop{org-ua}, \uantwerpendocsprop{arr}.
+}
+\def\@makechapterhead#1{%
+  \vspace*{1ex}%
+  \begin{flushright}
+    \makebox[0pt][l]{\rule[-0.4em]{10cm}{1.8em}}\textcolor{white}
+    {\bf\LARGE~\chaptername~}
+    \raisebox{-24pt}{
+      \begin{tikzpicture}
+        \foreach \theta in {0,5,...,355} {
+          \node[color=white] at (\theta:0.025)
+          {\bf\fontsize{72}{12}\selectfont\thechapter};
+        }
+        \node[color=uacorpblue] at (0,0)
+        {\bf\fontsize{72}{12}\selectfont\thechapter};
+      \end{tikzpicture}
+    }\hspace*{-8pt}
+    \par\nobreak
+    \interlinepenalty\@M
+    \bf\huge\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}
+    \par\nobreak
+  \end{flushright}
+  \rule{\textwidth}{1pt}
+  \vspace{5\p@}\par\nobreak
+  }
+\def\@schapter#1{%
+  \@makeschapterhead{#1}%
+  \@afterheading
+}
+\def\@makeschapterhead#1{%
+  \vspace*{1ex}%
+  \begin{flushright}
+    \bf\LARGE\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}
+  \end{flushright}
+  \rule{\textwidth}{1pt}
+  \vspace{5\p@}\par
+}
+\def\appendix{
+  \setcounter{chapter}{0}
+  \renewcommand*{\thechapter}{\Alph{chapter}}
+  \renewcommand*\chaptername\appendixname
+}
+\renewcommand\maketitle{%
+  \pagestyle{empty}
+  \begin{titlepage}
+    \AddToShipoutPicture*{%
+      \put(0,0){%
+        \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+          \clip (0,0) rectangle(\paperwidth,\paperheight);
+          \fill[lightgray]
+          (2.125,20.192) rectangle (\paperwidth,6);
+          \begin{scope}
+            \clip (2.125,20.192) rectangle (\paperwidth,6);
+            \node[anchor=south west]
+            at (2.125,6)
+            {\ifx\@titlepageimage\@empty
+              \else
+              \includegraphics[keepaspectratio,
+              scale=0.01,
+              min size={18.875cm}{14.192cm}]{\@titlepageimage}
+              \fi};
+          \end{scope}
+
+          \node
+          [anchor=west,text width=17cm,align=left,font=\Huge,uauaside]
+          at (2.125,\paperheight-3cm)
+          {
+            \textsf{\textbf{\@title}}
+          };
+
+          \node
+          [anchor=west,text width=17cm,align=left,font=\Large,uauaside]
+          at (2.125,\paperheight-5cm)
+          {
+            \textsf{\textbf{\@subtitle}}
+          };
+
+          \node
+          [anchor=base west,maincolor,
+          text width=17cm,align=left,font=\LARGE]
+          at (2.125,\paperheight-6.5cm)
+          {\textsf{\textbf{\@author}}};
+
+          \fill[maincolor] (2.125,6)
+          -- (\paperwidth,6)
+          -- (\paperwidth,2.625)
+          -- (2.55,2.625)
+          arc (-90:-180:0.425)
+          -- cycle;
+
+          \node[white,anchor=west,text width=17cm,align=left,font=\small]
+          at (2.55,5.3)
+          {\textsf{\textbf{\@extra}}};
+
+          \node[white,anchor=west,text width=17cm,align=left,font=\small]
+          at (2.55,4)
+          {\textsf{\textbf{\@affiliation{}
+                | \@versionyear}\\
+              \@address}};
+
+          \node[anchor=west] at
+          (2.125,1.313)
+          {\includegraphics[width=4.75cm]{\logopos}};
+        \end{tikzpicture}
+      }
+    }
+  \end{titlepage}%
+  ~\par\relax
+  \cleardoublepage
+  \begin{center}
+    \includegraphics[width=4.75cm]{\logopos}
+    \vfill
+    \@affiliation\\
+    \@extra\par
+    \vfill
+    \Huge\textsf{\@title}\par
+    \large\textsf{\@subtitle}\par
+    \vfill
+    \textbf{\@author}
+    \vfill
+  \end{center}
+  \clearpage
+  \vfill
+  \textbf{Contact}\\
+  \smallskip
+  \@author\\
+  \@affiliation\\
+  \@address\\
+  \vfill
+  \copyright{} \@versionyear{} \@author\\
+  \uantwerpendocsprop{arr}.
+  \vfill
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+  \pagestyle{fancy}
+  \thispagestyle{empty}
+  \
+}
+\newcommand\makefinalpage{
+  \cleardoublepage
+  \thispagestyle{empty}
+  ~% intentionally blank page
+  \clearpage
+  \thispagestyle{empty}
+  \begin{tikzpicture}[remember picture,overlay]
+    \node at (current page.center) {
+      \begin{tikzpicture}[inner sep=0pt]
+        \clip (0,0) rectangle(\paperwidth,\paperheight);
+        \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
+      \end{tikzpicture}
+    };
+  \end{tikzpicture}
+}
+\AtBeginDocument{
+  \@ifpackageloaded{hyperref}{
+    \hypersetup{
+      backref=true,
+      hyperindex=true,
+      pagebackref=true,
+      breaklinks=true,
+      colorlinks=true,
+      citecolor=black,
+      filecolor=black,
+      linkcolor=black,
+      pageanchor=true,
+      pdfpagemode=UseOutlines,
+      urlcolor=black,
+      pdftitle={\@title},
+      pdfsubject={\@subtitle},
+      pdfauthor={\@author}
+    }
+  }{}
+}
+\endinput
+%%
+%% End of file `uantwerpenreport.cls'.