diff --git a/Makefile b/Makefile
index 399312080def05a19483c22dde51e58b4dc83d0d..52de958a1842da4849aa9a73f02e60c453625698 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-.PHONY: all clean clean-all install
+.PHONY: all explode clean clean-all install
 
+SUBMAKEFILES=logo/mu logo/mu/color locale
 CLASSFILES=fithesis.cls fithesis[23].cls
 STYLEFILES=style/*.sty style/*/*.sty style/*/*.clo
 AUXFILES=example.aux example.log example.out example.toc example.lot example.lof example.bib fithesis.aux fithesis.log fithesis.toc fithesis.ind fithesis.idx fithesis.out fithesis.ilg fithesis.gls fithesis.glo
@@ -11,17 +12,21 @@ INSTALLFILES=$(CLASSFILES) $(STYLEFILES) $(LOGOFILES) $(PDFFILES) $(SOURCEFILE)
 TEXLIVEFILES=$(CLASSFILES) $(STYLEFILES) $(LOGOFILES)
 
 # This pseudo-target creates the class files, typesets both
-# the example file and the technical documentation and
-# removes any auxiliary files.
-all: fithesis3.cls $(PDFFILES) clean
+# the example file and the technical documentation, makes
+# the style and locale files and removes any auxiliary files.
+all:
 	@if ! kpsewhich scrreprt.cls > /dev/null; then echo "The scrreprt document class isn't installed."; exit 1; fi
 	@if ! kpsewhich tex-gyre/qplr.pfb > /dev/null; then echo "The TeX Gyre Pagella font isn't installed."; exit 1; fi
-	cd logo/mu; make all
-	cd logo/mu/color; make all
+	for dir in $(SUBMAKEFILES); do make all -C "$$dir"; done
+	make explode clean
+
+# This pseudo-target creates the class files and typesets
+# both the example file and the technical documentation
+explode: fithesis3.cls $(PDFFILES)
 
 # This target creates the class files.
 fithesis3.cls: fithesis.ins fithesis.dtx
-	yes | tex $< # TODO: Remove the `yes`
+	tex $<
 
 # This target typesets the technical documentation.
 fithesis.pdf: fithesis.dtx
@@ -49,7 +54,7 @@ install:
 install-texlive:
 	@if [ -z "$(to)" ]; then echo "Usage: make to=DIRECTORY install-texlive"; exit 1; fi
 	mkdir --parents "$(to)/tex/latex/fithesis3"
-	cp --parents --verbose $(TEXLIVEFILES) "$(to)/texmf-local/tex/latex/fithesis2"
+	cp --parents --verbose $(TEXLIVEFILES) "$(to)/tex/latex/fithesis3"
 	mkdir --parents "$(to)/doc/latex/fithesis3"
 	cp fithesis.pdf "$(to)/doc/latex/fithesis3/manual.pdf"
 	texhash
@@ -59,5 +64,6 @@ clean:
 	rm -f $(AUXFILES)
 
 # This pseudo-target removes any makeable files.
-clean-all: clean
+implode: clean
 	rm -f $(PDFFILES) $(CLASSFILES)
+	for dir in $(SUBMAKEFILES); do make implode -C "$$dir"; done
diff --git a/example.pdf b/example.pdf
deleted file mode 100644
index 7fd2c7bc164e616d7997bfef294c764eec738832..0000000000000000000000000000000000000000
Binary files a/example.pdf and /dev/null differ
diff --git a/fithesis.cls b/fithesis.cls
deleted file mode 100644
index d47922c5ef78e193380efd1920c77008ace5aac8..0000000000000000000000000000000000000000
--- a/fithesis.cls
+++ /dev/null
@@ -1,66 +0,0 @@
-%%
-%% This is file `fithesis.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fithesis.dtx  (with options: `oldclass1')
-%% 
-%% 
-%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
-%% authors listed elsewhere in this file.
-%% 
-%% For further copyright information, and conditions for modification
-%% and distribution, see the file legal.txt, and any other copyright
-%% notices in this file.
-%% 
-%% This file is part of the LaTeX2e system.
-%% ----------------------------------------
-%%   This system is distributed in the hope that it will be useful,
-%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-%% 
-%% IMPORTANT COPYRIGHT NOTICE:
-%% 
-%% You are NOT ALLOWED to distribute this file alone.
-%% 
-%% If you receive only some of these files from someone, complain!
-%% 
-%% However, NO PERMISSION is granted to generate or to distribute a
-%% modified version of this file under its original name.
-%% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% 
-%% MODIFICATION ADVICE:
-%% 
-%% If you want to customize this file, it is best to make a copy of
-%% the source file(s) from which it was produced.  Use a different
-%% name for your copy(ies) and modify the copy(ies); this will ensure
-%% that your modifications do not get overwritten when you install a
-%% new release of the standard system.  You should also ensure that
-%% your modified source file does not generate any modified file with
-%% the same name as a standard file.
-%% 
-%% You will also need to produce your own, suitably named, .ins file to
-%% control the generation of files from your source file; this file
-%% should contain your own preambles for the files it generates, not
-%% those in the standard .ins files.
-%% 
-%% The names of the source files used are shown above.
-%% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{oldfithesis1}[2015/03/04 old fithesis will load fithesis3 MU thesis class]
-
-\errmessage{%
-  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>%
-}\LoadClass{fithesis3}
-
-\endinput
-%%
-%% End of file `fithesis.cls'.
diff --git a/fithesis.dtx b/fithesis.dtx
index 4ccf61733336bb7c631e86600bea3d76b77fa917..bffa4622664026dfa3c95991a775c932e7598795 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -56,7 +56,10 @@
 
 %</driver>
 %    \end{macrocode}
+%<*class>
+\NeedsTeXFormat{LaTeX2e}
 % \fi
+\def\thesis@version{2015/03/21 fithesis3 version 0.3.09 MU thesis class}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -132,7 +135,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \title{The \textsf{fithesis3} class for the typesetting of theses written
-%   at the Masaryk Univerzity in Brno}
+%   at the Masaryk Univerzity in Brno\thanks{The documentation
+%   concerns the \thesis@version.}}
 % \author{Daniel Marek, Jan PavloviÄŤ, VĂ­t NovotnĂ˝, Petr Sojka}
 % \date{\today}
 % \maketitle
@@ -170,11 +174,6 @@
 % also conditionally loaded during the expansion of the
 % |\thesis@load| macro (see section \ref{sec:thesis@load}).
 % Other packages may be required by the style files you are using.
-% \iffalse
-%<*class>
-\NeedsTeXFormat{LaTeX2e}
-% \fi
-\def\thesis@version{2015/03/21 fithesis3 version 0.3.09 MU thesis class}
 %    \begin{macrocode}
 \ProvidesClass{fithesis3}[\thesis@version]
 \LoadClass[a4paper]{rapport3}
@@ -588,8 +587,8 @@
 % The \marg{\texttt{autoLayout}=bool} pair either enables,
 % if \textit{bool} is \texttt{true} or unspecified, or disables
 % autolayout. Autolayout injects the
-% |\thesis@documentStart| and |\thesis@documentEnd| private macros
-% at the beginning and the end of the thesis, respectively. The
+% |\thesis@preamble| and |\thesis@postamble| private macros
+% at the beginning and the end of the document, respectively. The
 % setting can be tested using the \DescribeMacro{\ifthesis@auto}
 % |\ifthesis@auto| ... |\else| ... |\fi| conditional. The
 % autolayout is enabled by default.
@@ -604,13 +603,13 @@
     \thesis@autofalse%
   \fi}
 %    \end{macrocode}
-% The \DescribeMacro{\thesis@documentStart}|\thesis@documentStart|
-% and \DescribeMacro{\thesis@documentEnd}|\thesis@documentEnd|
+% The \DescribeMacro{\thesis@preamble}|\thesis@postamble|
+% and \DescribeMacro{\thesis@postamble}|\thesis@preamble|
 % private macros are defined as empty strings by default and are
 % subject to redefinition by the style files.
 %    \begin{macrocode}
-\def\thesis@documentStart{}
-\def\thesis@documentEnd{}
+\def\thesis@preamble{}
+\def\thesis@postamble{}
 %    \end{macrocode}
 % \section{Private API}
 % \subsection{Main routine}\label{sec:thesis@load}
@@ -708,13 +707,13 @@
       \thesis@exists{\thesis@stylepath\thesis@style.sty}{%
         \RequirePackageWithOptions{\thesis@stylepath\thesis@style}}%
 %    \end{macrocode}
-% If autolayout is enabled, the |\thesis@documentStart| and
-% |\thesis@documentEnd| macros are scheduled for expansion at the
-% beginning or the end of the document, respectively.
+% If autolayout is enabled, the |\thesis@preamble| and
+% |\thesis@postamble| macros are scheduled for expansion at the
+% beginning and at the end of the document, respectively.
 %    \begin{macrocode}
       \ifthesis@auto%
-        \AtBeginDocument{\thesis@documentStart}%
-        \AtEndDocument{\thesis@documentEnd}%
+        \AtBeginDocument{\thesis@preamble}%
+        \AtEndDocument{\thesis@postamble}%
       \fi%
 %    \end{macrocode}
 % Lastly, a \BibTeX\ file named |\jobname.bib| containing the
@@ -847,6 +846,66 @@
 %
 % \subsection{Locale files}
 % \label{sec:locale-files}
+% Locale files contain macro definitions for various locales. They
+% live in the \texttt{locale/} subtree and they are loaded during
+% the main routine (see section \ref{sec:thesis@load}). A locale
+% file needs to define the following private macros:\begin{itemize}
+%   \item\DescribeMacro{\thesis@placeholders@title}
+%                      |\thesis@placeholders@title| -- The
+%                      placeholder title of the thesis
+%   \item\DescribeMacro{\thesis@placeholders@keywords}
+%                      |\thesis@placeholders@keywords| -- The
+%                      placeholder keywords of the thesis
+%   \item\DescribeMacro{\thesis@placeholders@abstract}
+%                      |\thesis@placeholders@abstract| -- The
+%                      placeholder abstract of the thesis 
+%   \item\DescribeMacro{\thesis@placeholders@author}
+%                      |\thesis@placeholders@author| -- The
+%                      placeholder name of the thesis author
+%   \item\DescribeMacro{\thesis@universityName}
+%                      |\thesis@universityName| -- The name of the
+%                      university
+%   \item\DescribeMacro{\thesis@facultyName}
+%                      |\thesis@facultyName| -- The name of the
+%                      faculty
+%   \item\DescribeMacro{\thesis@placeholders@advisor}
+%                      |\thesis@placeholders@advisor| -- The
+%                      placeholder name of the advisor
+%   \item\DescribeMacro{\thesis@placeholders@department}
+%                      |\thesis@placeholders@department| -- The
+%                      placeholder department name
+%   \item\DescribeMacro{\thesis@placeholders@programme}
+%                      |\thesis@placeholders@programme| -- The
+%                      placeholder programme name
+%   \item\DescribeMacro{\thesis@placeholders@thanks}
+%                      |\thesis@placeholders@thanks| -- The
+%                      placeholder acknowledgement text
+%   \item\DescribeMacro{\thesis@declaration}
+%                      |\thesis@declaration| -- The declaration
+%                      text
+%   \item\DescribeMacro{\thesis@advisorTitle}
+%                      |\thesis@advisorTitle| -- The title of the
+%                      advisor
+%   \item\DescribeMacro{\thesis@abstractTitle}
+%                      |\thesis@abstractTitle| -- The title of the
+%                      abstract section
+%   \item\DescribeMacro{\thesis@keywordsTitle}
+%                      |\thesis@keywordsTitle| -- The title of the
+%                      keywords section
+%   \item\DescribeMacro{\thesis@thanksTitle}
+%                      |\thesis@thanksTitle| -- The title of the
+%                      acknowledgement section
+%   \item\DescribeMacro{\thesis@declarationTitle}
+%                      |\thesis@declarationTitle| -- The title of
+%                      the declaration section
+%   \item\DescribeMacro{\thesis@typeName}
+%                      |\thesis@typeName| -- The name of the
+%                      thesis type
+% \end{itemize}
+% ^^A \input{locale/base.dtx}
+% \input{locale/english.dtx}
+% \input{locale/czech.dtx}
+% \input{locale/slovak.dtx}
 %
 % \subsection{Style files}
 % \label{sec:style-files}
diff --git a/fithesis.ins b/fithesis.ins
index 41889287a5d19e1985cc41f24e6bae24f5052509..5f1099b34e30ac6238bd2590a7758a49ddb1e0f9 100644
--- a/fithesis.ins
+++ b/fithesis.ins
@@ -24,7 +24,6 @@
 %% 
 %% You are NOT ALLOWED to change this file.
 %% 
-\def\batchfile{fithesis.ins}
 \input docstrip.tex
 \preamble
 
@@ -72,25 +71,8 @@ those in the standard .ins files.
 The names of the source files used are shown above.
 
 \endpreamble
-
-\def\batchfile{fithesis.dst}  % ignored in distribution
-\input docstrip.tex           % ignored in distribution
-
-\keepsilent
-
-\Msg{*** Generating the files ***}
-
-\generateFile{fithesis.cls}{t}{\from{fithesis.dtx}{oldclass1}}
-\generateFile{fithesis2.cls}{t}{\from{fithesis.dtx}{oldclass2}}
-\generateFile{fithesis3.cls}{t}{\from{fithesis.dtx}{class}}
-
-
-\Msg{***********************************************************}
-\Msg{*}
-\Msg{* To finish the installation, use either the}
-\Msg{* `install` or `install-texive` make targets.}
-\Msg{*}
-\Msg{* Happy TeXing}
-\Msg{***********************************************************}
-
-\endinput
+\askforoverwritefalse
+\generate{\file{fithesis.cls}{\from{fithesis.dtx}{oldclass1}}
+          \file{fithesis2.cls}{\from{fithesis.dtx}{oldclass2}}
+          \file{fithesis3.cls}{\from{fithesis.dtx}{class}}}
+\endbatchfile
diff --git a/fithesis.pdf b/fithesis.pdf
deleted file mode 100644
index 773d52fc992590b02dd7119496427c93eb75d6e2..0000000000000000000000000000000000000000
Binary files a/fithesis.pdf and /dev/null differ
diff --git a/fithesis2.cls b/fithesis2.cls
deleted file mode 100644
index 0b30af81208a3514b0c66e480d2e0b1b6e98ed61..0000000000000000000000000000000000000000
--- a/fithesis2.cls
+++ /dev/null
@@ -1,66 +0,0 @@
-%%
-%% This is file `fithesis2.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fithesis.dtx  (with options: `oldclass2')
-%% 
-%% 
-%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
-%% authors listed elsewhere in this file.
-%% 
-%% For further copyright information, and conditions for modification
-%% and distribution, see the file legal.txt, and any other copyright
-%% notices in this file.
-%% 
-%% This file is part of the LaTeX2e system.
-%% ----------------------------------------
-%%   This system is distributed in the hope that it will be useful,
-%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-%% 
-%% IMPORTANT COPYRIGHT NOTICE:
-%% 
-%% You are NOT ALLOWED to distribute this file alone.
-%% 
-%% If you receive only some of these files from someone, complain!
-%% 
-%% However, NO PERMISSION is granted to generate or to distribute a
-%% modified version of this file under its original name.
-%% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% 
-%% MODIFICATION ADVICE:
-%% 
-%% If you want to customize this file, it is best to make a copy of
-%% the source file(s) from which it was produced.  Use a different
-%% name for your copy(ies) and modify the copy(ies); this will ensure
-%% that your modifications do not get overwritten when you install a
-%% new release of the standard system.  You should also ensure that
-%% your modified source file does not generate any modified file with
-%% the same name as a standard file.
-%% 
-%% You will also need to produce your own, suitably named, .ins file to
-%% control the generation of files from your source file; this file
-%% should contain your own preambles for the files it generates, not
-%% those in the standard .ins files.
-%% 
-%% The names of the source files used are shown above.
-%% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{oldfithesis2}[2015/03/04 old fithesis2 will load fithesis3 MU thesis class]
-
-\errmessage{%
-  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>%
-}\LoadClass{fithesis3}
-
-\endinput
-%%
-%% End of file `fithesis2.cls'.
diff --git a/fithesis3.cls b/fithesis3.cls
deleted file mode 100644
index 399ccb167f1af00705351f35a399304f7f41d863..0000000000000000000000000000000000000000
--- a/fithesis3.cls
+++ /dev/null
@@ -1,315 +0,0 @@
-%%
-%% This is file `fithesis3.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fithesis.dtx  (with options: `class')
-%% 
-%% 
-%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
-%% authors listed elsewhere in this file.
-%% 
-%% For further copyright information, and conditions for modification
-%% and distribution, see the file legal.txt, and any other copyright
-%% notices in this file.
-%% 
-%% This file is part of the LaTeX2e system.
-%% ----------------------------------------
-%%   This system is distributed in the hope that it will be useful,
-%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-%% 
-%% IMPORTANT COPYRIGHT NOTICE:
-%% 
-%% You are NOT ALLOWED to distribute this file alone.
-%% 
-%% If you receive only some of these files from someone, complain!
-%% 
-%% However, NO PERMISSION is granted to generate or to distribute a
-%% modified version of this file under its original name.
-%% 
-%% You are NOT ALLOWED to change this file.
-%% 
-%% 
-%% MODIFICATION ADVICE:
-%% 
-%% If you want to customize this file, it is best to make a copy of
-%% the source file(s) from which it was produced.  Use a different
-%% name for your copy(ies) and modify the copy(ies); this will ensure
-%% that your modifications do not get overwritten when you install a
-%% new release of the standard system.  You should also ensure that
-%% your modified source file does not generate any modified file with
-%% the same name as a standard file.
-%% 
-%% You will also need to produce your own, suitably named, .ins file to
-%% control the generation of files from your source file; this file
-%% should contain your own preambles for the files it generates, not
-%% those in the standard .ins files.
-%% 
-%% The names of the source files used are shown above.
-%% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\NeedsTeXFormat{LaTeX2e}
-\def\thesis@version{2015/03/21 fithesis3 version 0.3.09 MU thesis class}
-\ProvidesClass{fithesis3}[\thesis@version]
-\LoadClass[a4paper]{rapport3}
-\RequirePackage{xstring}
-\RequirePackage{keyval}
-\RequirePackage{newfile}
-\RequirePackage{etoolbox}
-\def\thesissetup#1{%
-  \setkeys{thesis}{#1}}
-\def\thesis@basepath{fithesis3/}
-\define@key{thesis}{basepath}{%
-  \ifx\@empty#1\@empty%
-    \def\thesis@basepath{}%
-  \else%
-    \def\thesis@basepath{#1/}%
-  \fi}
-\def\thesis@logopath{\thesis@basepath logo/\thesis@university/}
-\define@key{thesis}{logopath}{%
-  \def\thesis@logopath{\thesis@subdir{#1}}}
-
-\def\thesis@subdir#1{%
-  \ifx\@empty#1\@empty%
-    \thesis@basepath%
-  \else%
-    \def\@slash{/}%
-    \StrLeft{#1}{1}[\@fst]%
-    \ifx\@fst\@slash%
-      #1/%
-    \else%
-      \thesis@basepath#1/%
-    \fi%
-  \fi}
-\def\thesis@stylepath{\thesis@basepath  style/}
-\define@key{thesis}{stylepath}{%
-  \def\thesis@stylepath{\thesis@subdir{#1}}}
-\def\thesis@localepath{\thesis@basepath locale/}
-\define@key{thesis}{localepath}{%
-  \def\thesis@localepath{\thesis@subdir{#1}}}
-\newif\ifthesis@woman\thesis@womanfalse
-\define@key{thesis}{gender}{%
-  \def\thesis@male{m}%
-  \def\thesis@arg{#1}%
-  \ifx\thesis@male\thesis@arg%
-    \thesis@womanfalse%
-  \else%
-    \thesis@womantrue%
-  \fi}
-\def\thesis@author{\thesis@placeholders@author}
-\define@key{thesis}{author}{%
-  \def\thesis@author{#1}}
-\def\thesis@bachelors{bc}
-\def\thesis@masters{mgr}
-\def\thesis@doctoral{d}
-\def\thesis@rigorous{r}
-\let\thesis@type\thesis@bachelors
-\define@key{thesis}{type}{%
-  \def\thesis@type{#1}}
-\def\thesis@university{mu}
-\define@key{thesis}{university}{%
-  \def\thesis@university{#1}}
-  % whose implicit value is \texttt{fi}.
-\def\thesis@faculty{fi}
-\define@key{thesis}{faculty}{%
-  \def\thesis@faculty{#1}}
-\def\thesis@department{\thesis@placeholders@department}
-\define@key{thesis}{department}{%
-  \def\thesis@department{#1}}
-\def\thesis@programme{\thesis@placeholders@programme}
-\define@key{thesis}{programme}{%
-  \def\thesis@Programme{#1}}
-\def\thesis@logo{\thesis@faculty}
-\define@key{thesis}{logo}{%
-  \def\thesis@logo{#1}}
-\def\thesis@style{\thesis@university/\thesis@faculty}
-\define@key{thesis}{style}{%
-  \def\thesis@style{#1}}
-\newif\ifthesis@style@inheritance\thesis@style@inheritancetrue
-\define@key{thesis}{styleInheritance}[true]{%
-  \def\@true{true}%
-  \def\@arg{#1}%
-  \ifx\@true\@arg%
-    \thesis@style@inheritancetrue%
-  \else%
-    \thesis@style@inheritancefalse%
-  \fi}
-\def\thesis@locale{%
-  % Babel detection
-  \ifx\languagename\undefined%
-  czech\else\languagename\fi}
-\define@key{thesis}{locale}{%
-  \def\thesis@locale{#1}}
-\newif\ifthesis@locale@inheritance\thesis@locale@inheritancetrue
-\define@key{thesis}{localeInheritance}[true]{%
-  \def\@true{true}%
-  \def\@arg{#1}%
-  \ifx\@true\@arg%
-    \thesis@locale@inheritancetrue%
-  \else%
-    \thesis@locale@inheritancefalse%
-  \fi}
-\def\thesis@year{\the\year}
-\define@key{thesis}{year}{%
-  \def\thesis@year{#1}}
-\def\thesis@place{Brno}
-\define@key{thesis}{place}{%
-  \def\thesis@place{#1}}
-\def\thesis@title{\thesis@placeholders@title}
-\define@key{thesis}{title}{%
-  \def\thesis@title{#1}}
-\let\thesis@titleEn\undefined
-\define@key{thesis}{titleen}{%
-  \def\thesis@titleEn{#1}}
-\def\thesis@keywords{\thesis@placeholders@keywords}
-\define@key{thesis}{keywords}{%
-  \def\thesis@keywords{#1}}
-\let\thesis@keywordsEn\undefined
-\define@key{thesis}{keywordsEn}{%
-  \def\thesis@keywordsEn{#1}}
-\def\thesis@abstract{\thesis@placeholders@abstract}
-\define@key{thesis}{abstract}{%
-  \def\thesis@abstract{#1}}
-\let\thesis@abstractEn\undefined
-\define@key{thesis}{abstractEn}{%
-  \def\thesis@abstractEn{#1}}
-\def\thesis@advisor{\thesis@placeholders@advisor}
-\define@key{thesis}{advisor}{%
-  \def\thesis@advisor{#1}}
-\def\thesis@thanks{\thesis@placeholders@thanks}
-\define@key{thesis}{thanks}{%
-  \long\def\thesis@thanks{#1}}
-\newif\ifthesis@auto\thesis@autotrue
-\define@key{thesis}{autoLayout}[true]{%
-  \def\@true{true}%
-  \def\@arg{#1}%
-  \ifx\@true\@arg%
-    \thesis@autotrue%
-  \else%
-    \thesis@autofalse%
-  \fi}
-\def\thesis@documentStart{}
-\def\thesis@documentEnd{}
-\newif\ifthesis@loaded\thesis@loadedfalse
-\AtEndPreamble{\thesis@load}
-\def\thesis@load{%
-  \ifthesis@loaded\else%
-    \thesis@loadedtrue
-    \makeatletter%
-      \ifthesis@locale@inheritance
-        \input{\thesis@localepath base}
-      \fi
-      \thesis@input{\thesis@localepath\thesis@locale}%
-      \ifthesis@locale@inheritance
-        \thesis@input{\thesis@localepath\thesis@university/%
-          \thesis@locale}%
-        \thesis@input{\thesis@localepath\thesis@university/%
-          \thesis@faculty/\thesis@locale}%
-      \fi
-      \@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}
-      }%
-      \ifthesis@style@inheritance
-        \thesis@exists{\thesis@stylepath base.sty}{%
-          \RequirePackageWithOptions{\thesis@stylepath base}}%
-        \thesis@exists{\thesis@stylepath\thesis@university/%
-          base.sty}{\RequirePackageWithOptions{\thesis@stylepath%
-          \thesis@university/base}}%
-      \fi
-      \thesis@exists{\thesis@stylepath\thesis@style.sty}{%
-        \RequirePackageWithOptions{\thesis@stylepath\thesis@style}}%
-      \ifthesis@auto%
-        \AtBeginDocument{\thesis@documentStart}%
-        \AtEndDocument{\thesis@documentEnd}%
-      \fi%
-      \AtEndDocument{%
-        % Generate the BibTeX file
-        \newoutputstream{bib}%
-        \openoutputfile{\jobname.bib}{bib}%
-        \thesis@bibgen{bib}
-        \closeoutputstream{bib}}%
-    \makeatother%
-  \fi}
-\def\thesis@exists#1#2{%
-  \IfFileExists{#1}{#2}{%
-  \typeout{File #1 doesn't exist.}}}
-
-\def\thesis@input#1{%
-  \thesis@exists{#1}{\input{#1}}}
-{\catcode`\<=1
-\catcode`\>=2
-\catcode`\{=12
-\catcode`\}=12
-\catcode`\_=13
-\gdef\thesis@bibgen#1<<%
-  % Helper macros
-  \def\add<\addtostream<#1>>%
-  \let\ea\expandafter%
-  %% Find the last space-separated word
-  \def\tail##1<\xtail##1 \relax>%
-  \def\xtail##1 ##2<%
-    \ifx\relax##2%
-      ##1%
-      \ea\@gobbletwo%
-    \fi%
-    \xtail##2>%
-  %% Pre-cooked parts of the output
-  \edef\thesis@author@toks<\thesis@author>
-  \def\surname<\ea\tail\ea<\thesis@author@toks>>%
-  \edef\entryType<@\ifx\thesis@type\thesis@masters%
-      MastersThesis%
-    \else\ifx\thesis@type\thesis@doctoral%
-      PhdThesis%
-    \else%
-      misc%
-    \fi\fi>%
-  % 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",>%
-    \add<__TITLE______=_"\thesis@title",>%
-    \add<__YEAR_______=_"\thesis@year",>%
-    \add<__TYPE_______=_"\thesis@typeName",>%
-    \add<__SCHOOL_____=_"\thesis@universityName,
-      \thesis@facultyName",>%
-    \add<__SUPERVISOR_=_"\thesis@advisor",>%
-    \add<__PAGES______=_"\thepage">%
-    \add<}>
-  >>>%
->
-\def\thesis@lower#1{%
-  \edef\thesis@expanded{\csname thesis@#1\endcsname}%
-  \expandafter\lowercase\expandafter{\thesis@expanded}}
-\def\thesis@upper#1{%
-  \edef\thesis@expanded{\csname thesis@#1\endcsname}%
-  \expandafter\uppercase\expandafter{\thesis@expanded}}
-\endinput
-%%
-%% End of file `fithesis3.cls'.
diff --git a/locale/Makefile b/locale/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..acf86a6d6b8afae680658a7cb4e3e8c2d7f5df41
--- /dev/null
+++ b/locale/Makefile
@@ -0,0 +1,17 @@
+LOGS=czech.log slovak.log english.log
+DIRECTORIES=mu/law mu/fsps mu/fss mu/econ mu/med mu/fi mu/phil mu/ped mu/sci mu
+OUTPUT=czech.tex slovak.tex english.tex mu/czech.tex mu/law/czech.tex mu/law/slovak.tex mu/law/english.tex mu/fsps/czech.tex mu/fsps/slovak.tex mu/fsps/english.tex mu/slovak.tex mu/english.tex mu/fss/czech.tex mu/fss/slovak.tex mu/fss/english.tex mu/econ/czech.tex mu/econ/slovak.tex mu/econ/english.tex mu/med/czech.tex mu/med/slovak.tex mu/med/english.tex mu/fi/czech.tex mu/fi/slovak.tex mu/fi/english.tex mu/phil/czech.tex mu/phil/slovak.tex mu/phil/english.tex mu/ped/czech.tex mu/ped/slovak.tex mu/ped/english.tex mu/sci/czech.tex mu/sci/slovak.tex mu/sci/english.tex
+
+.PHONY: explode implode clean all
+all:
+	mkdir --parents $(DIRECTORIES)
+	make explode clean
+
+explode: $(LOGS)
+
+%.log: %.ins %.dtx
+	tex $<
+
+implode: clean
+	rm -f $(OUTPUT) $(LOGS)
+	@-rmdir $(DIRECTORIES)
diff --git a/locale/czech.tex b/locale/czech.dtx
similarity index 50%
rename from locale/czech.tex
rename to locale/czech.dtx
index 5d23a9f2aa56a21fb2e5e18362e9aa651fd09b3d..bc371d233932729aa18062259511b26c3163702e 100644
--- a/locale/czech.tex
+++ b/locale/czech.dtx
@@ -1,3 +1,5 @@
+%    \begin{macrocode}
+%<*base>
 % Pomocná makra
 \def\thesis@gender@koncovka{%
   \ifthesis@woman a\fi}
@@ -33,3 +35,42 @@
   \else%
     Neznámý typ práce%
   \fi\fi\fi\fi}
+%</base>
+%<*mu>
+\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.}
+%</mu>
+%<*mu/law>
+\def\thesis@facultyName{Právnická fakulta}
+%</mu/law>
+%<*mu/fsps>
+\def\thesis@facultyName{Fakulta sportovnĂ­ch studiĂ­}
+%</mu/fsps>
+%<*mu/fss>
+\def\thesis@facultyName{Fakulta sociálních studií}
+%</mu/fss>
+%<*mu/econ>
+\def\thesis@facultyName{Ekonomicko-správní fakulta}
+%</mu/econ>
+%<*mu/med>
+\def\thesis@facultyName{Lékařská fakulta}
+%</mu/med>
+%<*mu/fi>
+\def\thesis@facultyName{Fakulta informatiky}
+%</mu/fi>
+%<*mu/phil>
+\def\thesis@facultyName{Filozofická fakulta}
+%</mu/phil>
+%<*mu/ped>
+\def\thesis@facultyName{Pedagogická fakulta}
+%</mu/ped>
+%<*mu/sci>
+\def\thesis@facultyName{Přírodovědecká fakulta}
+%</mu/sci>
+%    \end{macrocode}
diff --git a/locale/czech.ins b/locale/czech.ins
new file mode 100644
index 0000000000000000000000000000000000000000..465cec86d6aae401417359ea334de019125fc6e6
--- /dev/null
+++ b/locale/czech.ins
@@ -0,0 +1,86 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+%% authors listed elsewhere in this file. 
+%% 
+%% This file is part of the LaTeX2e system.
+%% ----------------------------------------
+%%   This system is distributed in the hope that it will be useful,
+%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+%% 
+%% IMPORTANT COPYRIGHT NOTICE:
+%% 
+%% You are NOT ALLOWED to distribute this file alone.
+%% 
+%% If you receive only some of these files from someone, complain!
+%% 
+%% 
+%% No other permissions to distribute this file in any form are
+%% granted and in particular NO PERMISSION to modify its contents.
+%% 
+%% You are NOT ALLOWED to change this file.
+%% 
+\input docstrip.tex
+\preamble
+
+
+Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+authors listed elsewhere in this file. 
+
+For further copyright information, and conditions for modification
+and distribution, see the file legal.txt, and any other copyright
+notices in this file.
+
+This file is part of the LaTeX2e system.
+----------------------------------------
+  This system is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+IMPORTANT COPYRIGHT NOTICE:
+
+You are NOT ALLOWED to distribute this file alone.
+
+If you receive only some of these files from someone, complain!
+
+However, NO PERMISSION is granted to generate or to distribute a
+modified version of this file under its original name.
+ 
+You are NOT ALLOWED to change this file.
+
+
+MODIFICATION ADVICE:
+
+If you want to customize this file, it is best to make a copy of
+the source file(s) from which it was produced.  Use a different
+name for your copy(ies) and modify the copy(ies); this will ensure
+that your modifications do not get overwritten when you install a
+new release of the standard system.  You should also ensure that
+your modified source file does not generate any modified file with
+the same name as a standard file.
+
+You will also need to produce your own, suitably named, .ins file to
+control the generation of files from your source file; this file
+should contain your own preambles for the files it generates, not
+those in the standard .ins files.
+
+The names of the source files used are shown above.
+
+\endpreamble
+\askforoverwritefalse
+\generate{\file{czech.tex}{\from{czech.dtx}{base}}
+          \file{mu/czech.tex}{\from{czech.dtx}{mu}}
+          \file{mu/law/czech.tex}{\from{czech.dtx}{mu/law}}
+          \file{mu/fsps/czech.tex}{\from{czech.dtx}{mu/fsps}}
+          \file{mu/fss/czech.tex}{\from{czech.dtx}{mu/fss}}
+          \file{mu/econ/czech.tex}{\from{czech.dtx}{mu/econ}}
+          \file{mu/med/czech.tex}{\from{czech.dtx}{mu/med}}
+          \file{mu/fi/czech.tex}{\from{czech.dtx}{mu/fi}}
+          \file{mu/phil/czech.tex}{\from{czech.dtx}{mu/phil}}
+          \file{mu/ped/czech.tex}{\from{czech.dtx}{mu/ped}}
+          \file{mu/sci/czech.tex}{\from{czech.dtx}{mu/sci}}}
+\endbatchfile
diff --git a/locale/english.tex b/locale/english.dtx
similarity index 50%
rename from locale/english.tex
rename to locale/english.dtx
index 8357dc960fee61c63dfe722ad6eae90e899fbd5c..3dd8cf033e562e0bd0742f4e6db4bd77a650243e 100644
--- a/locale/english.tex
+++ b/locale/english.dtx
@@ -1,3 +1,5 @@
+%    \begin{macrocode}
+%<*base>
 % Placeholders
 \def\thesis@placeholders@title{Thesis Title}
 \def\thesis@placeholders@keywords{keyword1, keyword2, ...}
@@ -29,3 +31,40 @@
   \else%
     Unknown thesis type%
   \fi\fi\fi\fi}
+%</base>
+%<*mu>
+\def\thesis@universityName{Masaryk University}
+\def\thesis@declaration{%
+  Hereby I declare that this paper is my original authorial work, 
+  which I have worked out by my own. All sources, references and
+  literature used or excerpted during elaboration of this work are
+  properly cited and listed in complete reference to the due source.}
+%</mu>
+%<*mu/law>
+\def\thesis@facultyName{Faculty of Law}
+%</mu/law>
+%<*mu/fsps>
+\def\thesis@facultyName{Faculty of Sports Studies}
+%</mu/fsps>
+%<*mu/fss>
+\def\thesis@facultyName{Faculty of Social Studies}
+%</mu/fss>
+%<*mu/econ>
+\def\thesis@facultyName{Faculty of Economics and Administration}
+%</mu/econ>
+%<*mu/med>
+\def\thesis@facultyName{Faculty of Medicine}
+%</mu/med>
+%<*mu/fi>
+\def\thesis@facultyName{Faculty of Informatics}
+%</mu/fi>
+%<*mu/phil>
+\def\thesis@facultyName{Faculty of Arts}
+%</mu/phil>
+%<*mu/ped>
+\def\thesis@facultyName{Faculty of Education}
+%</mu/ped>
+%<*mu/sci>
+\def\thesis@facultyName{Faculty of Science}
+%</mu/sci>
+%    \end{macrocode}
diff --git a/locale/english.ins b/locale/english.ins
new file mode 100644
index 0000000000000000000000000000000000000000..d2a4ea38f1cd1bdfc52521d47e6d6fdb462c1f88
--- /dev/null
+++ b/locale/english.ins
@@ -0,0 +1,86 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+%% authors listed elsewhere in this file. 
+%% 
+%% This file is part of the LaTeX2e system.
+%% ----------------------------------------
+%%   This system is distributed in the hope that it will be useful,
+%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+%% 
+%% IMPORTANT COPYRIGHT NOTICE:
+%% 
+%% You are NOT ALLOWED to distribute this file alone.
+%% 
+%% If you receive only some of these files from someone, complain!
+%% 
+%% 
+%% No other permissions to distribute this file in any form are
+%% granted and in particular NO PERMISSION to modify its contents.
+%% 
+%% You are NOT ALLOWED to change this file.
+%% 
+\input docstrip.tex
+\preamble
+
+
+Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+authors listed elsewhere in this file. 
+
+For further copyright information, and conditions for modification
+and distribution, see the file legal.txt, and any other copyright
+notices in this file.
+
+This file is part of the LaTeX2e system.
+----------------------------------------
+  This system is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+IMPORTANT COPYRIGHT NOTICE:
+
+You are NOT ALLOWED to distribute this file alone.
+
+If you receive only some of these files from someone, complain!
+
+However, NO PERMISSION is granted to generate or to distribute a
+modified version of this file under its original name.
+ 
+You are NOT ALLOWED to change this file.
+
+
+MODIFICATION ADVICE:
+
+If you want to customize this file, it is best to make a copy of
+the source file(s) from which it was produced.  Use a different
+name for your copy(ies) and modify the copy(ies); this will ensure
+that your modifications do not get overwritten when you install a
+new release of the standard system.  You should also ensure that
+your modified source file does not generate any modified file with
+the same name as a standard file.
+
+You will also need to produce your own, suitably named, .ins file to
+control the generation of files from your source file; this file
+should contain your own preambles for the files it generates, not
+those in the standard .ins files.
+
+The names of the source files used are shown above.
+
+\endpreamble
+\askforoverwritefalse
+\generate{\file{english.tex}{\from{english.dtx}{base}}
+          \file{mu/english.tex}{\from{english.dtx}{mu}}
+          \file{mu/law/english.tex}{\from{english.dtx}{mu/law}}
+          \file{mu/fsps/english.tex}{\from{english.dtx}{mu/fsps}}
+          \file{mu/fss/english.tex}{\from{english.dtx}{mu/fss}}
+          \file{mu/econ/english.tex}{\from{english.dtx}{mu/econ}}
+          \file{mu/med/english.tex}{\from{english.dtx}{mu/med}}
+          \file{mu/fi/english.tex}{\from{english.dtx}{mu/fi}}
+          \file{mu/phil/english.tex}{\from{english.dtx}{mu/phil}}
+          \file{mu/ped/english.tex}{\from{english.dtx}{mu/ped}}
+          \file{mu/sci/english.tex}{\from{english.dtx}{mu/sci}}}
+\endbatchfile
diff --git a/locale/mu/czech.tex b/locale/mu/czech.tex
deleted file mode 100644
index 90eb2eea0a419bec68e3fc2ca071447745b49567..0000000000000000000000000000000000000000
--- a/locale/mu/czech.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\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.}
diff --git a/locale/mu/econ/czech.tex b/locale/mu/econ/czech.tex
deleted file mode 100644
index 9fec74b55ac43d750d09d852d69d9e13757b1a8d..0000000000000000000000000000000000000000
--- a/locale/mu/econ/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Ekonomicko-správní fakulta}
diff --git a/locale/mu/econ/english.tex b/locale/mu/econ/english.tex
deleted file mode 100644
index f1c89e483043ad2a620a767345781f4cdf1d8a7d..0000000000000000000000000000000000000000
--- a/locale/mu/econ/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Economics and Administration}
diff --git a/locale/mu/econ/slovak.tex b/locale/mu/econ/slovak.tex
deleted file mode 100644
index d8d13cc9fe6abb97a93f35acff6506ba336555ca..0000000000000000000000000000000000000000
--- a/locale/mu/econ/slovak.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Ekonomicko-správna fakulta}
diff --git a/locale/mu/english.tex b/locale/mu/english.tex
deleted file mode 100644
index cc5a55712f75c2742c6a9e38a5f00db2e5a9f6f6..0000000000000000000000000000000000000000
--- a/locale/mu/english.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\def\thesis@universityName{Masaryk University}
-\def\thesis@declaration{%
-  Hereby I declare that this paper is my original authorial work, 
-  which I have worked out by my own. All sources, references and
-  literature used or excerpted during elaboration of this work are
-  properly cited and listed in complete reference to the due source.}
diff --git a/locale/mu/fi/czech.tex b/locale/mu/fi/czech.tex
deleted file mode 100644
index 669411db2679941e6d0adf6128d8d3e86825f318..0000000000000000000000000000000000000000
--- a/locale/mu/fi/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Fakulta informatiky}
diff --git a/locale/mu/fi/english.tex b/locale/mu/fi/english.tex
deleted file mode 100644
index 30416d85c54bad610414b8238b85de26caac95b3..0000000000000000000000000000000000000000
--- a/locale/mu/fi/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Informatics}
diff --git a/locale/mu/fi/slovak.tex b/locale/mu/fi/slovak.tex
deleted file mode 100644
index 34c7587d43e5b6e74af1ad64f46c4bdc05ae086a..0000000000000000000000000000000000000000
--- a/locale/mu/fi/slovak.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath mu/fi/czech.tex}
diff --git a/locale/mu/fsps/czech.tex b/locale/mu/fsps/czech.tex
deleted file mode 100644
index 0cb5f947f6c1a92542e4548bbf62f1198f93cd32..0000000000000000000000000000000000000000
--- a/locale/mu/fsps/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Fakulta sportovnĂ­ch studiĂ­}
diff --git a/locale/mu/fsps/english.tex b/locale/mu/fsps/english.tex
deleted file mode 100644
index 1d9517e9eb17e396fc5041c9d487e802b6b053c2..0000000000000000000000000000000000000000
--- a/locale/mu/fsps/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Sports Studies}
diff --git a/locale/mu/fsps/slovak.tex b/locale/mu/fsps/slovak.tex
deleted file mode 100644
index e3c818e5567d93cea48256c4938b5523016bb2eb..0000000000000000000000000000000000000000
--- a/locale/mu/fsps/slovak.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Fakulta športových štúdií}
diff --git a/locale/mu/fss/czech.tex b/locale/mu/fss/czech.tex
deleted file mode 100644
index a6cf6bd03b7b7e080baff1709c12117c3b407244..0000000000000000000000000000000000000000
--- a/locale/mu/fss/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Fakulta sociálních studií}
diff --git a/locale/mu/fss/english.tex b/locale/mu/fss/english.tex
deleted file mode 100644
index 4b20fbc41b4acff57e74d1bf3c84d50bfdbba22e..0000000000000000000000000000000000000000
--- a/locale/mu/fss/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Social Studies}
diff --git a/locale/mu/fss/slovak.tex b/locale/mu/fss/slovak.tex
deleted file mode 100644
index dd9e09932c67bd56a0a4ded03487243410ba8252..0000000000000000000000000000000000000000
--- a/locale/mu/fss/slovak.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Fakulta sociálnych štúdií}
diff --git a/locale/mu/law/czech.tex b/locale/mu/law/czech.tex
deleted file mode 100644
index 495bd3b0d2806ff00801906fb430b0a069b6d9aa..0000000000000000000000000000000000000000
--- a/locale/mu/law/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Právnická fakulta}
diff --git a/locale/mu/law/english.tex b/locale/mu/law/english.tex
deleted file mode 100644
index a8d15061ce668766d6ae486e5b157f10f03a8bb4..0000000000000000000000000000000000000000
--- a/locale/mu/law/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Law}
diff --git a/locale/mu/law/slovak.tex b/locale/mu/law/slovak.tex
deleted file mode 100644
index b28f5bbc4c23900a1b7e8a37f13115b96d50d8ec..0000000000000000000000000000000000000000
--- a/locale/mu/law/slovak.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath mu/law/czech.tex}
diff --git a/locale/mu/med/czech.tex b/locale/mu/med/czech.tex
deleted file mode 100644
index 56f834d7a0abfe402f63211b4b8727ea97c1ffb6..0000000000000000000000000000000000000000
--- a/locale/mu/med/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Lékařská fakulta}
diff --git a/locale/mu/med/english.tex b/locale/mu/med/english.tex
deleted file mode 100644
index cddb4aff41f46e7a8bccaa8de2b341cc3c06fa1c..0000000000000000000000000000000000000000
--- a/locale/mu/med/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Medicine}
diff --git a/locale/mu/med/slovak.tex b/locale/mu/med/slovak.tex
deleted file mode 100644
index a7c93d2bebccbb207128f3762f500737f080fc04..0000000000000000000000000000000000000000
--- a/locale/mu/med/slovak.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Lekárska fakulta}
diff --git a/locale/mu/ped/czech.tex b/locale/mu/ped/czech.tex
deleted file mode 100644
index 3f5e6015dce594b3ffbc32dc367c7e1bc304cb27..0000000000000000000000000000000000000000
--- a/locale/mu/ped/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Pedagogická fakulta}
diff --git a/locale/mu/ped/english.tex b/locale/mu/ped/english.tex
deleted file mode 100644
index 41ba7c311095a25ccfd26c054f726bee8a343724..0000000000000000000000000000000000000000
--- a/locale/mu/ped/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Education}
diff --git a/locale/mu/ped/slovak.tex b/locale/mu/ped/slovak.tex
deleted file mode 100644
index ebd980f1795febaf71f7ec31b418aa30c63af6d2..0000000000000000000000000000000000000000
--- a/locale/mu/ped/slovak.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath mu/ped/czech.tex}
diff --git a/locale/mu/phil/czech.tex b/locale/mu/phil/czech.tex
deleted file mode 100644
index 090df13593460bbcdaaa968239332249af86a6a6..0000000000000000000000000000000000000000
--- a/locale/mu/phil/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Filozofická fakulta}
diff --git a/locale/mu/phil/english.tex b/locale/mu/phil/english.tex
deleted file mode 100644
index 8841bf1deadffb0fd31762e219d88bdd844c38e8..0000000000000000000000000000000000000000
--- a/locale/mu/phil/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Arts}
diff --git a/locale/mu/phil/slovak.tex b/locale/mu/phil/slovak.tex
deleted file mode 100644
index c2eaf5a41f75f54c10df3355eed8799d7745c153..0000000000000000000000000000000000000000
--- a/locale/mu/phil/slovak.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath mu/phil/czech.tex}
diff --git a/locale/mu/sci/czech.tex b/locale/mu/sci/czech.tex
deleted file mode 100644
index 95059b6b28cb095f0eea1b7ec2c1ffc457d7f13f..0000000000000000000000000000000000000000
--- a/locale/mu/sci/czech.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Přírodovědecká fakulta}
diff --git a/locale/mu/sci/english.tex b/locale/mu/sci/english.tex
deleted file mode 100644
index f59f20ef4db0b4b465bbadd58189f17adf388d30..0000000000000000000000000000000000000000
--- a/locale/mu/sci/english.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Faculty of Science}
diff --git a/locale/mu/sci/slovak.tex b/locale/mu/sci/slovak.tex
deleted file mode 100644
index 35564b5a001fbe81deb7c68f00e7adc3083183f1..0000000000000000000000000000000000000000
--- a/locale/mu/sci/slovak.tex
+++ /dev/null
@@ -1 +0,0 @@
-\def\thesis@facultyName{Prírodovedecká fakulta}
diff --git a/locale/mu/slovak.tex b/locale/mu/slovak.tex
deleted file mode 100644
index fc624eb86c7f458b4928d532600085bb74f2585c..0000000000000000000000000000000000000000
--- a/locale/mu/slovak.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath mu/czech.tex}
-
-\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.}
diff --git a/locale/slovak.dtx b/locale/slovak.dtx
new file mode 100644
index 0000000000000000000000000000000000000000..73b4d55b338ecf5a09dba5dabae475808613e5b2
--- /dev/null
+++ b/locale/slovak.dtx
@@ -0,0 +1,85 @@
+%    \begin{macrocode}
+%<*base>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath czech.tex}
+
+% Pomocná makrá
+\def\thesis@gender@koncovka{%
+  \ifthesis@woman a\fi}
+
+% Zástupné texty
+\def\thesis@placeholders@title{Názov práce}
+\def\thesis@placeholders@keywords{kľúčové slovo 1, kľúčové slovo 2, ...}
+\def\thesis@placeholders@abstract{Text zhrnutie}
+\def\thesis@placeholders@author{Meno autora}
+\def\thesis@universityName{Názov univerzity}
+\def\thesis@facultyName{Názov fakulty}
+\def\thesis@placeholders@advisor{Meno vedoucĂ­ho}
+\def\thesis@placeholders@department{Názov katedry}
+\def\thesis@placeholders@programme{Názov študijného programu}
+\def\thesis@placeholders@thanks{Text poÄŹakovanie ...}
+\def\thesis@declaration{Text prehlásenie ...}
+
+% RĂ´zne
+\def\thesis@advisorTitle{Vedúci práce}
+\def\thesis@abstractTitle{Zhrnutie}
+\def\thesis@keywordsTitle{Kľúčové slová}
+\def\thesis@thanksTitle{PoÄŹakovanie}
+\def\thesis@declarationTitle{Prehlásenie}
+\def\thesis@typeName{%
+  \ifx\thesis@type\thesis@bachelors%
+    Bakalárska práca%
+  \else\ifx\thesis@type\thesis@masters%
+    Diplomová práca%
+  \else\ifx\thesis@type\thesis@doctoral%
+    Dizertačná práca%
+  \else\ifx\thesis@type\thesis@rigorous%
+    Rigorózna práca%
+  \else%
+    Neznámy typ práce%
+  \fi\fi\fi\fi}
+%</base>
+%<*mu>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath mu/czech.tex}
+
+\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.}
+%</mu>
+%<*mu/law>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath mu/law/czech.tex}
+%</mu/law>
+%<*mu/fsps>
+\def\thesis@facultyName{Fakulta športových štúdií}
+%</mu/fsps>
+%<*mu/fss>
+\def\thesis@facultyName{Fakulta sociálnych štúdií}
+%</mu/fss>
+%<*mu/econ>
+\def\thesis@facultyName{Ekonomicko-správna fakulta}
+%</mu/econ>
+%<*mu/med>
+\def\thesis@facultyName{Lekárska fakulta}
+%</mu/med>
+%<*mu/fi>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath mu/fi/czech.tex}
+%</mu/fi>
+%<*mu/phil>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath mu/phil/czech.tex}
+%</mu/phil>
+%<*mu/ped>
+% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
+\input{\thesis@localepath mu/ped/czech.tex}
+%</mu/ped>
+%<*mu/sci>
+\def\thesis@facultyName{Prírodovedecká fakulta}
+%</mu/sci>
+%    \end{macrocode}
diff --git a/locale/slovak.ins b/locale/slovak.ins
new file mode 100644
index 0000000000000000000000000000000000000000..ce32a8a89fe0c7c85d322f1f2d4fab03ed320eb5
--- /dev/null
+++ b/locale/slovak.ins
@@ -0,0 +1,86 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+%% authors listed elsewhere in this file. 
+%% 
+%% This file is part of the LaTeX2e system.
+%% ----------------------------------------
+%%   This system is distributed in the hope that it will be useful,
+%%   but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+%% 
+%% IMPORTANT COPYRIGHT NOTICE:
+%% 
+%% You are NOT ALLOWED to distribute this file alone.
+%% 
+%% If you receive only some of these files from someone, complain!
+%% 
+%% 
+%% No other permissions to distribute this file in any form are
+%% granted and in particular NO PERMISSION to modify its contents.
+%% 
+%% You are NOT ALLOWED to change this file.
+%% 
+\input docstrip.tex
+\preamble
+
+
+Copyright 1993 1994 1995 The LaTeX3 Project and any individual
+authors listed elsewhere in this file. 
+
+For further copyright information, and conditions for modification
+and distribution, see the file legal.txt, and any other copyright
+notices in this file.
+
+This file is part of the LaTeX2e system.
+----------------------------------------
+  This system is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+IMPORTANT COPYRIGHT NOTICE:
+
+You are NOT ALLOWED to distribute this file alone.
+
+If you receive only some of these files from someone, complain!
+
+However, NO PERMISSION is granted to generate or to distribute a
+modified version of this file under its original name.
+ 
+You are NOT ALLOWED to change this file.
+
+
+MODIFICATION ADVICE:
+
+If you want to customize this file, it is best to make a copy of
+the source file(s) from which it was produced.  Use a different
+name for your copy(ies) and modify the copy(ies); this will ensure
+that your modifications do not get overwritten when you install a
+new release of the standard system.  You should also ensure that
+your modified source file does not generate any modified file with
+the same name as a standard file.
+
+You will also need to produce your own, suitably named, .ins file to
+control the generation of files from your source file; this file
+should contain your own preambles for the files it generates, not
+those in the standard .ins files.
+
+The names of the source files used are shown above.
+
+\endpreamble
+\askforoverwritefalse
+\generate{\file{slovak.tex}{\from{slovak.dtx}{base}}
+          \file{mu/slovak.tex}{\from{slovak.dtx}{mu}}
+          \file{mu/law/slovak.tex}{\from{slovak.dtx}{mu/law}}
+          \file{mu/fsps/slovak.tex}{\from{slovak.dtx}{mu/fsps}}
+          \file{mu/fss/slovak.tex}{\from{slovak.dtx}{mu/fss}}
+          \file{mu/econ/slovak.tex}{\from{slovak.dtx}{mu/econ}}
+          \file{mu/med/slovak.tex}{\from{slovak.dtx}{mu/med}}
+          \file{mu/fi/slovak.tex}{\from{slovak.dtx}{mu/fi}}
+          \file{mu/phil/slovak.tex}{\from{slovak.dtx}{mu/phil}}
+          \file{mu/ped/slovak.tex}{\from{slovak.dtx}{mu/ped}}
+          \file{mu/sci/slovak.tex}{\from{slovak.dtx}{mu/sci}}}
+\endbatchfile
diff --git a/locale/slovak.tex b/locale/slovak.tex
deleted file mode 100644
index dc6a2a93174c4cbbde270ed482184657bd83ce99..0000000000000000000000000000000000000000
--- a/locale/slovak.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
-\input{\thesis@localepath czech.tex}
-
-% Pomocná makrá
-\def\thesis@gender@koncovka{%
-  \ifthesis@woman a\fi}
-
-% Zástupné texty
-\def\thesis@placeholders@title{Názov práce}
-\def\thesis@placeholders@keywords{kľúčové slovo 1, kľúčové slovo 2, ...}
-\def\thesis@placeholders@abstract{Text zhrnutie}
-\def\thesis@placeholders@author{Meno autora}
-\def\thesis@universityName{Názov univerzity}
-\def\thesis@facultyName{Názov fakulty}
-\def\thesis@placeholders@advisor{Meno vedoucĂ­ho}
-\def\thesis@placeholders@department{Názov katedry}
-\def\thesis@placeholders@programme{Názov študijného programu}
-\def\thesis@placeholders@thanks{Text poÄŹakovanie ...}
-\def\thesis@declaration{Text prehlásenie ...}
-
-% RĂ´zne
-\def\thesis@advisorTitle{Vedúci práce}
-\def\thesis@abstractTitle{Zhrnutie}
-\def\thesis@keywordsTitle{Kľúčové slová}
-\def\thesis@thanksTitle{PoÄŹakovanie}
-\def\thesis@declarationTitle{Prehlásenie}
-\def\thesis@typeName{%
-  \ifx\thesis@type\thesis@bachelors%
-    Bakalárska práca%
-  \else\ifx\thesis@type\thesis@masters%
-    Diplomová práca%
-  \else\ifx\thesis@type\thesis@doctoral%
-    Dizertačná práca%
-  \else\ifx\thesis@type\thesis@rigorous%
-    Rigorózna práca%
-  \else%
-    Neznámy typ práce%
-  \fi\fi\fi\fi}
diff --git a/logo/mu/Makefile b/logo/mu/Makefile
index 0be5a6575d35bd7000e8171bc9f7efebbe96da07..49ab4be9887badf783c377349f76ada109495599 100644
--- a/logo/mu/Makefile
+++ b/logo/mu/Makefile
@@ -1,6 +1,10 @@
-.PHONY: all
+PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+.PHONY: all implode
 
-all: econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+all: $(PDFFILES)
 
 %.pdf: %.eps
 	epstopdf $<
+
+implode:
+	rm -f $(PDFFILES)
\ No newline at end of file
diff --git a/logo/mu/color/Makefile b/logo/mu/color/Makefile
index 0be5a6575d35bd7000e8171bc9f7efebbe96da07..49ab4be9887badf783c377349f76ada109495599 100644
--- a/logo/mu/color/Makefile
+++ b/logo/mu/color/Makefile
@@ -1,6 +1,10 @@
-.PHONY: all
+PDFFILES=econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+.PHONY: all implode
 
-all: econ.pdf fsps.pdf law.pdf med.pdf ped.pdf phil.pdf sci.pdf fi.pdf fss.pdf
+all: $(PDFFILES)
 
 %.pdf: %.eps
 	epstopdf $<
+
+implode:
+	rm -f $(PDFFILES)
\ No newline at end of file
diff --git a/logo/mu/color/econ.pdf b/logo/mu/color/econ.pdf
deleted file mode 100644
index a7b10ecc24728e998e9c8ef920d97d370cd0c03b..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/econ.pdf and /dev/null differ
diff --git a/logo/mu/color/fi.pdf b/logo/mu/color/fi.pdf
deleted file mode 100644
index 6e72c9cf81a85f6898689999a3e4742ddffa1247..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/fi.pdf and /dev/null differ
diff --git a/logo/mu/color/fsps.pdf b/logo/mu/color/fsps.pdf
deleted file mode 100644
index 923b0cd41bfd7ee10ab6d13432805c8d0a2f667b..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/fsps.pdf and /dev/null differ
diff --git a/logo/mu/color/fss.pdf b/logo/mu/color/fss.pdf
deleted file mode 100644
index b252d1132e1c133cdfdc6b3f11c7a25cf63e8b4c..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/fss.pdf and /dev/null differ
diff --git a/logo/mu/color/law.pdf b/logo/mu/color/law.pdf
deleted file mode 100644
index 30a8e290312f0d9cf7090f68b6eb7dcc8e023c6e..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/law.pdf and /dev/null differ
diff --git a/logo/mu/color/med.pdf b/logo/mu/color/med.pdf
deleted file mode 100644
index 926207ded5e8abef0a141582e6b447d8e505269c..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/med.pdf and /dev/null differ
diff --git a/logo/mu/color/ped.pdf b/logo/mu/color/ped.pdf
deleted file mode 100644
index f0becaad48b25ffff813e32178b594f5dc286dd6..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/ped.pdf and /dev/null differ
diff --git a/logo/mu/color/phil.pdf b/logo/mu/color/phil.pdf
deleted file mode 100644
index 18fde6eff4a330387917e8a33f199a59ea803d48..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/phil.pdf and /dev/null differ
diff --git a/logo/mu/color/sci.pdf b/logo/mu/color/sci.pdf
deleted file mode 100644
index 6329e7bade5c00998a8dbc8b85e19de297469eb7..0000000000000000000000000000000000000000
Binary files a/logo/mu/color/sci.pdf and /dev/null differ
diff --git a/logo/mu/econ.pdf b/logo/mu/econ.pdf
deleted file mode 100644
index db171a43c2aa2789f43f3abcc089a0d5ff21cfc4..0000000000000000000000000000000000000000
Binary files a/logo/mu/econ.pdf and /dev/null differ
diff --git a/logo/mu/fi.pdf b/logo/mu/fi.pdf
deleted file mode 100644
index 3e9ca58540eb980eafde5a3fbd0bc2200683cdf3..0000000000000000000000000000000000000000
Binary files a/logo/mu/fi.pdf and /dev/null differ
diff --git a/logo/mu/fsps.pdf b/logo/mu/fsps.pdf
deleted file mode 100644
index c70095f17e1adb55a6537a3a247a3cc51517ff95..0000000000000000000000000000000000000000
Binary files a/logo/mu/fsps.pdf and /dev/null differ
diff --git a/logo/mu/fss.pdf b/logo/mu/fss.pdf
deleted file mode 100644
index 9b2fd900876687369387e3dc07dfc6ebc439a645..0000000000000000000000000000000000000000
Binary files a/logo/mu/fss.pdf and /dev/null differ
diff --git a/logo/mu/law.pdf b/logo/mu/law.pdf
deleted file mode 100644
index 5dcc12fc68ce104bc886ea9568857268d422d165..0000000000000000000000000000000000000000
Binary files a/logo/mu/law.pdf and /dev/null differ
diff --git a/logo/mu/med.pdf b/logo/mu/med.pdf
deleted file mode 100644
index 2563d4ff049ed5fc37aa9f9b110254ec65cccc5f..0000000000000000000000000000000000000000
Binary files a/logo/mu/med.pdf and /dev/null differ
diff --git a/logo/mu/ped.pdf b/logo/mu/ped.pdf
deleted file mode 100644
index f76870593e2128ff4d2d05f78104a676e7f432ee..0000000000000000000000000000000000000000
Binary files a/logo/mu/ped.pdf and /dev/null differ
diff --git a/logo/mu/phil.pdf b/logo/mu/phil.pdf
deleted file mode 100644
index 2f5902195d2c620f0fe299b02ad980e851078543..0000000000000000000000000000000000000000
Binary files a/logo/mu/phil.pdf and /dev/null differ
diff --git a/logo/mu/sci.pdf b/logo/mu/sci.pdf
deleted file mode 100644
index ac47615b786548369425988836ff647245b2c87b..0000000000000000000000000000000000000000
Binary files a/logo/mu/sci.pdf and /dev/null differ
diff --git a/style/mu/fi.sty b/style/mu/fi.sty
index c4acccc2fd6df003dd0fac13f9eb03e8996eb124..e0564c5d42a85d4f9df7ae59490f6f98a976c0cc 100644
--- a/style/mu/fi.sty
+++ b/style/mu/fi.sty
@@ -8,7 +8,7 @@
 \ProcessOptions
 
 % Autolayout definition
-\def\thesis@documentStart{%
+\def\thesis@preamble{%
   \thesis@blocks@frontMatter%
     \thesis@blocks@cover%
     \thesis@blocks@titlePage%