diff --git a/ctufit-thesis.cls b/ctufit-thesis.cls
index dd58b24ee542ce631ee2e8083558faba1a43da90..76ed5ceebcd87315fc39dce7fea7196ed112c2fc 100644
--- a/ctufit-thesis.cls
+++ b/ctufit-thesis.cls
@@ -9,7 +9,7 @@
 %% Copyright 2021, Eliska Sestakova and Ondrej Guth
 %%
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public Licenese, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%  https://www.latex-project.org/lppl.txt
@@ -19,7 +19,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The current maintainer of this work is Tomas Novacek.
-%% Alternatively, submit bug reports into the tracker at
+%% Alternatively, submit bug reports to the tracker at
 %% https://gitlab.fit.cvut.cz/theses-templates/FITthesis-LaTeX/issues
 %%
 %%
@@ -83,7 +83,7 @@
 	\definecolor{headgray}{rgb}{0.50,0.50,0.51}
 	\definecolor{enumgray}{RGB}{0, 122, 195} %CTU blue
 \fi
-% colors end
+% colours end
 
 \DeclareRobustCommand{\ctufittitle}[1]{
 	\def\thectufittitle{#1}
@@ -298,7 +298,7 @@
 % \makeatother
 % frontmatter pseudochapters end
 
-% table of contents colored chapters
+% table of contents coloured chapters
 % \makeatletter
 \let\stdl@chapter\l@chapter
 \renewcommand*{\l@chapter}[2]{%
@@ -347,7 +347,7 @@
   
 \newenvironment{declaration}{}
 
-% acknowledgment page
+% acknowledgement page
 \newenvironment{acknowledgmentpage}{\frontchapternotprinted{\if\@ctufitlang C{Poděkování}\else\if\@ctufitlang E{Acknowledgments}\else{Poďakovanie}\fi\fi}
 ~
 \vfill
@@ -458,6 +458,20 @@
 }{%
   \popQED\endtrivlist%\@endpefalse
 }
+\theoremstyle{plain}
+\newtheorem{theorem}{\if\@ctufitlang C{Věta}\else\if\@ctufitlang E{Theorem}\else{Veta}\fi\fi}
+\newtheorem{lemma}[theorem]{\if\@ctufitlang C{TvrzenĂ­}\else\if\@ctufitlang E{Lemma}\else{Tvrdenie}\fi\fi}
+\newtheorem{corollary}[theorem]{\if\@ctufitlang C{DĹŻsledek}\else\if\@ctufitlang E{Corollary}\else{DĂ´sledok}\fi\fi}
+\newtheorem{proposition}[theorem]{\if\@ctufitlang C{Návrh}\else\if\@ctufitlang E{Proposition}\else{Návrh}\fi\fi}
+\newtheorem{definition}[theorem]{\if\@ctufitlang C{Definice}\else\if\@ctufitlang E{Definiton}\else{DefinĂ­cia}\fi\fi}
+\theoremstyle{definition}
+\newtheorem{example}[theorem]{\if\@ctufitlang C{Příklad}\else\if\@ctufitlang E{Example}\else{Príklad}\fi\fi}
+\theoremstyle{remark}
+\newtheorem{note}[theorem]{\if\@ctufitlang C{Poznámka}\else\if\@ctufitlang E{Note}\else{Poznámka}\fi\fi}
+\newtheorem*{note*}{\if\@ctufitlang C{Poznámka}\else\if\@ctufitlang E{Note}\else{Poznámka}\fi\fi}
+\newtheorem{remark}[theorem]{\if\@ctufitlang C{Pozorování}\else\if\@ctufitlang E{Remark}\else{Pozorovanie}\fi\fi}
+\newtheorem*{remark*}{\if\@ctufitlang C{Pozorování}\else\if\@ctufitlang E{Remark}\else{Pozorovanie}\fi\fi}
+\numberwithin{theorem}{chapter}
 % theorems, proofs, definitions, etc. end
 
 \DeclareRobustCommand{\printabstractpage}{%
diff --git a/ctufit-thesis.tex b/ctufit-thesis.tex
index 9c2acd907ffe596561070d7bdab5fe4dc38f0300..0c1cc0a20e25e3ece4e15e527015c8e1a4ec4574 100644
--- a/ctufit-thesis.tex
+++ b/ctufit-thesis.tex
@@ -5,6 +5,7 @@
 %% https://gitlab.fit.cvut.cz/theses-templates/FITthesis-LaTeX
 %%
 %%
+%% Copyright 2024, Tomas Novacek
 %% Copyright 2021, Eliska Sestakova and Ondrej Guth
 %%
 %% This work may be distributed and/or modified under the
@@ -17,9 +18,8 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The current maintainer of this work is Ondrej Guth.
-%% Contact ondrej.guth@fit.cvut.cz for bug reports.
-%% Alternatively, submit bug reports into the tracker at
+%% The current maintainer of this work is Tomas Novacek.
+%% Alternatively, submit bug reports to the tracker at
 %% https://gitlab.fit.cvut.cz/theses-templates/FITthesis-LaTeX/issues
 %%
 %%
@@ -100,22 +100,6 @@
 %\usepackage{minted}
 \usepackage{csquotes}
 
-%theorems, definitions, etc.
-\theoremstyle{plain}
-\newtheorem{theorem}{Věta}
-\newtheorem{lemma}[theorem]{TvrzenĂ­}
-\newtheorem{corollary}[theorem]{DĹŻsledek}
-\newtheorem{proposition}[theorem]{Návrh}
-\newtheorem{definition}[theorem]{Definice}
-\theoremstyle{definition}
-\newtheorem{example}[theorem]{Příklad}
-\theoremstyle{remark}
-\newtheorem{note}[theorem]{Poznámka}
-\newtheorem*{note*}{Poznámka}
-\newtheorem{remark}[theorem]{Pozorování}
-\newtheorem*{remark*}{Pozorování}
-\numberwithin{theorem}{chapter}
-%theorems, definitions, etc. END
 %%%%%%%%%%%%%%%%%%%%%%
 % DEMO CONTENTS SETTINGS END
 %%%%%%%%%%%%%%%%%%%%%%