diff --git a/example.tex b/example.tex
index e0381c761b2bfb523712406f658232b69caef2e2..a4f3ae7ee21d448417272f3a62edd9f5ec167621 100644
--- a/example.tex
+++ b/example.tex
@@ -1,7 +1,7 @@
-\documentclass[color]{fithesis3}
-\thesissetup{basepath=.,faculty=sci}
+\documentclass[color,cover]{fithesis3}
 \usepackage[utf8]{inputenc}
 \usepackage[slovak]{babel}
+\thesissetup{basepath=.}
 \begin{document}
   Ahoj všetci!
 \end{document}
diff --git a/fithesis.dtx b/fithesis.dtx
index a0fd6117933483f1efc2b92546919cdace6fef5a..724da3e453019b3d3db3585d2a06b94b477736cf 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -188,11 +188,16 @@
 %
 % \subsection{The \cs{thesissetup} macro}
 % \begin{macro}{\thesissetup}
-% The only public macro is the |\thesissetup|\marg{keyvals}
+% The main public macro is the |\thesissetup|\marg{keyvals}
 % command, where \textit{keyvals} is a comma-delimited list of
 % key-value pairs as defined by the \textsf{keyval} package. This
 % macro needs to be included prior to the beginning of a \LaTeX\ 
 % document. When used, the \textit{keyvals} are processed.
