diff --git a/english/config.tex b/english/config.tex
index 2f95ac40b566090e86eab69407861ddbd8e3bdee..a6107fffaed3480482fcfb206981e5efad837153 100644
--- a/english/config.tex
+++ b/english/config.tex
@@ -7,15 +7,15 @@
 % Here You can choose the reference style
 
 % ACM-style. Numeric references [1]. Alphabetical order.
-% \usepackage[style=unitartucs/citations/numeric]{biblatex} 
+% \usepackage[style=unitartucs/citations/numeric]{biblatex}
 
 % IEEE-style. Numeric references [1]. Reference order.
-\usepackage[style=unitartucs/citations/numeric,sorting=none]{biblatex} 
+\usepackage[style=unitartucs/citations/numeric,sorting=none]{biblatex}
 
 % AMS-style. Trigraph references [ABC]. Alphabetical order.
-% \usepackage[style=unitartucs/citations/alphabetic]{biblatex} 
+% \usepackage[style=unitartucs/citations/alphabetic]{biblatex}
 
 % APA-style. References with name and year (Koit 2010). Alphabetical order.
-% \usepackage[style=unitartucs/citations/authoryear,uniquename=init]{biblatex} 
+% \usepackage[style=unitartucs/citations/authoryear,uniquename=init]{biblatex}
 
 \addbibresource{english/references.bib} % This file contains your bibliography entries
diff --git a/english/sections/2-formatting.tex b/english/sections/2-formatting.tex
index 916c71a35d8098c557609dff52819c3c92c300d0..52fcf845286f01c25f8aab6dae108c6fd1ac18a4 100644
--- a/english/sections/2-formatting.tex
+++ b/english/sections/2-formatting.tex
@@ -2,7 +2,7 @@
 Many different tools, some of which You might not even be aware of, will be used to format Your thesis. As good formatting makes up 25\% of Your thesis grade, it is important to take it seriously and allocate sufficient time. Especially if You have not previously formatted documents of that size that well or learned the use of corresponding tools. This chapter looks at the formatting principles for different parts of the thesis.
 
 \subsection{The Title and Info Pages}
-The very first page – the title page – is already formatted in this template. The title page must include the curriculum You plan to graduate from (including the educational institution and the institute), thesis title, kind and volume corresponding to the level of studies, Your name, the names (and, optionally, the academic degrees) of Your supervisors, publication location, and year. The information that goes to your title page must be entered into the specific fields in the file \path{thesis.tex}. Be sure to check the corresponding information. For example, if You decide to add the academic degrees of Your supervisors, check if an abbreviation is MSc (Master of Science) or MA (Master of Arts). The degrees differ depending on the curricula.  
+The very first page – the title page – is already formatted in this template. The title page must include the curriculum You plan to graduate from (including the educational institution and the institute), thesis title, kind and volume corresponding to the level of studies, Your name, the names (and, optionally, the academic degrees) of Your supervisors, publication location, and year. The information that goes to your title page must be entered into the specific fields in the file \path{thesis.tex}. Be sure to check the corresponding information. For example, if You decide to add the academic degrees of Your supervisors, check if an abbreviation is MSc (Master of Science) or MA (Master of Arts). The degrees differ depending on the curricula.
 
 The info page (file \path{0-info.tex}), which follows Your title page, includes the abstract, keywords, and CERCS codes of Your work. The abstract should give an overview of everything done during Your work. For example, if three of Your content chapters thoroughly describe the different processes and results of Your work, then that should be readable from Your abstract. Concentrate on mentioning in the abstract what You did that can be read about in the thesis.
 
@@ -31,7 +31,7 @@ In Estonian, however, only the very first letter of the title is capitalized, an
 
 Punctuation should be avoided in titles. Depending on the nature of Your work, an em or en dash could be reasonable. For example, if You have created a software product, it is good to mention the product's name in the title, followed by a longer dash and a description of its unique value. On the other hand, a sentence with commas or question marks would not fit as a title.
 
