CTAN sync 202210220301

42 files changed, 1361 insertions, 836 deletions

diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE
new file mode 100644
index 0000000000..cf1ab25da0
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md
new file mode 100644
index 0000000000..b39a3a0290
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md
@@ -0,0 +1,24 @@
+# SimplePlus Beamer Theme
+
+A simple and clean beamer template.
+
+**Website:**
+
+https://github.com/PM25/SimplePlus-BeamerTheme
+
+**Overleaf:**
+
+https://www.overleaf.com/latex/templates/simpleplus-beamertheme/wfmfjhdcrdfx
+
+**Author:**
+
+Pin-Yen Huang (pyhuang97@gmail.com)
+
+**Compiled sample document:**
+
+beamertheme-simpleplus-sample.pdf
+
+## License
+
+This is free and unencumbered software released into the public domain.
+For more information, please see the file `LICENSE` or refer to <http://unlicense.org>.
\ No newline at end of file
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty
new file mode 100644
index 0000000000..906498e407
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty
@@ -0,0 +1,33 @@
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+
+%----------------------------------------------------------------------------------------
+% Package: beamertheme-SimplePlus
+% Author: Pin-Yen Huang (pyhuang97@gmail.com)
+% Version: 1.0, 2021-12-16
+% Link: https://github.com/PM25/SimplePlus-BeamerTheme
+% This is free and unencumbered software released into the
+% public domain; see <http://unlicense.org> for details.
+%----------------------------------------------------------------------------------------
+
+% define color
+\definecolor{InvisibleRed}{rgb}{0.97, 0.92, 0.92}
+\definecolor{InvisibleGreen}{rgb}{0.92, 0.97, 0.92}
+\definecolor{InvisibleBlue}{rgb}{0.92, 0.92, 0.97}
+
+\definecolor{MediumRed}{rgb}{0.925, 0.345, 0.345}
+\definecolor{MediumGreen}{rgb}{0.37, 0.7, 0.66}
+\definecolor{MediumBlue}{rgb}{0.015, 0.315, 0.45}
+
+\definecolor{DarkBlue}{rgb}{0.05, 0.15, 0.35} 
+
+% set color
+\usecolortheme[named=DarkBlue]{structure}
+
+\setbeamercolor{titlelike}{parent=structure}
+\setbeamercolor{block title}{bg=MediumBlue}
+\setbeamercolor{block body}{bg=InvisibleBlue}
+\setbeamercolor{block title example}{bg=MediumGreen}
+\setbeamercolor{block body example}{bg=InvisibleGreen}
+\setbeamercolor{block title alerted}{bg=MediumRed}
+\setbeamercolor{block body alerted}{bg=InvisibleRed}
\ No newline at end of file
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty
new file mode 100644
index 0000000000..9c57bc7cc3
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty
@@ -0,0 +1,38 @@
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+
+%----------------------------------------------------------------------------------------
+% Package: beamertheme-SimplePlus
+% Author: Pin-Yen Huang (pyhuang97@gmail.com)
+% Version: 1.0, 2021-12-16
+% Link: https://github.com/PM25/SimplePlus-BeamerTheme
+% This is free and unencumbered software released into the
+% public domain; see <http://unlicense.org> for details.
+%----------------------------------------------------------------------------------------
+
+\mode<presentation>
+
+%%%%%%%%%%%% fonts
+
+\setbeamerfont{structure}{family=\sffamily,series=\mdseries}
+
+\setbeamerfont{title}{size=\huge,series=\bfseries,parent=structure}
+\setbeamerfont{subtitle}{size=\normalsize,parent=title}
+
+\setbeamerfont{date}{size=\scriptsize,series=\mdseries,parent=structure}
+\setbeamerfont{author}{size=\large,series=\mdseries,parent=structure}
+\setbeamerfont{institute}{size=\scriptsize,series=\mdseries,parent=structure}
+
+\setbeamerfont{section in toc}{size=\Large,series=\bfseries,parent=structure}
+\setbeamerfont{section in head/foot}{size=\tiny,parent=structure}
+\setbeamerfont{subsection in toc}{size=\small,series=\mdseries,parent={section in toc}}
+
+\setbeamerfont{frametitle}{size=\LARGE,series=\bfseries,parent=structure}
+\setbeamerfont{framesubtitle}{parent=frametitle,size=\Large}
+
+\setbeamerfont{caption}{size=\footnotesize}
+\setbeamerfont{item}{parent=structure,series=\mdseries}
+\setbeamerfont{block title}{size=\large,series=\mdseries,parent={structure,block body}}
+
+\mode
+<all>
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty
new file mode 100644
index 0000000000..43ab163d18
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty
@@ -0,0 +1,60 @@
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+
+%----------------------------------------------------------------------------------------
+% Package: beamertheme-SimplePlus
+% Author: Pin-Yen Huang (pyhuang97@gmail.com)
+% Version: 1.0, 2021-12-16
+% Link: https://github.com/PM25/SimplePlus-BeamerTheme
+% This is free and unencumbered software released into the
+% public domain; see <http://unlicense.org> for details.
+%----------------------------------------------------------------------------------------
+
+\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{%
+  color(0pt)=(lower.bg); color(2pt)=(lower.bg); color(4pt)=(lower.bg)}
+
+\setbeamersize{text margin left=2em,text margin right=2em} 
+
+% table of contents (overview)
+\setbeamertemplate{section in toc}[sections numbered]
+\setbeamertemplate{subsection in toc}{\leavevmode\leftskip=3.2em\rlap{\hskip-2em\inserttocsectionnumber.\inserttocsubsectionnumber}\inserttocsubsection\par}
+
+\setbeamertemplate{footline}[frame number]
+\setbeamertemplate{navigation symbols}{}
+\setbeamertemplate{blocks}[rounded][shadow=false]
+\setbeamertemplate{enumerate items}[default]
+
+\setbeamertemplate{frametitle}{\vspace*{0.5em}\bfseries\insertframetitle\par\vskip-6pt\hrulefill\vspace{-0.1em}}
+
+\setbeamertemplate{title page}{
+    \vspace{7em}
+    \begingroup
+        \centering
+        % ------------------------
+        \begin{beamercolorbox}[sep=8pt,center]{title}
+        \usebeamerfont{title}\inserttitle\par%
+        \ifx\insertsubtitle\@empty%
+        \else%
+            \vskip0.25em%
+            {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}%
+        \fi%     
+        \end{beamercolorbox}%
+        \vskip0.5em\par
+        % ------------------------
+        \begin{beamercolorbox}[sep=8pt,center]{author}
+        \usebeamerfont{author}\insertauthor
+        \end{beamercolorbox}
+        \vskip-1em
+        % ------------------------
+        \begin{beamercolorbox}[sep=8pt,center]{institute}
+        \usebeamerfont{institute}\insertinstitute
+        \end{beamercolorbox}
+        % ------------------------
+        \begin{beamercolorbox}[sep=8pt,center]{date}
+        \usebeamerfont{date}\insertdate
+        \end{beamercolorbox}\vskip0.5em
+        % ------------------------
+        {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par}
+    \endgroup
+    \vfill
+}
\ No newline at end of file
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf
new file mode 100644
index 0000000000..4f56de719a
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex
new file mode 100644
index 0000000000..17e105a5b8
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex
@@ -0,0 +1,161 @@
+%----------------------------------------------------------------------------------------
+%	PACKAGES AND THEMES
+%----------------------------------------------------------------------------------------
+\documentclass[aspectratio=169,xcolor=dvipsnames]{beamer}
+\usetheme{SimplePlus}
+
+\usepackage{hyperref}
+\usepackage{graphicx} % Allows including images
+\usepackage{booktabs} % Allows the use of \toprule, \midrule and \bottomrule in tables
+
+%----------------------------------------------------------------------------------------
+%	TITLE PAGE
+%----------------------------------------------------------------------------------------
+
+\title[short title]{Simple Beamer Theme} % The short title appears at the bottom of every slide, the full title is only on the title page
+\subtitle{Subtitle}
+
+\author[Pin-Yen] {Pin-Yen Huang}
+
+\institute[NTU] % Your institution as it will appear on the bottom of every slide, may be shorthand to save space
+{
+    Department of Computer Science and Information Engineering \\
+    National Taiwan University % Your institution for the title page
+}
+\date{Dec 16, 2021} % Date, can be changed to a custom date
+
+
+%----------------------------------------------------------------------------------------
+%	PRESENTATION SLIDES
+%----------------------------------------------------------------------------------------
+
+\begin{document}
+
+\begin{frame}
+    % Print the title page as the first slide
+    \titlepage
+\end{frame}
+
+\begin{frame}{Overview}
+    % Throughout your presentation, if you choose to use \section{} and \subsection{} commands, these will automatically be printed on this slide as an overview of your presentation
+    \tableofcontents
+\end{frame}
+
+%------------------------------------------------
+\section{First Section}
+%------------------------------------------------
+
+\begin{frame}{Bullet Points}
+    \begin{itemize}
+        \item Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        \item Aliquam blandit faucibus nisi, sit amet dapibus enim tempus eu
+        \item Nulla commodo, erat quis gravida posuere, elit lacus lobortis est, quis porttitor odio mauris at libero
+        \item Nam cursus est eget velit posuere pellentesque
+        \item Vestibulum faucibus velit a augue condimentum quis convallis nulla gravida
+    \end{itemize}
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}{Blocks of Highlighted Text}
+    In this slide, some important text will be \alert{highlighted} because it's important. Please, don't abuse it.
+
+    \begin{block}{Block}
+        Sample text
+    \end{block}
+
+    \begin{alertblock}{Alertblock}
+        Sample text in red box
+    \end{alertblock}
+
+    \begin{examples}
+        Sample text in green box. The title of the block is ``Examples".
+    \end{examples}
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}{Multiple Columns}
+    \begin{columns}[c] % The "c" option specifies centered vertical alignment while the "t" option is used for top vertical alignment
+
+        \column{.45\textwidth} % Left column and width
+        \textbf{Heading}
+        \begin{enumerate}
+            \item Statement
+            \item Explanation
+            \item Example
+        \end{enumerate}
+
+        \column{.5\textwidth} % Right column and width
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer lectus nisl, ultricies in feugiat rutrum, porttitor sit amet augue. Aliquam ut tortor mauris. Sed volutpat ante purus, quis accumsan dolor.
+
+    \end{columns}
+\end{frame}
+
+%------------------------------------------------
+\section{Second Section}
+%------------------------------------------------
+
+\begin{frame}{Table}
+    \begin{table}
+        \begin{tabular}{l l l}
+            \toprule
+            \textbf{Treatments} & \textbf{Response 1} & \textbf{Response 2} \\
+            \midrule
+            Treatment 1         & 0.0003262           & 0.562               \\
+            Treatment 2         & 0.0015681           & 0.910               \\
+            Treatment 3         & 0.0009271           & 0.296               \\
+            \bottomrule
+        \end{tabular}
+        \caption{Table caption}
+    \end{table}
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}{Theorem}
+    \begin{theorem}[Mass--energy equivalence]
+        $E = mc^2$
+    \end{theorem}
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}{Figure}
+    Uncomment the code on this slide to include your own image from the same directory as the template .TeX file.
+    %\begin{figure}
+    %\includegraphics[width=0.8\linewidth]{test}
+    %\end{figure}
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}[fragile] % Need to use the fragile option when verbatim is used in the slide
+    \frametitle{Citation}
+    An example of the \verb|\cite| command to cite within the presentation:\\~
+
+    This statement requires citation \cite{p1}.
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}{References}
+    % Beamer does not support BibTeX so references must be inserted manually as below
+    \footnotesize{
+        \begin{thebibliography}{99}
+            \bibitem[Smith, 2012]{p1} John Smith (2012)
+            \newblock Title of the publication
+            \newblock \emph{Journal Name} 12(3), 45 -- 678.
+        \end{thebibliography}
+    }
+\end{frame}
+
+%------------------------------------------------
+
+\begin{frame}
+    \Huge{\centerline{\textbf{The End}}}
+\end{frame}
+
+%----------------------------------------------------------------------------------------
+
+\end{document}
\ No newline at end of file
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty
new file mode 100644
index 0000000000..5ff53a743e
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty
@@ -0,0 +1,23 @@
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+
+%----------------------------------------------------------------------------------------
+% Package: beamertheme-SimplePlus
+% Author: Pin-Yen Huang (pyhuang97@gmail.com)
+% Version: 1.0, 2021-12-16
+% Link: https://github.com/PM25/SimplePlus-BeamerTheme
+% This is free and unencumbered software released into the
+% public domain; see <http://unlicense.org> for details.
+%----------------------------------------------------------------------------------------
+
+\mode<presentation>
+
+% Settings
+\usetheme{Madrid}
+\useinnertheme{circles}
+
+\usefonttheme{SimplePlus}
+\usecolortheme{SimplePlus}
+\useinnertheme{SimplePlus}
+
+\mode<all>
\ No newline at end of file
diff --git a/macros/latex/contrib/iexec/iexec.dtx b/macros/latex/contrib/iexec/iexec.dtx
index ff627551a5..bdcb5609c9 100644
--- a/macros/latex/contrib/iexec/iexec.dtx
+++ b/macros/latex/contrib/iexec/iexec.dtx
@@ -50,12 +50,13 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{iexec}
 %<*package>
