diff --git a/example.tex b/example.tex
index 86957f78c0897878c00a6cb58c34e8a9298b4bdd..d55481fc49a10494ae419680334e5fba8f7126cb 100644
--- a/example.tex
+++ b/example.tex
@@ -100,7 +100,7 @@
 % The structure of the thesis has to conform to the guidelines at
 %  https://informatics.tuwien.ac.at/study-services
 
-\addtitlepage{naustrian} % German title page (not for dissertations at the PhD School).
+\addtitlepage{german}  % German title page (not for dissertations at the PhD School).
 \addtitlepage{english} % English title page.
 \addstatementpage
 
@@ -161,4 +161,4 @@
 \bibliographystyle{alpha}
 \bibliography{intro}
 
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/vutinfth.dtx b/vutinfth.dtx
index ab442803cb6d15afee249885da0e3e79aa97d783..da9456de57db68824068a3ccb0ce92843476399d 100644
--- a/vutinfth.dtx
+++ b/vutinfth.dtx
@@ -88,7 +88,7 @@
 % ^^A\DoNotIndex{\@empty,\@namedef,\@namelet,\@nameuse,\csname,\endcsname}
 % ^^A\DoNotIndex{\",\\}
 % ^^A\DoNotIndex{\else,\fi,\ifcsempty,\ifcsstring,\ifdefstrequal,\ifdefstring,\ifdraftdoc,\ifstrempty,\ifstrequal,\ifundef}
-% ^^A\DoNotIndex{\baselineskip,\bfseries,\bigskip,\centering,\chapter,\chapterstyle,\cleardoublepage,\displaydate,\expandafter,\fontsize,\footruleskip,\global,\graphicspath,\hfill,\hspace,\includegraphics,\languagename,\makeevenfoot,\makeevenhead,\makefootrule,\makeheadposition,\makeoddfoot,\makeoddhead,\makepagestyle,\makerunningwidth,\newdata,\newgeometry,\newlength,\pagestyle,\par,\parindent,\parskip,\raisebox,\relax,\restoregeometry,\rule,\selectfont,\selectlanguage,\setkeys,\setlength,\sfdefault,\sffamily,\smallskip,\space,\ss,\string,\textwidth,\thispagestyle,\vfill,\vspace}
+% ^^A\DoNotIndex{\baselineskip,\bfseries,\bigskip,\centering,\chapter,\chapterstyle,\cleardoublepage,\DTMusedate,\expandafter,\fontsize,\footruleskip,\global,\graphicspath,\hfill,\hspace,\includegraphics,\languagename,\makeevenfoot,\makeevenhead,\makefootrule,\makeheadposition,\makeoddfoot,\makeoddhead,\makepagestyle,\makerunningwidth,\newdata,\newgeometry,\newlength,\pagestyle,\par,\parindent,\parskip,\raisebox,\relax,\restoregeometry,\rule,\selectfont,\selectlanguage,\setkeys,\setlength,\sfdefault,\sffamily,\smallskip,\space,\ss,\string,\textwidth,\thispagestyle,\vfill,\vspace}
 %
 % \newcommand{\ispoly}{\textsuperscript{P}}
 %
@@ -216,7 +216,7 @@
 % \subsubsection{Dates}
 %
 % \DescribeMacro{\setdate}
-% All commands in this section are called with three madatory arguments, e.g., as |\command|\marg{day}\marg{month}\marg{year}. The syntax is identical to the last three arguments of the |\newdate| command of the |datetime| package, from which these commands derive. The following dates can be set:
+% All commands in this section are called with three madatory arguments, e.g., as |\command|\marg{day}\marg{month}\marg{year}. The syntax is identical to the last three arguments of the |\DTMsavedate| command of the |datetime2| package, from which these commands derive. The following dates can be set:
 % \begin{center}
 % \begin{tabular}{lllc}
 %   \toprule
@@ -334,8 +334,8 @@
 %   \toprule
 %   Command & Options & Description\\
 %   \midrule
-%   |\addtitlepage|\marg{list} & |english|   & Generates an English title page. \\
-%                              & |naustrian| & Generates a German title page. \\
+%   |\addtitlepage|\marg{list} & |english| & Generates an English title page. \\
+%                              & |german|  & Generates a German title page. \\
 %   \bottomrule
 % \end{tabular}
 % \end{center}
@@ -416,7 +416,7 @@
 % \DescribeMacro{\AddLanguage}
 % Used as |\AddLanguage|\marg{lang}, it enables the language \meta{lang} to by used by polylingual expressions.
 % \meta{lang} has to be chosed from the languages of the |babel| package that is used by this class.
-% Currently, |vutinfth| uses two languages, i.e., |english| for English expressions and |naustrian| for German expressions.
+% Currently, |vutinfth| uses two languages, i.e., |english| for English expressions and |german| for German expressions.
 %
 % \DescribeMacro{\CreatePolylingual}
 % Used as |\CreatePolylingual|\oarg{expressions}\marg{name}, it generates a command |\vutinfth@polylingual@|\meta{name} that selects the approriate expression based on the current language at the time of use.
@@ -424,9 +424,9 @@
 % \meta{lang$_i$} has to be chosen from the languages that were defined via |\AddLanguage|.
 % As a convention, text that needs to start with an uppercase letter is assigned to a name that starts with an uppercase letter.
 % The same holds for uppercase words, e.g.,\\
-% |\CreatePolylingual[english=advisor,naustrian=Betreuer]{advisor}|\\
-% |\CreatePolylingual[english=Advisor,naustrian=Betreuer]{Advisor}|\\
-% |\CreatePolylingual[english=ADVISOR,naustrian=BETREUER]{ADVISOR}|.\\
+% |\CreatePolylingual[english=advisor,german=Betreuer]{advisor}|\\
+% |\CreatePolylingual[english=Advisor,german=Betreuer]{Advisor}|\\
+% |\CreatePolylingual[english=ADVISOR,german=BETREUER]{ADVISOR}|.\\
 % See Section~\ref{sec:impl:data:declarations} for examples.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -493,8 +493,8 @@
 \RequirePackage{lmodern}%
 \RequirePackage{courier}%
 \RequirePackage[T1]{fontenc}%
-\RequirePackage[english,naustrian]{babel}%
-\RequirePackage[nodayofweek]{datetime}%
+\RequirePackage[english,german]{babel}%
+\RequirePackage[useregional]{datetime2}%
 \RequirePackage{geometry}%
 \RequirePackage{calc}%
 \RequirePackage{etoolbox}%
@@ -585,7 +585,7 @@
 % Creates the internal storage for the signing date.
 %    \begin{macrocode}
 \newcommand{\setdate}[3]{%
-  \newdate{vutinfth@date@signing}{#1}{#2}{#3}%
+  \DTMsavedate{vutinfth@date@signing}{#3-#2-#1}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -1163,7 +1163,7 @@
 % Adds the desired languages to the polylingual expressions. All added languages have to be given as arguments to the |babel| package.
 %    \begin{macrocode}
 \AddLanguage{english}%
-\AddLanguage{naustrian}%
+\AddLanguage{german}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1175,47 +1175,47 @@
 %    \begin{macrocode}
 \CreatePolylingual[
   english=Advisor,
-  naustrian=Betreuung]{Advisor}%
+  german=Betreuung]{Advisor}%
 \CreatePolylingual[
   english=Second advisor,
-  naustrian=Zweitbetreuung]{Secondadvisor}%
+  german=Zweitbetreuung]{Secondadvisor}%
 \CreatePolylingual[
   english=submitted in partial fulfillment of the requirements
     for the degree of,
-  naustrian=zur Erlangung des akademischen Grades]{submission}%
+  german=zur Erlangung des akademischen Grades]{submission}%
 \CreatePolylingual[
   english=in,
-  naustrian=im Rahmen des Studiums]{in}%
+  german=im Rahmen des Studiums]{in}%
 \CreatePolylingual[
   english=within the]{within}%
 \CreatePolylingual[
   english=Vienna PhD School of Informatics]{School}%
 \CreatePolylingual[
   english=by,
-  naustrian=eingereicht von]{by}%
+  german=eingereicht von]{by}%
 \CreatePolylingual[
   english=Registration Number,
-  naustrian=Matrikelnummer]{Registrationnumber}%
+  german=Matrikelnummer]{Registrationnumber}%
 \CreatePolylingual[
   english=to the Faculty of Informatics,
-  naustrian=an der Fakult\"at f\"ur Informatik]{faculty}%
+  german=an der Fakult\"at f\"ur Informatik]{faculty}%
 \CreatePolylingual[
   english=at the TU Wien,
-  naustrian=der Technischen Universit\"at Wien]{university}%
+  german=der Technischen Universit\"at Wien]{university}%
 \CreatePolylingual[
   english=Assistance,
-  naustrian=Mitwirkung]{Assistance}%
+  german=Mitwirkung]{Assistance}%
 \CreatePolylingual[
   english=The dissertation has been reviewed by:,
-  naustrian=Diese Dissertation haben begutachtet:]{Reviewed}%
+  german=Diese Dissertation haben begutachtet:]{Reviewed}%
 \CreatePolylingual[
   english=External reviewers:]{Reviewers}%
 \CreatePolylingual[
   english=Vienna,
-  naustrian=Wien]{Place}%
+  german=Wien]{Place}%
 \CreatePolylingual[
   english=Declaration of Authorship,
-  naustrian=Erkl\"arung zur Verfassung der Arbeit]{StatementChapter}%
+  german=Erkl\"arung zur Verfassung der Arbeit]{StatementChapter}%
 \CreatePolylingual[
   english={I hereby declare that I have written this Doctoral Thesis
     independently, that I have completely specified the utilized
@@ -1223,7 +1223,7 @@
     of the work - including tables, maps and figures - which belong
     to other works or to the internet, literally or extracted, by
     referencing the source as borrowed.},
-  naustrian={Hiermit erkl\"are ich, dass ich diese Arbeit
+  german={Hiermit erkl\"are ich, dass ich diese Arbeit
     selbst\"andig verfasst habe, dass ich die verwendeten Quellen
     und Hilfsmittel vollst\"andig angegeben habe und dass ich die
     Stellen der Arbeit -- einschlie{\ss}lich Tabellen, Karten und
@@ -1235,49 +1235,49 @@
 %    \begin{macrocode}
 \CreatePolylingual[
   english=Bachelor of Science,
-  naustrian=Bachelor of Science]{Bdeg}%
+  german=Bachelor of Science]{Bdeg}%
 \CreatePolylingual[
   english=Master of Science,
-  naustrian=Master of Science]{MdegMaster}%
+  german=Master of Science]{MdegMaster}%
 \CreatePolylingual[
   english=Diplom-Ingenieur,
-  naustrian=Diplom-Ingenieur]{MdegDiplMale}%
+  german=Diplom-Ingenieur]{MdegDiplMale}%
 \CreatePolylingual[
   english=Diplom-Ingenieurin,
-  naustrian=Diplom-Ingenieurin]{MdegDiplFemale}%
+  german=Diplom-Ingenieurin]{MdegDiplFemale}%
 \CreatePolylingual[
   english=Magister der Naturwissenschaften,
-  naustrian=Magister der Naturwissenschaften]{MdegRerNatMale}%
+  german=Magister der Naturwissenschaften]{MdegRerNatMale}%
 \CreatePolylingual[
   english=Magistra der Naturwissenschaften,
-  naustrian=Magistra der Naturwissenschaften]{MdegRerNatFemale}%
+  german=Magistra der Naturwissenschaften]{MdegRerNatFemale}%
 \CreatePolylingual[
   english=Magister der Sozial- und Wirtschaftswissenschaften,
-  naustrian=Magister der Sozial- und Wirtschaftswissenschaften]{%
+  german=Magister der Sozial- und Wirtschaftswissenschaften]{%
   MdegRerSocOecMale}%
 \CreatePolylingual[
   english=Magistra der Sozial- und Wirtschaftswissenschaften,
-  naustrian=Magistra der Sozial- und Wirtschaftswissenschaften]{%
+  german=Magistra der Sozial- und Wirtschaftswissenschaften]{%
   MdegRerSocOecFemale}%
 \CreatePolylingual[
   english=Doktor der Naturwissenschaften,
-  naustrian=Doktor der Naturwissenschaften]{DdegRerNatMale}%
+  german=Doktor der Naturwissenschaften]{DdegRerNatMale}%
 \CreatePolylingual[
   english=Doktorin der Naturwissenschaften,
-  naustrian=Doktorin der Naturwissenschaften]{DdegRerNatFemale}%
+  german=Doktorin der Naturwissenschaften]{DdegRerNatFemale}%
 \CreatePolylingual[
   english=Doktor der Technischen Wissenschaften,
-  naustrian=Doktor der Technischen Wissenschaften]{DdegTechnMale}%
+  german=Doktor der Technischen Wissenschaften]{DdegTechnMale}%
 \CreatePolylingual[
   english=Doktorin der Technischen Wissenschaften,
-  naustrian=Doktorin der Technischen Wissenschaften]{DdegTechnFemale}%
+  german=Doktorin der Technischen Wissenschaften]{DdegTechnFemale}%
 \CreatePolylingual[
   english=Doktor der Sozial- und Wirtschaftswissenschaften,
-  naustrian=Doktor der Sozial- und Wirtschaftswissenschaften]{%
+  german=Doktor der Sozial- und Wirtschaftswissenschaften]{%
   DdegRerSocOecMale}%
 \CreatePolylingual[
   english=Doktorin der Sozial- und Wirtschaftswissenschaften,
-  naustrian=Doktorin der Sozial- und Wirtschaftswissenschaften]{%
+  german=Doktorin der Sozial- und Wirtschaftswissenschaften]{%
   DdegRerSocOecFemale}%
 \CreatePolylingual[
   english=Doctor of Technical Sciences]{%
@@ -1287,16 +1287,16 @@
 %    \begin{macrocode}
 \CreatePolylingual[
   english=BACHELOR'S THESIS,
-  naustrian=BACHELORARBEIT]{BACHELORTHESIS}%
+  german=BACHELORARBEIT]{BACHELORTHESIS}%
 \CreatePolylingual[
   english=MASTER'S THESIS,
-  naustrian=MASTERARBEIT]{MASTERTHESIS}%
+  german=MASTERARBEIT]{MASTERTHESIS}%
 \CreatePolylingual[
   english=DIPLOMA THESIS,
-  naustrian=DIPLOMARBEIT]{DIPLOMATHESIS}%
+  german=DIPLOMARBEIT]{DIPLOMATHESIS}%
 \CreatePolylingual[
   english=DISSERTATION,
-  naustrian=DISSERTATION]{DOCTORTHESIS}%
+  german=DISSERTATION]{DOCTORTHESIS}%
 \CreatePolylingual[
   english=PhD THESIS]{PHDTHESIS}%
 %    \end{macrocode}