-These principles also apply to the titles of Your chapters, which are called headings. The content chapter headings start with numbers. It is up to You if You start the numbering from the Introduction chapter and end it with the Conclusion chapter or leave these two chapters unnumbered. In this template, the Introduction and Conclusion chapters are also numbered. The Conclusion chapter is followed by unnumbered sections called References and Appendices. For different appendices, it is reasonable to use some numbering again. To number the appendices, You can use Roman numerals (Appendix I, Appendix II) or capital letters (Appendix A, Appendix B). 
+These principles also apply to the titles of Your chapters, which are called headings. The content chapter headings start with numbers. It is up to You if You start the numbering from the Introduction chapter and end it with the Conclusion chapter or leave these two chapters unnumbered. In this template, the Introduction and Conclusion chapters are also numbered. The Conclusion chapter is followed by unnumbered sections called References and Appendices. For different appendices, it is reasonable to use some numbering again. To number the appendices, You can use Roman numerals (Appendix I, Appendix II) or capital letters (Appendix A, Appendix B).
 
 The subchapter numbering includes the number from the parent chapter. For example, the subchapters of chapter 2 are numbered 2.1, 2.2, etc. The dot mark after the entire numbering is used only in the first-level headings. Starting from the third-level headings, the numbering can be omitted. In this template, the heading styles (\verb|\section{...}|, \verb|\subsection{...}|, etc) provide the correct numbering.
 
@@ -48,7 +48,7 @@ It is possible to use italics (\verb|\emph{...}|), bold (\verb|\textbf{...}|), o
 When writing paragraphs, You should observe that there would not be a single lone word at the last row of the paragraph. This is called an orphan word, and it is not visually very good. Checking for orphan words or lines (an orphaned line of text at the beginning of a page that is followed by a new chapter or empty page) is something one should do as one of the last things when formatting their fair copy.
 
 \subsection{Elements}
-Many different elements like figures, tables, and code examples improve the appearance and reader’s understanding of Your thesis. 
+Many different elements like figures, tables, and code examples improve the appearance and reader’s understanding of Your thesis.
 
 \subsubsection{Figures}
 All the different images, be they plots, photographs, or screenshots, are labeled as figures. When adding an image, it should be labeled as a figure, numbered, and captioned. In the LaTeX template here, this is done by first adding or uploading the image to the \verb|figures| folder. Afterward the image can be used via the following code:
@@ -163,7 +163,7 @@ All the figures, tables, and mathematical equations must be cross‑referenced f
 \subsubsection{Footnote References}
 The external references can be called as weak and strong. This does not mean anything about their influence or usefulness to Your work. For some external sources, You must make a subjective decision if the reference will be rather the so-called weak or strong one. Weak references are, for example, references to Wikipedia pages, Stack Overflow posts, webpages of products, dictionaries, and private communication, where the referenced source is not a solid publication by a clear author. Generally speaking, all sorts of web references are usually weak references. However, a web reference to a blog post by a reputable author can be considered a strong reference.
 
-The weak references should be formatted as footnote references. To do that, use the \verb|\footnote{...}| command and copy-paste the link into it. To make the link actually work, use the \verb|\url{...}| command around the link. For such references, it is not important to find the author (for example, with product websites, software documentation, or Wikipedia articles, it might not even be an easily deducible author). Typically, it is sufficient to add the link to the website where You got the cited information. 
+The weak references should be formatted as footnote references. To do that, use the \verb|\footnote{...}| command and copy-paste the link into it. To make the link actually work, use the \verb|\url{...}| command around the link. For such references, it is not important to find the author (for example, with product websites, software documentation, or Wikipedia articles, it might not even be an easily deducible author). Typically, it is sufficient to add the link to the website where You got the cited information.
 
 Such footnote references are very good, but in addition to those, Your work should be based on an adequate number of strong or main references.
 
@@ -200,7 +200,7 @@ After the Appendix section, at the end of Your document, You must add a license
 The link above has the non-exclusive license as document number 30. In most cases, that license should apply to You. When Your work includes information that must not be published during some timeframe or even indefinitely, You need to write a corresponding application to the vice dean for academic affairs to use a limiting license. The application is in document number 32, and when the vice dean of academic affairs has approved Your application, You can use the corresponding limiting license from document number 31.
 
 \subsection{Metadata}