-[2022-10-15 0.9.1 Inputable Shell Executions]
+[2022-10-21 0.10.1 Inputable Shell Executions]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[tt=false, type1=true]{libertine}
 \usepackage{microtype}
+\usepackage[dtx]{docshots}
 \usepackage{iexec}
 \usepackage{href-ul}
 \PageIndex
@@ -81,29 +82,16 @@
 % This package helps you execute shell commands right from the
 % document and then put their output to the document:
 %
-% \begin{multicols}{2}
-% \setlength{\parskip}{0pt}
-% \small
-% \raggedcolumns
-%\iffalse
-%<*verb>
-%\fi
-\begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
-Today is
-  \iexec{date +\%e-\%b-\%Y}
-\end{document}
-\end{verbatim}
-%\iffalse
-%</verb>
-%\fi
-%
-% \columnbreak
-%
-% Today is \iexec[log]{date +\%e-\%b-\%Y}
-% \end{multicols}
+% \begin{docshot}
+% \documentclass{article}
+% \usepackage{iexec}
+% \usepackage[paperwidth=3in]{geometry}
+% \pagestyle{empty}
+% \begin{document}
+% Today is \textbf{%
+%   \iexec{date +\%e-\%b-\%Y}}
+% \end{document}
+% \end{docshot}
 
 % \DescribeMacro{\iexec} The only command provided by this package is |\iexec| \oarg{options} \marg{cmd}.
 % Its only mandatory argument \meta{cmd} is the command to be executed
@@ -117,19 +105,16 @@ Today is
 
 % \section{Options}
 
-% \DescribeMacro{quiet} If you don't want the output to be visible,
+% \DescribeMacro{quiet}
+% If you don't want the output to be visible,
 % use |\phantom\{\iexec{...}}|.
 % Otherwise, you can use |quiet| option:
 %\iffalse
 %<*verb>
 %\fi
 \begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
 I just want to delete some file:
 \iexec[quiet]{rm -f foo.txt}
-\end{document}
 \end{verbatim}
 %\iffalse
 %</verb>
@@ -137,41 +122,36 @@ I just want to delete some file:
 % In this case, whatever the shell command produces will not be included
 % into the document.
 
-% \DescribeMacro{stdout} The output of your code is saved into the file provided as an
+% \DescribeMacro{stdout}
+% The output of your code is saved into the file provided as an
 % optional argument of |\iexec| (the default value is |iexec.tmp|):
 %\iffalse
 %<*verb>
 %\fi
 \begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
 Today is \iexec[stdout=date.txt]{date +\%e-\%b-\%Y | tr -d '\\n'}.
-\end{document}
 \end{verbatim}
 %\iffalse
 %</verb>
 %\fi
 % The tailing part of the command here removes all ends-of-line.
 
-% \DescribeMacro{stderr} The error output of the code is saved into the file provided as an
+% \DescribeMacro{stderr}
+% The error output of the code is saved into the file provided as an
 % optional argument of |\iexec| (by default the error output
 % is streamed into |stdout|):
 %\iffalse
 %<*verb>
 %\fi
 \begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
 Today is \iexec[stderr=my.txt]{broken-command}.
-\end{document}
 \end{verbatim}
 %\iffalse
 %</verb>
 %\fi
 
-% \DescribeMacro{trace} The file specified will be deleted right after its usage. If you don't
+% \DescribeMacro{trace}
+% The file specified will be deleted right after its usage. If you don't
 % want this to happen, use |trace| package option: all files will remain
 % in the directory where they were created.
 % It's possible to turn tracing on globbaly, for the entire document, using
@@ -190,7 +170,8 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 %</verb>
 %\fi
 
-% \DescribeMacro{append} The stdout produced will be appended to the file specified:
+% \DescribeMacro{append}
+% The stdout produced will be appended to the file specified:
 %\iffalse
 %<*verb>
 %\fi
@@ -207,31 +188,38 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 %</verb>
 %\fi
 
-% \DescribeMacro{log} The stdout produced will be printed in \TeX{} log:
+% \DescribeMacro{log}
+% The stdout produced will be printed in \TeX{} log:
 %\iffalse
 %<*verb>
 %\fi
 \begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
 \iexec[log]{echo 'Hello, \\LaTeX!'}
-\end{document}
 \end{verbatim}
 %\iffalse
 %</verb>
 %\fi
 
-% \DescribeMacro{null} The stdout of the command will be sent to |/dev/null|:
+% \DescribeMacro{null}
+% The stdout of the command will be sent to |/dev/null|:
 %\iffalse
 %<*verb>
 %\fi
 \begin{verbatim}
-\documentclass{article}
-\usepackage{iexec}
-\begin{document}
 \iexec[null]{rm some-file.txt}
-\end{document}
+\end{verbatim}
+%\iffalse
+%</verb>
+%\fi
+
+% \DescribeMacro{ignore}
+% By default, we report an error if exit code is not equal to zero. You can suppress
+% this with |ignore| option:
+%\iffalse
+%<*verb>
+%\fi
+\begin{verbatim}
+\iexec[ignore]{broken-command}
 \end{verbatim}
 %\iffalse
 %</verb>
@@ -241,15 +229,6 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 
 % \section{Implementation}
 