@@ -1306,7 +1306,7 @@
 % Sets the title of the thesis.
 %    \begin{macrocode}
 \newcommand{\settitle}[2]{%
-  \CreatePolylingual[english=#1,naustrian=#2]{Title}%
+  \CreatePolylingual[english=#1,german=#2]{Title}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -1315,7 +1315,7 @@
 % Sets the subtitle of the thesis.
 %    \begin{macrocode}
 \newcommand{\setsubtitle}[2]{%
-  \CreatePolylingual[english=#1,naustrian=#2]{Subtitle}%
+  \CreatePolylingual[english=#1,german=#2]{Subtitle}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -1324,7 +1324,7 @@
 % Sets the curriculum name.
 %    \begin{macrocode}
 \newcommand{\setcurriculum}[2]{%
-  \CreatePolylingual[english=#1,naustrian=#2]{Curriculum}%
+  \CreatePolylingual[english=#1,german=#2]{Curriculum}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -1527,7 +1527,7 @@
           \vutinfth@placedate@width
         }%
         \vutinfth@polylingual@Place,
-        \displaydate{vutinfth@date@signing}\vspace*{\baselineskip}%
+        \DTMusedate{vutinfth@date@signing}\vspace*{\baselineskip}%
       \end{minipage}%
       \hfill
     }{}%
@@ -1781,7 +1781,7 @@
 % Generates the statement page.
 %    \begin{macrocode}
 \newcommand{\addstatementpage}{%
-  \selectlanguage{naustrian}%
+  \selectlanguage{german}%
   \ifundergraduate{\AddStatementPage}%
   \ifgraduate{%
     \ifdoctor{\AddStatementPage}%
@@ -1822,7 +1822,7 @@
 % Generates the German acknowledgement section.
 %    \begin{macrocode}
 \newenvironment{danksagung}{%
-  \selectlanguage{naustrian}%
+  \selectlanguage{german}%
   \chapter{Danksagung}%
 }{%
   \cleardoublepage
@@ -1834,7 +1834,7 @@
 % Generates the German acknowledgement section without an entry in the table of contents.
 %    \begin{macrocode}
 \newenvironment{danksagung*}{%
-  \selectlanguage{naustrian}%
+  \selectlanguage{german}%
   \chapter*{Danksagung}%
 }{%
   \cleardoublepage
@@ -1870,7 +1870,7 @@
 % Generates the German abstract without an entry in the table of contents.
 %    \begin{macrocode}
 \newenvironment{kurzfassung}{%
-  \selectlanguage{naustrian}%
+  \selectlanguage{german}%
   \chapter{Kurzfassung}%
 }{%
   \cleardoublepage
@@ -1882,7 +1882,7 @@
 % Generates the German abstract.
 %    \begin{macrocode}
 \newenvironment{kurzfassung*}{%
-  \selectlanguage{naustrian}%
+  \selectlanguage{german}%
   \chapter*{Kurzfassung}%
 }{%
   \cleardoublepage
@@ -1929,4 +1929,4 @@
 %
 % \PrintIndex ^^A compile index with `makeindex.exe -s gind.ist %.idx'
 %
-\endinput
\ No newline at end of file
+\endinput