-Your thesis file includes metadata – data about the file itself. This template adds them automatically based on the fields you have written in the \verb|thesis.tex| file. You can see the metadata of a PDF file with the Acrobad Reader software, when you choose \emph{Document Properties} from the context menu of the opened document (see Figure~\ref{fig:metadata}). It is important that the metadata of your work correspond to reality. 
+Your thesis file includes metadata – data about the file itself. This template adds them automatically based on the fields you have written in the \verb|thesis.tex| file. You can see the metadata of a PDF file with the Acrobad Reader software, when you choose \emph{Document Properties} from the context menu of the opened document (see Figure~\ref{fig:metadata}). It is important that the metadata of your work correspond to reality.
 
 \begin{figure}[ht]
     \centering
diff --git a/estonian/seadistus.tex b/estonian/seadistus.tex
index 8aa93b1614e45a20094b6231218d10f78730bce9..24c61e0c1015e55762b323d500a0334c374c6852 100644
--- a/estonian/seadistus.tex
+++ b/estonian/seadistus.tex
@@ -7,15 +7,15 @@
 % Siin saate valida viitamisstiili
 
 % ACM-stiilis numbriline viitamine [1], tأ¤hestikulises jأ¤rjekorras viited.
-% \usepackage[style=unitartucs/citations/numeric]{biblatex} 
+% \usepackage[style=unitartucs/citations/numeric]{biblatex}
 
 % IEEE-stiilis numbriline viitamine [1], viitamise jأ¤rjekorras viited.
-\usepackage[style=unitartucs/citations/numeric,sorting=none]{biblatex} 
+\usepackage[style=unitartucs/citations/numeric,sorting=none]{biblatex}
 
 % AMS-stiilis trigraafiline viitamine [ABC], tأ¤hestikulises jأ¤rjekorras viited.
-% \usepackage[style=unitartucs/citations/alphabetic]{biblatex} 
+% \usepackage[style=unitartucs/citations/alphabetic]{biblatex}
 
 % APA-stiilis viitamine (Koit 2010), tأ¤hestikulises jأ¤rjekorras viited.
-% \usepackage[style=unitartucs/citations/authoryear,uniquename=init]{biblatex} 
+% \usepackage[style=unitartucs/citations/authoryear,uniquename=init]{biblatex}
 
 \addbibresource{estonian/viited.bib} % Selles failis on Teie bibliograafia kirjed
diff --git a/estonian/sektsioonid/2-vormistamine.tex b/estonian/sektsioonid/2-vormistamine.tex
index 966de6d674c4d40f59675c4ab49059ba3673b55e..a131b1381c9ad9223d0fff02b7a33588518f9f6c 100644
--- a/estonian/sektsioonid/2-vormistamine.tex
+++ b/estonian/sektsioonid/2-vormistamine.tex
@@ -2,7 +2,7 @@
 Teie lأµputأ¶أ¶ dokumendi vormistamine hأµlmab vأ¤ga erinevaid tأ¶أ¶riistu, millest Te kأµigest ei pruugi teadlik olla. Kuna hea vormistamine on 25\% Teie lأµputأ¶أ¶ hindest, on oluline vormistamist vأµtta tأµsiselt ja varuda selleks aega. Eriti kui Te ei ole varem nii suuri dokumente nii pأµhjalikult vormistanud vأµi vastavate tأ¶أ¶riistade kasutamist أµppinud. Kأ¤esolev peatأ¼kk kirjeldab lأ¤hemalt lأµputأ¶أ¶ erinevate osade vormistamispأµhimأµtteid.
 
 \subsection{Tiitel- ja infoleht}
