diff --git a/.gitignore b/.gitignore
index 1621fcbe7ef3dfb815734d52d8be4c8dec129a80..57e2296c2a404c92a6cc1330e717ee3af307af5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ fithesis.dtx
 *.out
 *.idx
 *.toc
+test.sh
diff --git a/Makefile b/Makefile
index 4f76fa2786a1d0a239866bb8ec19903b31a72394..696dbff1b46d8de0f30584078850db88f7b1e5be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,27 @@
 .PHONY: all clean clean-all
 
-all: fithesis2.cls fithesis.pdf example.pdf clean
+all: fithesis3.cls fithesis.pdf example.pdf clean
 	cd loga && make all
 
 fithesis.dtx: fithesis.raw.dtx
 	./fithesis.raw.sh $< $@
 
-fithesis2.cls: fithesis.ins fithesis.dtx
+fithesis3.cls: fithesis.ins fithesis.dtx
 	yes | tex $<
 
 fithesis.pdf: fithesis.dtx
 	pdflatex $<
+	makeindex fithesis
+	pdflatex $<
 
-example.pdf: example.tex fithesis2.cls
+example.pdf: example.tex fithesis3.cls
 	pdflatex $<
 	pdflatex $<
 
 clean:
-	rm -f example.aux example.log example.out example.toc
-	rm -f fithesis.toc fithesis.aux fithesis.idx fithesis.log
+	rm -f example.aux example.log example.out example.toc example.lot example.lof
+	rm -f fithesis.aux fithesis.log fithesis.toc fithesis.ind fithesis.idx fithesis.out fithesis.ilg
 
 clean-all: clean
 	rm -f example.pdf
-	rm -f fit1[012].clo fithesis2.cls fithesis.dtx fithesis.pdf
+	rm -f fit1[012].clo fithesis3.cls fithesis.dtx fithesis.pdf
diff --git a/example.pdf b/example.pdf
index 16cd67cb1fa65fcde41179294dad082d0334f8f4..b3bf49b49b771993722f16a86ed6760e688ef4db 100644
Binary files a/example.pdf and b/example.pdf differ
diff --git a/example.tex b/example.tex
index e07ca87f57f648c7ddb49bfe013b624b33f6023d..fc8a29177a6c29e0a8a878652881aed9a52ad94a 100644
--- a/example.tex
+++ b/example.tex
@@ -3,6 +3,7 @@
 \usepackage[utf8]{inputenc}       % UTF-8 encoding
 \usepackage[T1]{fontenc}          % T1 font encoding
 \usepackage{blindtext}            % Lorem ipsum generator
+\usepackage[toc,page]{appendix}   % Appendices
 
 \thesislang{en}                   % The language of the thesis
 \thesistitle{Sample thesis}       % The title of the thesis
@@ -30,19 +31,21 @@
       keyword1, keyword2\,\dots
     \end{ThesisKeyWords}
     \tableofcontents                % The table of contents
-%   \listoftables                   % The list of tables (optional)
-%   \listoffigures                  % The list of figures (optional)
   
   \MainMatter                     % The main matter
     \chapter{Introduction}          % Chapters
     \Blindtext
     \chapter{Another chapter}
     \Blindtext
-    \appendix
-    \chapter{First appendix}        % Appendices
+                                    % Bibliography
+    \listoftables                   % The list of tables (optional)
+    \listoffigures                  % The list of figures (optional)
+                                    % Index (optional)
+
+  \begin{appendices}              % Appendices
+    \chapter{First appendix}
     \Blindtext
     \chapter{Another appendix}
     \Blindtext
-    % Bibliography goes here
-    % Index goes here (optional)
-\end{document}
+  \end{appendices}
+\end{document} 
diff --git a/fit10.clo b/fit10.clo
index 495f41b1df6ad547bded987095f620598cf237f7..51354bf68387bfeb202ce55254094ebda588c64f 100644
--- a/fit10.clo
+++ b/fit10.clo
@@ -49,7 +49,7 @@
 %% 
 %% The names of the source files used are shown above.
 %% 
-\ProvidesFile{fit10.clo}[2015/01/13 fithesis3 (size option)]
+\ProvidesFile{fit10.clo}[2015/01/14 fithesis3 (size option)]
 
 \renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont%
 \abovedisplayskip 10\p@ plus2\p@ minus5\p@
