diff --git a/fithesis.dtx b/fithesis.dtx
index ae7ea880df911b3861c305cf452dda8f2a613f3a..89147d6f0dd82e042f9f9ce0d0d550a66bae5a2f 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -534,6 +534,22 @@
   \def\thesis@title{#1}}
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\thesis@TeXtitle}
+% \subsubsection{The \texttt{TeXtitle} key}
+% The \marg{\texttt{TeXtitle}=title} pair sets the \TeX\ title of
+% the thesis to \textit{title}. The \textit{title} is used, when
+% typesetting the title, whereas |\thesis@title| is a plain text,
+% which gets included in the PDF header of the
+% resulting document as well as in the \BibTeX\ file containing
+% the bibliographical entry for the thesis. The \textit{title}
+% is stored within the private |\thesis@TeXtitle| macro, whose
+% implicit value is |\thesis@title|.
+%    \begin{macrocode}
+\def\thesis@TeXtitle{\thesis@title}
+\define@key{thesis}{TeXtitle}{%
+  \def\thesis@TeXtitle{#1}}
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\thesis@titleEn}
 % \subsubsection{The \texttt{titleEn} key}
 % The \marg{\texttt{titleEn}=title} pair sets the English title of
@@ -792,6 +808,13 @@
 \catcode`\}=12
 \catcode`\_=13
 \gdef\thesis@bibgen#1<<%
+  % Temporarily disable the UTF-8 encoding
+  \def\UTFviii@two@octets##1##2<%
+    \string##1\string##2>%
+  \def\UTFviii@three@octets##1##2##3<%
+    \string##1\string##2\string##3>%
+  \def\UTFviii@four@octets##1##2##3##4<%
+    \string##1\string##2\string##3\string##4>%
   % Helper macros
   \def\add<\addtostream<#1>>%
   \let\ea\expandafter%
@@ -816,13 +839,6 @@
   % Generate the file
   <%% Temporarily turn _s into spaces
     \catcode`\_=13 \let_=\space
-    % Temporarily disable the UTF-8 encoding
-    \def\UTFviii@two@octets##1##2<%
-      \string##1\string##2>%
-    \def\UTFviii@three@octets##1##2##3<%
-      \string##1\string##2\string##3>%
-    \def\UTFviii@four@octets##1##2##3##4<%
-      \string##1\string##2\string##3\string##4>%
     % Fill the output stream
     \add<\entryType{\surname\thesis@year thesis,>%
     \add<__AUTHOR_____=_"\thesis@author",>%
@@ -860,7 +876,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{oldfithesis1}[2015/03/04 old fithesis will load fithesis3 MU thesis class]
 
-\errmessage{%
+\ClassWarning{oldfithesis1}{%
   You are using the fithesis class, which has been deprecated.
   The fithesis3 class will be used instead.
   For more information, see <https://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml>%
@@ -873,7 +889,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{oldfithesis2}[2015/03/04 old fithesis2 will load fithesis3 MU thesis class]
 
-\errmessage{%
+\ClassWarning{oldfithesis2}{%
   You are using the fithesis2 class, which has been deprecated.
   The fithesis3 class will be used instead.
   For more information, see <https://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml>%
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index de42056754a974637b1717651d7e64eb965d2e57..4e8d1f68aa2e1fbc5571242ac09aabc0c1470cb5 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -22,6 +22,11 @@
 %     the parity of the page. Blank pages are optionally inserted
 %     prior the beginning of the next chapter to ensure that it
 %     starts on an odd page.
+%
+%     The \DescribeMacro{\ifthesis@twoside}|\ifthesis@twoside|
+%     conditional is set to \textit{false} or \textit{true},
+%     respectively. This value can be tested in the subsequently
+%     loaded style files.
 %   \item\texttt{onecolumn}, \texttt{twocolumn} -- The document
 %     is going to be set in a single column or in two columns,
 %     respectively.
@@ -39,8 +44,11 @@
 \DeclareOption{10pt}{\def\thesis@ptsize{0}}
 \DeclareOption{11pt}{\def\thesis@ptsize{1}}
 \DeclareOption{12pt}{\def\thesis@ptsize{2}}
-\DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse}
-\DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue}
+\newif\ifthesis@twoside
+\DeclareOption{oneside}{%
+  \thesis@twosidefalse\@twosidefalse\@mparswitchfalse}
+\DeclareOption{twoside}{%
+  \thesis@twosidetrue \@twosidetrue \@mparswitchtrue}
 \DeclareOption{onecolumn}{\@twocolumnfalse}
 \DeclareOption{twocolumn}{\@twocolumntrue}
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
@@ -93,22 +101,25 @@
 % cover.
 % \end{macro}\begin{macrocode}
 \def\thesis@blocks@cover{%
+  \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
   \begin{alwayssingle}
-  \thispagestyle{empty}
-  \begin{center}
-  {\sc\thesis@universityName\\\thesis@facultyName}
-  \vskip 1.4em
-  \includegraphics[width=40mm]{\thesis@logopath\thesis@logo}\\[0.4in]
-  \let\footnotesize\small
-  \let\footnoterule\relax{}
-  {\titlefont\bf\thesis@title\par\vfil}\vskip 0.8in
-  {\sc \thesis@typeName}\\[0.3in]
-  {\Large\bf\thesis@author}
-  \par\vfill
-  {\large\thesis@place, \thesis@year}
-  \end{center}
+    \thispagestyle{empty}
+    \begin{center}
+    {\sc\thesis@universityName\\\thesis@facultyName}
+    \vskip 1.4em
+    \includegraphics[width=40mm]{\thesis@logopath\thesis@logo}\\[0.4in]
+    \let\footnotesize\small
+    \let\footnoterule\relax{}
+    {\titlefont\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+    {\sc \thesis@typeName}\\[0.3in]
+    {\Large\bf\thesis@author}
+    \par\vfill
+    {\large\thesis@place, \thesis@year}
+    \end{center}
   \end{alwayssingle}
-  \newpage}
+  \newpage
+  \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+  }
 %    \end{macrocode}
 % \begin{macro}{\thesis@blocks@titlePage}
 % The |\thesis@blocks@titlePage| private macro typesets the thesis
@@ -118,23 +129,26 @@
 % |\thesis@logopath|.
 % \end{macro}\begin{macrocode}
 \def\thesis@blocks@titlePage{%
+  \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
   \begin{alwayssingle}
-  \thispagestyle{empty}
-  \begin{center}
-  {\sc\thesis@universityName\\\thesis@facultyName}
-  \vskip 1.4em
-  \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
-  \includegraphics[width=40mm]{\thesis@logopath@color\thesis@logo}\\[0.4in]
-  \let\footnotesize\small
-  \let\footnoterule\relax{}
-  {\titlefont\bf\thesis@title\par\vfil}\vskip 0.8in
-  {\sc \thesis@typeName}\\[0.3in]
-  {\Large\bf\thesis@author}
-  \par\vfill
-  {\large\thesis@place, \thesis@year}
-  \end{center}
+    \thispagestyle{empty}
+    \begin{center}
+    {\sc\thesis@universityName\\\thesis@facultyName}
+    \vskip 1.4em
+    \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
+    \includegraphics[width=40mm]{\thesis@logopath@color\thesis@logo}\\[0.4in]
+    \let\footnotesize\small
+    \let\footnoterule\relax{}
+    {\titlefont\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+    {\sc \thesis@typeName}\\[0.3in]
+    {\Large\bf\thesis@author}
+    \par\vfill
+    {\large\thesis@place, \thesis@year}
+    \end{center}
   \end{alwayssingle}
-  \newpage}
+  \newpage
+  \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+  }
 %    \end{macrocode}
 % \begin{macro}{\thesis@blocks@declaration}
 % The |\thesis@blocks@declaration| private macro typesets the
diff --git a/style/mu/fi.dtx b/style/mu/fi.dtx
index 35c99b830ac8af1d3aba77d58e04f3272e83e22f..def210d27cc92d6bbf0343c482b475689c6df58b 100644
--- a/style/mu/fi.dtx
+++ b/style/mu/fi.dtx
@@ -37,9 +37,9 @@
 % respectively, or to an empty string based on the options.
 %    \begin{macrocode}
 \def\thesis@preamble{%
+  \thesis@blocks@cover%
+  \thesis@blocks@titlePage%
   \thesis@blocks@frontMatter%
-    \thesis@blocks@cover%
-    \thesis@blocks@titlePage%
     \thesis@blocks@declaration%
     \thesis@blocks@thanks%
     \thesis@blocks@abstract%