diff --git a/thesis.tex b/thesis.tex
index 430f633308b882c18d000b023c036f5c45159c1e..367a9c034ae1d5d3cad092753e6fc1bf964f9190 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -1,9 +1,26 @@
 % !TEX root = thesis.tex
 
-% Valime eesti keele. Infolehel, vأµأµrsأµnades ja tsitaatides on ka inglise keel.
-%\documentclass[english,estonian]{unitartucs/thesis}
-\documentclass[estonian,english]{unitartucs/thesis}
 
-%\input{estonian/lأµputأ¶أ¶.tex}
-\input{english/thesis.tex}
+% Teretulemast Tartu أœlikooli arvutiteaduse instituudi bakalaureuse- ja magistriأµppe lأµputأ¶أ¶de malli.
+% Welcome to the University of Tartu's Institute of Computer Science's Bachelor's and Master's Thesis template.
+
+% Vali siin, kas su lأµputأ¶أ¶ on eesti vأµi inglise keeles
+% Choose here if your thesis is in Estonian or English
+
+\newcommand{\templateLanguage}{Estonian} % Eesti keeles
+%\newcommand{\templateLanguage}{English} % In English 
+
+
+% We load the correct things based on your choice
+
+\RequirePackage{ifthen}
+\ifthenelse{\equal{\templateLanguage}{Estonian}}
+    {% True case
+        \documentclass[english,estonian]{unitartucs/thesis}
+        \input{estonian/lأµputأ¶أ¶.tex}
+    }
+    {% false case
+        \documentclass[estonian,english]{unitartucs/thesis}
+        \input{english/thesis.tex}
+    }