-Kأµige esimese lehekأ¼lge – tiitellehe – vormistamine on siin mallis juba tehtud. Tiitellehel peab olema Teie lأµpetatav أµppekava (sh أµppeasutus ja instituut), lأµputأ¶أ¶ pealkiri, tأ¶أ¶ liik ning maht vastavalt أµppetasemele, Teie kui autori nimi, Teie tأ¶أ¶ juhendajate nimed (soovi korral vأµite lisada ka nende teaduskraadid) ning tأ¶أ¶ avaldamise asukoht ja aasta. Tiitellehele tulev info tuleb teil sisestada vأ¤ljadesse failis \path{thesis.tex}. Kindlasti kontrollige kirjutatud informatsioon أ¼le. Nأ¤iteks, kui otsustasite lisada juhendajate teaduskraadid, siis kas vastava kraadi lأ¼hend on MSc (Master of Science) vأµi MA (Master of Arts). Erinevate أµppekavade lأµpetajatel on kraadi nimetus erinev.  
+Kأµige esimese lehekأ¼lge – tiitellehe – vormistamine on siin mallis juba tehtud. Tiitellehel peab olema Teie lأµpetatav أµppekava (sh أµppeasutus ja instituut), lأµputأ¶أ¶ pealkiri, tأ¶أ¶ liik ning maht vastavalt أµppetasemele, Teie kui autori nimi, Teie tأ¶أ¶ juhendajate nimed (soovi korral vأµite lisada ka nende teaduskraadid) ning tأ¶أ¶ avaldamise asukoht ja aasta. Tiitellehele tulev info tuleb teil sisestada vأ¤ljadesse failis \path{thesis.tex}. Kindlasti kontrollige kirjutatud informatsioon أ¼le. Nأ¤iteks, kui otsustasite lisada juhendajate teaduskraadid, siis kas vastava kraadi lأ¼hend on MSc (Master of Science) vأµi MA (Master of Arts). Erinevate أµppekavade lأµpetajatel on kraadi nimetus erinev.
 
 Tiitellehele jأ¤rgneb infoleht (fail \path{0-info.tex}), kus on Teie tأ¶أ¶ lأ¼hikokkuvأµte, vأµtmesأµnad ning CERCS koodid. Lأ¼hikokkuvأµte peaks andma أ¼levaate kأµigist Teie tأ¶أ¶s tehtust. Nأ¤iteks kui Teie tأ¶أ¶ sisupeatأ¼kkidest kolm on sellised, mis kirjeldavad pأµhjalikult erinevaid tأ¶أ¶ kأ¤igus tehtud asju ning vastavaid tulemusi, siis peaks lأ¼hikokkuvأµttest olema see informatsioon loetav. Keskenduge lأ¼hikokkuvأµttes sellele, millest Teie tehtust saab lأµputأ¶أ¶s lugeda.
 
diff --git a/thesis.tex b/thesis.tex
index 367a9c034ae1d5d3cad092753e6fc1bf964f9190..9bbbe21767085bbc7c90f0088a33d8c36fbc6c89 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -8,7 +8,7 @@
 % Choose here if your thesis is in Estonian or English
 
 \newcommand{\templateLanguage}{Estonian} % Eesti keeles
-%\newcommand{\templateLanguage}{English} % In English 
+%\newcommand{\templateLanguage}{English} % In English
 
 
 % We load the correct things based on your choice
diff --git a/unitartucs/thesis.cls b/unitartucs/thesis.cls
index ec0142bef8ede64f3a290a3ee99ab60af5fb4d7d..265383d2ab2a9bb23ff661e261027f86d84776e7 100644
--- a/unitartucs/thesis.cls
+++ b/unitartucs/thesis.cls
@@ -52,7 +52,7 @@
     \renewcommand{\infoUT}{
         {\fontsize{15}{15}\selectfont U\fontsize{12}{12}\selectfont NIVERSITY}
         {\fontsize{12}{12}\selectfont OF}
-        {\fontsize{15}{15}\selectfont T\fontsize{12}{12}\selectfont ARTU}    
+        {\fontsize{15}{15}\selectfont T\fontsize{12}{12}\selectfont ARTU}
     }
     \renewcommand{\infoICS}{Institute of Computer Science}
 }
@@ -244,7 +244,7 @@
 
 % Lingid ja PDF-i meta-andmed
 \AtEndPreamble{
-   
+
     \usepackage[breaklinks]{hyperref}
     \hypersetup{
         colorlinks,
@@ -259,7 +259,7 @@
         \def\UrlFont{\color{colorURL}\normalfont}% Color with our URL color
         \def\UrlLeft##1\UrlRight{\underLine[height=1pt, top=-0.25ex]{##1}}% Close underline like in Word
     }
-    
+
     % hyperref-i adapteerimine lisatud subsubsubsection-i jaoks
     \newcommand*{\toclevel@subsubsubsection}{4}
     \renewcommand*{\toclevel@paragraph}{5}