+%
+% It is noteworthy that the values as defined by the |\thesissetup|
+% public macro can only contain one paragraph of text. If you wish
+% to set multiple paragraphs of text as the value, you should use
+% the |\thesislong| public macro.
 %    \begin{macrocode}
 \def\thesissetup#1{%
   \setkeys{thesis}{#1}}
@@ -465,17 +470,32 @@
   \def\thesis@fieldEn{#1}}
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\thesis@logo}
-% \subsubsection{The \texttt{logo} key}
-% The \marg{\texttt{logo}=filename} pair sets the filename of the
-% logo file to be used to \textit{filename}. The \textit{filename}
-% is stored within the private |\thesis@logo| macro, whose implicit
-% value is |\thesis@faculty|. The logo file is loaded from the
+% \begin{macro}{\thesis@universityLogo}
+% \subsubsection{The \texttt{universityLogo} key}
+% The \marg{\texttt{universityLogo}=filename} pair sets the
+% filename of the logo file to be used to \textit{filename}. The
+% \textit{filename} is stored within the private
+% |\thesis@universityLogo| macro, whose implicit value is
+% \texttt{base}. The logo file is loaded from the
 % |\thesis@logopath\thesis@logo| path.
 %    \begin{macrocode}
-\def\thesis@logo{\thesis@faculty}
-\define@key{thesis}{logo}{%
-  \def\thesis@logo{#1}}
+\def\thesis@universityLogo{base}
+\define@key{thesis}{universityLogo}{%
+  \def\thesis@universityLogo{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\thesis@facultyLogo}
+% \subsubsection{The \texttt{facultyLogo} key}
+% The \marg{\texttt{facultyLogo}=filename} pair sets the filename
+% of the logo file to be used to \textit{filename}. The
+% \textit{filename} is stored within the private
+% |\thesis@facultyLogo| macro, whose implicit value is
+% |\thesis@faculty|. The logo file is loaded from the
+% |\thesis@logopath\thesis@logo| path.
+%    \begin{macrocode}
+\def\thesis@facultyLogo{\thesis@faculty}
+\define@key{thesis}{facultyLogo}{%
+  \def\thesis@facultyLogo{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\thesis@style}
@@ -731,8 +751,8 @@
 % |\thesis@placeholders@abstract|.
 %    \begin{macrocode}
 \def\thesis@abstract{\thesis@placeholders@abstract}
-\define@key{thesis}{abstract}{%
-  \def\thesis@abstract{#1}}
+\long\def\KV@thesis@abstract#1{%
+  \long\def\thesis@abstract{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\thesis@abstractEn}
@@ -743,8 +763,8 @@
 % whose implicit value is |\thesis@placeholders@abstractEn|.
 %    \begin{macrocode}
 \def\thesis@abstractEn{\thesis@placeholders@abstractEn}
-\define@key{thesis}{abstractEn}{%
-  \def\thesis@abstractEn{#1}}
+\long\def\KV@thesis@abstractEn#1{%
+  \long\def\thesis@abstractEn{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\thesis@advisor}\begin{macro}{\thesis@advisorEn}
@@ -767,10 +787,9 @@
 % The \marg{\texttt{thanks}=text} pair sets the acknowledgement
 % text to \textit{text}. The \textit{text} is stored within
 % the private |\thesis@thanks| macro, whose implicit value is
-% |\thesis@|\discretionary{}{}{}|placeholders@thanks|.
+% |\undefined|.
 %    \begin{macrocode}
-\def\thesis@thanks{\thesis@placeholders@thanks}
-\define@key{thesis}{thanks}{%
+\long\def\KV@thesis@thanks#1{%
   \long\def\thesis@thanks{#1}}
 %    \end{macrocode}
 % \end{macro}
@@ -818,6 +837,23 @@
 \def\thesis@preamble{}
 \def\thesis@postamble{}
 %    \end{macrocode}
+% \subsection{The \cs{thesislong} macro}
+% \begin{macro}{\thesislong}
+% The public macro |\thesislong|\marg{key}\marg{value},
+% where \textit{value} may contain multiple paragraphs of text, can
+% be used for the following \textit{key}s as an alternative to the
+% |\thesissetup| public macro, which only permits a single
+% paragraph as the \textit{value}:
+% \begin{itemize}
+%   \item\texttt{abstract}
+%   \item\texttt{abstractEn}
+%   \item\texttt{thanks}
+% \end{itemize}
+%    \begin{macrocode}
+\long\def\thesislong#1#2{%
+  \csname KV@thesis@#1\endcsname{#2}}
+%    \end{macrocode}
+% \end{macro}
 % \section{Private API}
 % \subsection{Main routine}\label{sec:thesis@load}
 % The |\thesis@load| macro is responsible for preparing the
@@ -877,28 +913,23 @@
 %   \item\texttt{Keywords} is set to either |\thesis@keywordsEn|,
 %     if defined, or to |\thesis@keywords|.
 %   \item\texttt{Creator} is set to \texttt{\thesis@version}.
-%   \item\texttt{Subject} is set to either |\thesis@abstractEn|, if
-%     defined, or to |\thesis@abstract|.
 % \end{itemize}
 %    \begin{macrocode}
-      \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}%
-      \hypersetup{%
-        pdftitle={\ifx\thesis@titleEn\undefined%
-          \thesis@title%
-        \else%
-          \thesis@titleEn%
-        \fi}, pdfauthor={\thesis@author},%
-        pdfkeywords={\ifx\thesis@keywordsEn\undefined%
-          \thesis@keywords%
-        \else%
-          \thesis@keywordsEn%
-        \fi}, pdfcreator={\thesis@version},%
-        pdfsubject={\ifx\thesis@abstractEn\undefined%
-          \thesis@abstract%
-        \else%
-          \thesis@abstractEn%
-        \fi}
-      }%
+       \thesis@require{hyperref}%
+      {\def\@titleEnPlaceholder{\thesis@placeholders@titleEn}
+       \def\@keywordsEnPlaceholder{\thesis@placeholders@keywordsEn}
+       \hypersetup{%
+       pdftitle={\ifx\thesis@titleEn\@titleEnPlaceholder%
+         \thesis@title%
+       \else%
+         \thesis@titleEn%
+       \fi}, pdfauthor={\thesis@author},%
+       pdfkeywords={\ifx\thesis@keywordsEn\@keywordsEnPlaceholder%
+         \thesis@keywords%
+       \else%
+         \thesis@keywordsEn%
+       \fi}, pdfcreator={\thesis@version},%
+     }}%
 %    \end{macrocode}
 % Consequently, the style files are loaded with the class
 % options passed onto them. If inheritance is enabled for
@@ -949,11 +980,11 @@
         \closeoutputstream{bib}}%
     \makeatother%
   \fi}
-
 %    \end{macrocode}
-% The \DescribeMacro{\thesis@exists}|\thesis@exists| and
-% \DescribeMacro{\thesis@input}|\thesis@input| macros are used to
-% include locale files and test the existance of files in general.
+% The \DescribeMacro{\thesis@exists}|\thesis@exists|\marg{path}
+% and \DescribeMacro{\thesis@input}|\thesis@input|\marg{path}
+% private macros are internally used to include locale files
+% and to test the existance of files in general.
 %    \begin{macrocode}
 \def\thesis@exists#1#2{%
   \IfFileExists{#1}{#2}{%
@@ -962,6 +993,15 @@
 \def\thesis@input#1{%
   \thesis@exists{#1}{\input{#1}}}
 %    \end{macrocode}
+% The \DescribeMacro{\thesis@require}|\thesis@require|%
+% \marg{package} expands to |\RequirePackage|\marg{package}, if
+% the specified \textit{package} has not yet been loaded. This
+% generally serves to prevents options clashes, when the options
+% with which the package had been loaded are of no consequence.
+%    \begin{macrocode}
+\def\thesis@require#1{%
+  \@ifpackageloaded{#1}{}{\RequirePackage{#1}}}
+%    \end{macrocode}
 % The \DescribeMacro{\thesis@bibgen}|\thesis@bibgen| macro
 % generates the contents of a \BibTeX\ file containing a
 % bibliographical entry for the thesis.
@@ -1201,7 +1241,7 @@
 % \subsubsection{Base style files}
 % \input{style/base.dtx}
 % \input{style/mu/base.dtx}
-% \subsubsection{The style file of the Faculty of Informatics}
+% \subsubsection{The style files of the Faculty of Informatics}
 % \input{style/mu/fi.dtx}
-% \subsubsection{The style file of the Faculty of Science}
+% \subsubsection{The style files of the Faculty of Science}
 % \input{style/mu/sci.dtx}
diff --git a/locale/czech.dtx b/locale/czech.dtx
index b0c928a6e45bbb65c24d7b62c84ec62ba3790c87..e631b0095dcd3fcba483ce99915c283e02301cc6 100644
--- a/locale/czech.dtx
+++ b/locale/czech.dtx
@@ -4,7 +4,8 @@
 % \begin{macro}{\thesis@gender@koncovka}
 % The locale file defines the |\thesis@gender@koncovka| macro,
 % which expands to the correct verb ending based on the value of
-% the |\thesis@ifwoman| macro.
+% the |\thesis@ifwoman| macro and the |\thesis@typeName@akuzativ|
+% containing the accusative case of the thesis type name.
 % \end{macro}\iffalse
 %<*base>
 % \fi\begin{macrocode}
@@ -28,7 +29,6 @@
 \def\thesis@placeholders@department{Název katedry}
 \def\thesis@placeholders@programme{Název studijního programu}
 \def\thesis@placeholders@field{Název studijního oboru}
-\def\thesis@placeholders@thanks{Text poděkování ...}
 \def\thesis@assignment{MĂ­sto tohoto listu vloĹľte kopii
   oficiálního podepsaného zadání práce.}
 \def\thesis@declaration{Text prohlášení ...}
@@ -51,27 +51,31 @@
   \else\ifx\thesis@type\thesis@rigorous%
     Rigorózní práce%
   \else%
-    Neznámý typ práce%
+    <<Neznámý typ práce (\thesis@type)>>%
+  \fi\fi\fi\fi}
+\def\thesis@typeName@akuzativ{%
+  \ifx\thesis@type\thesis@bachelors%
+    Bakalářskou práci%
+  \else\ifx\thesis@type\thesis@masters%
+    Diplomovou práci%
+  \else\ifx\thesis@type\thesis@doctoral%
+    Disertační práci%
+  \else\ifx\thesis@type\thesis@rigorous%
+    Rigorózní práci%
+  \else%
+    <<Neznámý typ práce (\thesis@type)>>%
   \fi\fi\fi\fi}
 %    \end{macrocode}\iffalse
 %</base>
 % \fi\file{locale/mu/czech.def}
 % This is the Czech locale file specific to the Masaryk
 % University in Brno. It replaces the |\thesis@universityName|
-% placeholder with the correct value and defines the declaration
-% text.
+% placeholder with the correct value.
 % \iffalse
 %<*mu>
 % \fi\begin{macrocode}
 \ProvidesFile{fithesis3/locale/mu/czech.def}[2015/04/08]
 \def\thesis@universityName{Masarykova Univerzita}
-\def\thesis@declaration{%
-  Prohlašuji, že tato \thesis@lower{typeName} je mým původním
-  autorským dílem, které jsem vypracoval\thesis@gender@koncovka\ 
-  samostatně. Všechny zdroje, prameny a literaturu, které jsem
-  při vypracování používal\thesis@gender@koncovka\ nebo z~nich
-  čerpal\thesis@gender@koncovka, v~práci řádně cituji s~uvedením
-  úplného odkazu na příslušný zdroj.}
 %    \end{macrocode}\iffalse
 %</mu>
 % \fi\file{locale/mu/law/czech.def}
@@ -136,15 +140,25 @@
 % Informatics at the Masaryk University in Brno.
 % It replaces the |\thesis@facultyName| placeholder with the
 % correct value and updates the |\thesis@placeholders@assignment|
-% in accordance with the requirements of the faculty.
+% and |\thesis@declaration| private macros in accordance with the
+% requirements of the faculty.
 % \iffalse
 %<*mu/fi>
 % \fi\begin{macrocode}
 \ProvidesFile{fithesis3/locale/mu/fi/czech.def}[2015/04/08]
 \def\thesis@facultyName{Fakulta informatiky}
+
+% Zástupné texty
 \def\thesis@placeholders@assignment{MĂ­sto tohoto listu vloĹľte
   kopie oficiálního podepsaného zadání práce a prohlášení
   autora školního díla.}
+\def\thesis@declaration{%
+  Prohlašuji, že tato \thesis@lower{typeName} je mým původním
+  autorským dílem, které jsem vypracoval\thesis@gender@koncovka\ 
+  samostatně. Všechny zdroje, prameny a literaturu, které jsem
+  při vypracování používal\thesis@gender@koncovka\ nebo z~nich
+  čerpal\thesis@gender@koncovka, v~práci řádně cituji s~uvedením
+  úplného odkazu na příslušný zdroj.}
 %    \end{macrocode}\iffalse
 %</mu/fi>
 % \fi\file{locale/mu/phil/czech.def}
@@ -177,9 +191,11 @@
 % It defines the private macros required by the
 % |\thesis@blocks@bibEntry| block defined within the
 % \texttt{style/mu/sci.sty} style file.
-% It also replaces the |\thesis@facultyName| placeholder with the
-% correct value and redefines the |\thesis@abstractTitle| macro in
-% accordance with the formal requirements of the faculty.
+% It also replaces the |\thesis@facultyName| and
+% |\thesis@placeholders@department| placeholders with the
+% correct value and redefines the |\thesis@abstractTitle|,
+% |\thesis@placeholders@abstract| and |\thesis@declaration| macros
+% in accordance with the formal requirements of the faculty.
 % \iffalse
 %<*mu/sci>
 % \fi\begin{macrocode}
@@ -187,9 +203,15 @@
 
 % Zástupné texty
 \def\thesis@facultyName{Přírodovědecká fakulta}
+\def\thesis@placeholders@department{Název ústavu}
+\def\thesis@placeholders@abstract{Text abstraktu}
 
 % OstatnĂ­
 \def\thesis@abstractTitle{Abstrakt}
+\def\thesis@declaration{%
+  Prohlašuji, že jsem svoji \thesis@lower{typeName@akuzativ}
+  vypracoval\thesis@gender@koncovka\ samostatnÄ› s~vyuĹľitĂ­m
+  informačních zdrojů, které jsou v~práci citovány.}
 
 % Bibliografický záznam
 \def\thesis@bibTitle{Bibliografický záznam}
diff --git a/locale/english.dtx b/locale/english.dtx
index 097caaa7ddb260561ac67f7b3e3ff1888206fc07..eecc717e68a7cef28e21e25be9c89b6ae30c1272 100644
--- a/locale/english.dtx
+++ b/locale/english.dtx
@@ -15,11 +15,10 @@
 \def\thesis@placeholders@authorEn{Author's name}
 \def\thesis@placeholders@universityNameEn{University name}
 \def\thesis@facultyNameEn{Faculty name}
-\def\thesis@placeholders@advisorEn{Advisor's name}
+\def\thesis@placeholders@advisorEn{\thesis@advisorTitleEn's name}
 \def\thesis@placeholders@departmentEn{Department name}
 \def\thesis@placeholders@programmeEn{Study programme name}
 \def\thesis@placeholders@fieldEn{The field of study}
-\def\thesis@placeholders@thanksEn{Acknowledgement text ...}
 \def\thesis@assignmentEn{Replace this page with a copy
   of the official signed thesis assignment.}
 \def\thesis@declarationEn{Declaration text ...}
@@ -43,7 +42,7 @@
   \else\ifx\thesis@type\thesis@rigorous%
     Rigorous Thesis%
   \else%
-    Unknown thesis type%
+    <<Unknown thesis type (\thesis@type)>>%
   \fi\fi\fi\fi}
 %    \end{macrocode}\iffalse
 %</base-shared>
@@ -66,7 +65,6 @@
 \let\thesis@placeholders@department=\thesis@placeholders@departmentEn
 \let\thesis@placeholders@programme=\thesis@placeholders@programmeEn
 \let\thesis@placeholders@field=\thesis@placeholders@fieldEn
-\let\thesis@placeholders@thanks=\thesis@placeholders@thanksEn
 \let\thesis@assignment=\thesis@assignmentEn
 \let\thesis@declaration=\thesis@declarationEn
 
@@ -238,7 +236,8 @@
 % to be shared with non-English locale files.
 % It replaces the |\thesis@facultyNameEn| placeholder with the
 % correct value and updates the |\thesis@placeholders@assignmentEn|
-% in accordance with the requirements of the faculty.
+% and |\thesis@declarationEn| private macros in accordance with the
+% requirements of the faculty.
 % \iffalse
 %<*mu/fi-shared>
 % \fi\begin{macrocode}
@@ -254,7 +253,8 @@
 % Informatics at the Masaryk University in Brno.
 % It replaces the |\thesis@facultyName| placeholder with the
 % correct value and updates the |\thesis@placeholders@assignment|
-% in accordance with the requirements of the faculty.
+% and |\thesis@declaration| private macros in accordance with the
+% requirements of the faculty.
 % \iffalse
 %<*mu/fi>
 % \fi\begin{macrocode}
diff --git a/locale/slovak.dtx b/locale/slovak.dtx
index 7f8e2bc9b403979de867f5b7dd04fecb13ec5cb3..f42dc5b89ff44b64f1c59fc80eafe32cd6d355f5 100644
--- a/locale/slovak.dtx
+++ b/locale/slovak.dtx
@@ -6,7 +6,8 @@
 % \begin{macro}{\thesis@gender@koncovka}
 % The locale file defines the |\thesis@gender@koncovka| macro,
 % which expands to the correct verb ending based on the value of
-% the |\thesis@ifwoman| macro.
+% the |\thesis@ifwoman| macro and the |\thesis@typeName@akuzativ|
+% containing the accusative case of the thesis type name.
 % \end{macro}\iffalse
 %<*base>
 % \fi\begin{macrocode}
@@ -30,7 +31,6 @@
 \def\thesis@placeholders@department{Názov katedry}
 \def\thesis@placeholders@programme{Názov študijného programu}
 \def\thesis@placeholders@field{Název študijného odboru}
-\def\thesis@placeholders@thanks{Text poÄŹakovanie ...}
 \def\thesis@assignment{Namiesto tejto stránky vložte kópiu
   oficiálneho podpísaného zadania práce.}
 \def\thesis@declaration{Text prehlásenie ...}
@@ -53,7 +53,19 @@
   \else\ifx\thesis@type\thesis@rigorous%
     Rigorózna práca%
   \else%
-    Neznámy typ práce%
+    <<Neznámy typ práce (\thesis@type)>>%
+  \fi\fi\fi\fi}
+\def\thesis@typeName@akuzativ{%
+  \ifx\thesis@type\thesis@bachelors%
+    Bakalársku prácu%
+  \else\ifx\thesis@type\thesis@masters%
+    Diplomovú prácu%
+  \else\ifx\thesis@type\thesis@doctoral%
+    Dizertačnú prácu%
+  \else\ifx\thesis@type\thesis@rigorous%
+    Rigoróznu prácu%
+  \else%
+    <<Neznámy typ práce (\thesis@type)>>%
   \fi\fi\fi\fi}
 %    \end{macrocode}\iffalse
 %</base>
@@ -69,14 +81,6 @@
 
 % SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
 \input{\thesis@localepath mu/czech.def}
-
-\def\thesis@declaration{%
-  Prehlasujem, že táto \thesis@lower{typeName} je mojím pôvodným
-  autorským dielom, ktoré som vypracoval\thesis@gender@koncovka\ 
-  samostatne. Všetky zdroje, pramene a literatúru, ktoré som pri
-  vypracovaní používal\thesis@gender@koncovka\ alebo z~nich
-  čerpal\thesis@gender@koncovka, v~práci riadne citujem
-  s~uvedením úplného odkazu na príslušný zdroj.}
 %    \end{macrocode}\iffalse
 %</mu>
 % \fi\file{locale/mu/law/slovak.def}
@@ -144,8 +148,9 @@
 % Informatics at the Masaryk University in Brno. It
 % inherits the value of the |\thesis@facultyName| private macro
 % from the respective Czech locale file.
-% It also updates the |\thesis@placeholders@assignment|
-% in accordance with the requirements of the faculty.
+% It also updates the |\thesis@placeholders@assignment| and
+% |\thesis@declaration| private macros in accordance with the
+% requirements of the faculty.
 % \iffalse
 %<*mu/fi>
 % \fi\begin{macrocode}
@@ -154,9 +159,17 @@
 % SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
 \input{\thesis@localepath mu/fi/czech.def}
 
+% Zástupné texty
 \def\thesis@assignment{Namiesto tejto stránky vložte kópiu
   oficiálneho podpísaného zadania práce a prehlásenie autora
   školského diela.}
+\def\thesis@declaration{%
+  Prehlasujem, že táto \thesis@lower{typeName} je mojím pôvodným
+  autorským dielom, ktoré som vypracoval\thesis@gender@koncovka\ 
+  samostatne. Všetky zdroje, pramene a literatúru, ktoré som pri
+  vypracovaní používal\thesis@gender@koncovka\ alebo z~nich
+  čerpal\thesis@gender@koncovka, v~práci riadne citujem
+  s~uvedením úplného odkazu na príslušný zdroj.}
 %    \end{macrocode}\iffalse
 %</mu/fi>
 % \fi\file{locale/mu/phil/slovak.def}
@@ -193,10 +206,12 @@
 % It defines the private macros required by the
 % |\thesis@blocks@bibEntry| block defined within the
 % \texttt{style/mu/sci.sty} style file.
-% It also replaces the |\thesis@facultyName| placeholder with the
-% correct value. The redefinition of the |\thesis@abstractTitle|
-% macro is inherited from the respective Czech locale file in
-% accordance with the formal requirements of the faculty. The
+% It also replaces the |\thesis@facultyName| and
+% |\thesis@placeholders@department| placeholders with the
+% correct value. The redefinitions of the |\thesis@abstractTitle|
+% and |\thesis@placeholders@abstract| macros are inherited from the
+% respective Czech locale file and the |\thesis@declaration| macro
+% is redefined in accordance with the formal requirements of the faculty. The
 % |\thesis@bib@academicYear| macro is likewise inherited from the
 % respective Czech locale file.
 % \iffalse
@@ -209,6 +224,7 @@
 
 % Zástupné texty
 \def\thesis@facultyName{Prírodovedecká fakulta}
+\def\thesis@placeholders@department{Názov ústavu}
 
 % Bibliografický záznam
 \def\thesis@bib@author{Autor}
@@ -218,6 +234,12 @@
 \def\thesis@bib@advisor{\thesis@advisorTitle}
 \def\thesis@bib@pages{Počet strán}
 \def\thesis@bib@keywords{\thesis@keywordsTitle}
+
+% RĂ´zne
+\def\thesis@declaration{%
+  Prehlasujem, Ĺľe som svoju \thesis@lower{typeName@akuzativ}
+  vypracoval\thesis@gender@koncovka\ samostatne s~vyuĹľitĂ­m
+  informačných zdrojov, ktoré sú v~práci citované.}
 %    \end{macrocode}\iffalse
 %</mu/sci>
 % \fi
diff --git a/logo/mu/Makefile b/logo/mu/Makefile
index 49ab4be9887badf783c377349f76ada109495599..6f4a6c462fd1e9b060c6f4ab3a2d9ae04a9d691e 100644
--- a/logo/mu/Makefile
+++ b/logo/mu/Makefile
@@ -1,4 +1,4 @@
-PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf base.pdf
 .PHONY: all implode
 
 all: $(PDFFILES)
diff --git a/logo/mu/color/Makefile b/logo/mu/color/Makefile
index 49ab4be9887badf783c377349f76ada109495599..6f4a6c462fd1e9b060c6f4ab3a2d9ae04a9d691e 100644
--- a/logo/mu/color/Makefile
+++ b/logo/mu/color/Makefile
@@ -1,4 +1,4 @@
-PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf base.pdf
 .PHONY: all implode
 
 all: $(PDFFILES)
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index 7dfed4c658696313cf64b23e9c89fab428e93f0c..3b90540f9c7140e5f646eec4ff5d9b4ea4ae5549 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -99,8 +99,8 @@
 \RequirePackage[resetfonts]{cmap}
 \RequirePackage[T1]{fontenc}
 \RequirePackage[sc]{mathpazo}
-\RequirePackage{graphicx}
-\RequirePackage{pdfpages}
+\thesis@require{graphicx}
+\thesis@require{pdfpages}
 \hypersetup{
   plainpages=false,          % Multiple page numbering support
   pdfpagelabels              % Generate pdf page labels
@@ -113,18 +113,18 @@
 % \begin{macro}{\thesis@blocks@frontMatter}
 % The |\thesis@blocks@frontMatter| private macro sets up the style
 % of the front matter of the thesis.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@frontMatter{%
   \pagestyle{plain}
   \parindent 1.5em
   \setcounter{page}{1}
   \pagenumbering{roman}}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@clear}
+% \end{macro}\begin{macro}{\thesis@blocks@clear}
 % The |\thesis@blocks@clear| private macro clears the current page
 % along with the next left-handed (even-numbered) page, when
 % double-sided typesetting is enabled.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@clear{%
   \ifthesis@twoside%
     \clearpage%
@@ -135,13 +135,10 @@
   \fi
 }
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@cover}
+% \end{macro}\begin{macro}{\thesis@blocks@cover}
 % The |\thesis@blocks@cover| private macro typesets the thesis
-% cover. The size of the font used to typeset the thesis title is
-% defined within the \DescribeMacro{\thesis@titleFont}
-% |\thesis@titleFont| private macro.
-% \end{macro}\begin{macrocode}
-\def\thesis@titleFont{\fontsize\@xxvpt{30}\selectfont}
+% cover.
+% \begin{macrocode}
 \def\thesis@blocks@cover{%
   \thesis@blocks@clear
   \ifthesis@cover\else
@@ -152,29 +149,27 @@
       {\sc\thesis@universityName\\\thesis@facultyName}
       \vskip 1.4em
       \includegraphics[width=40mm]{%
-        \thesis@logopath\thesis@logo}\\[0.4in]
+        \thesis@logopath\thesis@facultyLogo}\\[0.4in]
       \let\footnotesize\small
       \let\footnoterule\relax{}
-      {\thesis@titleFont\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+      {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
       {\sc \thesis@typeName}\\[0.3in]
-      {\Large\bf\thesis@author}
+      {\thesis@titlePage@Large\bf\thesis@author}
       \par\vfill
-      {\large\thesis@place, \thesis@year}
+      {\thesis@titlePage@large\thesis@place, \thesis@year}
       \end{center}
     \end{alwayssingle}
     \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
     \thesis@blocks@clear
   \fi}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@titlePage}
+% \end{macro}\begin{macro}{\thesis@blocks@titlePage}
 % The |\thesis@blocks@titlePage| private macro typesets the thesis
 % title page. The title page is similar to the cover except for the
 % fact that if color typesetting is enables, the logo is loaded
 % from the |\thesis@logopath color/| directory instead of
-% |\thesis@logopath|. The size of the font used to typeset the
-% thesis title is defined within the |\thesis@titleFont| private
-% macro.
-% \end{macro}\begin{macrocode}
+% |\thesis@logopath|.
+% \begin{macrocode}
 \def\thesis@blocks@titlePage{%
   \thesis@blocks@clear
   \begin{alwayssingle}
@@ -184,23 +179,23 @@
     \vskip 1.4em
     \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
     \includegraphics[width=40mm]{%
-      \thesis@logopath@color\thesis@logo}\\[0.4in]
+      \thesis@logopath@color\thesis@facultyLogo}\\[0.4in]
     \let\footnotesize\small
     \let\footnoterule\relax{}
-    {\thesis@titleFont\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+    {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
     {\sc \thesis@typeName}\\[0.3in]
-    {\Large\bf\thesis@author}
+    {\thesis@titlePage@Large\bf\thesis@author}
     \par\vfill
-    {\large\thesis@place, \thesis@year}
+    {\thesis@titlePage@large\thesis@place, \thesis@year}
     \end{center}
   \end{alwayssingle}
   \thesis@blocks@clear}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@tables}
+% \end{macro}\begin{macro}{\thesis@blocks@tables}
 % The |\thesis@blocks@tables| private macro typesets the table of
 % contents and optionally the |\listoftables| and the
 % |\listoffigures|.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@tables{%
   \thesis@blocks@clear%
   \tableofcontents%
@@ -209,10 +204,10 @@
   \thesis@blocks@clear%
 }
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@declaration}
+% \end{macro}\begin{macro}{\thesis@blocks@declaration}
 % The |\thesis@blocks@declaration| private macro typesets the
 % declaration text.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@declaration{%
   \thesis@blocks@clear%
   \begin{alwayssingle}%
@@ -226,23 +221,26 @@
   \end{alwayssingle}
   \thesis@blocks@clear}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@thanks}
+% \end{macro}\begin{macro}{\thesis@blocks@thanks}
 % The |\thesis@blocks@thanks| private macro typesets the
-% acknowledgement.
-% \end{macro}\begin{macrocode}
+% acknowledgement, if the |\thesis@thanks| private macro is
+% defined.
+% \begin{macrocode}
 \def\thesis@blocks@thanks{%
-  \thesis@blocks@clear%
-  \begin{alwayssingle}%
-    \chapter*{\thesis@thanksTitle}%
-    \thesis@thanks%
-    \par\vfill%
-  \end{alwayssingle}%
-  \thesis@blocks@clear}
+  \ifx\thesis@thanks\undefined\else%
+    \thesis@blocks@clear%
+    \begin{alwayssingle}%
+      \chapter*{\thesis@thanksTitle}%
+      \thesis@thanks%
+      \par\vfill%
+    \end{alwayssingle}%
+    \thesis@blocks@clear
+  \fi}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@abstract}
+% \end{macro}\begin{macro}{\thesis@blocks@abstract}
 % The |\thesis@blocks@abstract| private macro typesets the
 % abstract.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@abstract{%
   \thesis@blocks@clear%
   \begin{alwayssingle}%
@@ -252,11 +250,11 @@
   \end{alwayssingle}%
   \thesis@blocks@clear}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@abstractEn}
+% \end{macro}\begin{macro}{\thesis@blocks@abstractEn}
 % The |\thesis@blocks@abstractEn| private macro typesets the
 % abstract in English. If the current locale is English, the
 % macro produces no output.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@abstractEn{%
   \ifthesis@english\else%
     \thesis@blocks@clear%
@@ -268,10 +266,10 @@
     \thesis@blocks@clear%
   \fi}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@keywords}
+% \end{macro}\begin{macro}{\thesis@blocks@keywords}
 % The |\thesis@blocks@keywords| private macro typesets the
 % keywords.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@keywords{%
   \thesis@blocks@clear%
   \begin{alwayssingle}%
@@ -281,11 +279,11 @@
   \end{alwayssingle}%
   \thesis@blocks@clear}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@keywordsEn}
+% \end{macro}\begin{macro}{\thesis@blocks@keywordsEn}
 % The |\thesis@blocks@keywordsEn| private macro typesets the
 % keywords in English. If the current locale is English, the
 % macro produces no output.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@keywordsEn{%
   \ifthesis@english\else%
     \thesis@blocks@clear%
@@ -297,32 +295,36 @@
     \thesis@blocks@clear%
   \fi}
 %    \end{macrocode}
-% \begin{macro}{\thesis@blocks@assignment}
+% \end{macro}\begin{macro}{\thesis@blocks@assignment}
 % The |\thesis@blocks@assignment| private macro either typesets a
 % blank page to be replaced with the official thesis assignment or
 % injects the file located at the |\thesis@assignmentPDF| path, if
-% defined.
-% \end{macro}\begin{macrocode}
+% defined. In case of a rigorous thesis, the macro expands to an
+% empty token string.
+% \begin{macrocode}
 \def\thesis@blocks@assignment{%
-  \thesis@blocks@clear%
-  \ifx\thesis@assignmentPDF\undefined%
-    \begin{alwayssingle}%
-      \thispagestyle{empty}
-      \addtocounter{page}{-\ifthesis@twoside2\else1\fi}
-      \noindent\textit{\thesis@assignment}%
-    \end{alwayssingle}%
-  \else%
-    \includepdf[pages=-]{\thesis@assignmentPDF}%
-  \fi\thesis@blocks@clear}
+  \ifx\thesis@type\thesis@rigorous\else%
+    \thesis@blocks@clear%
+    \ifx\thesis@assignmentPDF\undefined%
+      \begin{alwayssingle}%
+        \thispagestyle{empty}
+        \addtocounter{page}{-\ifthesis@twoside2\else1\fi}
+        \noindent\textit{\thesis@assignment}%
+      \end{alwayssingle}%
+    \else%
+      \includepdf[pages=-]{\thesis@assignmentPDF}%
+    \fi%
+    \thesis@blocks@clear
+  \fi}
 %    \end{macrocode}
 % The file defines several blocks to be used in the redefinitions
 % of the |\thesis@preamble| and |\thesis@postable| private macros
 % by the subsequently loaded style files.
 %
-% \begin{macro}{\thesis@blocks@mainMatter}
+% \end{macro}\begin{macro}{\thesis@blocks@mainMatter}
 % The |\thesis@blocks@mainMatter| private macro sets up the style
 % of the main matter of the thesis.
-% \end{macro}\begin{macrocode}
+% \begin{macrocode}
 \def\thesis@blocks@mainMatter{%
   \thesis@blocks@clear
   \setcounter{page}{1}
@@ -330,6 +332,7 @@
   \pagestyle{thesisheadings}
   \parindent 1.5em\relax}
 %    \end{macrocode}
+% \end{macro}
 % The rest of the file comprises redefinitions of \LaTeX\ commands
 % and private \texttt{rapport3} class macros altering the layout of
 % the resulting document. Depending on the type size of 10, 11 or
@@ -532,19 +535,46 @@
 % \file{style/mu/fit12.clo}
 % This file is conditionally loaded by the
 % \texttt{style/mu/base.sty} file to redefine the page geometry to
-% match the type size of 12 points.
+% match the type size of 12 points. The type dimensions defined by
+% the file are stored in the following private macros as well:
+% \begin{itemize}
+%  \item\DescribeMacro{\thesis@titlePage@normalsize}%
+%    |\thesis@titlePage@normalsize| -- Equivalent to |\normalsize|
+%  \item\DescribeMacro{\thesis@titlePage@small}%
+%    |\thesis@titlePage@small| -- Equivalent to |\small|
+%  \item\DescribeMacro{\thesis@titlePage@footnotesize}%
+%    |\thesis@titlePage@footnotesize| -- Equivalent to
+%    |\footnotesize|
+%  \item\DescribeMacro{\thesis@titlePage@scriptsize}%
+%    |\thesis@titlePage@scriptsize| -- Equivalent to |\scriptsize|
+%  \item\DescribeMacro{\thesis@titlePage@tiny}%
+%    |\thesis@titlePage@tiny| -- Equivalent to |\tiny|
+%  \item\DescribeMacro{\thesis@titlePage@large}%
+%    |\thesis@titlePage@large| -- Equivalent to |\large|
+%  \item\DescribeMacro{\thesis@titlePage@Large}%
+%    |\thesis@titlePage@Large| -- Equivalent to |\Large|
+%  \item\DescribeMacro{\thesis@titlePage@LARGE}%
+%    |\thesis@titlePage@LARGE| -- Equivalent to |\LARGE|
+%  \item\DescribeMacro{\thesis@titlePage@huge}%
+%    |\thesis@titlePage@huge| -- Equivalent to |\huge|
+%  \item\DescribeMacro{\thesis@titlePage@Huge}%
+%    |\thesis@titlePage@Huge| -- Equivalent to |\Huge|
+% \end{itemize}
+% These private macros can be used to typeset elements, whose size
+% should remain constant regardless of the font size setting.
 %    \begin{macrocode}
 %<*12pt>
 \ProvidesFile{fit12.clo}[2015/04/08]
+%</12pt>
 
-\renewcommand{\normalsize}{\fontsize\@xiipt{14.5}\selectfont%
-\abovedisplayskip 12\p@ plus3\p@ minus7\p@
+\def\thesis@titlePage@normalsize{\fontsize\@xiipt{14.5}%
+\selectfont\abovedisplayskip 12\p@ plus3\p@ minus7\p@
 \belowdisplayskip \abovedisplayskip
 \abovedisplayshortskip  \z@ plus3\p@
 \belowdisplayshortskip  6.5\p@ plus3.5\p@ minus3\p@
 \let\@listi\@listI}
 
-\renewcommand{\small}{\fontsize\@xipt{13.6}\selectfont%
+\def\thesis@titlePage@small{\fontsize\@xipt{13.6}\selectfont%
 \abovedisplayskip 11\p@ plus3\p@ minus6\p@
 \belowdisplayskip \abovedisplayskip
 \abovedisplayshortskip  \z@ plus3\p@
@@ -554,7 +584,7 @@
             \itemsep \parsep
             \topsep 9\p@ plus3\p@ minus5\p@}}
 
-\renewcommand{\footnotesize}{\fontsize\@xpt{12}\selectfont%
+\def\thesis@titlePage@footnotesize{\fontsize\@xpt{12}\selectfont%
 \abovedisplayskip 10\p@ plus2\p@ minus5\p@
 \belowdisplayskip \abovedisplayskip
 \abovedisplayshortskip  \z@ plus3\p@
@@ -563,14 +593,25 @@
 \topsep 6\p@ plus2\p@ minus2\p@\parsep 3\p@ plus2\p@ minus\p@
 \itemsep \parsep}}
             
-\renewcommand{\scriptsize}{\fontsize\@viiipt{9.5pt}\selectfont}
-\renewcommand{\tiny}{\fontsize\@vipt{7pt}\selectfont}
-\renewcommand{\large}{\fontsize\@xivpt{18pt}\selectfont}
-\renewcommand{\Large}{\fontsize\@xviipt{22pt}\selectfont}
-\renewcommand{\LARGE}{\fontsize\@xxpt{25pt}\selectfont}
-\renewcommand{\huge}{\fontsize\@xxvpt{30pt}\selectfont}
-\renewcommand{\Huge}{\fontsize\@xxvpt{30pt}\selectfont}
+\def\thesis@titlePage@scriptsize{\fontsize\@viiipt{9.5pt}\selectfont}
+\def\thesis@titlePage@tiny{\fontsize\@vipt{7pt}\selectfont}
+\def\thesis@titlePage@large{\fontsize\@xivpt{18pt}\selectfont}
+\def\thesis@titlePage@Large{\fontsize\@xviipt{22pt}\selectfont}
+\def\thesis@titlePage@LARGE{\fontsize\@xxpt{25pt}\selectfont}
+\def\thesis@titlePage@huge{\fontsize\@xxvpt{30pt}\selectfont}
+\def\thesis@titlePage@Huge{\fontsize\@xxvpt{30pt}\selectfont}
 
+%<*12pt>
+\renewcommand{\normalsize}{\thesis@titlePage@normalsize}
+\renewcommand{\small}{\thesis@titlePage@small}
+\renewcommand{\footnotesize}{\thesis@titlePage@footnotesize}
+\renewcommand{\scriptsize}{\thesis@titlePage@scriptsize}
+\renewcommand{\tiny}{\thesis@titlePage@tiny}
+\renewcommand{\large}{\thesis@titlePage@large}
+\renewcommand{\Large}{\thesis@titlePage@Large}
+\renewcommand{\LARGE}{\thesis@titlePage@LARGE}
+\renewcommand{\huge}{\thesis@titlePage@huge}
+\renewcommand{\Huge}{\thesis@titlePage@Huge}
 %</12pt>
 \let\@normalsize\normalsize
 \normalsize
diff --git a/style/mu/sci.dtx b/style/mu/sci.dtx
index 5d7c9a15cb9e173e77dee5a90477d3c5527e155d..85c6b8fd9c14dcbc5ab4249ce14f4bd82b5071f5 100644
--- a/style/mu/sci.dtx
+++ b/style/mu/sci.dtx
@@ -8,6 +8,16 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/sci}[2015/04/09]
 %    \end{macrocode}
+% The file loads the following packages:
+% \begin{itemize}
+%   \item\textsf{tikz} -- Used for dimension arithmetic.
+%   \item\textsf{changepage} -- Used for altering the geometry of
+%     the page.
+% \end{itemize}
+%    \begin{macrocode}
+\thesis@require{tikz}
+\thesis@require{changepage}
+%    \end{macrocode}
 % \begin{macro}{\thesis@blocks@bibEntry}
 % The |\thesis@blocks@bibEntry| private macro typesets a
 % bibliographical entry. Along with the macros required by the
@@ -42,8 +52,38 @@
   \thesis@blocks@clear
   \begin{alwayssingle}
     \chapter*{\thesis@bibTitle}
-    {\renewcommand{\arraystretch}{2}
-    \begin{tabular}{ll}
+    {% Calculate the width of the columns
+    \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+      \bf\thesis@bib@author:}}
+    \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+      \bf\thesis@bib@title:}}
+    \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+      \bf\thesis@bib@programme:}}
+    \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+      \bf\thesis@bib@field:}}
+    % Unless this is a rigorous thesis, we will be typesetting the
+    % name of the thesis advisor.
+    \let\@E\relax\newlength{\@E}
+      \ifx\thesis@type\thesis@rigorous%
+        \setlength{\@E}{0pt}%
+      \else%
+        \settowidth{\@E}{{\bf\thesis@bib@advisor:}}
+      \fi%
+    \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+      \bf\thesis@bib@academicYear:}}
+    \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+      \bf\thesis@bib@pages:}}
+    \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+      \bf\thesis@bib@keywords:}}
+    \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt}
+    \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{%
+      max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)}
+    \let\@right\relax\newlength{\@right}\setlength{\@right}{%
+      \textwidth-\@left-\@skip}
+    
+    % Typeset the table
+    \renewcommand{\arraystretch}{2}
+    \begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
       \textbf{\thesis@bib@author:} & \vtop{%
         \hbox{\strut\thesis@author}%
         \hbox{\strut\thesis@facultyName, \thesis@universityName}%
@@ -54,8 +94,12 @@
         & \thesis@programme \\
       \textbf{\thesis@bib@field:}
         & \thesis@field \\
-      \textbf{\thesis@bib@advisor:}
-        & \thesis@advisor \\
+      % Unless this is a rigorous thesis, typeset the name of the
+      % thesis advisor.
+      \ifx\thesis@type\thesis@rigorous\else%
+        \textbf{\thesis@bib@advisor:}
+          & \thesis@advisor \\
+      \fi
       \textbf{\thesis@bib@academicYear:}
         & \thesis@academicYear \\
       \textbf{\thesis@bib@pages:}
@@ -66,8 +110,7 @@
   \end{alwayssingle}
   \thesis@blocks@clear}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\thesis@blocks@bibEntryEn}
