diff --git a/fithesis3/style/mu/base.dtx b/fithesis3/style/mu/base.dtx
index 4d0f0d94d526ed9d3df862d75afabbeb27698fee..81ffcdb204473addd496bd5047dfdca618a9024f 100644
--- a/fithesis3/style/mu/base.dtx
+++ b/fithesis3/style/mu/base.dtx
@@ -23,7 +23,7 @@
 %     prior the beginning of the next chapter to ensure that it
 %     starts on an left-hand (even-numbered) page.
 %
-%     The \DescribeMacro{\ifthesis@twoside}|\ifthesis@twoside|
+%     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.
@@ -33,7 +33,7 @@
 %   \item\texttt{draft}, \texttt{final} -- Overful lines are or
 %     aren't marked within the document, respectively.
 %   \item\texttt{monochrome}, \texttt{color} -- The
-%     \DescribeMacro{\ifthesis@color}|\ifthesis@color| conditional
+%     \DescribeMacro{\ifthesis@color@}|\ifthesis@color@| conditional
 %     is set to \textit{false} or \textit{true}, respectively.
 %     This value can be tested in the subsequently loaded style
 %     files.
@@ -48,6 +48,11 @@
 %   \item\texttt{cover}, \texttt{nocover} -- The
 %     \DescribeMacro{\thesis@blocks@cover}|\thesis@blocks@cover|
 %     is or isn't going to expand to the thesis cover.
+%
+%     The \DescribeMacro{\ifthesis@cover@}|\ifthesis@cover@|
+%     conditional is set to \textit{false} or \textit{true},
+%     respectively. This value can be tested in the subsequently
+%     loaded style files.
 % \end{itemize}
 % The defaults are \texttt{12pt}, \texttt{twoside}, \texttt{final},
 % \texttt{monochrome}, \texttt{nolof}, \texttt{nolot} and
@@ -56,25 +61,25 @@
 \DeclareOption{10pt}{\def\thesis@ptsize{0}}
 \DeclareOption{11pt}{\def\thesis@ptsize{1}}
 \DeclareOption{12pt}{\def\thesis@ptsize{2}}
-\newif\ifthesis@twoside
+\newif\ifthesis@twoside@
 \DeclareOption{oneside}{%
-  \thesis@twosidefalse\@twosidefalse\@mparswitchfalse}
+  \thesis@twoside@false\@twosidefalse\@mparswitchfalse}
 \DeclareOption{twoside}{%
-  \thesis@twosidetrue \@twosidetrue \@mparswitchtrue}
+  \thesis@twoside@true \@twosidetrue \@mparswitchtrue}
 \DeclareOption{onecolumn}{\@twocolumnfalse}
 \DeclareOption{twocolumn}{\@twocolumntrue}
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
-\newif\ifthesis@color\thesis@colorfalse
-\DeclareOption{monochrome}{\thesis@colorfalse}
-\DeclareOption{color}{\thesis@colortrue}
+\newif\ifthesis@color@
+\DeclareOption{monochrome}{\thesis@color@false}
+\DeclareOption{color}{\thesis@color@true}
 \DeclareOption{nolot}{\def\thesis@blocks@lot{}}
 \DeclareOption{lot}{\let\thesis@blocks@lot\listoftables}
 \DeclareOption{nolof}{\def\thesis@blocks@lof{}}
 \DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures}
-\newif\ifthesis@cover
-\DeclareOption{nocover}{\thesis@coverfalse}
-\DeclareOption{cover}{\thesis@covertrue}
+\newif\ifthesis@cover@
+\DeclareOption{nocover}{\thesis@cover@false}
+\DeclareOption{cover}{\thesis@cover@true}
 
 % Options executed by default
 \ExecuteOptions{12pt,twoside,final,monochrome,lot,lof,nocover}
@@ -84,6 +89,7 @@
 %   \item\textsf{fontenc} -- The font encoding is set to Cork.
 %   \item\textsf{mathpazo} -- The virtual \texttt{mathpazo} fonts
 %     will be used for math.
+%   \item\textsf{colorx} -- Adds support for color manipulation.
 %   \item\textsf{tgpagella} -- Changes the default roman font family
 %     to \TeX\ Gyre Pagella.
 %   \item\textsf{cmap} -- Places an an explicit \texttt{ToUnicode}