-% \changes{v0.2.0}{2021/07/10}{Initial version}
-% \changes{v0.4.0}{2021/08/01}{Runtime verification for --shell-escape option}
-% \changes{v0.4.1}{2021/08/08}{Options trace, stdout, and quiet added}
-% \changes{v0.5.0}{2022/01/08}{Major bug fixes}
-% \changes{v0.6.0}{2022/10/09}{Additional options 'log' and 'append'}
-% \changes{v0.7.0}{2022/10/10}{Additional option 'null'}
-% \changes{v0.8.0}{2022/10/11}{Bug fixes}
-% \changes{v0.9.0}{2022/10/12}{Additional option 'stderr'}
-
 % First, we include \href{https://ctan.org/pkg/shellesc}{shellesc} package, which
 % we use to execute shell commands:
 %    \begin{macrocode}
@@ -267,6 +246,9 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 %    \end{macrocode}
 
 % Then, we prepare to parse the options of |\iexec| command:
+% \changes{v0.10.0}{2022/10/19}{The option "ignore" suppresses the checking of "iexec.ret" value.}
+% \changes{v0.7.0}{2022/09/25}{The option "append" was introduced --- if it's turned on, stdout will be appended to the file, instead of rewriting it (this is how it was before).}
+% \changes{v0.7.0}{2022/09/25}{The option "log" was introduced, to turn on log/debug messages in TeX log (they were all visible always, which was sometimes annoying. Also, this option enables printing of the entire content of stdout to the log too (this may be pretty convenient for debugging).}
 %    \begin{macrocode}
 \RequirePackage{pgfkeys}
 \makeatletter\pgfkeys{
@@ -280,6 +262,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
   log/.store in = \iexec@log,
   null/.store in = \iexec@null,
   quiet/.store in = \iexec@quiet,
+  ignore/.store in = \iexec@ignore,
   stdout
 }\makeatother
 %    \end{macrocode}
@@ -307,9 +290,12 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 % \begin{macro}{\iexec}
 % Then, we define |\iexec| command.
 % It is implemented with the help of |\ShellEscape| from |shellesc| package:
+% \changes{v0.10.0}{2022/10/19}{The file "iexec.ret" is reused for all scripts.}
 %    \begin{macrocode}
-\makeatletter\newcommand\iexec[2][]{%
-  \begingroup
+\makeatletter
+\newread\iexec@retfile
+\newcommand\iexec[2][]{%
+  \begingroup%
     \pgfqkeys{/iexec}{#1}%
 %    \end{macrocode}
 % First, we verify that |latex| is running with |--shell-escape| option, since without
@@ -323,7 +309,9 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 %    \end{macrocode}
 % Then, start the log from a clean line:
 %    \begin{macrocode}
-      \message{^^J}%
+      \ifdefined\iexec@log%
+        \message{^^J}%
+      \fi%
 %    \end{macrocode}
 % Then, we define a few special chars in order to escape them in the shell
 % (the full
@@ -335,36 +323,60 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
       \let\}\@charrb%
 %    \end{macrocode}
 % Then, we execute it:
+% \changes{v0.10.0}{2022/10/19}{The ability to track exit code was added. Now, the code is saved into "iexec.ret" file, which is then read and checked for zero value.}
+% \changes{v0.8.0}{2022/10/05}{The option "null" was introduced, allowing redirection of stdout to "/dev/null". Doesn't work on Windows, though.}
+% \changes{v0.9.0}{2022/10/15}{The option "stderr" was introduced, allowing redirection of stderr to a file. Without this option specified, stderr will go to stdout.}
 %    \begin{macrocode}
       \def\iexec@cmd{(#2)
         \ifdefined\iexec@append>\fi>
         \ifdefined\iexec@null/dev/null\else\iexec@stdout\fi
-        \space\ifdefined\iexec@stderr2>\iexec@stderr\else2>&1\fi}
+        \space\ifdefined\iexec@stderr2>\iexec@stderr\else2>&1\fi
+        \ifdefined\iexec@ignore\else; echo $? >iexec.ret\fi}
       \ShellEscape{\iexec@cmd}%
 %    \end{macrocode}
 % Then, a message is printed to TeX log:
 %    \begin{macrocode}
-      \message{iexec: [\iexec@cmd]^^J}%
+      \ifdefined\iexec@log%
+        \message{iexec: [\iexec@cmd]^^J}%
+      \fi%
     \endgroup%
 %    \end{macrocode}
 % Then, if required, the content of the stdout file will be printed to the log:
 %    \begin{macrocode}
-    \ifdefined\iexec@null\else
-    \ifdefined\iexec@log
-      \message{iexec: this is the content of \iexec@stdout:^^J}%
-      \iexec@typeout{\iexec@stdout}
+    \ifdefined\iexec@null\else%
+    \ifdefined\iexec@log%
+      \message{iexec: This is the content of \iexec@stdout:^^J}%
+      \iexec@typeout{\iexec@stdout}%
       \message{<EOF>^^J}%
     \fi\fi%
 %    \end{macrocode}
+% Then, we check exit code:
+%    \begin{macrocode}
+    \ifdefined\iexec@log\else%
+      \immediate\openin\iexec@retfile=iexec.ret%
+      \read\iexec@retfile to \iexec@ret%
+      \immediate\closein\iexec@retfile%
+      \ifnum\iexec@ret=0\else%
+        \PackageError{iexec}{Exit code is \iexec@ret}{}%
+      \fi%
+    \fi%
+%    \end{macrocode}
 % Then, include the produced output into the current document:
 %    \begin{macrocode}
-    \ifdefined\iexec@null\else
-    \ifdefined\iexec@quiet
-      \message{iexec: Due to 'quiet' option we didn't read
-      the content of '\iexec@stdout' (\pdffilesize{} bytes)^^J}%
+    \ifdefined\iexec@null\else%
+    \ifdefined\iexec@quiet%
+      \ifdefined\iexec@log%
+        \message{iexec: Due to 'quiet' option we didn't read
+        the content of '\iexec@stdout'
+        \ifdefined\pdffilesize(\pdffilesize{\iexec@stdout}
+        bytes)\fi^^J}%
+      \fi%
     \else%
-      \message{iexec: We include the content of
-        '\iexec@stdout' (\pdffilesize{} bytes)...^^J}%
+      \ifdefined\iexec@log%
+        \message{iexec: We include the content of
+        '\iexec@stdout'\ifdefined\pdffilesize(\pdffilesize
+        {\iexec@stdout} bytes)\fi...^^J}%
+      \fi%
       \input{\iexec@stdout}%
       \message{iexec: The content of '\iexec@stdout'
       was included into the document^^J}%
@@ -372,17 +384,23 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 %    \end{macrocode}
 % Finally, delete the file or leave it untouched:
 %    \begin{macrocode}
-    \ifdefined\iexec@null\else
+    \ifdefined\iexec@null\else%
     \ifiexec@trace%
-      \message{iexec: Due to package option 'trace',
-      the file '\iexec@stdout' was not deleted^^J}%
+      \ifdefined\iexec@log%
+        \message{iexec: Due to package option 'trace',
+        the file '\iexec@stdout' was not deleted^^J}%
+      \fi%
     \else%
       \ifdefined\iexec@traceit%
-        \message{iexec: Due to 'trace' option,
-        the file '\iexec@stdout' was not deleted^^J}%
+        \ifdefined\iexec@log%
+          \message{iexec: Due to 'trace' option,
+          the file '\iexec@stdout' was not deleted^^J}%
+        \fi%
       \else%
         \ShellEscape{rm \iexec@stdout}%
-        \message{iexec: The file '\iexec@stdout' was deleted^^J}%
+        \ifdefined\iexec@log%
+          \message{iexec: The file '\iexec@stdout' was deleted^^J}%
+        \fi%
       \fi%
     \fi\fi%
   \endgroup
@@ -393,7 +411,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
 % \Finale
 
 %\clearpage
-%
 %\PrintChanges
+
 %\clearpage
 %\PrintIndex
diff --git a/macros/latex/contrib/iexec/iexec.pdf b/macros/latex/contrib/iexec/iexec.pdf
index 3b14fd32d0..96f30b1582 100644
--- a/macros/latex/contrib/iexec/iexec.pdf
+++ b/macros/latex/contrib/iexec/iexec.pdf
diff --git a/macros/latex/contrib/qrbill/README.md b/macros/latex/contrib/qrbill/README.md
index 8079883d18..03eff67b34 100644
--- a/macros/latex/contrib/qrbill/README.md
+++ b/macros/latex/contrib/qrbill/README.md
@@ -4,7 +4,7 @@ Copyright (C) Marei Peischl (peiTeX)  <marei@peitex.de>, 2020–2022
 
 This work is part of a collaborative project of Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
 
-qrbill 2022/10/18 v1.06
+qrbill 2022/10/20 v1.07
 
 ***************************************************************************
 
@@ -77,4 +77,6 @@ For further information on l3build and other options please have a look at the c
  * v1.06 (2022-10-18)
    - additional customization for vrule
    - add possibilities to ignore data fields if empty
-   - allow the usage of commas within the billing info
\ No newline at end of file
+   - allow the usage of commas within the billing info
+ * v1.07 (2022-10-20)
+   - fix utf8 encoding für qrmode=package
\ No newline at end of file
diff --git a/macros/latex/contrib/qrbill/qrbill.dtx b/macros/latex/contrib/qrbill/qrbill.dtx
index fab4a79821..6d169404d5 100644
--- a/macros/latex/contrib/qrbill/qrbill.dtx
+++ b/macros/latex/contrib/qrbill/qrbill.dtx
@@ -54,7 +54,7 @@
 % \fi
 % \iffalse
 %<*driver>
-\ProvidesFile{qrbill.dtx}[2022/10/18 v1.06  \ create QR-bills based on the Swiss standard]
+\ProvidesFile{qrbill.dtx}[2022/10/20 v1.07  \ create QR-bills based on the Swiss standard]
 \documentclass[english, parskip=half-]{scrartcl}
 \usepackage{iftex}
 \ifPDFTeX
@@ -514,7 +514,7 @@
 % \section{Implementation}
 %    \begin{macrocode}
 \RequirePackage{expl3}
-\ProvidesExplPackage{qrbill}{2022/10/18}{1.06}{
+\ProvidesExplPackage{qrbill}{2022/10/20}{1.07}{
   Template for QR-bills based on the Swiss Payment Standards
 }
 \RequirePackage{iftex}
@@ -690,16 +690,7 @@
 \dim_new:N \g_qrbill_QRcode_dim
 \dim_gset:Nn \g_qrbill_QRcode_dim {46mm}
 \bool_if:NT \g__qrbill_luamode_bool {
-	\file_if_exist:nTF {qrencode.lua} {
-		\lua_load_module:n {qrbill-latexluaqrcode}
-	} {
-		\msg_new:nnn {qrbill} {luaqrcode-not-found} {
-			Could~not~find~the~required~library~for~qrmode=lua.\\
-			I~will~switch~to~qrmode=package.
-		}
-		\msg_warning:nn {qrbill} {luaqrcode-not-found}
-		\bool_gset_false:N \g__qrbill_luamode_bool
-	}
+	\lua_load_module:n {qrbill-latexluaqrcode}
 
 	% qrcode setup
 	\dim_new:N \l__qrbill_QRblocksize_dim
@@ -719,6 +710,10 @@
 	}
 }
 
+%    \end{macrocode}
+% \changes{v1.07}{2022/10/20}{patch the qrcode package to work with utf-8 strings}
+%    \begin{macrocode}
+
 \bool_if:NF \g__qrbill_luamode_bool {
   \usepackage{qrcode}
   % modified version of \qr@encode@binary to allow utf8 qrcodes required by swiss qrbill scheme
@@ -731,17 +726,16 @@
 		%
 		%First, the mode indicator.
 		\def\qr@codetext{4}% %This means `binary'
-		%
-		%Next, the character count.
-		\xdef\qr@stringlength{\tl_count:o {\qr@plaintext}}%
+		% patch character count mechanism, because we have to encode to hex before counting so the package does accept our utf8 string
+		\__qrbill_qr_get_string_length_encoded:n { \qr@plaintext }
 		%Set \qr@charactercountlengthinhex to \qr@charactercountbits@byte/4%
 		\edef\qr@charactercountlengthinhex{\int_eval:n {\qr@charactercountbits@byte / 4}}%
 		\qr@decimaltohex[\qr@charactercountlengthinhex]{\qr@charactercount}{\qr@stringlength}%
 		\xa\g@addto@macro\xa\qr@codetext\xa{\qr@charactercount}%
 		%
 		%Now comes the actual data.
-		\exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str  { \qr@plaintext }  {iso88591} {utf8}
-		\exp_args:NNV \str_set_convert:Nnnn \l_tmpa_str  \l_tmpa_str {} {latin1/hex}
+		\exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str  { \qr@plaintext }  {} {utf8/hex}
+
 		\str_gput_right:NV \qr@codetext \l_tmpa_str
 		\xdef\qr@codetext{\exp_args:No \str_lowercase:n {\qr@codetext}}
 		%Now the terminator.
@@ -769,8 +763,33 @@
 	}
   \cs_set:Nn \qrbill_parse_QRcode:n {
 		\cs_set_eq:NN \qr@encode@binary \__qrbill_encode_unicode_binary:n
-		\raisebox{\depth}{\cs_set_eq:NN \qr@encode@binary \__qrbill_encode_unicode_binary:n\qrcode[height= \g_qrbill_QRcode_dim]{#1}}
+		\raisebox{\depth}{
+			\__qrbill_enable_unicode_qrcode_patch:
+			\qrcode[height= \g_qrbill_QRcode_dim]{#1}
+		}
   }
+
+	\cs_new:Nn \__qrbill_qr_get_string_length_encoded:n {%
+		\exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str  { #1 }  {} {utf8/hex}
+		\xdef\qr@stringlength{\int_eval:n {\str_count:N \l_tmpa_str / 2}}
+	}
+
+	\cs_new:Nn \__qrbill_qr_padatfront:nn {%
+		% #1 = macro containing text to pad
+		% #2 = desired number of characters
+		% Pads a number with initial zeros.
+		\prg_replicate:nn {\int_max:nn {0} {#2- \tl_count:N #1}} {
+			\qr@g@preface@macro{#1}{0}
+		}
+	}
+
+	\let\orig@qr@getstringlength\qr@getstringlength
+
+	\cs_new:Nn \__qrbill_enable_unicode_qrcode_patch: {
+		\cs_set_eq:NN \qr@padatfront \__qrbill_qr_padatfront:nn
+		\AddToHook{cmd/qr@choose@best@version/before}{\cs_set_eq:NN \qr@getstringlength\__qrbill_qr_get_string_length_encoded:n}
+		\AddToHook{cmd/qr@choose@best@version/after}{\let\qr@getstringlength\orig@qr@getstringlength}
+	}
 }
 
 \cs_generate_variant:Nn \qrbill_parse_QRcode:n {V}
@@ -1182,7 +1201,8 @@
 	    }
   }
   %necessary to preserve spaces!
-  \str_replace_all:Nnn \l_qrbill_data_str {~ } {\ }
+  \bool_if:NF \g__qrbill_luamode_bool
+		{ \str_replace_all:Nnn \l_qrbill_data_str {~ } {\ } }
   \prop_map_inline:Nn \g__qrbill_replacement_prop {
 		\str_replace_all:Nnn \l_qrbill_data_str {##1} {##2}
 	}
diff --git a/macros/latex/contrib/qrbill/qrbill.pdf b/macros/latex/contrib/qrbill/qrbill.pdf
index fe8ddd638a..3684e2c948 100644
--- a/macros/latex/contrib/qrbill/qrbill.pdf
+++ b/macros/latex/contrib/qrbill/qrbill.pdf
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index 39360949f0..d021520e3b 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -90,6 +90,17 @@ also have a look at the example files.
 
 == CHANGES ==
 
+V. 2.1 (2022-10-21):
+    - univie-ling-wlg:
+      * Add a sans (Source Sans Pro or MyriadPro) and monospaced (DejaVu Sans Mono)
+        font.
+      * Add draftmark option.
+    - univie-ling-handout:
+    - univie-ling-expose:
+    - univie-ling-paper:
+    - univie-ling-thesis:
+      * Fix polyglossia option.
+
 V. 2.0 (2022-10-02):
     - Add general documentation (univie-ling.pdf).
     - univie-ling-handout:
@@ -109,6 +120,7 @@ V. 1.20 (2022-09-08):
     - univie-ling-thesis:
     - univie-ling-wlg:
       * Load varioref \AtBeginDocument.
+
 V. 1.19 (2022-06-18):
     - Add handout class.
     - univie-ling-expose:
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index 297bf740f1..1564b3a9ee 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -37,7 +37,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesFile{univie-ling.bbx}[2022/10/02 v.2.0 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2022/10/21 v.2.1 biblatex bibliography style]
 
 % Load base style (authoryear-comp)
 \RequireBibliographyStyle{authoryear-comp}
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index e4937b0fa3..a643cacf26 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -35,7 +35,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\ProvidesFile{univie-ling.cbx}[2022/10/02 v.2.0 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2022/10/21 v.2.1 biblatex citation style]
 
 \RequireCitationStyle{authoryear-comp}
 
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
index 12cb21db93..570c4e2e3b 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
index dac6d7b74a..23b602db8c 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
index 72b734d553..f578a135e8 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
index aa429549f5..c0451d826f 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
index 83b8b152df..0b089403c9 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
index e6c62d407c..3a7992cdf7 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
index ba8f0ab19e..0719df2af3 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
index e780fe4f91..d5baf32825 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index a41185e64c..99040225d2 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index 9f6d69016b..f1f8ad6505 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index 82941e94cd..f7984c7280 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
@@ -341,7 +341,11 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{description}
- \item 2022/10/02 (v.\,2.0)
+  \item 2022/10/21 (v.\,2.1)
+	\begin{itemize}
+		\item Fix \joption{polyglossia} option.
+	\end{itemize}
+  \item 2022/10/02 (v.\,2.0)
 	\begin{itemize}
 		\item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
 		\item Fix some \textsf{varioref} definitions.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
index e308a78e55..7350488fd3 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
index 1dbba9f736..15d5a07eab 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
@@ -63,7 +63,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
@@ -385,6 +385,10 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{description}
+ \item 2022/10/21 (v.\,2.1)
+    \begin{itemize}
+ 	    \item Fix \joption{polyglossia} option.
+    \end{itemize}
  \item 2022/10/02 (v.\,2.0)
 	\begin{itemize}
 		\item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 7838dcbfef..f7025aba1a 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index bfd39d1995..c3b67f8602 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -63,7 +63,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
@@ -374,6 +374,10 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{itemize}
+  \item 2022/10/21 (v.\,2.1)
+	\begin{itemize}
+		\item Fix \joption{polyglossia} option.
+	\end{itemize}
   \item 2022/10/02 (v.\,2.0)
 	\begin{itemize}
 		\item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index 096cdf536d..6997a5f366 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index d181c6cc78..cdec8d14ad 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
@@ -404,7 +404,11 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{itemize}
- \item 2022/10/02 (v.\,2.0)
+  \item 2022/10/21 (v.\,2.1)
+	\begin{itemize}
+		\item Fix \joption{polyglossia} option.
+	\end{itemize}
+  \item 2022/10/02 (v.\,2.0)
 	\begin{itemize}
 		\item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
 		\item Fix some \textsf{varioref} definitions.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index b57238618d..527c0b2d59 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 7805945596..ee433f9e13 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
@@ -81,14 +81,16 @@ be used for contributions to this journal. It comes with suitable \textsf{biblat
 
 The class uses PostScript (a.\,k.\,a. Type\,1) fonts and thus requires classic (PDF)LaTeX.
 
-By default, the class uses by default \emph{Crimson} as a serif font (via the \textsf{cochineal} package).
-Alternatively, the quite similar shaped \emph{MinionPro} can also be used.
-It covers more glyphs and is probably a bit more polished than \emph{Cochineal}, but due to license reasons it is not included in the common 
-\LaTeX\ distributions. \emph{MinionPro} is provided by the excellent \textsf{FontPro} package.%
+By default, the class uses \emph{Cochineal} as a serif font, an extended fork of \emph{Crimson},
+\emph{Source Sans Pro} as sans serif, and \emph{DejaVu Sans Mono} as monospaced font.
+Alternatively, the quite similar shaped \emph{MinionPro} (serif) and \emph{MyriadPro} (sans) can also be used.
+They cover more glyphs and are probably a bit more polished than \emph{Cochineal} and \emph{Source Sans Pro}, but due to license reasons
+they are not included in the common  \LaTeX\ distributions. Both \emph{MinionPro} and \emph{MyriadPro} are provided by the excellent
+\textsf{FontPro} package.%
 \footnote{\url{https://github.com/sebschub/FontPro} <25.\,01.\,2017>.} However, some effort is needed to install the package and fonts.
 Please refer to the package's documentation in case you are interested.
 
-If you want to use \emph{MinionPro}, use the class option \joption{expertfonts=true} (see sec.~\ref{coptions}).
+If you want to use the \emph{MinionPro}/\emph{MyriadPro} pair of fonts, use the class option \joption{expertfonts=true} (see sec.~\ref{coptions}).
 
 
 \section{Class Options}\label{coptions}
@@ -105,7 +107,8 @@ needed to use this class should be included in your LaTeX distribution and thus
 The class provides the following option to set the font handling:
 \begin{description}
  \setlength\itemsep{0pt}
- \item{\joption{expertfonts=true|false}}: if this option is set to true, \emph{MinionPro} is used instead of \emph{Crimson}.
+ \item{\joption{expertfonts=true|false}}: if this option is set to true, \emph{MinionPro} and \emph{MyriadPro} are used instead of \emph{Crimson}
+      and \emph{Source Sans Pro}.
       See sec.~\ref{fonts} for details.
 \end{description}
 
@@ -137,6 +140,11 @@ The class can generate a titlepage in two different forms.
 	     the journal metadata. Pagination info in these places is suppressed.
 \end{description}
 
+\subsection{Draft mode}\label{draft}
+
+The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with the editors.
+With \joption{draftmark=true}, this mark is printed on top of each page.  With \joption{draftmark=firstpage}, the draft mark appears on the title page only.
+
 \section{General settings}
 
 \subsection{Editorial data}
@@ -233,7 +241,12 @@ A template is provided as well:	\url{https://github.com/jspitz/univie-ling/raw/m
 
 \raggedright
 \begin{itemize}
- \item 2022/10/02 (v.\,2.0)
+  \item 2022/10/21 (v.\,2.1)
+	\begin{itemize}
+		\item Add a sans (\emph{Source Sans Pro} or \emph{MyriadPro}) and monospaced (\emph{DejaVu Sans Mono}) font.
+		\item Add \joption{draftmark} option.
+	\end{itemize}
+  \item 2022/10/02 (v.\,2.0)
 	\begin{itemize}
 		\item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
 		\item Fix and properly localize some \textsf{varioref} definitions.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
index 5431d65c90..3d19d59c0f 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.tex b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
index 21698e7028..0f6e3da8f8 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
@@ -42,7 +42,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 2.0, 2022/10/02}
+\date{Version 2.1, 2022/10/21}
 
 \maketitle
 
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index 102a7e0bcc..570067b9c8 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2022/10/02 v.2.0 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2022/10/21 v.2.1 Univie Linguistic Exposes (JSp)]
 
 
 %% ============================================================
@@ -58,106 +58,108 @@
 \ExplSyntaxOn
 \keys_define:nn { uve }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uve@biblatextrue
-                \@uve@captionptrue
-                \@uve@refsptrue
-                \@uve@covingtontrue
-                \@uve@microtypetrue
-             }{
-                \@uve@biblatexfalse
-                \@uve@captionpfalse
-                \@uve@refspfalse
-                \@uve@covingtonfalse
-                \@uve@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uve@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uve@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uve@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uve@covington,
-	covington.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uve@usefontencfalse
-             }{
-               \def\uve@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uve@microtype,
-	microtype.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uve@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uve@psfontsfalse
-               \@uve@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uve@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uve@draftmarktrue
-            \@uve@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uve@draftmarkfalse
-            \@uve@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uve@draftmarktrue
-            \@uve@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uve@psfontstrue
-            \@uve@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uve@psfontsfalse
-            \@uve@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uve@psfontsfalse
-            \@uve@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uve@biblatextrue
+            \@uve@captionptrue
+            \@uve@refsptrue
+            \@uve@covingtontrue
+            \@uve@microtypetrue
+         }{
+            \@uve@biblatexfalse
+            \@uve@captionpfalse
+            \@uve@refspfalse
+            \@uve@covingtonfalse
+            \@uve@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uve@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uve@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uve@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uve@covington,
+    covington.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uve@usefontencfalse
+         }{
+           \def\uve@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uve@microtype,
+    microtype.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uve@psfontsfalse
+           \@uve@otffontstrue
+           \@uve@polyglossiatrue
+         }{
+           \@uve@polyglossiafalse
+         }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uve@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uve@draftmarktrue
+        \@uve@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uve@draftmarkfalse
+        \@uve@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uve@draftmarktrue
+        \@uve@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uve@psfontstrue
+        \@uve@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uve@psfontsfalse
+        \@uve@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uve@psfontsfalse
+        \@uve@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -177,13 +179,13 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   fontsize=12pt,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   sectionentrydots=true
+       a4paper,
+       fontsize=12pt,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       sectionentrydots=true
 ]{scrartcl}[2003/04/22]
 
 \RequirePackage{array}
@@ -332,7 +334,7 @@
 
 \RequirePackage{geometry}
 
-\usepackage{setspace}
+\RequirePackage{setspace}
 \onehalfspacing
 
 % Header and pagination:
@@ -439,39 +441,39 @@
        \end{center}
       \vspace{2\baselineskip}
       \begin{center}
-	{\usekomafont{tpcaption}\translate{tpcaption}\par}
-	{\ifx\@title\@empty\else
+    {\usekomafont{tpcaption}\translate{tpcaption}\par}
+    {\ifx\@title\@empty\else
            \usekomafont{title}{\enquote{\@title%
             \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
-         \fi
-        }
-        \vskip 2em
-        {%
-          {\usekomafont{tpcaption}\translate{author}\par}
-          \usekomafont{author}{%
-            \lineskip 0.75em%
-            \begin{tabular}[t]{c}
-              \@author
-            \end{tabular}\par
-          }%
-        }%
-       \end{center}\par
-        \vfill
-        {\usekomafont{date}{\translate{vienna}, \translate{monthyear}\par}}%
-        \vskip 2em
-	\usekomafont{codes}{%
-	\begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
-	\translate{stkz}: & & \@studienkennzahl\tabularnewline
-        \noalign{\vskip6pt}
-	\translate{strt}: & & \@studienrichtung\tabularnewline
-        \noalign{\vskip6pt}
-        \translate{supervisor}: & & \@supervisor\tabularnewline%
-        \noalign{\vskip6pt}
-        \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
-	\noalign{\vskip6pt}
-        \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi
-	\end{tabular}\par
-	}
+     \fi
+    }
+    \vskip 2em
+    {%
+      {\usekomafont{tpcaption}\translate{author}\par}
+       \usekomafont{author}{%
+          \lineskip 0.75em%
+          \begin{tabular}[t]{c}
+            \@author
+          \end{tabular}\par
+       }%
+    }%
+    \end{center}\par
+    \vfill
+      {\usekomafont{date}{\translate{vienna}, \translate{monthyear}\par}}%
+       \vskip 2em
+       \usekomafont{codes}{%
+         \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
+           \translate{stkz}: & & \@studienkennzahl\tabularnewline
+           \noalign{\vskip6pt}
+           \translate{strt}: & & \@studienrichtung\tabularnewline
+           \noalign{\vskip6pt}
+           \translate{supervisor}: & & \@supervisor\tabularnewline%
+           \noalign{\vskip6pt}
+           \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
+           \noalign{\vskip6pt}
+           \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi
+         \end{tabular}\par
+      }
       \par
       \@thanks\let\@thanks\@empty
       \null
@@ -491,8 +493,8 @@
       \fi
       \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
     \end{titlepage}
-  \setcounter{footnote}{0}%
-  \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+    \setcounter{footnote}{0}%
+    \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
     \let\thanks\relax
     \let\maketitle\relax
     \let\@maketitle\relax
@@ -580,9 +582,9 @@
 
 \if@uve@captionp
    \RequirePackage[format=plain,
-	           justification=RaggedRight,
-	           singlelinecheck=false
-	          ]{caption}
+               justification=RaggedRight,
+               singlelinecheck=false
+              ]{caption}
 \fi
 
 %% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
index 293064b15d..8327970b1f 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
@@ -33,7 +33,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}[1997/06/01]
-\ProvidesClass{univie-ling-handout}[2022/10/02 v.2.0 Univie Ling handout class (JSp)]
+\ProvidesClass{univie-ling-handout}[2022/10/21 v.2.1 Univie Ling handout class (JSp)]
 
 %% ============================================================
 %% CLASS OPTIONS
@@ -68,40 +68,40 @@
 \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
 % German CD (default)
 \def\uvh@cd@german{
-	\def\uvh@name{\uvh@name@de}
-	\def\uvh@shortname{\uvh@shortname@de}
-	\def\uvh@university{Universit\"at Wien}
-	\def\uvh@department{\uvh@department@de}
-	\def\uvh@location{\uvh@location@de}
-	\def\uvh@country{\uvh@country@de}
-	\def\uvh@function{\uvh@function@de}
-	\def\uvh@secfunction{\uvh@secfunction@de}
-	\def\uvh@phoneprefix{T}
-	\def\uvh@faxprefix{F}
-	\def\uvh@emailprefix{}
-	\def\uvh@urlprefix{}
-	\def\uvh@pageprefix{Seite}
-	\def\uvh@headerdeptsep{\ $\cdot$\ }
-	\def\uvh@headernamesep{,\ }
-	\def\and{\\}
+    \def\uvh@name{\uvh@name@de}
+    \def\uvh@shortname{\uvh@shortname@de}
+    \def\uvh@university{Universit\"at Wien}
+    \def\uvh@department{\uvh@department@de}
+    \def\uvh@location{\uvh@location@de}
+    \def\uvh@country{\uvh@country@de}
+    \def\uvh@function{\uvh@function@de}
+    \def\uvh@secfunction{\uvh@secfunction@de}
+    \def\uvh@phoneprefix{T}
+    \def\uvh@faxprefix{F}
+    \def\uvh@emailprefix{}
+    \def\uvh@urlprefix{}
+    \def\uvh@pageprefix{Seite}
+    \def\uvh@headerdeptsep{\ $\cdot$\ }
+    \def\uvh@headernamesep{,\ }
+    \def\and{\\}
 }
 \def\uvh@cd@english{%
-	\def\uvh@name{\uvh@name@en}
-	\def\uvh@shortname{\uvh@shortname@en}
-	\def\uvh@university{University of Vienna}
-	\def\uvh@department{\uvh@department@en}
-	\def\uvh@location{\uvh@location@en}
-	\def\uvh@country{\uvh@country@en}
-	\def\uvh@function{\uvh@function@en}
-	\def\uvh@secfunction{\uvh@secfunction@en}
-	\def\uvh@phoneprefix{T}
-	\def\uvh@faxprefix{F}
-	\def\uvh@emailprefix{}
-	\def\uvh@urlprefix{}
-	\def\uvh@pageprefix{Page}
-	\def\uvh@headerdeptsep{\ $\cdot$\ }
-	\def\uvh@headernamesep{,\ }
-	\def\uvh@secnamesep{,\ }
+    \def\uvh@name{\uvh@name@en}
+    \def\uvh@shortname{\uvh@shortname@en}
+    \def\uvh@university{University of Vienna}
+    \def\uvh@department{\uvh@department@en}
+    \def\uvh@location{\uvh@location@en}
+    \def\uvh@country{\uvh@country@en}
+    \def\uvh@function{\uvh@function@en}
+    \def\uvh@secfunction{\uvh@secfunction@en}
+    \def\uvh@phoneprefix{T}
+    \def\uvh@faxprefix{F}
+    \def\uvh@emailprefix{}
+    \def\uvh@urlprefix{}
+    \def\uvh@pageprefix{Page}
+    \def\uvh@headerdeptsep{\ $\cdot$\ }
+    \def\uvh@headernamesep{,\ }
+    \def\uvh@secnamesep{,\ }
 }
 \uvh@cd@german
 
@@ -110,170 +110,172 @@
 \ExplSyntaxOn
 \keys_define:nn { uvh }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvh@biblatextrue
-                \@uvh@captionptrue
-                \@uvh@refsptrue
-                \@uvh@covingtontrue
-                \@uvh@microtypetrue
-             }{
-                \@uvh@biblatexfalse
-                \@uvh@captionpfalse
-                \@uvh@refspfalse
-                \@uvh@covingtonfalse
-                \@uvh@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvh@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvh@biblatex,
-	biblatex.usage:n = preamble,
-	% breakevent=<true|false>
-	% Line break in heading between event and event spec (location, date etc.)
-	breakevent.legacy_if_set:n = @uvh@breakevent,
-	breakevent.usage:n = preamble,
-	% bwlogo=<true|false>
-	% Print monochrome logo?
-	bwlogo.code:n = 
-	  { \bool_if:nTF {#1} {
-	       \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
-               \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
-             }{
-               \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
-               \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
-             }
-          },
-	bwlogo.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvh@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvh@covington,
-	covington.usage:n = preamble,
-	% firstpagination=<true|false>
-	% Suppress pagination on first page?
-	firstpagination.legacy_if_set:n = @uvh@pageonfirst,
-	firstpagination.usage:n = preamble,
-	% foldmarks=<true|false>
-	% Output fold marks?
-	foldmarks.legacy_if_set:n = @uvh@foldmarks,
-	foldmarks.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvh@usefontencfalse
-             }{
-               \def\uvh@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% fontsize=<size>
-	% Set base font size
-	fontsize.tl_set:N = \uvh@fontsize,
-	fontsize.usage:n = preamble,
-	% landscape=<true|false>
-	% Set landscape
-	landscape.legacy_if_set:n = @uvh@landscape,
-	landscape.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvh@microtype,
-	microtype.usage:n = preamble,
-	% papersize=<size>
-	% Set paper size
-	papersize.tl_set:N = \uvh@papersize,
-	papersize.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvh@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvh@psfontsfalse
-               \@uvh@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% pplogo=<true|false>
-	% Print logo on page 2ff.
-	pplogo.legacy_if_set:n = @uvh@pplogo,
-	pplogo.usage:n = preamble,
-	% punchmarks=<true|false>
-	% Output punch marks?
-	punchmarks.legacy_if_set:n = @uvh@punchmark,
-	punchmarks.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvh@refsp,
-	ref.usage:n = preamble,
-	% swaphead=<true|false>
-	% Swap title and event in header
-	swaphead.legacy_if_set:n = @uvh@swaphead,
-	swaphead.usage:n = preamble,
-	% totalpages=<true|false>
-	% Output total page number
-	totalpages.legacy_if_set:n = @uvh@lastpage,
-	totalpages.usage:n = preamble,
-	% widesubtitle=<true|false>
-	% Print subtitle over the whole text width
-	% (may conflict with address field)
-	widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle,
-	widesubtitle.usage:n = preamble,
-	% cd=<german|english>
-        % CD Language
-	cd .choice:,
-	% german
-	cd / german .code:n = { \uvh@cd@german },
-        % english
-	cd / english .code:n = { \uvh@cd@english },
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvh@draftmarktrue
-            \@uvh@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvh@draftmarkfalse
-            \@uvh@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvh@draftmarktrue
-            \@uvh@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvh@psfontstrue
-            \@uvh@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvh@psfontsfalse
-            \@uvh@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvh@psfontsfalse
-            \@uvh@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvh@biblatextrue
+            \@uvh@captionptrue
+            \@uvh@refsptrue
+            \@uvh@covingtontrue
+            \@uvh@microtypetrue
+         }{
+            \@uvh@biblatexfalse
+            \@uvh@captionpfalse
+            \@uvh@refspfalse
+            \@uvh@covingtonfalse
+            \@uvh@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvh@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvh@biblatex,
+    biblatex.usage:n = preamble,
+    % breakevent=<true|false>
+    % Line break in heading between event and event spec (location, date etc.)
+    breakevent.legacy_if_set:n = @uvh@breakevent,
+    breakevent.usage:n = preamble,
+    % bwlogo=<true|false>
+    % Print monochrome logo?
+    bwlogo.code:n = 
+      { \bool_if:nTF {#1} {
+           \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
+           \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
+         }{
+           \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
+           \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
+         }
+      },
+    bwlogo.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvh@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvh@covington,
+    covington.usage:n = preamble,
+    % firstpagination=<true|false>
+    % Suppress pagination on first page?
+    firstpagination.legacy_if_set:n = @uvh@pageonfirst,
+    firstpagination.usage:n = preamble,
+    % foldmarks=<true|false>
+    % Output fold marks?
+    foldmarks.legacy_if_set:n = @uvh@foldmarks,
+    foldmarks.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvh@usefontencfalse
+         }{
+           \def\uvh@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % fontsize=<size>
+    % Set base font size
+    fontsize.tl_set:N = \uvh@fontsize,
+    fontsize.usage:n = preamble,
+    % landscape=<true|false>
+    % Set landscape
+    landscape.legacy_if_set:n = @uvh@landscape,
+    landscape.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvh@microtype,
+    microtype.usage:n = preamble,
+    % papersize=<size>
+    % Set paper size
+    papersize.tl_set:N = \uvh@papersize,
+    papersize.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvh@psfontsfalse
+           \@uvh@otffontstrue
+           \@uvh@polyglossiatrue
+        }{
+           \@uvh@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % pplogo=<true|false>
+    % Print logo on page 2ff.
+    pplogo.legacy_if_set:n = @uvh@pplogo,
+    pplogo.usage:n = preamble,
+    % punchmarks=<true|false>
+    % Output punch marks?
+    punchmarks.legacy_if_set:n = @uvh@punchmark,
+    punchmarks.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvh@refsp,
+    ref.usage:n = preamble,
+    % swaphead=<true|false>
+    % Swap title and event in header
+    swaphead.legacy_if_set:n = @uvh@swaphead,
+    swaphead.usage:n = preamble,
+    % totalpages=<true|false>
+    % Output total page number
+    totalpages.legacy_if_set:n = @uvh@lastpage,
+    totalpages.usage:n = preamble,
+    % widesubtitle=<true|false>
+    % Print subtitle over the whole text width
+    % (may conflict with address field)
+    widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle,
+    widesubtitle.usage:n = preamble,
+    % cd=<german|english>
+    % CD Language
+    cd .choice:,
+    % german
+    cd / german .code:n = { \uvh@cd@german },
+    % english
+    cd / english .code:n = { \uvh@cd@english },
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvh@draftmarktrue
+        \@uvh@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvh@draftmarkfalse
+        \@uvh@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvh@draftmarktrue
+        \@uvh@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvh@psfontstrue
+        \@uvh@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvh@psfontsfalse
+        \@uvh@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvh@psfontsfalse
+        \@uvh@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -754,9 +756,9 @@
 
 \if@uvh@captionp
     \RequirePackage[format=plain,
-	            justification=RaggedRight,
-	            singlelinecheck=false
-	           ]{caption}
+                justification=RaggedRight,
+                singlelinecheck=false
+               ]{caption}
 \fi
 
 %% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index 34f029b9ed..639c8d0423 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2022/10/02 v.2.0 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2022/10/21 v.2.1 Univie Linguistic Papers (JSp)]
 
 
 %% ============================================================
@@ -59,106 +59,108 @@
 \ExplSyntaxOn
 \keys_define:nn { uvp }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvp@biblatextrue
-                \@uvp@captionptrue
-                \@uvp@refsptrue
-                \@uvp@covingtontrue
-                \@uvp@microtypetrue
-             }{
-                \@uvp@biblatexfalse
-                \@uvp@captionpfalse
-                \@uvp@refspfalse
-                \@uvp@covingtonfalse
-                \@uvp@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvp@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvp@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvp@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvp@covington,
-	covington.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvp@usefontencfalse
-             }{
-               \def\uvp@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvp@microtype,
-	microtype.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvp@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvp@psfontsfalse
-               \@uvp@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvp@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvp@draftmarktrue
-            \@uvp@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvp@draftmarkfalse
-            \@uvp@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvp@draftmarktrue
-            \@uvp@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvp@psfontstrue
-            \@uvp@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvp@psfontsfalse
-            \@uvp@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvp@psfontsfalse
-            \@uvp@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvp@biblatextrue
+            \@uvp@captionptrue
+            \@uvp@refsptrue
+            \@uvp@covingtontrue
+            \@uvp@microtypetrue
+         }{
+            \@uvp@biblatexfalse
+            \@uvp@captionpfalse
+            \@uvp@refspfalse
+            \@uvp@covingtonfalse
+            \@uvp@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvp@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvp@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvp@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvp@covington,
+    covington.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvp@usefontencfalse
+         }{
+           \def\uvp@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvp@microtype,
+    microtype.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvp@psfontsfalse
+           \@uvp@otffontstrue
+           \@uvp@polyglossiatrue
+        }{
+           \@uvp@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvp@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvp@draftmarktrue
+        \@uvp@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvp@draftmarkfalse
+        \@uvp@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvp@draftmarktrue
+        \@uvp@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvp@psfontstrue
+        \@uvp@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvp@psfontsfalse
+        \@uvp@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvp@psfontsfalse
+        \@uvp@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -178,14 +180,14 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   fontsize=12pt,
-	   BCOR=0mm,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   sectionentrydots=true
+       a4paper,
+       fontsize=12pt,
+       BCOR=0mm,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       sectionentrydots=true
 ]{scrartcl}[2003/04/22]
 
 
@@ -690,9 +692,9 @@ This includes all drawings, sketches, graphics and internet sources.}
 
 \if@uvp@captionp
     \RequirePackage[format=plain,
-	            justification=RaggedRight,
-	            singlelinecheck=false
-	           ]{caption}
+                justification=RaggedRight,
+                singlelinecheck=false
+               ]{caption}
 \fi
 
 %% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 8cc29a83ac..016c21d1be 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2022/10/02 v.2.0 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2022/10/21 v.2.1 Univie Linguistic Theses (JSp)]
 
 
 %% ============================================================
@@ -63,114 +63,116 @@
 \ExplSyntaxOn
 \keys_define:nn { uvt }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvt@biblatextrue
-                \@uvt@captionptrue
-                \@uvt@refsptrue
-                \@uvt@covingtontrue
-                \@uvt@microtypetrue
-             }{
-                \@uvt@biblatexfalse
-                \@uvt@captionpfalse
-                \@uvt@refspfalse
-                \@uvt@covingtonfalse
-                \@uvt@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvt@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvt@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvt@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvt@covington,
-	covington.usage:n = preamble,
-	% fdegree=<true|false>
-	% Female degree forms
-	fdegree.legacy_if_set:n = @uvt@fdegree,
-	fdegree.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvt@usefontencfalse
-             }{
-               \def\uvt@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvt@microtype,
-	microtype.usage:n = preamble,
-	% pdfa=<true|false>
-	% PDF/A
-	pdfa.legacy_if_set:n = @uvt@pdfa,
-	pdfa.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvt@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvt@psfontsfalse
-               \@uvt@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvt@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvt@draftmarktrue
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvt@biblatextrue
+            \@uvt@captionptrue
+            \@uvt@refsptrue
+            \@uvt@covingtontrue
+            \@uvt@microtypetrue
+         }{
+            \@uvt@biblatexfalse
+            \@uvt@captionpfalse
+            \@uvt@refspfalse
+            \@uvt@covingtonfalse
+            \@uvt@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvt@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvt@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvt@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvt@covington,
+    covington.usage:n = preamble,
+    % fdegree=<true|false>
+    % Female degree forms
+    fdegree.legacy_if_set:n = @uvt@fdegree,
+    fdegree.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvt@usefontencfalse
+         }{
+           \def\uvt@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvt@microtype,
+    microtype.usage:n = preamble,
+    % pdfa=<true|false>
+    % PDF/A
+    pdfa.legacy_if_set:n = @uvt@pdfa,
+    pdfa.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvt@psfontsfalse
+           \@uvt@otffontstrue
+           \@uvt@polyglossiatrue
+        }{
+           \@uvt@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvt@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvt@draftmarktrue
+        \@uvt@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvt@draftmarkfalse
             \@uvt@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvt@draftmarkfalse
-            \@uvt@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvt@draftmarktrue
-            \@uvt@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvt@psfontstrue
-            \@uvt@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvt@psfontsfalse
-            \@uvt@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvt@psfontsfalse
-            \@uvt@otffontsfalse
-          },
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvt@draftmarktrue
+        \@uvt@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvt@psfontstrue
+        \@uvt@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvt@psfontsfalse
+        \@uvt@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvt@psfontsfalse
+        \@uvt@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -189,12 +191,12 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   chapterentrydots=true
+       a4paper,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       chapterentrydots=true
 ]{scrreprt}[2003/04/22]
 
 \RequirePackage{array}
@@ -518,8 +520,8 @@ This includes all drawings, sketches, graphics and internet sources.}
        \end{center}
       \vspace{2\baselineskip}
       \begin{center}
-	{\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
-	{\ifx\@title\@empty\else
+    {\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
+    {\ifx\@title\@empty\else
            \usekomafont{title}{\enquote{\@title%
             \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
          \fi
@@ -539,23 +541,23 @@ This includes all drawings, sketches, graphics and internet sources.}
           }%
         }%
         \vskip 2em
-	{\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par}
+    {\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par}
         \usekomafont{degree}{\@degree}
        \end{center}\par
         \vfill
         {\usekomafont{date}{Wien, \the\year\,/\,Vienna, \the\year\par}}%
         \vskip 2em
-	\usekomafont{codes}{%
-	\begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
-	Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
+    \usekomafont{codes}{%
+    \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
+    Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
         \noalign{\vskip6pt}
-	\@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
+    \@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
         \noalign{\vskip6pt}
         Betreut von\,/\,Supervisor: & & \@supervisor\tabularnewline%
         \noalign{\vskip6pt}
         \ifx\@cosupervisor\@empty\else Mitbetreut von\,/\,Co-Supervisor: & & \@cosupervisor\fi
-	\end{tabular}\par
-	}
+    \end{tabular}\par
+    }
       \par
       \@thanks\let\@thanks\@empty
       \null
@@ -706,9 +708,9 @@ This includes all drawings, sketches, graphics and internet sources.}
 
 \if@uvt@captionp
    \RequirePackage[format=plain,
-	           justification=RaggedRight,
-	           singlelinecheck=false
-	          ]{caption}
+               justification=RaggedRight,
+               singlelinecheck=false
+              ]{caption}
 \fi
 
 
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 1be6bd1ccc..988bb4b588 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -33,7 +33,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2022/10/02 v.2.0 Univie WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2022/10/21 v.2.1 Univie WLG journal layout (JSp)]
 
 
 %% ============================================================
@@ -42,6 +42,8 @@
 
 \newif\if@wlg@biblatex\@wlg@biblatexfalse
 \newif\if@wlg@covington\@wlg@covingtontrue
+\newif\if@wlg@draftmark\@wlg@draftmarkfalse
+\newif\if@wlg@draftmarkfp\@wlg@draftmarkfpfalse
 \newif\if@wlg@expert\@wlg@expertfalse
 \newif\if@wlg@titlepage\@wlg@titlepagefalse
 \newif\if@wlg@specialprint\@wlg@specialprintfalse
@@ -51,41 +53,61 @@
 \ExplSyntaxOn
 \keys_define:nn { wlg }
 {
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @wlg@biblatex,
-	biblatex.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @wlg@covington,
-	covington.usage:n = preamble,
-	% expertfonts=<true|false>
-	% Load MinionPro
-	expertfonts.legacy_if_set:n = @wlg@expert,
-	expertfonts.usage:n = preamble,
-	% preprint=<true|false>
-	preprint.legacy_if_set:n = @wlg@preprint,
-	preprint.usage:n = preamble,
-	% peerrev=<true|false>
-	peerrev.legacy_if_set:n = @wlg@peerrev,
-	peerrev.usage:n = preamble,
-	% titlepage=<none|specialprint|issue>
-	titlepage .choice:,
-	% none
-	titlepage / none .code:n = 
-	  { \@wlg@titlepagefalse
-            \@wlg@specialprintfalse
-          },
-        % specialprint
-	titlepage / specialprint .code:n = 
-	  { \@wlg@titlepagetrue
-            \@wlg@specialprinttrue
-          },
-        % issue
-	titlepage / issue .code:n = 
-	  { \@wlg@titlepagetrue
-            \@wlg@specialprintfalse
-          },
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @wlg@biblatex,
+    biblatex.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @wlg@covington,
+    covington.usage:n = preamble,
+    % expertfonts=<true|false>
+    % Load MinionPro
+    expertfonts.legacy_if_set:n = @wlg@expert,
+    expertfonts.usage:n = preamble,
+    % preprint=<true|false>
+    preprint.legacy_if_set:n = @wlg@preprint,
+    preprint.usage:n = preamble,
+    % peerrev=<true|false>
+    peerrev.legacy_if_set:n = @wlg@peerrev,
+    peerrev.usage:n = preamble,
+    % titlepage=<none|specialprint|issue>
+    titlepage .choice:,
+    % none
+    titlepage / none .code:n = 
+      { \@wlg@titlepagefalse
+        \@wlg@specialprintfalse
+      },
+    % specialprint
+    titlepage / specialprint .code:n = 
+      { \@wlg@titlepagetrue
+        \@wlg@specialprinttrue
+      },
+    % issue
+    titlepage / issue .code:n = 
+      { \@wlg@titlepagetrue
+        \@wlg@specialprintfalse
+      },
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@wlg@draftmarktrue
+        \@wlg@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@wlg@draftmarkfalse
+        \@wlg@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@wlg@draftmarktrue
+        \@wlg@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
 }
 \ExplSyntaxOff
 
@@ -106,17 +128,17 @@
 \LoadClass{scrartcl}[2003/04/22]
 
 \KOMAoptions{%
-	footlines=2,
-	paper=152mm:229mm,
-	DIV=calc,
-	fontsize=12pt,
-	footlines=2,
-	headings=small,
-	captions=tableheading,
-	listof=totoc,
-	numbers=noenddot,
-	abstract=on,
-	twoside=semi
+    footlines=2,
+    paper=152mm:229mm,
+    DIV=calc,
+    fontsize=12pt,
+    footlines=2,
+    headings=small,
+    captions=tableheading,
+    listof=totoc,
+    numbers=noenddot,
+    abstract=on,
+    twoside=semi
 }
 
 \recalctypearea
@@ -134,21 +156,46 @@
 \InputIfFileExists{univie-ling-wlg.cfg}
 
 %% ============================================================
+%% HELPERS:
+%% ============================================================
+
+\newif\if@wlg@inputeencloaded\@wlg@inputeencloadedfalse
+\newcommand*\AfterInputencOrAtEndPreamble[1]{%
+    \AfterPackage*{inputenc}{%
+       #1%
+      \@wlg@inputeencloadedtrue
+    }
+    \AtEndPreamble{%
+       \if@wlg@inputeencloaded\else
+          #1%
+       \fi%
+   }%
+}
+
+%% ============================================================
 %% FONTS UND MICROTYPOGRAPHY:
 %% ============================================================
 
-% Roman Font:
+
 \if@wlg@expert
-  % Adobe Minion (Expert)
+  % Roman Font: Adobe Minion (Expert)
   \RequirePackage[footnotefigures]{MinionPro}
+  % Sans; Myriad
+  \RequirePackage[medfamily,scale=0.925]{MyriadPro}
+  % Mono: DejaVu
+  \RequirePackage[scaled=0.83]{DejaVuSansMono}
 \else
-  % Crimson
+  % Roman Font: Crimson
   \RequirePackage[osf]{cochineal}
   % Enable bold and slanted in IPA
   \AtBeginDocument{%
     \@ifpackageloaded{tipa}{%
        \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{}
   }
+  % Sans: Alegreya
+  \RequirePackage[osf,scaled=.9]{sourcesanspro}
+  % Mono: DejaVu
+  \RequirePackage[scaled=0.8]{DejaVuSansMono}
 \fi
 
 % Hyperlinks
@@ -182,6 +229,8 @@
 \languagealias{naustrian}{German}
 \deftranslation[to=German]{chapter}{Kapitel}
 \deftranslation[to=English]{chapter}{chapter}
+\deftranslation[to=German]{draft}{ENTWURF}
+\deftranslation[to=English]{draft}{DRAFT}
 \deftranslation[to=German]{section}{Abschnitt}
 \deftranslation[to=English]{section}{section}
 \deftranslation[to=German]{footnote}{Anm.}
@@ -392,13 +441,13 @@
 \raggedbottom
 
 % Quotation marks
-\AfterPackage*{inputenc}{%
+\AfterInputencOrAtEndPreamble{%
   \RequirePackage{csquotes}
   \ExecuteQuoteOptions{autostyle=try,german=guillemets,austrian=guillemets,maxlevel=3}
-  \if@wlg@biblatex
+  \AfterPackage*{biblatex}{%
      % Change cite command for integrated csquotes env.
      \SetCiteCommand{\parencite}
-  \fi
+  }
   \renewcommand{\mktextdel}[1]{[\,]}
 }
 
@@ -432,12 +481,12 @@
 \def\@author{}
 \def\@@author{}
 \renewcommand*\author[2][]{%
-	\ifx\\#1\\%
-		\def\@@author{#2}
-	\else
-		\def\@@author{#1}
-	\fi
-	\def\@author{#2}
+    \ifx\\#1\\%
+        \def\@@author{#2}
+    \else
+        \def\@@author{#1}
+    \fi
+    \def\@author{#2}
 }
 
 % Author affiliation (starred: corresponding author)
@@ -454,25 +503,25 @@
 \def\@title{}
 \def\@@title{}
 \renewcommand*\title[2][]{%
-	\ifx\\#1\\%
-		\def\@@title{#2}
-	\else
-		\def\@@title{#1}
-	\fi
-	\def\@title{#2}
+    \ifx\\#1\\%
+        \def\@@title{#2}
+    \else
+        \def\@@title{#1}
+    \fi
+    \def\@title{#2}
 }
 
 \def\@issuetitle{}
 \newcommand*\issuetitle[1]{%
-	\def\@issuetitle{#1}
+    \def\@issuetitle{#1}
 }
 \def\@issuesubtitle{}
 \newcommand*\issuesubtitle[1]{%
-	\def\@issuesubtitle{#1}
+    \def\@issuesubtitle{#1}
 }
 \def\@issueeditors{}
 \newcommand*\issueeditors[1]{%
-	\def\@issueeditors{#1}
+    \def\@issueeditors{#1}
 }
 
 \def\@issue{}
@@ -588,58 +637,58 @@
           \vskip 3em
         \fi
         \if@wlg@specialprint
-		{\usekomafont{title}{\@title\par}}%
-		\vskip 1em
-		{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
-		\vskip 2em
-		{%
-		  \usekomafont{author}{%
-		      \@author\par
-		  }%
-		}%
-		  \vfill
-		  {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}%
-		                      \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
-		                      (\versal{WLG})
-		 \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
-		{\ifx\@issuetitle\@empty\else
-			\vskip 1em
-			\usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
+        {\usekomafont{title}{\@title\par}}%
+        \vskip 1em
+        {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
+        \vskip 2em
+        {%
+          \usekomafont{author}{%
+              \@author\par
+          }%
+        }%
+          \vfill
+          {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}%
+                              \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
+                              (\versal{WLG})
+         \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
+        {\ifx\@issuetitle\@empty\else
+            \vskip 1em
+            \usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
                          \ifx\@issuesubtitle\@empty\else.\ \@issuesubtitle\fi\par}%
-		 \fi}%
-		 \ifx\@issueeditors\@empty\else
-		  \usekomafont{date}{%
-		      \translate{edby}\ \@issueeditors\par
-		  }%
+         \fi}%
+         \ifx\@issueeditors\@empty\else
+          \usekomafont{date}{%
+              \translate{edby}\ \@issueeditors\par
+          }%
                  \fi
         \else
-		{\ifx\@issuetitle\@empty
-		   \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par}
+        {\ifx\@issuetitle\@empty
+           \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par}
                      \etocsettocstyle{\subsubsection*{\contentsname}}{}
-		     \etocsetstyle{chapter}
-			  {}
-			  {\scriptsize\mdseries\rmfamily}
-			  {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}}
-			  {}
+             \etocsetstyle{chapter}
+              {}
+              {\scriptsize\mdseries\rmfamily}
+              {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}}
+              {}
                    \tableofcontents
-		\else
-		   \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par}
-		\fi}
-		{\ifx\@issuetitle\@empty\else
-			\vskip 1em
-			\usekomafont{date}{\translate{specialissue}\par}%
-			\usekomafont{title}{\@issuetitle\par}%
-		        \vskip 3pt
-		        {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}%
-		         \vskip 2em
-		        {%
-		         \ifx\@issueeditors\@empty\else
-		         \usekomafont{date}{%
-		            \translate{edby}\ \@issueeditors\par
-		         }%
+        \else
+           \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par}
+        \fi}
+        {\ifx\@issuetitle\@empty\else
+            \vskip 1em
+            \usekomafont{date}{\translate{specialissue}\par}%
+            \usekomafont{title}{\@issuetitle\par}%
+                \vskip 3pt
+                {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}%
+                 \vskip 2em
+                {%
+                 \ifx\@issueeditors\@empty\else
+                 \usekomafont{date}{%
+                    \translate{edby}\ \@issueeditors\par
+                 }%
                          \fi
                        }%
-		 \fi}%
+         \fi}%
         \fi%
         \vfill
         {\usekomafont{publishers}{\translate{univie} $\cdot$ \translate{lingdep} $\cdot$ \@pubyear\par}}%
@@ -694,7 +743,7 @@
 
 \renewcommand*{\@maketitle}{%
   \addcontentsline{toc}{chapter}{\@author\texorpdfstring{\\[5pt]}{: }\@title%
-				       \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}%
+                       \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}%
   \next@tdpage
   \global\@topnum=\z@
   \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -706,17 +755,17 @@
   \null
   \vskip 2em%
   \renewcommand*\@@aff[2][]{%
-	\def\@ccauthor{\translate{corrauthor}}%
-	\ifx##1f%
-		\def\@ccauthor{\translate{corrauthorf}}%
-	\else\ifx##1p%
-		\def\@ccauthor{\translate{corrauthors}}%
-	\fi\fi%
-	\def\@cauthor{##2}%
-	\thanks{\protect\raggedright ##2 (\@ccauthor).}
+    \def\@ccauthor{\translate{corrauthor}}%
+    \ifx##1f%
+        \def\@ccauthor{\translate{corrauthorf}}%
+    \else\ifx##1p%
+        \def\@ccauthor{\translate{corrauthors}}%
+    \fi\fi%
+    \def\@cauthor{##2}%
+    \thanks{\protect\raggedright ##2 (\@ccauthor).}
   }
   \renewcommand*\@aff[2][]{%
-	\thanks{\protect\raggedright ##2.}
+    \thanks{\protect\raggedright ##2.}
   }
   \begin{flushleft}%
     \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
@@ -820,7 +869,7 @@
     \cleardoublepage
     \phantomsection
     \addcontentsline{toc}{chapter}{\@iauthor\texorpdfstring{\\[5pt]}{: }\@ititle%
-				       \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}%
+                       \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}%
     \includepdf[pages=3-]{\@ipaper}
 }
 
@@ -928,10 +977,10 @@
 \setkomafont{captionlabel}{\bfseries}
 % left aligned captions
 \RequirePackage[%
-	format=hang,
-	justification=RaggedRight,
-	singlelinecheck=false
-	]{caption}
+    format=hang,
+    justification=RaggedRight,
+    singlelinecheck=false
+    ]{caption}
 
 %% Nicer tables with booktabs.sty
 \RequirePackage{booktabs}
@@ -946,11 +995,13 @@
 
 % Biblatex
 \if@wlg@biblatex
-  \RequirePackage[%
-      style=univie-ling,
-      sorting=nyvt,
-      autolang=hyphen]
-  {biblatex}
+  \AfterInputencOrAtEndPreamble{%
+      \RequirePackage[%
+           style=univie-ling,
+           sorting=nyvt,
+           autolang=hyphen]
+      {biblatex}
+  }
 \fi
 \AtBeginDocument{%
   \@ifundefined{bibhang}{}{%
@@ -1008,4 +1059,26 @@
 % Main url
 \def\wlgurl{http://wlg.univie.ac.at}
 
+%% =============================================================
+%% DRAFT:
+%% =============================================================
+
+\if@wlg@draftmark
+
+\if@wlg@draftmarkfp
+  \RequirePackage[firstpageonly]{draftwatermark}
+\else
+  \RequirePackage{draftwatermark}
+\fi
+
+\DraftwatermarkOptions{%
+  angle=0,
+  vpos=10pt,
+  anchor=ct,
+  fontsize=14pt,
+  text={\translate{draft} (\today)}
+}
+
+\fi
+
 %% Finis.