+% \end{macro}\begin{macro}{\thesis@blocks@bibEntryEn}
 % The |\thesis@blocks@bibEntryEn| private macro typesets a
 % bibliographical entry in English. Along with the macros
 % required by the locale file interface, the locale files
@@ -103,11 +146,42 @@
     \thesis@blocks@clear
     \begin{alwayssingle}
       \chapter*{\thesis@bibTitleEn}
-      {\renewcommand{\arraystretch}{2}
-      \begin{tabular}{ll}
+      {% Calculate the width of the columns
+      \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+        \bf\thesis@bib@authorEn:}}
+      \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+        \bf\thesis@bib@titleEn:}}
+      \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+        \bf\thesis@bib@programmeEn:}}
+      \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+        \bf\thesis@bib@fieldEn:}}
+      % Unless this is a rigorous thesis, we will be typesetting
+      % the name of the thesis advisor.
+      \let\@E\relax\newlength{\@E}
+        \ifx\thesis@type\thesis@rigorous%
+          \setlength{\@E}{0pt}%
+        \else%
+          \settowidth{\@E}{{\bf\thesis@bib@advisorEn:}}
+        \fi%
+      \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+        \bf\thesis@bib@academicYearEn:}}
+      \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+        \bf\thesis@bib@pages:}}
+      \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+        \bf\thesis@bib@keywordsEn:}}
+      \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt}
+      \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{%
+        max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)}
+      \let\@right\relax\newlength{\@right}\setlength{\@right}{%
+        \textwidth-\@left-\@skip}
+
+    % Typeset the table
+    \renewcommand{\arraystretch}{2}
+    \begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
         \textbf{\thesis@bib@authorEn:} & \vtop{%
           \hbox{\strut\thesis@authorEn}%
-          \hbox{\strut\thesis@facultyNameEn, \thesis@universityNameEn}%
+          \hbox{\strut\thesis@facultyNameEn,
+                \thesis@universityNameEn}%
           \hbox{\strut\thesis@departmentEn}} \\
         \textbf{\thesis@bib@titleEn:}
           & \thesis@titleEn \\