diff --git a/fit11.clo b/fit11.clo
index b3f3d5f7f2aa4b6eedda9c3fdd3fdb194ab1b568..ce9ebceef66949b36c3e31c026c6be39123985e9 100644
--- a/fit11.clo
+++ b/fit11.clo
@@ -49,7 +49,7 @@
 %% 
 %% The names of the source files used are shown above.
 %% 
-\ProvidesFile{fit11.clo}[2015/01/13 fithesis3 (size option)]
+\ProvidesFile{fit11.clo}[2015/01/14 fithesis3 (size option)]
 
 \renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont%
 \abovedisplayskip 11\p@ plus3\p@ minus6\p@
diff --git a/fit12.clo b/fit12.clo
index f943c711b97b1aab9d7dbccaec8ac9d3cbe5a8cf..763f7472ffc651aad31473f541727b5a8b822d5d 100644
--- a/fit12.clo
+++ b/fit12.clo
@@ -49,7 +49,7 @@
 %% 
 %% The names of the source files used are shown above.
 %% 
-\ProvidesFile{fit12.clo}[2015/01/13 fithesis3 (size option)]
+\ProvidesFile{fit12.clo}[2015/01/14 fithesis3 (size option)]
 
 \renewcommand{\normalsize}{\fontsize\@xiipt{14.5}\selectfont%
 \abovedisplayskip 12\p@ plus3\p@ minus7\p@
diff --git a/fithesis.pdf b/fithesis.pdf
index 145277b6f381c6abf32c4d541495df32db2a183e..7305d8ae06744fb6481439194cedb2f184c41644 100644
Binary files a/fithesis.pdf and b/fithesis.pdf differ
diff --git a/fithesis.raw.dtx b/fithesis.raw.dtx
index c37ad1c57a150d2dcbd1dab345f1449fb161cafc..11b36e06b77f42dd1e56089b749a3713eba2238a 100644
--- a/fithesis.raw.dtx
+++ b/fithesis.raw.dtx
@@ -19,7 +19,17 @@
 % and the derived files fithesis3.cls, fit10.clo, fit11.clo, fit12.clo.
 %
 % History:
-% 2015/01/13 v0.3.2 pdf metadata stamping added for \thesistitle and \thesisstudent [VN]
+% 2015/01/14 v0.3.4 Import the url package to allow for the use of
+%                   \url{} within the documentation. (backport of v0.2.15) [VN]
+% 2015/01/14 v0.3.3 Small fixes (added \relax at \MainMatter),
+%                   generating both fithesis.cls (obsolete, loading
+%                   fithesis2.cls) and fithesis2.cls, minor doc edits,
+%                   version numbering of .clo fixed, switch to utf8
+%                   and ensuring that .dtx compiles. Documentation
+%                   adjusted to the current status quo, added link
+%                   to discussion forum (backport of v0.2.14) [PS]
+% 2015/01/13 v0.3.2 pdf metadata stamping added for \thesistitle
+%                   and \thesisstudent [VN]
 % 2015/01/09 v0.3.1 documentation now uses babel and cmap packages [VN]
 %                   the entire file was transcoded into utf8 [VN]
 %                   \thesiscolor was replaced by color class option [VN]
@@ -33,7 +43,7 @@
 % 2006/05/08 v0.2.9 add EN version of University name [JP]
 % 2006/01/20 v0.2.8 add change of University name [JP]
 % 2005/05/10 v0.2.7 escape all czech letters [JP]
-%                   babel is used insted of stupid package czech [JP]
+%                   babel is used instead of stupid package czech [JP]
 %                   \MainMatter should be placed after \tablesofcontents [PS]
 % 2004/12/22 v0.2.6 fix : behind Advisor [JP]
 % 2004/05/13 v0.2.5 add english abstract [JP]
@@ -57,8 +67,8 @@
 % 1998 - bachelor project of Daniel Marek under supervision of Petr Sojka
 %
 % TODO:
-% - commented source
-% - index dodělat
+% - commented source, in english
+% - index support
 % - adding reference to docbook
 %
 %    \begin{macrocode}
@@ -66,12 +76,16 @@
 \documentclass{ltxdoc}
 \makeindex
 \usepackage{makeidx}
-\usepackage[resetfonts]{cmap}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc} % this file uses UTF-8
 \usepackage[czech]{babel}
