diff --git a/abstract.tex b/abstract.tex
index d24c166..57a2e89 100644
--- a/abstract.tex
+++ b/abstract.tex
@@ -6,7 +6,7 @@ \chapter*{Abstract}
 
 
 This is a placeholder for the abstract. It summarizes the whole thesis
-to give a very short overview. Usually, this the abstract is written
+to give a very short overview. Usually, this abstract is written
 when the whole thesis text is finished.
 
 
diff --git a/colophon.tex b/colophon.tex
index 4a1c009..3984d24 100644
--- a/colophon.tex
+++ b/colophon.tex
@@ -8,10 +8,10 @@
 %%      Karl Voit
 
 
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
 \newcommand{\mycolophon}{%%
-  This document 
-  %% was written with \myacro{GNU}~Emacs, 
-  is set in Palatino, compiled with
+  This document is set in Palatino, compiled with
   \href{http://LaTeX.TUGraz.at}{pdf\LaTeX2e} and
   \href{http://en.wikipedia.org/wiki/Biber_(LaTeX)}{\texttt{Biber}}.
 
@@ -19,6 +19,18 @@
   \href{http://www.komascript.de/}{KOMA script} and can be found 
   online: \href{https://github.com/novoid/LaTeX-KOMA-template}{https://github.com/novoid/LaTeX-KOMA-template}
 }
+}
+{%%
+\newcommand{\mycolophon}{%%
+  Dieses Dokument ist in der Schriftart Palatino mit
+  \href{http://LaTeX.TUGraz.at}{pdf\LaTeX2e} und
+  \href{http://en.wikipedia.org/wiki/Biber_(LaTeX)}{\texttt{Biber}} kompiliert.
+
+  Das \LaTeX{} Template von Karl Voit basiert auf
+  \href{http://www.komascript.de/}{KOMA Script} und ist online
+  verfügbar: \href{https://github.com/novoid/LaTeX-KOMA-template}{https://github.com/novoid/LaTeX-KOMA-template}
+}
+}
 
 
 %%% Local Variables: 
diff --git a/main.tex b/main.tex
index 851c574..a26ca3e 100644
--- a/main.tex
+++ b/main.tex
@@ -51,10 +51,8 @@
 %% spacing. Please use with caution: 100% ("1.0") is fine because the
 %% font was designed for it.
 
-\newcommand{\mylanguage}{ngerman,american}
-%% "english,ngerman", "ngerman,english", ...
-%% NOTE: The *last* language is the active one!
-%% See babel documentation for further details.
+\newcommand{\mylanguage}{english}
+%% "english" or "german"
 
 %% BibLaTeX-settings: (see biblatex reference for further description)
 \newcommand{\mybiblatexstyle}{authoryear}
@@ -91,13 +89,13 @@
 \newcommand{\mycolorlinks}{true}  %% "true" or "false"
 %% Enables or disables colored links (hyperref package).
 
-\newcommand{\mytitlepage}{template/title_Thesis_TU_Graz}
+\newcommand{\mytitlepage}{template/title_Thesis_TU_Graz_-_kazemakase}
 %% Your own or one of following pre-defined title pages:
 %% "template/title_plain_maketitle": simple maketitle page
-%% "template/title_Diplomarbeit_KF_Uni_Graz.tex": fancy (german) title page for KF Uni Graz
+%% "template/title_Diplomarbeit_KF_Uni_Graz.tex": fancy title page for KF Uni Graz
 %% "template/title_Thesis_TU_Graz":
 %%             titlepage for Graz University of Technology (correct
-%%             (old?) Corporate Design) by Karl Voit (2012)
+%%             old Corporate Design) by Karl Voit (2012)
 %% "template/title_Thesis_TU_Graz_-_kazemakase":
 %%             titlepage for Graz University of Technology
 %%             (correct new Corporate Design) by kazemakase (2013):
@@ -123,10 +121,6 @@
 %% table of contents. If \mytodonotesoptions is set to "disable", no
 %% list of todos is added, independent of this setting here.
 
-\setboolean{english_affidavit}{true}  %% "true" or "false"
-%% If set to "true": the language of the statutory declaration text is set to
-%% English, otherwise it is in German.
-
 
 %% ========================================================================
 %%%% Document metadata
diff --git a/template/declaration_TU_Graz.tex b/template/declaration_TU_Graz.tex
index 9dc9f75..c430ce5 100644
--- a/template/declaration_TU_Graz.tex
+++ b/template/declaration_TU_Graz.tex
@@ -20,7 +20,7 @@
 }
 
 
-\ifthenelse{\boolean{english_affidavit}}{
+\ifthenelse{\equal{\mylanguage}{english}}{
   \section*{Affidavit}
   I declare that I have authored this thesis independently, that I have
   not used other than the declared sources/resources, and that I have
diff --git a/template/preamble.tex b/template/preamble.tex
index bcd35fd..7122af0 100644
--- a/template/preamble.tex
+++ b/template/preamble.tex
@@ -427,8 +427,9 @@
 %doc%
 %doc% \subsection{\texttt{babel}: Language settings}
 %doc%
-%doc% The default setting of the language is American. Please change settings for
-%doc% additional or alternative languages used in \texttt{main.tex}.
+%doc% The default setting of the english language kind is American. For german, the
+%doc% \texttt{ngerman} kind is used. Please change settings for additional or
+%doc% alternative languages in \texttt{template/preamble.tex}.
 %doc%
 %doc% Please note that the default language of the document is the \emph{last} language
 %doc% which is added to the package options.
@@ -439,7 +440,14 @@
 %doc% \verb+\foreigntextquote+, or \verb+\foreignblockquote+ provided by
 %doc% \texttt{csquotes} (see Section~\ref{sub:csquotes}).
 %doc%
-\usepackage[\mylanguage]{babel}  %% used languages; default language is *last* language of options
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
+  \usepackage[ngerman,american]{babel}
+}
+{%%
+  \usepackage[american,ngerman]{babel}
+}
+
 
 %doc%
 %doc% \subsection{\texttt{scrlayer-scrpage}: Headers and footers}
@@ -449,7 +457,7 @@
 %doc% package for defining header and footer information. Please refer to the \myacro{KOMA}
 %doc% script documentation how to use this package.
 %doc%
-\usepackage{scrlayer-scrpage} %%  advanced page style using KOMA
+\usepackage{scrlayer-scrpage}%%  advanced page style using KOMA
 
 
 %doc%
diff --git a/template/title_Diplomarbeit_KF_Uni_Graz.tex b/template/title_Diplomarbeit_KF_Uni_Graz.tex
index 9d811d6..f359158 100644
--- a/template/title_Diplomarbeit_KF_Uni_Graz.tex
+++ b/template/title_Diplomarbeit_KF_Uni_Graz.tex
@@ -16,7 +16,29 @@
 {\LARGE\bfseries\myworktitle}
 
 \vfill
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
+to obtain the academic degree\\[5mm]
+{\LARGE\mygrade}\\[5mm]
+in the field of study \mystudy\\
+at the \myuniversity
+
+\vfill
+
+on the topic\\[10mm]
+
+{\LARGE\bfseries\mytitle}
+
+\vfill
+
+submitted to the\\
+\myinstitute
+
+Supervisor: \mysupervisor
 
+from\\[5mm]
+}
+{%%
 zur Erlangung des akademischen Grades eines\\[5mm]
 {\LARGE\mygrade}\\[5mm]
 der Studienrichtung \mystudy\\
@@ -36,6 +58,7 @@
 Begutachter: \mysupervisor
 
 von\\[5mm]
+}
 {\Large\bfseries\myauthor}\\[5mm]
 \myhomestreet\\
 \myhomepostalnumber~\myhometown
diff --git a/template/title_Thesis_TU_Graz.tex b/template/title_Thesis_TU_Graz.tex
index 6be3b06..d24228b 100644
--- a/template/title_Thesis_TU_Graz.tex
+++ b/template/title_Thesis_TU_Graz.tex
@@ -34,6 +34,8 @@
 
 {\bfseries\large\myworktitle}
 
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
 to achieve the university degree of
 
 \mygrade
@@ -63,6 +65,38 @@
 
 \myinstitute\\
 Head: \myinstitutehead\\
+}
+{%%
+zur Erlangung des akademischen Grades eines
+
+\mygrade
+
+\mydegreeprogramme
+
+
+\vfill\vfill\vfill
+
+
+an der
+
+\vfill
+
+{\bfseries\large\myuniversity}
+
+
+\vfill\vfill\vfill
+
+
+Begutachter
+
+\mysupervisor
+%usually not mentioned on titlepage:% Evaluator: \myevaluator
+
+\vfill
+
+\myinstitute\\
+Leitung: \myinstitutehead\\
+}
 
 \vfill
 
diff --git a/template/title_Thesis_TU_Graz_-_kazemakase.tex b/template/title_Thesis_TU_Graz_-_kazemakase.tex
index 2433d89..65aa6fb 100644
--- a/template/title_Thesis_TU_Graz_-_kazemakase.tex
+++ b/template/title_Thesis_TU_Graz_-_kazemakase.tex
@@ -43,6 +43,23 @@
 
 {\normalsize\bfseries\myworktitle}\\
 \vfill
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
+to obtain the academic degree\\
+{\mygrade}\\
+\vfill
+submitted at the\\
+{\normalsize\bfseries\myuniversity}
+
+\vfill\vfill\vfill
+\vfill\vfill\vfill
+
+Supervisor\\
+\mysupervisor\\
+\vfill
+Cosupervisor\\
+}
+{%%
 zur Erlangung des akademischen Grades\\
 {\mygrade}\\
 \vfill
@@ -56,6 +73,7 @@
 \mysupervisor\\
 \vfill
 Mitbetreuer\\
+}
 \mycosupervisor\\
 %usually not mentioned on titlepage:% Evaluator: \myevaluator
 \vfill
diff --git a/template/title_VWA.tex b/template/title_VWA.tex
index 8e4ca52..8149463 100644
--- a/template/title_VWA.tex
+++ b/template/title_VWA.tex
@@ -18,6 +18,19 @@
 
 \vfill
 
+\ifthenelse{\equal{\mylanguage}{english}}%%
+{%%
+Pre-scientific work written by\\[5mm]
+{\Large\bfseries\myauthor}\\[5mm]
+Class \mystudy\\[50mm]
+
+\vfill
+
+\includegraphics[width=3cm]{figures/institution}\\[5mm]
+
+Supervisor: \mysupervisor
+}
+{%%
 Vorwissenschaftliche Arbeit verfasst von\\[5mm]
 {\Large\bfseries\myauthor}\\[5mm]
 Klasse \mystudy\\[50mm]
@@ -27,6 +40,7 @@
 \includegraphics[width=3cm]{figures/institution}\\[5mm]
 
 Betreuer: \mysupervisor
+}
 
 \vfill
 
diff --git a/template/typographic_settings.tex b/template/typographic_settings.tex
index be79f35..d671fa4 100644
--- a/template/typographic_settings.tex
+++ b/template/typographic_settings.tex
@@ -169,17 +169,15 @@
 %doc% 
 %doc% \emph{Never} use quotation marks found on your keyboard.
 %doc% They end up in strange characters or false looking quotation marks.
-%doc% 
-%doc% In \LaTeX{} you are able to use typographically correct quotation marks. The package 
+%doc%
+%doc% Different languages also use quotation marks differently. In \LaTeX{} you
+%doc% are able to use typographically correct quotation marks. The package 
 %doc% \href{http://www.ctan.org/pkg/csquotes}{\texttt{csquotes}} offers you with 
 %doc% \verb#\enquote{foobar}# a command to get correct quotation marks around \enquote{foobar}.
-%doc% Please do check the package options in order to modify
-%doc% its settings according to the language used\footnote{most of the time in 
-%doc% combination with the language set in the options of the \texttt{babel} package}.
 %doc% 
 %doc% \href{http://www.ctan.org/pkg/csquotes}{\texttt{csquotes}} is also recommended 
 %doc% by \texttt{biblatex} (see Section~\ref{sec:references}). 
-\usepackage[babel=true,strict=true,english=american,german=guillemets]{csquotes}
+\usepackage[autostyle=true,strict=true,english=american,german=guillemets]{csquotes}
 
 %doc% 
 %doc% \subsection{Line spread}