@@ -115,8 +189,12 @@
           & \thesis@programmeEn \\
         \textbf{\thesis@bib@fieldEn:}
           & \thesis@fieldEn \\
-        \textbf{\thesis@bib@advisorEn:}
-          & \thesis@advisorEn \\
+        % Unless this is a rigorous thesis, typeset the name of the
+        % thesis advisor.
+        \ifx\thesis@type\thesis@rigorous\else%
+          \textbf{\thesis@bib@advisorEn:}
+            & \thesis@advisorEn \\
+        \fi
         \textbf{\thesis@bib@academicYearEn:}
           & \thesis@academicYear \\
         \textbf{\thesis@bib@pagesEn:}
@@ -128,6 +206,99 @@
     \thesis@blocks@clear
   \fi}
 %    \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@frontMatter}
+% The |\thesis@blocks@frontMatter| private macro sets up the style
+% of the front matter front matter of the thesis. The front matter
+% is typeset without any visible numbering, as mandated by the
+% formal requirements of the faculty.
+%    \begin{macrocode}
+\def\thesis@blocks@frontMatter{%
+  \pagestyle{empty}
+  \parindent 1.5em
+  \setcounter{page}{1}
+  \pagenumbering{roman}}
+%    \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@cover}
+% The |\thesis@blocks@cover| private macro typesets the thesis
+% cover.
+% \begin{macrocode}
+\def\thesis@blocks@cover{%
+  \thesis@blocks@clear
+  \ifthesis@cover\else
+    \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+    \begin{alwayssingle}
+      \thispagestyle{empty}
+      \begin{center}
+      {\sc\thesis@titlePage@LARGE\thesis@universityName\\%
+          \thesis@titlePage@Large\thesis@facultyName\\[0.3em]%
+          \thesis@titlePage@large\thesis@department}
+      \vfill
+      {\bf\thesis@titlePage@Huge\thesis@typeName}
+      \vfill
+      {\thesis@titlePage@large\thesis@place
+       \ \thesis@year\hfill\thesis@author}
+      \end{center}
+    \end{alwayssingle}
+    \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+    \thesis@blocks@clear
+  \fi}
+%    \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@titlePage}
+% The |\thesis@blocks@titlePage| private macro typesets the thesis
+% title page.
+% \begin{macrocode}
+\def\thesis@blocks@titlePage{{%
+  \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
+  \thesis@blocks@clear
+  \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+  \begin{alwayssingle}
+    \thispagestyle{empty}
+    % The top of the page
+    \begin{adjustwidth}{-12mm}{}
+      \begin{minipage}{30mm}
+        \includegraphics[width=30mm]{%
+          \thesis@logopath@color\thesis@universityLogo}
+      \end{minipage}
+      \begin{minipage}{89mm}
+        \begin{center}
+          {\sc\thesis@titlePage@LARGE\thesis@universityName\\%
+              \thesis@titlePage@Large\thesis@facultyName\\[0.3em]%
+              \thesis@titlePage@large\thesis@department}
+          \rule{\textwidth}{2pt}\vspace*{2mm}
+        \end{center}
+      \end{minipage}
+      \begin{minipage}{30mm}
+        \includegraphics[width=30mm]{%
+          \thesis@logopath@color\thesis@facultyLogo}
+      \end{minipage}
+    \end{adjustwidth}
+    % The middle of the page
+    \vfill
+    {\bf\thesis@titlePage@Huge\thesis@TeXtitle\\[0.8em]}
+    {\thesis@titlePage@large\thesis@typeName\\[1em]}
+    {\bf\thesis@titlePage@LARGE\thesis@author\\}
+    \vfill\noindent
+    % The bottom of the page
+    {\bf\thesis@titlePage@large%
+      % Unless this is a rigorous thesis, typeset the name of the
+      % thesis advisor.
+      \ifx\thesis@type\thesis@rigorous\else%
+          \thesis@advisorTitle: \thesis@advisor\hfill%
+      \fi%
+      \thesis@place\ \thesis@year}
+  \end{alwayssingle}
+  \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+  \thesis@blocks@clear}
+\def\thesis@blocks@declaration{%
+  \thesis@blocks@clear%
+  \begin{alwayssingle}%
+    \chapter*{\thesis@declarationTitle}%
+    \thesis@declaration%
+    \vskip 2cm%
+    \hfill\thesis@author%
+  \end{alwayssingle}
+  \thesis@blocks@clear}}
+%    \end{macrocode}
 % \end{macro}
 % The style file defines the autolayout preamble as the cover and
 % the title page followed by the bibliographic entry, the abstract
@@ -138,8 +309,8 @@
 %    \begin{macrocode}
 \def\thesis@preamble{%
   \thesis@blocks@cover%
-  \thesis@blocks@titlePage%
   \thesis@blocks@frontMatter%
+    \thesis@blocks@titlePage%
     \thesis@blocks@bibEntry%
     \thesis@blocks@bibEntryEn%
     \thesis@blocks@abstract%