@@ -96,22 +102,89 @@
 %     assignment.
 %   \item\textsf{hyperref} -- Adds support for injecting metadata
 %     into the resulting PDF document.
+%   \item\textsf{keyval} -- Adds support for parsing
+%     comma-delimited lists of key-value pairs.
 % \end{itemize}
 % In addition to that, the \textsf{hyperref} package is configured
-% to support both roman and arabic page numbering in one document.
+% to support both roman and arabic page numbering in one document
+% and to decorate hyperlinks with an underline instead of a
+% rectangular box.
 %    \begin{macrocode}
 \RequirePackage[resetfonts]{cmap}
 \RequirePackage[T1]{fontenc}
+\RequirePackage[usenames,dvipsnames,svgnames,table]{xcolor}
 \thesis@require{mathpazo}
 \thesis@require{tgpagella}
 \thesis@require{graphicx}
 \thesis@require{pdfpages}
 \thesis@require{hyperref}
+\thesis@require{keyval}
 \hypersetup{
+  pdfborderstyle={/S/U/W 1}, % Less obtrusive borders
   plainpages=false,          % Multiple page numbering support
   pdfpagelabels              % Generate pdf page labels
 }
 %    \end{macrocode}
+% \begin{macro}{\thesis@tabular}\begin{macro}{\thesis@endtabular}
+% \begin{macro}{\thesis@tabularx}\begin{macro}{\thesis@endtabularx}
+% The file defines the |thesis@tabular| and |thesis@tabularx|
+% environments, which can be used to typeset the |tabular| and
+% |tabularx| tables decorated with the colors specified within the
+% |\thesis@color@tableOdd| and |\thesis@color@tableEven| private
+% macros, if the \texttt{color} option is specified. In order to
+% use the |thesis@tabularx| environment, the user must manually
+% include the \textsf{tabularx} package.
+%    \begin{macrocode}
+\newenvironment{thesis@tabular}{%
+  \ifthesis@color@%
+    \rowcolors{1}{\thesis@color@tableOdd}{\thesis@color@tableEven}%
+  \fi\tabular}{\endtabular}
+\newenvironment{thesis@tabularx}{%
+  \ifthesis@color@%
+    \rowcolors{1}{\thesis@color@tableOdd}{\thesis@color@tableEven}%
+  \fi\tabularx}{\endtabularx}
+%    \end{macrocode}
+% \end{macro}\end{macro}\end{macro}\end{macro}
+% \begin{macro}{\thesis@color@setup}
+% The file defines the |\thesis@color@setup|\marg{colors} command,
+% where \textit{colors} is a comma-delimited list of key-value
+% pairs as defined by the \textsf{keyval} package. The command can
+% be invoked either by the subsequently loaded style files or by
+% the user to define which colors will be used, when the
+% \texttt{color} option is specified.
+%    \begin{macrocode}
+\def\thesis@color@setup#1{%
+  \setkeys{thesis@color}{#1}}
+%    \end{macrocode}
+% \end{macro}
+% The following key-value pairs are supported:
+% \begin{enumerate}
+%   \item\marg{\texttt{links}=color} -- Sets the color of hyperref
+%     links to \textit{color}. The default color is specified by
+%     the \textsf{hyperref} package.
+%   \item\marg{\texttt{tableOdd}=color} -- Sets the color of the
+%     odd table rows within the \texttt{thesis@tabular} and
+%     \texttt{thesis@tabularx} environments to \textit{color}. The
+%     \textit{color} is stored within the
+%     \DescribeMacro{\thesis@color@tableOdd}%
+%     |\thesis@color@tableOdd| private macro.
+%   \item\marg{\texttt{tableEven}=color} -- Sets the color of the
+%     even table rows within the \texttt{thesis@tabular} and
+%     \texttt{thesis@tabularx} environments to \textit{color}. The
+%     \textit{color} is stored within the
+%     \DescribeMacro{\thesis@color@tableEven}%
+%     |\thesis@color@tableEven| private macro.
+% \end{enumerate}
+%    \begin{macrocode}
+\define@key{thesis@color}{links}{%
+  \hypersetup{linkbordercolor=#1}}
+\def\thesis@color@tableOdd{white}
+\define@key{thesis@color}{tableOdd}{%
+  \def\thesis@color@tableOdd{#1}}
+\def\thesis@color@tableEven{white}
+\define@key{thesis@color}{tableEven}{%
+  \def\thesis@color@tableEven{#1}}
+%    \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.
@@ -133,7 +206,7 @@
 % double-sided typesetting is enabled.
 % \begin{macrocode}
 \def\thesis@blocks@clear{%
-  \ifthesis@twoside%
+  \ifthesis@twoside@%
     \clearpage%
     \thispagestyle{empty}%
     \cleardoublepage%
@@ -147,7 +220,7 @@
 % double-sided typesetting is enabled.
 % \begin{macrocode}
 \def\thesis@blocks@clearRight{%
-  \ifthesis@twoside%
+  \ifthesis@twoside@%
     \clearpage%
     \ifodd\value{page}%
       \thispagestyle{empty}%
@@ -176,9 +249,9 @@
 % certain parts of the cover page.
 % \begin{macrocode}
 \def\thesis@blocks@cover{%
-  \ifthesis@cover%
+  \ifthesis@cover@%
     \thesis@blocks@clear%
-    \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+    \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
     \begin{alwayssingle}%
       \thispagestyle{empty}%
       \begin{center}%
@@ -192,7 +265,7 @@
         \thesis@blocks@cover@footer%
       \end{center}%
     \end{alwayssingle}%
-    \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+    \ifthesis@twoside@\@twosidetrue\fi % Re-enable twoside
   \fi}
 %    \end{macrocode}
 % The output of the |\thesis@blocks@cover@header| private macro is
@@ -271,7 +344,7 @@
       \begin{center}%
         \thesis@blocks@titlePage@header%
         {\edef\thesis@logopath@color{%
-          \thesis@logopath\ifthesis@color color/\fi}
+          \thesis@logopath\ifthesis@color@ color/\fi}
         \includegraphics[width=40mm]{%
           \thesis@logopath@color\thesis@facultyLogo}\\[0.4in]}%
         \let\footnotesize\small%
@@ -453,7 +526,7 @@
     \ifx\thesis@assignmentFiles\undefined%
       \begin{alwayssingle}%
         \thispagestyle{empty}
-        \addtocounter{page}{-\ifthesis@twoside2\else1\fi}
+        \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}
         \noindent\textit{\thesis@@{assignment}}%
       \end{alwayssingle}%
     \else%
diff --git a/fithesis3/style/mu/econ.dtx b/fithesis3/style/mu/econ.dtx
index b128d917d4fa629a0aa4c31eead747e1b9038ad7..3e440dc1d4d6cd42df7b2a7fedb41781b49aacb0 100644
--- a/fithesis3/style/mu/econ.dtx
+++ b/fithesis3/style/mu/econ.dtx
@@ -9,6 +9,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-econ}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{7C211E}
+\definecolor{thesis@color@facultylight}{HTML}{DAC1BF}
+\definecolor{thesis@color@facultyxlight}{HTML}{EFE4E3}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % English locale.
 %    \begin{macrocode}
@@ -34,7 +45,7 @@
 % cover.
 %    \begin{macrocode}
 \def\thesis@blocks@cover{%
-  \ifthesis@cover
+  \ifthesis@cover@
     \thesis@blocks@clear
     \begin{alwayssingle}
       \thispagestyle{empty}
@@ -93,7 +104,7 @@
 \def\thesis@blocks@frontMatter{%
   \thesis@blocks@clear
   % In case of double-sided typesetting, change the geometry
-  \ifthesis@twoside
+  \ifthesis@twoside@
     \geometry{top=25mm,bottom=20mm,left=35mm,
       right=15mm, includeheadfoot}
   \fi\pagestyle{empty}
diff --git a/fithesis3/style/mu/fi.dtx b/fithesis3/style/mu/fi.dtx
index 738215dac3a49d051bf61818487af27e3c932776..367bfc0cf7c1076d9690be3d7dbb023643e194f6 100644
--- a/fithesis3/style/mu/fi.dtx
+++ b/fithesis3/style/mu/fi.dtx
@@ -6,7 +6,18 @@
 % \url{https://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis3/style/mu/fithesis3-fi}[2015/04/12]
+\ProvidesPackage{fithesis3/style/mu/fithesis3-fi}[2015/05/02]
+%    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{FFD451}
+\definecolor{thesis@color@facultylight}{HTML}{FFECB3}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFF9E5}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
 %    \end{macrocode}
 % \begin{macro}{\thesis@blocks@titlePage}
 % The style file redefines the cover and title page footers to
diff --git a/fithesis3/style/mu/fsps.dtx b/fithesis3/style/mu/fsps.dtx
index a7aa3eb331ba17ec5bb939f0b253d5652edd39e3..1b214ae96cc584276d26984f0bb8a880dd3609a5 100644
--- a/fithesis3/style/mu/fsps.dtx
+++ b/fithesis3/style/mu/fsps.dtx
@@ -8,6 +8,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-fss}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{0042BA}
+\definecolor{thesis@color@facultylight}{HTML}{BBC7DD}
+\definecolor{thesis@color@facultyxlight}{HTML}{E4E9F1}
+\thesis@color@setup{%
+  links=thesis@color@facultylight,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % The style file configures the title page header to include the
 % field name.
 %    \begin{macrocode}
diff --git a/fithesis3/style/mu/fss.dtx b/fithesis3/style/mu/fss.dtx
index 224a6ef8e9ef60d21158850996bedec5d9d8abb8..b0f6c8b60ea6fc5aaece75184f861ad38e7ee4cf 100644
--- a/fithesis3/style/mu/fss.dtx
+++ b/fithesis3/style/mu/fss.dtx
@@ -17,6 +17,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-fss}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{007B69}
+\definecolor{thesis@color@facultylight}{HTML}{B8DAD5}
+\definecolor{thesis@color@facultyxlight}{HTML}{E3F1EE}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % English locale.
 %    \begin{macrocode}
diff --git a/fithesis3/style/mu/law.dtx b/fithesis3/style/mu/law.dtx
index 2b043c016ce517c9da1b97c2aa9f937b58b3634d..de86b7085e7d72d701b42ae481f7ee36e85a768a 100644
--- a/fithesis3/style/mu/law.dtx
+++ b/fithesis3/style/mu/law.dtx
@@ -8,6 +8,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-law}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{80379B}
+\definecolor{thesis@color@facultylight}{HTML}{D3BADC}
+\definecolor{thesis@color@facultyxlight}{HTML}{F0E7F3}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % English locale.
 %    \begin{macrocode}
diff --git a/fithesis3/style/mu/med.dtx b/fithesis3/style/mu/med.dtx
index 4e60badfbca8006932cdd7bab9e6fd3df75ae33d..82dc472eb55c669575801a92ce8e49cc096a453f 100644
--- a/fithesis3/style/mu/med.dtx
+++ b/fithesis3/style/mu/med.dtx
@@ -9,6 +9,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-med}[2015/04/27]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{F2532D}
+\definecolor{thesis@color@facultylight}{HTML}{FFBFC2}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFE3E5}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % English locale.
 %    \begin{macrocode}
@@ -36,7 +47,7 @@
 % cover.
 %    \begin{macrocode}
 \def\thesis@blocks@cover{%
-  \ifthesis@cover
+  \ifthesis@cover@
     \thesis@blocks@clear
     \begin{alwayssingle}
       \thispagestyle{empty}
@@ -95,7 +106,7 @@
 \def\thesis@blocks@frontMatter{%
   \thesis@blocks@clear
   % In case of double-sided typesetting, change the geometry
-  \ifthesis@twoside
+  \ifthesis@twoside@
     \geometry{top=25mm,bottom=20mm,left=35mm,
       right=15mm, includeheadfoot}
   \fi\pagestyle{empty}
diff --git a/fithesis3/style/mu/ped.dtx b/fithesis3/style/mu/ped.dtx
index 330acb2c44d781225d2fe52fcdcdb92e75ee6a7a..8c7cceedc5e56bba75f2e1a0bb60b2cf7fecb1e6 100644
--- a/fithesis3/style/mu/ped.dtx
+++ b/fithesis3/style/mu/ped.dtx
@@ -8,6 +8,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-ped}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{FFA02F}
+\definecolor{thesis@color@facultylight}{HTML}{FFDEB7}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFF1E0}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % English locale.
 %    \begin{macrocode}
diff --git a/fithesis3/style/mu/phil.dtx b/fithesis3/style/mu/phil.dtx
index a0fcf0dccbfc4b8e6234213da4d6c44e5b08ea2e..d0222f5c655a1cb678b1172e1090a87666fd12cb 100644
--- a/fithesis3/style/mu/phil.dtx
+++ b/fithesis3/style/mu/phil.dtx
@@ -8,6 +8,17 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fithesis3/style/mu/fithesis3-phil}[2015/04/26]
 %    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{00A1DE}
+\definecolor{thesis@color@facultylight}{HTML}{B8E4F5}
+\definecolor{thesis@color@facultyxlight}{HTML}{E0F3FA}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
+%    \end{macrocode}
 % The style file configures the title page header to include the
 % department and the field name.
 %    \begin{macrocode}
diff --git a/fithesis3/style/mu/sci.dtx b/fithesis3/style/mu/sci.dtx
index d492718e2d188d0d51e2d7475f7965765a65590b..6554389dd0a03d105ffed6509f207a3d79c45441 100644
--- a/fithesis3/style/mu/sci.dtx
+++ b/fithesis3/style/mu/sci.dtx
@@ -6,7 +6,18 @@
 % \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis3/style/mu/fithesis3-sci}[2015/04/12]
+\ProvidesPackage{fithesis3/style/mu/fithesis3-sci}[2015/05/02]
+%    \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+%    \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{00AF3F}
+\definecolor{thesis@color@facultylight}{HTML}{B8E8C9}
+\definecolor{thesis@color@facultyxlight}{HTML}{E0F5E8}
+\thesis@color@setup{%
+  links=thesis@color@faculty,%
+  tableOdd=thesis@color@facultyxlight,%
+  tableEven=thesis@color@facultylight}
 %    \end{macrocode}
 % In addition to the main locale, the file also requires the
 % Czech and English locales.
@@ -93,11 +104,13 @@
     % Typeset the table
     \renewcommand{\arraystretch}{2}
     \begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
-      \textbf{\thesis@czech@bib@author:} & \vtop{%
-        \hbox{\strut\thesis@author}%
-        \hbox{\strut\thesis@czech@facultyName,
-                    \thesis@czech@universityName}%
-        \hbox{\strut\thesis@department}} \\
+      \textbf{\thesis@czech@bib@author:} &
+        \noindent\parbox[t]{\@right}{
+          \thesis@author\\
+          \thesis@czech@facultyName,
+          \thesis@czech@universityName\\
+          \thesis@department
+        }\\
       \textbf{\thesis@czech@bib@thesisTitle:}
         & \thesis@title \\
       \textbf{\thesis@czech@bib@programme:}
@@ -193,11 +206,13 @@
     % Typeset the table
     \renewcommand{\arraystretch}{2}
     \begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
-        \textbf{\thesis@english@bib@author:} & \vtop{%
-          \hbox{\strut\thesis@author}%
-          \hbox{\strut\thesis@english@facultyName,
-                \thesis@english@universityName}%
-          \hbox{\strut\thesis@departmentEn}} \\
+        \textbf{\thesis@english@bib@author:} &
+          \noindent\parbox[t]{\@right}{
+            \thesis@author\\
+            \thesis@english@facultyName,
+            \thesis@english@universityName\\
+            \thesis@departmentEn
+          }\\
         \textbf{\thesis@english@bib@thesisTitle:}
           & \thesis@titleEn \\
         \textbf{\thesis@english@bib@programme:}
@@ -237,9 +252,9 @@
 % cover.
 % \begin{macrocode}
 \def\thesis@blocks@cover{%
-  \ifthesis@cover
+  \ifthesis@cover@
     \thesis@blocks@clear
-    \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+    \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
     \begin{alwayssingle}
       \thispagestyle{empty}
       \begin{center}
@@ -253,7 +268,7 @@
        \ \thesis@year\hfill\thesis@author}
       \end{center}
     \end{alwayssingle}
-    \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+    \ifthesis@twoside@\@twosidetrue\fi % Re-enable twoside
   \fi}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@titlePage}