+\usepackage{tgpagella}
+\usepackage[resetfonts]{cmap}
+\usepackage[T1]{fontenc} % use 8bit fonts
 \usepackage{csquot,mflogo}
+\usepackage{url}
+\usepackage{hyperref}
 \EnableCrossrefs
+\emergencystretch 2dd
 \begin{document}
 \DocInput{fithesis.dtx}
 \end{document}
@@ -81,24 +95,23 @@
 %
 % \newcommand{\bs}{\char`\\}
 % \newcommand{\prikaz}[1]{\texttt{\bs #1}\index{#1@\texttt{\bs#1}}}
-% \newcommand{\fit}{\textsf{fithesis}}
+% \newcommand{\fit}{\textsf{fithesis3}}
 % \newcommand{\itm}[1]{\noindent{\bf #1}} 
-% \title{Sada maker \fit\ pro sazbu\\ diplomové a bakalářské práce}
+% \title{Sada maker \fit\ pro sazbu závěrečných prací MU}
 % \author{Daniel Marek, Jan PavloviÄŤ, VĂ­t NovotnĂ˝, Petr Sojka}
 % \date{\today}
 % \maketitle
 %
 % \begin{abstract}
 % \noindent 
-% Tento text popisuje instalaci a pouĹľitĂ­ sady maker
-% pro sazbu diplomové a bakalářské práce na Fakultě informatiky 
-% Masarykovy univerzity v~systému \LaTeX. Uživateli 
-% umoĹľnĂ­ jednotnÄ›
-% vysadit všechny potřebné povinné i nepovinné části stanovené
-% v~pokynech pro vypracování diplomové a bakalářské práce 
-% na FI~MU. Jeho pouĹľitĂ­ v\'v{s}ak automaticky \emph{nezaruÄŤuje}
+% Tento text popisuje instalaci a použití sady \LaTeX ových maker
+% pro sazbu diplomové či bakalářské práce na fakultách
+% Masarykovy univerzity. UĹľivateli umoĹľnĂ­ jednotnÄ›
+% vysadit všechny potřebné povinné i nepovinné části
+% stanovené v~pokynech pro vypracování závěrečných prací 
+% na MU. Jeho použití však automaticky \emph{nezaručuje}
 % typografickou správnost, je třeba ho případně použít jako
-% pom\r{u}cku.
+% pomĹŻcku.
 % \end{abstract}
 %
 % \tableofcontents
@@ -107,16 +120,31 @@
 % K~samotné instalaci stylu jsou potřeba alespoň dva soubory:
 % standardnĂ­ instalaÄŤnĂ­ soubory \LaTeX u 
 % \texttt{fithesis.dtx} a \texttt{fithesis.ins}.
-% Protože je v~makrech používáno písmo Palatino, logo
+% Protože je v~makrech používáno písmo Palatino
+% (verze z balĂ­ku TeX Gyre), logo
 % Fakulty informatiky a samotná sazba diplomové a bakalářské práce je
 % založena na stylu {\sf scrreprt}, je třeba zároveň  
-% instalovat i tuto podporu, pokud ji distribuce \TeX u kterou
-% používáte neobsahuje.
+% instalovat i tuto podporu, pokud ji distribuce \TeX u, kterou
+% používáte, neobsahuje.
+%
+% Instalaci je možné automatizovat programem \texttt{make}
+% přiloženým \texttt{Makefile}.
 %
 % Po spuštění instalace příkazem \texttt{tex fithesis.ins} se vygenerují
-% soubory \texttt{fithesis3.cls} (základní třída) a soubory \texttt{fit10.clo}, 
-% \texttt{fit11.clo} a \texttt{fit12.clo} (volby urÄŤujĂ­cĂ­ velikost pĂ­sma). 
-% Příkazem \texttt{cslatex fithesis.dtx} je možné přeložit dokumentaci.
+% soubory \texttt{fithesis3.cls} (základní třída) a soubory 
+% \texttt{fit10.clo}, \texttt{fit11.clo} a \texttt{fit12.clo} 
+% (volby určující velikost písma a mezerování). 
+% Příkazy
+% \begin{verbatim}
+% pdflatex fithesis.dtx
+% makeindex fithesis
+% pdflatex fithesis.dtx
+% \end{verbatim} 
+% je možné přeložit dokumentaci.
+%
+% Užití stylu je na [FI] MU podporováno, návrhy a připomínky jsou vítány
+% na diskusním fóru Informačního systému MU na URL\newline
+% \url{https://is.muni.cz/auth/df/fithesis-sazba/}.
 %
 % \iffalse
 %    \begin{macrocode}
@@ -297,7 +325,7 @@
 \def\Langen{en}
 
 \def\@thesislang{\Langcs}
-\def\@thesissubtitle{Diplomová práce}
+\def\@thesissubtitle{Diplomov\'{a} pr\'{a}ce}
 \def\@thesislogopath{loga} % The loga directory by default
 
 \def\titlefont{\fontsize\@xxvpt{30}\selectfont}
@@ -331,49 +359,49 @@
   \ifx\@thesislang\Langen
    \def\facultyname{Faculty of Science}
    \def\universityname{Masaryk University}
-  \else \def\facultyname{Přírodovědecká fakulta}
+  \else \def\facultyname{P\v{r}\'{i}rodov\v{e}deck\'{a} fakulta}
   \fi
   \else \ifx\@thesisfaculty\Law
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Law}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Právnická fakulta}
+   \else \def\facultyname{Pr\'{a}vnick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Eco
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Economics and Administration}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Ekonomicko-správní fakulta}
+   \else \def\facultyname{Ekonomicko-spr\'{a}vn\'{i} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Fss
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Social Studies}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Fakulta sociálních studií}
+   \else \def\facultyname{Fakulta soci\'{a}ln\'{i}ch studi\'{i}}
    \fi
   \else \ifx\@thesisfaculty\Med
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Medicine}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Lékařská fakulta}
+   \else \def\facultyname{L\'{e}ka\v{r}sk\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Ped
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Education}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Pedagogická fakulta}
+   \else \def\facultyname{Pedagogick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Phil
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Arts}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Filozofická fakulta}
+   \else \def\facultyname{Filozofick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Fsps
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Sports Studies}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Fakulta sportovnĂ­ch studiĂ­}
+   \else \def\facultyname{Fakulta sportovn\'{i}ch studi\'{i}}
    \fi
          \else
           \def\facultyname{\@thesisfaculty}
@@ -414,18 +442,18 @@
 \def\thesislang#1{\gdef\@thesislang{#1}}
 
 \def\DeclarationTextcs{%
-	Prohlašuji, že tato \expandafter\lowecasewrapper\@thesissubtitle{} 
-	je mým p\r{u}vodním autorským
-	dílem, které jsem vypracoval\@w\ samostatně. Všechny zdroje, prameny a
-	literaturu, které jsem při vypracování používal\@w\ nebo z~nich
-	čerpal\@w, v~práci řádně cituji s~uvedením úplného odkazu na příslušný
+	Prohla\v{s}uji, \v{z}e tato \expandafter\lowecasewrapper\@thesissubtitle{} 
+	je m\'{y}m p\r{u}vodn\'{i}m autorsk\'{y}m
+	d\'{i}lem, kter\'{e} jsem vypracoval\@w\ samostatn\v{e}. V\v{s}echny zdroje, prameny a
+	literaturu, kter\'{e} jsem p\v{r}i vypracov\'{a}n\'{i} pou\v{z}\'{i}val\@w\ nebo z~nich
+	\v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y}
 	zdroj.}
 \def\DeclarationTextsk{%
-	Prehlasujem, že táto \expandafter\lowecasewrapper\@thesissubtitle{} 
-	je mojím p\^{o}vodným autorským
-	dielom, ktoré som vypracoval\@w\ samostatne. Všetky zdroje, pramene a
-	literatúru, ktoré som pri vypracovaní používal\@w\ alebo z~nich
-	čerpal\@w, v~práci riadne citujem s~uvedením úplného odkazu na príslušný
+	Prehlasujem, \v{z}e t\'{a}to \expandafter\lowecasewrapper\@thesissubtitle{} 
+	je moj\'{i}m p\^{o}vodn\'{y}m autorsk\'{y}m
+	dielom, ktor\'{e} som vypracoval\@w\ samostatne. V\v{s}etky zdroje, pramene a
+	literat\'{u}ru, ktor\'{e} som pri vypracovan\'{i} pou\v{z}\'{i}val\@w\ alebo z~nich
+	\v{c}erpal\@w, v~pr\'{a}ci riadne citujem s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na pr\'{i}slu\v{s}n\'{y}
 	zdroj.}
 \def\DeclarationTexten{%
 	Hereby I declare, that this paper is my original authorial work, 
@@ -434,11 +462,11 @@
 }
 
 \def\DeclarationTitlecs{%
-	Prohlášení
+	Prohl\'{a}\v{s}en\'{i}
 }
 
 \def\DeclarationTitlesk{%
-	Prehlásenie
+	Prehl\'{a}senie
 }
 
 \def\DeclarationTitleen{%
@@ -446,11 +474,11 @@
 }
 
 \def\ThanksTitlecs{%
-	Poděkování
+	Pod\v{e}kov\'{a}n\'{i}
 }
 
 \def\ThanksTitlesk{%
-	PoÄŹakovanie
+	Po\v{d}akovanie
 }
 
 \def\ThanksTitleen{%
@@ -458,7 +486,7 @@
 }
 
 \def\AbstractTitlecs{%
-	ShrnutĂ­
+	Shrnut\'{i}
 }
 
 \def\AbstractTitlesk{%
@@ -470,11 +498,11 @@
 }
 
 \def\KeyWordsTitlecs{%
-	Klíčová slova
+	Kl\'{i}\v{c}ov\'{a} slova
 }
 
 \def\KeyWordsTitlesk{%
-	K\v{l}účové slová
+	K\v{l}\'{u}\v{c}ov\'{e} slov\'{a}
 }
 
 \def\KeyWordsTitleen{%
@@ -482,11 +510,11 @@
 }
 
 \def\AdvisorTitlecs{%
-	Vedoucí práce:
+	Vedouc\'{i} pr\'{a}ce:
 }
 
 \def\AdvisorTitlesk{%
-	Vedúci práce:
+	Ved\'{u}ci pr\'{a}ce:
 }
 
 \def\AdvisorTitleen{%
@@ -630,7 +658,7 @@
 \setcounter{page}{1}
 \pagenumbering{arabic}
 \pagestyle{thesisheadings}
-\parindent 1.5em}
+\parindent 1.5em\relax}
 
 %</class>
 %    \end{macrocode}
@@ -794,6 +822,7 @@
 %   pdfpagelabels                     % Generate pdf page labels
 % ]{hyperref}
 % \usepackage{blindtext}            % Lorem ipsum generator
+% \usepackage[toc,page]{appendix}   % Appendices
 % 
 % \thesislang{en}                   % The language of the thesis
 % \thesistitle{Sample thesis}       % The title of the thesis
@@ -821,24 +850,26 @@
 %       keyword1, keyword2\,\dots
 %     \end{ThesisKeyWords}
 %     \tableofcontents                % The table of contents
-% %   \listoftables                   % The list of tables (optional)
-% %   \listoffigures                  % The list of figures (optional)
 %   
 %   \MainMatter                     % The main matter
 %     \chapter{Introduction}          % Chapters
 %     \Blindtext
 %     \chapter{Another chapter}
 %     \Blindtext
-%     \appendix
-%     \chapter{First appendix}        % Appendices
+%                                     % Bibliography
+%     \listoftables                   % The list of tables (optional)
+%     \listoffigures                  % The list of figures (optional)
+%                                     % Index (optional)
+% 
+%   \begin{appendices}              % Appendices
+%     \chapter{First appendix}
 %     \Blindtext
 %     \chapter{Another appendix}
 %     \Blindtext
-%     % Bibliography goes here
-%     % Index goes here (optional)
+%   \end{appendices}
 % \end{document} 
 % \end{verbatim}
-% 
+% \newpage
 % \printindex
 % \iffalse
 %    \begin{macrocode}
diff --git a/fithesis3.cls b/fithesis3.cls
index 74adb43a5e9fe396c200e31f9564deced73dc102..4dd6de47a5ef55ce883ee92849468004ccb9deca 100644
--- a/fithesis3.cls
+++ b/fithesis3.cls
@@ -50,7 +50,7 @@
 %% The names of the source files used are shown above.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fithesis3}[2015/01/13 fithesis3 version 0.3.2 MU thesis class]
+\ProvidesClass{fithesis3}[2015/01/14 fithesis3 version 0.3.4 MU thesis class]
 
 \ifx\clsclass\undefined
  \def\clsclass{rapport3}
@@ -81,7 +81,7 @@
 \hypersetup{pdfpagelabels}    % Generate pdf page labels
 \hypersetup{pdftex}           % PDF Metadata stamping
 \hypersetup{
-  pdfcreator={fithesis3 v0.3.2 MU thesis class},
+  pdfcreator={fithesis3 v0.3.4 MU thesis class},
 }
 
 \def\Scrreprtcls{scrreprt}
@@ -170,7 +170,7 @@
 \def\Langen{en}
 
 \def\@thesislang{\Langcs}
-\def\@thesissubtitle{Diplomov^^c3^^a1 pr^^c3^^a1ce}
+\def\@thesissubtitle{Diplomov\'{a} pr\'{a}ce}
 \def\@thesislogopath{loga} % The loga directory by default
 
 \def\titlefont{\fontsize\@xxvpt{30}\selectfont}
@@ -204,49 +204,49 @@
   \ifx\@thesislang\Langen
    \def\facultyname{Faculty of Science}
    \def\universityname{Masaryk University}
-  \else \def\facultyname{P^^c5^^99^^c3^^adrodov^^c4^^9bdeck^^c3^^a1 fakulta}
+  \else \def\facultyname{P\v{r}\'{i}rodov\v{e}deck\'{a} fakulta}
   \fi
   \else \ifx\@thesisfaculty\Law
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Law}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Pr^^c3^^a1vnick^^c3^^a1 fakulta}
+   \else \def\facultyname{Pr\'{a}vnick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Eco
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Economics and Administration}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Ekonomicko-spr^^c3^^a1vn^^c3^^ad fakulta}
+   \else \def\facultyname{Ekonomicko-spr\'{a}vn\'{i} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Fss
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Social Studies}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Fakulta soci^^c3^^a1ln^^c3^^adch studi^^c3^^ad}
+   \else \def\facultyname{Fakulta soci\'{a}ln\'{i}ch studi\'{i}}
    \fi
   \else \ifx\@thesisfaculty\Med
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Medicine}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{L^^c3^^a9ka^^c5^^99sk^^c3^^a1 fakulta}
+   \else \def\facultyname{L\'{e}ka\v{r}sk\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Ped
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Education}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Pedagogick^^c3^^a1 fakulta}
+   \else \def\facultyname{Pedagogick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Phil
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Arts}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Filozofick^^c3^^a1 fakulta}
+   \else \def\facultyname{Filozofick\'{a} fakulta}
    \fi
   \else \ifx\@thesisfaculty\Fsps
    \ifx\@thesislang\Langen
     \def\facultyname{Faculty of Sports Studies}
     \def\universityname{Masaryk University}
-   \else \def\facultyname{Fakulta sportovn^^c3^^adch studi^^c3^^ad}
+   \else \def\facultyname{Fakulta sportovn\'{i}ch studi\'{i}}
    \fi
          \else
           \def\facultyname{\@thesisfaculty}
@@ -280,18 +280,18 @@
 \def\thesislang#1{\gdef\@thesislang{#1}}
 
 \def\DeclarationTextcs{%
-Prohla^^c5^^a1uji, ^^c5^^bee tato \expandafter\lowecasewrapper\@thesissubtitle{}
-je m^^c3^^bdm p\r{u}vodn^^c3^^adm autorsk^^c3^^bdm
-d^^c3^^adlem, kter^^c3^^a9 jsem vypracoval\@w\ samostatn^^c4^^9b. V^^c5^^a1echny zdroje, prameny a
-literaturu, kter^^c3^^a9 jsem p^^c5^^99i vypracov^^c3^^a1n^^c3^^ad pou^^c5^^be^^c3^^adval\@w\ nebo z~nich
-^^c4^^8derpal\@w, v~pr^^c3^^a1ci ^^c5^^99^^c3^^a1dn^^c4^^9b cituji s~uveden^^c3^^adm ^^c3^^bapln^^c3^^a9ho odkazu na p^^c5^^99^^c3^^adslu^^c5^^a1n^^c3^^bd
+Prohla\v{s}uji, \v{z}e tato \expandafter\lowecasewrapper\@thesissubtitle{}
+je m\'{y}m p\r{u}vodn\'{i}m autorsk\'{y}m
+d\'{i}lem, kter\'{e} jsem vypracoval\@w\ samostatn\v{e}. V\v{s}echny zdroje, prameny a
+literaturu, kter\'{e} jsem p\v{r}i vypracov\'{a}n\'{i} pou\v{z}\'{i}val\@w\ nebo z~nich
+\v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y}
 zdroj.}
 \def\DeclarationTextsk{%
-Prehlasujem, ^^c5^^bee t^^c3^^a1to \expandafter\lowecasewrapper\@thesissubtitle{}
-je moj^^c3^^adm p\^{o}vodn^^c3^^bdm autorsk^^c3^^bdm
-dielom, ktor^^c3^^a9 som vypracoval\@w\ samostatne. V^^c5^^a1etky zdroje, pramene a
-literat^^c3^^baru, ktor^^c3^^a9 som pri vypracovan^^c3^^ad pou^^c5^^be^^c3^^adval\@w\ alebo z~nich
-^^c4^^8derpal\@w, v~pr^^c3^^a1ci riadne citujem s~uveden^^c3^^adm ^^c3^^bapln^^c3^^a9ho odkazu na pr^^c3^^adslu^^c5^^a1n^^c3^^bd
+Prehlasujem, \v{z}e t\'{a}to \expandafter\lowecasewrapper\@thesissubtitle{}
+je moj\'{i}m p\^{o}vodn\'{y}m autorsk\'{y}m
+dielom, ktor\'{e} som vypracoval\@w\ samostatne. V\v{s}etky zdroje, pramene a
+literat\'{u}ru, ktor\'{e} som pri vypracovan\'{i} pou\v{z}\'{i}val\@w\ alebo z~nich
+\v{c}erpal\@w, v~pr\'{a}ci riadne citujem s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na pr\'{i}slu\v{s}n\'{y}
 zdroj.}
 \def\DeclarationTexten{%
 Hereby I declare, that this paper is my original authorial work,
@@ -300,11 +300,11 @@ during elaboration of this work are properly cited and listed in complete refere
 }
 
 \def\DeclarationTitlecs{%
-Prohl^^c3^^a1^^c5^^a1en^^c3^^ad
+Prohl\'{a}\v{s}en\'{i}
 }
 
 \def\DeclarationTitlesk{%
-Prehl^^c3^^a1senie
+Prehl\'{a}senie
 }
 
 \def\DeclarationTitleen{%
@@ -312,11 +312,11 @@ Declaration
 }
 
 \def\ThanksTitlecs{%
-Pod^^c4^^9bkov^^c3^^a1n^^c3^^ad
+Pod\v{e}kov\'{a}n\'{i}
 }
 
 \def\ThanksTitlesk{%
-Po^^c4^^8fakovanie
+Po\v{d}akovanie
 }
 
 \def\ThanksTitleen{%
@@ -324,7 +324,7 @@ Acknowledgement
 }
 
 \def\AbstractTitlecs{%
-Shrnut^^c3^^ad
+Shrnut\'{i}
 }
 
 \def\AbstractTitlesk{%
@@ -336,11 +336,11 @@ Abstract
 }
 
 \def\KeyWordsTitlecs{%
-Kl^^c3^^ad^^c4^^8dov^^c3^^a1 slova
+Kl\'{i}\v{c}ov\'{a} slova
 }
 
 \def\KeyWordsTitlesk{%
-K\v{l}^^c3^^ba^^c4^^8dov^^c3^^a9 slov^^c3^^a1
+K\v{l}\'{u}\v{c}ov\'{e} slov\'{a}
 }
 
 \def\KeyWordsTitleen{%
@@ -348,11 +348,11 @@ Keywords
 }
 
 \def\AdvisorTitlecs{%
-Vedouc^^c3^^ad pr^^c3^^a1ce:
+Vedouc\'{i} pr\'{a}ce:
 }
 
 \def\AdvisorTitlesk{%
-Ved^^c3^^baci pr^^c3^^a1ce:
+Ved\'{u}ci pr\'{a}ce:
 }
 
 \def\AdvisorTitleen{%
@@ -495,7 +495,7 @@ Advisor:
 \setcounter{page}{1}
 \pagenumbering{arabic}
 \pagestyle{thesisheadings}
-\parindent 1.5em}
+\parindent 1.5em\relax}
 
 
 \renewcommand*\l@part[2]{%