@@ -261,9 +276,9 @@
 % title page.
 % \begin{macrocode}
 \def\thesis@blocks@titlePage{{%
-  \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
+  \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color@ color/\fi}
   \thesis@blocks@clear
-  \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+  \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
   \begin{alwayssingle}
     \thispagestyle{empty}
     % The top of the page
@@ -300,7 +315,7 @@
       \fi%
       \thesis@place\ \thesis@year}
   \end{alwayssingle}
-  \ifthesis@twoside\@twosidetrue\fi}} % Re-enable twoside
+  \ifthesis@twoside@\@twosidetrue\fi}} % Re-enable twoside
 %    \end{macrocode}
 % \end{macro}
 % The style file defines the autolayout preamble as the cover and
diff --git a/fithesis3/test/econ-tables.tex b/fithesis3/test/econ-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..68640abd908667111228bde469b69849dd748da1
--- /dev/null
+++ b/fithesis3/test/econ-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=econ
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fi-tables.tex b/fithesis3/test/fi-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..314101b5ebfbd79390307d1e8bc46d685d23f45c
--- /dev/null
+++ b/fithesis3/test/fi-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=fi
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fsps-tables.tex b/fithesis3/test/fsps-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..b869b5447f6adb810a96ffac447642f5b96c58f8
--- /dev/null
+++ b/fithesis3/test/fsps-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=fsps
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fss-tables.tex b/fithesis3/test/fss-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..379feca72168c2db1a5b4c3bc0ab325372c640c7
--- /dev/null
+++ b/fithesis3/test/fss-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=fss
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/law-tables.tex b/fithesis3/test/law-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..e36c33c54cfc84526770d55d42908aa756656748
--- /dev/null
+++ b/fithesis3/test/law-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=law
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/med-tables.tex b/fithesis3/test/med-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..bf51d5fcec8e2a8c562cc5b42b2bc5d100ef5fc0
--- /dev/null
+++ b/fithesis3/test/med-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=med
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/ped-tables.tex b/fithesis3/test/ped-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..7ccc86dfac2f13f3a36de7daf02bf6de997e316e
--- /dev/null
+++ b/fithesis3/test/ped-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=ped
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/phil-tables.tex b/fithesis3/test/phil-tables.tex
new file mode 100644
index 0000000000000000000000000000000000000000..a1ab21fe46ab852ec3058dbeeff5f622235e1c26
--- /dev/null
+++ b/fithesis3/test/phil-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+  basepath=..,
+  faculty=phil
+}
+\begin{document}
+  \begin{thesis@tabular}{cc}
+    a&b\\c&d
+  \end{thesis@tabular}
+  \begin{thesis@tabularx}{\textwidth}{cc}
+    a&b\\c&d
+  \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/sci-czech.tex b/fithesis3/test/sci-czech.tex
new file mode 100644
index 0000000000000000000000000000000000000000..75f608beda74f85ddeec153354796bd895f9a662
--- /dev/null
+++ b/fithesis3/test/sci-czech.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[czech]{babel}
+\thesissetup{
+  basepath=..,
+  faculty=sci
+}
+\begin{document}
+  foo bar
+\end{document}
\ No newline at end of file
diff --git a/fithesis3/test/sci-english.tex b/fithesis3/test/sci-english.tex
new file mode 100644
index 0000000000000000000000000000000000000000..4b552acc38bd481deb5f7a8a840565a185f1a421
--- /dev/null
+++ b/fithesis3/test/sci-english.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[english]{babel}
+\thesissetup{
+  basepath=..,
+  faculty=sci
+}
+\begin{document}
+  foo bar
+\end{document}
\ No newline at end of file
diff --git a/fithesis3/test/sci-slovak.tex b/fithesis3/test/sci-slovak.tex
new file mode 100644
index 0000000000000000000000000000000000000000..708708ba21e8f973ba196db4679a2f85c6d2aaa7
--- /dev/null
+++ b/fithesis3/test/sci-slovak.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[slovak]{babel}
+\thesissetup{
+  basepath=..,
+  faculty=sci
+}
+\begin{document}
+  foo bar
+\end{document}
\ No newline at end of file