cleanthesis (26jun19)

git-svn-id: svn://tug.org/texlive/trunk@51472 c570f23f-e606-0410-a88d-b1316a301751

23 files changed, 725 insertions, 424 deletions

diff --git a/Master/texmf-dist/doc/latex/cleanthesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/cleanthesis/CHANGELOG.md
index 784b6a53b11..11484a2dca0 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/cleanthesis/CHANGELOG.md
@@ -1,7 +1,7 @@
 ---
 
 CHANGELOG.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -27,6 +27,19 @@ The latest version of this file can be found at the master branch of the
 ## Latest Dev
 - ...
 
+## v0.4.0
+- Fixed compatibility to new version of KOMA script
+- Fixed code for headline/title styles (e.g., removed use of package titlesec)
+- Fixed code for footer style (e.g., removed use of package fancyhdr)
+- Fixed compatibility to new version of biblatex (e.g., obsolete options)
+- Fixed an issue with page breaks at headings (thanks @guillerodriguez)
+- Added style for part sections (often used for books)
+- Added new package options: quotation style, bibliography sorting, 
+- Changed alignment of titles from justified to left aligned
+- Changed the documentation according the updates
+- Changed file structure of the repository in order to improve the development and release process
+- Example: several improvements, such as location of appendix, use of subsubsections and paragraphs, long section titles, listings, pdf bookmark for toc, or separate config file
+
 ## v0.3.1
 - re-licensed cleanthesis using the LPPL 1.3, http://www.latex-project.org/lppl.txt
 - moved documentation into a separate subfolder (doc/)
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/MANIFEST.md b/Master/texmf-dist/doc/latex/cleanthesis/MANIFEST.md
index bfcce9491dd..a4ec746b550 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/MANIFEST.md
+++ b/Master/texmf-dist/doc/latex/cleanthesis/MANIFEST.md
@@ -1,7 +1,7 @@
 ---
 
 MANIFEST.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -27,6 +27,7 @@ cleanthesis/
 |-- cleanthesis.sty             - the cleanthesis style
 |-- MANIFEST.md                 - this file
 |-- README.md                   - readme file
+|-- VERSION                     - the version of the style
 |-- doc/
     |-- cleanthesis-doc.tex     - documentation source
     |-- cleanthesis-doc.pdf     - generated documentation
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/README.md b/Master/texmf-dist/doc/latex/cleanthesis/README.md
index 27b2f2ca2b2..3e7ee50281c 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/README.md
+++ b/Master/texmf-dist/doc/latex/cleanthesis/README.md
@@ -1,7 +1,15 @@
 # Clean Thesis
-*-- A LaTeX Style for Thesis Documents --*
+*-- A Clean LaTeX Style for Thesis Documents --*
 
-## Readme:
+## Table of contents
+
+* [About](#about)
+* [Getting started](#getting-started)
+* [Documentation and Support](#documentation-and-support)
+* [Contributing](#contributing)
+* [License Information](#license-information)
+
+## About
 
 **Clean, Simple, Elegant**
 *Clean Thesis* is a LaTeX style for thesis documents, developed for my diploma thesis (Diplomarbeit). The style can be understood as my personal compromise — a typical clean looking scientific document combined and polished with minor beautifications.
@@ -11,15 +19,32 @@ The design of this *Clean Thesis* style is inspired by user guide documents from
 Note: If you are looking for an exact and correct style regarding typographic rules, please have a look at the "[Classic Thesis Style](see http://www.miede.de/#classicthesis)".
 
 **Donation = Postcard**
-Based on the idea of André Miede: If you like the *Clean Thesis* style I would be very pleased about a donation in the form of a POSTCARD. You can find my address at the *Clean Thesis* [website](http://cleanthesis.der-ric.de/) as well as in the [documentation](Clean-Thesis.pdf). I am going to collect all postcards and exhibit them at the website I mentioned.
+Based on the idea of André Miede: If you like the *Clean Thesis* style I would be very pleased about a donation in the form of a POSTCARD. You can find my address at the *Clean Thesis* [website](http://cleanthesis.der-ric.de/) as well as in the [documentation](doc/cleanthesis-doc.pdf). I am going to collect all postcards and exhibit them at the website I mentioned.
 
 **Idea and Inspiration**
-The idea of providing my customized style for thesis documents passed through my mind while writing my own thesis. Motivated and inspired by the superb "[Classic Thesis Style](see http://www.miede.de/#classicthesis)" by André Miede (thanks to André for doing a great job) I decided to collect all design and style related functionality in a separate LaTeX style and provide this style to other thesis writers.
+The idea of providing my customized style for thesis documents passed through my mind while writing my own thesis. Motivated and inspired by the superb "[Classic Thesis Style](http://www.miede.de/#classicthesis)" by André Miede (thanks to André for doing a great job) I decided to collect all design and style related functionality in a separate LaTeX style and provide this style to other thesis writers.
+
+## Getting started
+
+* Make sure you have an up-to-date TeX distribution
+* Download the latest [release](https://github.com/derric/cleanthesis/releases) or clone the repository with `git clone https://github.com/derric/cleanthesis.git`
+* Check out the included [example thesis](my-thesis.tex)
+* [Read the documentation](doc/cleanthesis-doc.pdf) to learn more about *Clean Thesis* and available package options
+
+## Documentation and Support
+
+The [documentation](doc/cleanthesis-doc.pdf) gives an overview of available package options.
+
+Please ask **questions** or start **discussions** about *Clean Thesis* at [Stack Exchange](http://tex.stackexchange.com/questions/tagged/cleanthesis) (tagged [cleanthesis](http://tex.stackexchange.com/questions/tagged/cleanthesis)). GitHub issues are for development purposes, e.g, reporting bugs or requesting new features.
+
+## Contributing
+
+Did you find an error or a bug? Do you have a feature request? Before opening a [new issue](https://github.com/derric/cleanthesis/issues/new), please check out the list of [existing](https://github.com/derric/cleanthesis/issues) and [closed](https://github.com/derric/cleanthesis/issues?q=is%3Aissue+is%3Aclosed) issues.
 
-## License Information:
+## License Information
 
 README.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/VERSION b/Master/texmf-dist/doc/latex/cleanthesis/VERSION
new file mode 100644
index 00000000000..60a2d3e96c8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cleanthesis/VERSION
@@ -0,0 +1 @@
+0.4.0
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/abstract.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/abstract.tex
index 00cb3d2169a..a011582632e 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/abstract.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/abstract.tex
@@ -1,14 +1,14 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \pdfbookmark[0]{Abstract}{Abstract}
-\chapter*{Abstract}
+\addchap*{Abstract}
 \label{sec:abstract}
-\vspace*{-10mm}
 
 \blindtext
 
 \vspace*{20mm}
 
-{\usekomafont{chapter}Abstract (different language)}\label{sec:abstract-diff} \\
+{\usekomafont{chapter}Abstract (different language)}
+\label{sec:abstract-diff}
 
 \blindtext
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/acknowledgement.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/acknowledgement.tex
index 5f6d4cf4e33..09f29999d79 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/acknowledgement.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/acknowledgement.tex
@@ -1,8 +1,7 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \pdfbookmark[0]{Acknowledgement}{Acknowledgement}
-\chapter*{Acknowledgement}
+\addchap*{Acknowledgement}
 \label{sec:acknowledgement}
-\vspace*{-10mm}
 
 \Blindtext[2][2]
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-appendix.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-appendix.tex
new file mode 100644
index 00000000000..e482c186410
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-appendix.tex
@@ -0,0 +1,40 @@
+% !TEX root = ../my-thesis.tex
+%
+\chapter{Example Appendix}
+\label{sec:appendix}
+
+\Blindtext[1][1]
+
+\section{Appendix Section 1}
+\label{sec:appendix:sec1}
+
+\Blindtext[1][1]
+
+\begin{table}[h]
+	\begin{tabularx}{\textwidth}{X | X | X}
+		%\hline
+		Alpha		& Beta			& Gamma			\\ \hline
+		0			& 1				& 2				\\ \hline
+		3			& 4				& 5				\\ %\hline
+	\end{tabularx}
+	\label{tab:table1}
+	\caption{This is a caption text.}
+\end{table}
+
+\section{Appendix Section 2}
+\label{sec:appendix:sec2}
+
+\Blindtext[1][1]
+
+\begin{table}[h]
+	\begin{tabularx}{\textwidth}{X | X | X}
+		%\hline
+		Alpha		& Beta			& Gamma			\\ \hline
+		0			& 1				& 2				\\ \hline
+		3			& 4				& 5				\\ %\hline
+	\end{tabularx}
+	\label{tab:table2}
+	\caption{This is a caption text.}
+\end{table}
+
+\Blindtext[1][2]
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-concepts.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-concepts.tex
index 4464cdc5101..3255bf362bc 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-concepts.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-concepts.tex
@@ -1,6 +1,6 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
-\chapter{Concepts: This text is here to test a very long title, to simulate the line break behavior, to show that an extremely long tilte also works}
+\chapter{Concepts: This text is here to test a very long title, to simulate the line break behavior, to show that an extremely long title also works}
 \label{sec:concepts}
 
 \cleanchapterquote{Users do not care about what is inside the box, as long as the box does what they need done.}{Jef Raskin}{about Human Computer Interfaces}
@@ -12,7 +12,7 @@
 
 \Blindtext[2][2]
 
-\section{Concepts Section 2}
+\section{Concepts Section 2 with a very very long title that illustrates how long section titles are handled in the footer}
 \label{sec:concepts:sec2}
 
 \Blindtext[3][2]
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-conclusion.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-conclusion.tex
index 20e2ec81099..a4b46b944f5 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-conclusion.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-conclusion.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \chapter{Conclusion}
 \label{sec:conclusion}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-introduction.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-introduction.tex
index 9cd34ebad32..a10e2c4af08 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-introduction.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-introduction.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \chapter{Introduction}
 \label{sec:intro}
@@ -28,7 +28,40 @@ Germany
 
 \subsection{Some References}
 \label{sec:intro:results:refs}
+
 \cite{WEB:GNU:GPL:2010,WEB:Miede:2011}
+\Blindtext[1][1]
+
+\subsubsection{Methodology}
+\label{sec:intro:results:refs:method}
+
+\Blindtext[1][2]
+
+\paragraph{Strategy 1}
+\Blindtext[1][1]
+
+\begin{lstlisting}[language=Python, caption={This simple helloworld.py file prints Hello World.}\label{lst:pyhelloworld}]
+#!/usr/bin/env python
+print "Hello World"
+\end{lstlisting}
+
+\paragraph{Strategy 2}
+\Blindtext[1][1]
+
+\begin{lstlisting}[language=Python, caption={This is a bubble sort function.}\label{lst:pybubblesort}]
+#!/usr/bin/env python
+def bubble_sort(list):
+    for num in range(len(list)-1,0,-1):
+        for i in range(num):
+            if list[i]>list[i+1]:
+                tmp = list[i]
+                list[i] = list[i+1]
+                list[i+1] = tmp
+
+alist = [34,67,2,4,65,16,17,95,20,31]
+bubble_sort(list)
+print(list)
+\end{lstlisting}
 
 \section{Thesis Structure}
 \label{sec:intro:structure}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-related-work.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-related-work.tex
index 04c3c9142f0..5fe1cbfa80b 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-related-work.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-related-work.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \chapter{Related Work}
 \label{sec:related}
@@ -7,6 +7,17 @@
 
 \Blindtext[2][1]
 
+\begin{lstlisting}[language=Java, caption={A simple Hellow World example in Java.}\label{lst:javahelloworld}]
+public class HelloWorld {
+	public static void main ( String[] args ) {
+		// Output Hello World!
+		System.out.println( "Hello World!" );
+	}
+}
+\end{lstlisting}
+
+\Blindtext[1][1]
+
 \section{Related Work Section 1}
 \label{sec:related:sec1}
 
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-system.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-system.tex
index 5fea8c9354a..641d8a9c07f 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-system.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/chapter-system.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \chapter{System}
 \label{sec:system}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/colophon.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/colophon.tex
index 59fc99e7e4b..94fe0678788 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/colophon.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/colophon.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 \pagestyle{empty}
 \hfill
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/declaration.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/declaration.tex
index db58183ea20..08905f468ea 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/declaration.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/declaration.tex
@@ -1,10 +1,10 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 %************************************************
 % Declaration
 %************************************************
 \pdfbookmark[0]{Declaration}{Declaration}
-\chapter*{Declaration}
+\addchap{Declaration}
 \label{sec:declaration}
 \thispagestyle{empty}
 
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/content/titlepages.tex b/Master/texmf-dist/doc/latex/cleanthesis/content/titlepages.tex
index 497b14e9642..3fe08353cd9 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/content/titlepages.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/content/titlepages.tex
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
 %
 % ------------------------------------  --> cover title page
 \begin{titlepage}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf b/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf
index c38f8375973..d75851ad2b0 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf
+++ b/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.tex b/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.tex
index 49601243947..d153bbccb7e 100644
--- a/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.tex
+++ b/Master/texmf-dist/doc/latex/cleanthesis/doc/cleanthesis-doc.tex
@@ -1,5 +1,5 @@
 %% cleanthesis-doc.tex
-%% Copyright 2015 R. Langner
+%% Copyright 2019 R. Langner
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -25,8 +25,7 @@
 \usepackage{booktabs}
 \usepackage{shortvrb}
 \usepackage{pifont}
-
-\rcsid{$Id: cleanthesis.tex,v 0.3.1 2015/08/26 23:32:00 derric stable $}
+\usepackage{graphicx}
 
 \newcommand*{\cleanthesis}{\emph{Clean Thesis}\xspace}
 \newcommand*{\cthesishome}{http://cleanthesis.der-ric.de/}
@@ -34,21 +33,26 @@
 
 \titlepage{%
   title={The \sty{cleanthesis} Package},
-  subtitle={A LaTeX Style for Thesis Documents},
+  subtitle={A Clean LaTeX Style for Thesis Documents},
   url={\cthesishome},
   author={Ricardo Langner},
   email={info@cleanthesis.der-ric.de},
-  revision={\rcsrevision},
-  date={\rcstoday}}
+  revision={0.4.0},
+  date={2019/06/21}}
 
 \hypersetup{%
   pdftitle={The \cleanthesis Package},
-  pdfsubject={A LaTeX Style for Thesis Documents},
+  pdfsubject={A Clean LaTeX Style for Thesis Documents},
   pdfauthor={Ricardo Langner},
   pdfkeywords={tex, latex, thesis, style}}
 
 
 %\setcounter{secnumdepth}{4}
+% > adjust depth of the toc and removes the indention
+\setcounter{tocdepth}{3}
+\AtBeginToc{\setcounter{tocdepth}{3}}
+\AtEndToc{\setcounter{tocdepth}{5}}
+\KOMAoption{toc}{flat}
 
 \begin{document}
 
@@ -83,7 +87,7 @@ Alfred-Schrapel-Str. 7 \\
 \subsection{License}
 \label{sec:intro:license}
 
-Copyright \textcopyright\ 2015 R. Langner
+Copyright \textcopyright\ 2019 R. Langner
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -107,7 +111,7 @@ This work consists of all files listed in MANIFEST.md.
 
 First of all I would like to thank André Miede. He is the author of the Classic Thesis style. His Classic Thesis style inspired end encouraged me to publish my own thesis style. Thank you André for doing a great job.
 
-I would like to thank the following people for using the \cleanthesis style and giving important initial feedback to me, e.g., features, bugs: (1) \textbf{Sebastian Kleinau}\footnote{\url{http://www.sk-downloading.de/} (in German only)} in his bachelor thesis, (2) \textbf{Mathias Frisch}\footnote{\url{http://wwwpub.zih.tu-dresden.de/~frisch/}} in his dissertation (PhD), and (3) \textbf{Anton Augsburg}\footnote{\url{http://antonaugsburg.de/} (in German only)} in his project thesis.
+I would like to thank the following people for using the \cleanthesis style and providing me important initial feedback (e.g., features, bugs): (1) \textbf{Sebastian Kleinau} in his bachelor thesis, (2) \textbf{Mathias Frisch} in his dissertation (PhD), and (3) \textbf{Anton Augsburg} in his project thesis.
 
 \subsection{Prerequisites}
 \label{sec:intro:pre}
@@ -124,16 +128,12 @@ The following section gives an overview of all resources required by this packag
 \label{sec:userguide:pkgopt}
 
 All package options are given in \keyval notation.
-The value \texttt{true} can be omitted for all boolean keys, \eg \opt{sansserif} without a value is equivalent to \kvopt{sansserif}{true}.
+The value \texttt{true} can be omitted for all boolean keys, \eg \opt{hangsection} without a value is equivalent to \kvopt{hangsection}{true}.
 
 All of the following options must be used as \sty{cthesis} is loaded, \ie in the optional argument to \cmd{usepackage}.
 
 \begin{optionlist}
 
-\boolitem[false]{sansserif}
-
-Sets whether to use a sans serif font or not.
-
 \boolitem[false]{hangfigurecaption}
 
 Sets whether to use a hanging figure label (similar to headlines, placed in page margin) or not.
@@ -146,6 +146,14 @@ Sets whether to use a hanging section label (placed in page margin) or not.
 
 Sets whether to use a hanging sub-section label (placed in page margin) or not.
 
+\boolitem[false]{sansserif}
+
+Sets whether to use a sans serif font or not.
+
+\boolitem[false]{configurelistings}
+
+Sets whether to use the package listings and to configure the visual appearance of lstlisting environments.
+
 \optitem[endash]{figuresep}{\opt{none},\opt{colon},\opt{period},\opt{space},\opt{quad},\opt{endash}}
 
 This option can be used to define a different label separator for cations of figures. The following value are allowed:
@@ -187,6 +195,23 @@ The following values are allowed:
 \item[bluegreen] Headlines and titles use a blue color, figure labels use green.
 \end{valuelist}
 
+\optitem[english]{quotesstyle}{csquotes style options}
+
+Sets the quote style.
+This is a direct interface to the corresponding style option of the csquotes package.
+For further information please check out the csquotes documentation \url{https://www.ctan.org/pkg/csquotes}.
+The default is \texttt{english}.
+For individual settings, for instance German quotes, you can use \texttt{quotesstyle=german}.
+
+
+\subsubsection{Setup Your Bibliography}
+
+\boolitem[false]{configurebiblatex}
+
+Sets whether to use and configure the package biblatex within the template.
+
+If this option is set to false, you can setup your bibliography environment by yourself depending on your individual needs or requirements. In this case, you have to include something like \cs{usepackage\{biblatex\}} and \cs{bibliography\{bib-refs\}} in your preamble (i.e., before the \cs{begin\{document\}} statement).
+
 \optitem[bibtex]{bibsys}{\opt{biber},\opt{bibtex}}
 
 Sets whether to use \texttt{biber} or \texttt{bibtex} as citation management tool (engine).
@@ -199,11 +224,35 @@ The default (still) is \texttt{bibtex}.
 Sets the file name of the bibtex file used for the bibliography.
 If this option is not used (defined), the package looks for the default bibliography \texttt{bib-refs.bib}.
 
-\optitem[alphabetic]{bibstyle}{\opt{alphabetic},\opt{numeric},\opt{authoryear}}
+\optitem[alphabetic]{bibstyle}{biblatex style options}
 
-Sets whether to use an \texttt{alphabetic}, a \texttt{numeric}, or an \texttt{authoryear} reference style for the bibliography.
-For further information please check out the biblatex documentation\footnote{\url{http://www.ctan.org/pkg/biblatex}}.
+Sets the bibliography style.
+This is a direct interface to the corresponding style option of the biblatex package.
+For further information please check out the biblatex documentation \url{http://www.ctan.org/pkg/biblatex}.
 The default is \texttt{alphabetic}.
+Two popular options are:
+
+\begin{valuelist}
+\item[alphabetic] (default) Prints labels similar to the traditional BibTeX style \texttt{alpha.bst}, for instance \texttt{[Lan+15]} or \texttt{[LHD17]}
+\item[numeric] Uses numeric labels, such as \texttt{[1]} or \texttt{[37]}
+\end{valuelist}
+
+However, you can also pass non-standard options to make use of other bibliography packages for biblatex.
+For example, by setting the option \texttt{style=ieee} or \texttt{style=ieee-alphabetic} you can use the biblatex-ieee package (see \url{https://ctan.org/pkg/biblatex-ieee}).
+
+\optitem[nty]{bibsorting}{biblatex sorting options}
+
+Sets the sorting order of the bibliography.
+This is a direct interface to the corresponding option of the biblatex package.
+For further information please check out the biblatex documentation \url{http://www.ctan.org/pkg/biblatex}.
+The default is \texttt{nty}.
+Some popular options include:
+
+\begin{valuelist}
+\item[nty] (default) Sort by name, title, year
+\item[nyt] Sort by name, year, title
+\item[none] No sorting at all, entries are processed in the order of their citation
+\end{valuelist}
 
 \end{optionlist}
 
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/my-thesis-setup.tex b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis-setup.tex
new file mode 100644
index 00000000000..b446bbf8631
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis-setup.tex
@@ -0,0 +1,77 @@
+% !TEX root = my-thesis.tex
+
+
+% **************************************************
+% Files' Character Encoding
+% **************************************************
+\PassOptionsToPackage{utf8}{inputenc}
+\usepackage{inputenc}
+
+
+% **************************************************
+% Information and Commands for Reuse
+% **************************************************
+\newcommand{\thesisTitle}{The Clean Thesis Style}
+\newcommand{\thesisName}{Ricardo Langner}
+\newcommand{\thesisSubject}{Documentation}
+\newcommand{\thesisDate}{June 21, 2016}
+\newcommand{\thesisVersion}{My First Draft}
+
+\newcommand{\thesisFirstReviewer}{Jane Doe}
+\newcommand{\thesisFirstReviewerUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisFirstReviewerDepartment}{Department of Clean Thesis Style}
+
+\newcommand{\thesisSecondReviewer}{John Doe}
+\newcommand{\thesisSecondReviewerUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisSecondReviewerDepartment}{Department of Clean Thesis Style}
+
+\newcommand{\thesisFirstSupervisor}{Jane Doe}
+\newcommand{\thesisSecondSupervisor}{John Smith}
+
+\newcommand{\thesisUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisUniversityDepartment}{Department of Clean Thesis Style}
+\newcommand{\thesisUniversityInstitute}{Institute for Clean Thesis Dev}
+\newcommand{\thesisUniversityGroup}{Clean Thesis Group (CTG)}
+\newcommand{\thesisUniversityCity}{City}
+\newcommand{\thesisUniversityStreetAddress}{Street address}
+\newcommand{\thesisUniversityPostalCode}{Postal Code}
+
+
+% **************************************************
+% Debug LaTeX Information
+% **************************************************
+%\listfiles
+
+
+% **************************************************
+% Load and Configure Packages
+% **************************************************
+\usepackage[english]{babel} % babel system, adjust the language of the content
+\PassOptionsToPackage{% setup clean thesis style
+    figuresep=colon,%
+    hangfigurecaption=false,%
+    hangsection=true,%
+    hangsubsection=true,%
+    sansserif=false,%
+    configurelistings=true,%
+    colorize=full,%
+    colortheme=bluemagenta,%
+    configurebiblatex=true,%
+    bibsys=biber,%
+    bibfile=bib-refs,%
+    bibstyle=alphabetic,%
+    bibsorting=nty,%
+}{cleanthesis}
+\usepackage{cleanthesis}
+
+\hypersetup{% setup the hyperref-package options
+    pdftitle={\thesisTitle},    %   - title (PDF meta)
+    pdfsubject={\thesisSubject},%   - subject (PDF meta)
+    pdfauthor={\thesisName},    %   - author (PDF meta)
+    plainpages=false,           %   -
+    colorlinks=false,           %   - colorize links?
+    pdfborder={0 0 0},          %   -
+    breaklinks=true,            %   - allow line break inside links
+    bookmarksnumbered=true,     %
+    bookmarksopen=true          %
+}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.pdf b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.pdf
new file mode 100644
index 00000000000..6574034c159
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.pdf
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.tex b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.tex
new file mode 100644
index 00000000000..eedba725b57
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cleanthesis/my-thesis.tex
@@ -0,0 +1,124 @@
+% **************************************************
+% Document Class Definition
+% **************************************************
+\documentclass[%
+    paper=A4,               % paper size --> A4 is default in Germany
+    twoside=true,           % onesite or twoside printing
+    openright,              % doublepage cleaning ends up right side
+    parskip=half,           % spacing value / method for paragraphs
+    chapterprefix=true,     % prefix for chapter marks
+    11pt,                   % font size
+    headings=normal,        % size of headings
+    bibliography=totoc,     % include bib in toc
+    listof=totoc,           % include listof entries in toc
+    titlepage=on,           % own page for each title page
+    captions=tableabove,    % display table captions above the float env
+    chapterprefix=false,    % do not display a prefix for chapters
+    appendixprefix=false,    % but display a prefix for appendix chapter
+    draft=false,            % value for draft version
+]{scrreprt}%
+
+
+% **************************************************
+% Setup YOUR thesis document in this file !
+% **************************************************
+\input{my-thesis-setup}
+
+
+% **************************************************
+% Document CONTENT
+% **************************************************
+\begin{document}
+
+% uncomment the following command to fill up pages with
+% whitespace instead of aligning the first and last lines
+% of a page (see \raggedbottom vs. \flushbottom)
+%\raggedbottom
+
+% --------------------------
+% rename document parts
+% --------------------------
+%\renewcaptionname{ngerman}{\figurename}{Abb.}
+%\renewcaptionname{ngerman}{\tablename}{Tab.}
+\renewcaptionname{english}{\figurename}{Fig.}
+\renewcaptionname{english}{\tablename}{Tab.}
+
+% --------------------------
+% Front matter
+% --------------------------
+\pagenumbering{roman}			% roman page numbing (invisible for empty page style)
+\pagestyle{empty}				% no header or footers
+\input{content/titlepages}		% INCLUDE: all titlepages
+\cleardoublepage
+
+\pagestyle{plain}				% display just page numbers
+\input{content/abstract}		% INCLUDE: the abstracts (english and german)
+\cleardoublepage
+%
+\input{content/acknowledgement} % INCLUDE: acknowledgement
+\cleardoublepage
+%
+\currentpdfbookmark{\contentsname}{toc}
+\setcounter{tocdepth}{2}		% define depth of toc
+\tableofcontents				% display table of contents
+\cleardoublepage
+
+% --------------------------
+% Body matter
+% --------------------------
+\pagenumbering{arabic}			% arabic page numbering
+\setcounter{page}{1}			% set page counter
+\pagestyle{scrheadings}			% header and footer style
+
+%% Uncomment the following lines using the \part command
+%% to add part sections
+%\part{Example Part}
+\input{content/chapter-introduction}   % INCLUDE: introduction
+\input{content/chapter-related-work}   % INCLUDE: related work
+
+%\part{Additional Example Part}
+\input{content/chapter-system}         % INCLUDE: system
+\input{content/chapter-concepts}       % INCLUDE: concepts
+\input{content/chapter-conclusion}     % INCLUDE: conclusion
+
+% --------------------------
+% Back matter
+% --------------------------
+%
+{%
+\setstretch{1.1}
+\renewcommand{\bibfont}{\normalfont\small}
+\setlength{\biblabelsep}{0pt}
+\setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
+\printbibliography[nottype=online]
+\newrefcontext[labelprefix={@}]
+\printbibliography[heading=subbibliography,title={Webpages},type=online]
+}
+\cleardoublepage
+
+\listoffigures
+\cleardoublepage
+
+\listoftables
+\cleardoublepage
+
+\lstlistoflistings
+\cleardoublepage
+
+\appendix\cleardoublepage
+\input{content/chapter-appendix}       % INCLUDE: appendix
+
+\cleardoublepage
+\input{content/colophon}
+
+\cleardoublepage
+\input{content/declaration}
+\clearpage
+
+\newpage
+\mbox{}
+
+% **************************************************
+% End of Document CONTENT
+% **************************************************
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.pdf b/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.pdf
deleted file mode 100644
index b028f8bac35..00000000000
--- a/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.tex b/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.tex
deleted file mode 100644
index 885b0c09bcd..00000000000
--- a/Master/texmf-dist/doc/latex/cleanthesis/thesis-example.tex
+++ /dev/null
@@ -1,158 +0,0 @@
-% **************************************************
-% Document Class Definition
-% **************************************************
-\documentclass[%
-	paper=A4,					% paper size --> A4 is default in Germany
-	twoside=true,				% onesite or twoside printing
-	openright,					% doublepage cleaning ends up right side
-	parskip=full,				% spacing value / method for paragraphs
-	chapterprefix=true,			% prefix for chapter marks
-	11pt,						% font size
-	headings=normal,			% size of headings
-	bibliography=totoc,			% include bib in toc
-	listof=totoc,				% include listof entries in toc
-	titlepage=on,				% own page for each title page
-	captions=tableabove,		% display table captions above the float env
-	draft=false,				% value for draft version
-]{scrreprt}%
-
-% **************************************************
-% Debug LaTeX Information
-% **************************************************
-%\listfiles
-
-% **************************************************
-% Information and Commands for Reuse
-% **************************************************
-\newcommand{\thesisTitle}{The Clean Thesis Style}
-\newcommand{\thesisName}{Ricardo Langner}
-\newcommand{\thesisSubject}{Documentation}
-\newcommand{\thesisDate}{August 26, 2015}
-\newcommand{\thesisVersion}{My First Draft}
-
-\newcommand{\thesisFirstReviewer}{Jane Doe}
-\newcommand{\thesisFirstReviewerUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisFirstReviewerDepartment}{Department of Clean Thesis Style}
-
-\newcommand{\thesisSecondReviewer}{John Doe}
-\newcommand{\thesisSecondReviewerUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisSecondReviewerDepartment}{Department of Clean Thesis Style}
-
-\newcommand{\thesisFirstSupervisor}{Jane Doe}
-\newcommand{\thesisSecondSupervisor}{John Smith}
-
-\newcommand{\thesisUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisUniversityDepartment}{Department of Clean Thesis Style}
-\newcommand{\thesisUniversityInstitute}{Institut for Clean Thesis Dev}
-\newcommand{\thesisUniversityGroup}{Clean Thesis Group (CTG)}
-\newcommand{\thesisUniversityCity}{City}
-\newcommand{\thesisUniversityStreetAddress}{Street address}
-\newcommand{\thesisUniversityPostalCode}{Postal Code}
-
-% **************************************************
-% Load and Configure Packages
-% **************************************************
-\usepackage[utf8]{inputenc}		% defines file's character encoding
-\usepackage[english]{babel} % babel system, adjust the language of the content
-\usepackage[					% clean thesis style
-	figuresep=colon,%
-	sansserif=false,%
-	hangfigurecaption=false,%
-	hangsection=true,%
-	hangsubsection=true,%
-	colorize=full,%
-	colortheme=bluemagenta,%
-	bibsys=bibtex,%
-	bibfile=bib-refs,%
-	bibstyle=alphabetic,%
-]{cleanthesis}
-
-\hypersetup{					% setup the hyperref-package options
-	pdftitle={\thesisTitle},	% 	- title (PDF meta)
-	pdfsubject={\thesisSubject},% 	- subject (PDF meta)
-	pdfauthor={\thesisName},	% 	- author (PDF meta)
-	plainpages=false,			% 	-
-	colorlinks=false,			% 	- colorize links?
-	pdfborder={0 0 0},			% 	-
-	breaklinks=true,			% 	- allow line break inside links
-	bookmarksnumbered=true,		%
-	bookmarksopen=true			%
-}
-
-% **************************************************
-% Document CONTENT
-% **************************************************
-\begin{document}
-
-% --------------------------
-% rename document parts
-% --------------------------
-%\renewcaptionname{ngerman}{\figurename}{Abb.}
-%\renewcaptionname{ngerman}{\tablename}{Tab.}
-\renewcaptionname{english}{\figurename}{Fig.}
-\renewcaptionname{english}{\tablename}{Tab.}
-
-% --------------------------
-% Front matter
-% --------------------------
-\pagenumbering{roman}			% roman page numbing (invisible for empty page style)
-\pagestyle{empty}				% no header or footers
-\input{content/titlepages}		% INCLUDE: all titlepages
-\cleardoublepage
-
-\pagestyle{plain}				% display just page numbers
-\input{content/abstract}		% INCLUDE: the abstracts (english and german)
-\cleardoublepage
-%
-\input{content/acknowledgement} % INCLUDE: acknowledgement
-\cleardoublepage
-%
-\setcounter{tocdepth}{2}		% define depth of toc
-\tableofcontents				% display table of contents
-\cleardoublepage
-
-% --------------------------
-% Body matter
-% --------------------------
-\pagenumbering{arabic}			% arabic page numbering
-\setcounter{page}{1}			% set page counter
-\pagestyle{maincontentstyle} 	% fancy header and footer
-
-\input{content/chapter-introduction} % INCLUDE: introduction
-\input{content/chapter-related-work} % INCLUDE: related work
-\input{content/chapter-system}	% INCLUDE: system
-\input{content/chapter-concepts} % INCLUDE: concepts
-\input{content/chapter-conclusion} % INCLUDE: conclusion
-\cleardoublepage
-
-% --------------------------
-% Back matter
-% --------------------------
-{%
-\setstretch{1.1}
-\renewcommand{\bibfont}{\normalfont\small}
-\setlength{\biblabelsep}{0pt}
-\setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
-\printbibliography[nottype=online]
-\printbibliography[heading=subbibliography,title={Webseiten},type=online,prefixnumbers={@}]
-}
-\cleardoublepage
-
-\listoffigures
-\cleardoublepage
-
-\listoftables
-\cleardoublepage
-
-\input{content/colophon}
-\cleardoublepage
-
-\input{content/declaration}
-\clearpage
-\newpage
-\mbox{}
-
-% **************************************************
-% End of Document CONTENT
-% **************************************************
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/cleanthesis/cleanthesis.sty b/Master/texmf-dist/tex/latex/cleanthesis/cleanthesis.sty
index 188515d44ce..7091ebd0722 100644
--- a/Master/texmf-dist/tex/latex/cleanthesis/cleanthesis.sty
+++ b/Master/texmf-dist/tex/latex/cleanthesis/cleanthesis.sty
@@ -1,5 +1,5 @@
 %% cleanthesis.sty
-%% Copyright 2015 R. Langner
+%% Copyright 2019 R. Langner
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -29,7 +29,7 @@
 %
 % **************************************************
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cleanthesis}[2015/08/26 v0.3.1 Clean-looking thesis style inspired by Apple's user guide documents]
+\ProvidesPackage{cleanthesis}[2019/06/21 v0.4.0 A clean LaTeX style for thesis documents]
 %
 % **************************************************
 % Package options
@@ -42,11 +42,6 @@
 % in an easy way
 \RequirePackage{xkeyval}
 
-% OPTION sansserif
-% --> values = true|false
-\define@boolkey[ct]{cthesis}{sansserif}[true]{}
-\setkeys[ct]{cthesis}{sansserif=false}
-
 % OPTION hangfigurecaption
 % --> values = true|false
 \define@boolkey[ct]{cthesis}{hangfigurecaption}[true]{}
@@ -62,6 +57,21 @@
 \define@boolkey[ct]{cthesis}{hangsubsection}[true]{}
 \setkeys[ct]{cthesis}{hangsubsection=true}
 
+% OPTION sansserif
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{sansserif}[false]{}
+\setkeys[ct]{cthesis}{sansserif=false}
+
+% OPTION configurelistings
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{configurelistings}[false]{}
+\setkeys[ct]{cthesis}{configurelistings=false}
+
+% OPTION configurebiblatex
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{configurebiblatex}[false]{}
+\setkeys[ct]{cthesis}{configurebiblatex=false}
+
 % OPTION figuresep
 % --> values = none|colon|period|space|quad|endash
 \define@choicekey*[ct]{cthesis}{figuresep}{none,colon,period,space,quad,newline,endash}[endash]{\def\cthesis@figuresep{#1}}
@@ -88,10 +98,19 @@
 \setkeys[ct]{cthesis}{bibfile=bib-refs}
 
 % OPTION bibstyle
-% --> values = alphabetic|numeric|authoryear
-\define@choicekey*[ct]{cthesis}{bibstyle}[\val\bibstylenr]{alphabetic,numeric,authoryear}[alphabetic]{\def\cthesis@bibstyle{#1}}
+% --> values = biblatex style options
+\define@key[ct]{cthesis}{bibstyle}[alphabetic]{\def\cthesis@bibstyle{#1}}
 \setkeys[ct]{cthesis}{bibstyle=alphabetic}
 
+% OPTION bibsorting
+% --> values = biblatex sorting options
+\define@key[ct]{cthesis}{bibsorting}[nty]{\def\cthesis@bibsorting{#1}}
+\setkeys[ct]{cthesis}{bibsorting=nty}
+
+% OPTION quotesstyle
+% --> values = csquotes style options
+\define@key[ct]{cthesis}{quotesstyle}[english]{\def\cthesis@quotesstyle{#1}}
+\setkeys[ct]{cthesis}{quotesstyle=english}
 
 \DeclareOptionX*{
 	\PackageWarning{cleanthesis}{Unknown option ‘\CurrentOption’}%
@@ -99,6 +118,8 @@
 
 \ProcessOptionsX[ct]<cthesis>
 
+% Checks if bib file exists, if not we throw an error
+\IfFileExists{\cthesis@bibfile.bib}{}{\PackageError{cleanthesis}{Unable to find BibTeX file \cthesis@bibfile.bib!}{Please provide the name of your BibTeX file to the cleanthesis package parameter bibfile.}}
 
 % **************************************************
 % Color Definitions
@@ -186,6 +207,7 @@
 \definecolor{ctcolorblack}{gray}{0}
 \definecolor{ctcolorgray}{gray}{.5}
 \definecolor{ctcolorgraylight}{gray}{.8}
+\definecolor{ctcolorgraylighter}{gray}{.95}
 
 % sets the color theme regarding the given package option colortheme
 \ifcase\cthesis@colortheme
@@ -203,40 +225,38 @@
 % **************************************************
 % Font Definitions (see http://www.tug.dk/FontCatalogue/)
 % **************************************************
-\RequirePackage[T1]{fontenc}		% font types and character verification
-%\ifthenelse{\boolean{@sansserif}}%
+\RequirePackage[T1]{fontenc}	% font types and character verification
+
 \ifct@cthesis@sansserif
-%	{%
-		% Using sans-serif fonts
-		%
-		%\RequirePackage{helvet}	% Font:	Helvetica
-		%\RequirePackage{nimbus}	% Font:	Nimbus Sans, a clone of the Helvetica
-		\RequirePackage{tgheros}	% Font:	TEX Gyre Heros
-		%\RequirePackage{libertine}	% Font:	Biolinum, the standard sans serif typeface with the Libertine package
-		%\RequirePackage[scaled]{berasans} % Font:	Bera Sans, a a version of Bitstream Vera Sans slightly enhanced
-		\renewcommand*\familydefault{\sfdefault}%
-%	}{%
+	% Using sans-serif fonts
+	%
+	%\RequirePackage{helvet}	% Font:	Helvetica
+	%\RequirePackage{nimbus}	% Font:	Nimbus Sans, a clone of the Helvetica
+	\RequirePackage{tgheros}	% Font:	TEX Gyre Heros
+	%\RequirePackage{libertine}	% Font:	Biolinum, the standard sans serif typeface with the Libertine package
+	%\RequirePackage[scaled]{berasans} % Font:	Bera Sans, a a version of Bitstream Vera Sans slightly enhanced
+	\renewcommand*\familydefault{\sfdefault}%
 \else
-		% Using serif fonts
-		%
-		\RequirePackage{lmodern}	% font set: Latin Modern
-		\RequirePackage{charter}	% font set: Charter
-		%\RequirePackage{fourier}	% font set: (basically improved utopia)
-%	}
+	% Using serif fonts
+	%
+	\RequirePackage{lmodern}	% font set: Latin Modern
+	\RequirePackage{charter}	% font set: Charter
+	%\RequirePackage{fourier}	% font set: (basically improved utopia)
 \fi
 
 % **************************************************
 % Load Packages
 % **************************************************
-\RequirePackage{fixltx2e}			% packages provides fixes to LaTeX2e
 \RequirePackage{microtype}			% typographic tuning
 \RequirePackage{setspace}			% for line spacing, e.g. \onehalfspacing
 \RequirePackage[]{graphicx}			% graphics import features
-\RequirePackage{fancyhdr}			% for header and footer modifications
+\RequirePackage{tabularx}			% table features
+%\RequirePackage{fancyhdr}			% for header and footer modifications
 \RequirePackage{enumitem}			% for simple list modifications
 \RequirePackage{blindtext}		% package for blind text
 \RequirePackage{textcomp}			% different symbols
 \RequirePackage{hyperref} 			% interactive link inside the document
+\RequirePackage[automark]{scrlayer-scrpage}
 
 %
 \RequirePackage[					% modify figure and table captions
@@ -253,63 +273,89 @@
 %	}{}
 \fi
 %
-\RequirePackage[					% page layout modifications
-	paper=a4paper,					% 	- use A4 paper size
-	%scale={0.86,0.94},				% 	- total body size (h,v)
-	%scale={0.86,0.94},				% 	- total body size (h,v)
-	nohead,							% 	- no header
-	includefoot,					% 	- include footer space
-	includemp,						% 	- include side note space
-	bindingoffset=0.5cm,			% 	- binding correction
-	top=2.25cm,						% 	- total body: top margin
-	left=3.75cm,					% 	- total body: left margin (odd pages)
-	right=0.75cm,					% 	- total body: right margin (odd pages)
-	bottom=1.5cm,					% 	- total body: bottom margin
-	marginparwidth=1.75cm,			% 	- width for side note
-	marginparsep=10pt,				% 	- space between notes and body text (content)
-	footskip=2cm,					% 	- footer skip size
-]{geometry}
+%
+% **************************************************
+% Page construction
+% **************************************************
+\KOMAoption{headinclude}{false}     % include header in body?
+\KOMAoption{footinclude}{false}      % include footer in body?
+\KOMAoption{footlines}{2.1}         % number of foot lines
+\KOMAoption{mpinclude}{false}       % include marginpar in body?
+\KOMAoption{BCOR}{25mm}             % binding correction
+\KOMAoption{DIV}{12}                % number of page divs (divider)
+%
 %
 \RequirePackage[					% advanced quotes
 	strict=true,					% 	- warning are errors now
-	style=german					% 	- german quotes
+	style=\cthesis@quotesstyle		% 	- german quotes
 ]{csquotes}
 %
-\RequirePackage[					% use biblatex for bibliography
-	backend=\cthesis@bibsys,		% 	- use biber backend (bibtex replacement) or bibtex
-	bibencoding=utf8,				% 	- use auto file encode
-	style=\cthesis@bibstyle,		% 	- use alphabetic (or numeric) bib style
-	natbib=true,					% 	- allow natbib commands
-	hyperref=true,					% 	- activate hyperref support
-	backref=true,					% 	- activate backrefs
-	isbn=false,						% 	- don't show isbn tags
-	url=false,						% 	- don't show url tags
-	doi=false,						% 	- don't show doi tags
-	urldate=long,					% 	- display type for dates
-	maxnames=3,%
-	minnames=1,%
-	maxbibnames=5,%
-	minbibnames=3,%
-	maxcitenames=2,%
-	mincitenames=1%
-]{biblatex}
-\bibliography{\cthesis@bibfile}
-\DefineBibliographyStrings{ngerman}{%
-	andothers = {{et\,al\adddot}}, % 'et al.' instead of 'u.a.'
-	backrefpage = {{zitiert auf Seite}},%
-	backrefpages = {{zitiert auf den Seiten}},%
-}
+
+% **************************************************
+% Bibliography
+% **************************************************
+\ifct@cthesis@configurebiblatex
+	\RequirePackage[					% use biblatex for bibliography
+		backend=\cthesis@bibsys,		% 	- use biber backend (bibtex replacement) or bibtex
+		style=\cthesis@bibstyle,		% 	- use alphabetic (or numeric) bib style
+		natbib=true,					% 	- allow natbib commands
+		hyperref=true,					% 	- activate hyperref support
+		backref=true,					% 	- activate backrefs
+		isbn=false,						% 	- don't show isbn tags
+		url=false,						% 	- don't show url tags
+		doi=false,						% 	- don't show doi tags
+		urldate=long,					% 	- display type for dates
+		maxnames=3,%
+		minnames=1,%
+		maxbibnames=5,%
+		minbibnames=3,%
+		maxcitenames=2,%
+		mincitenames=1,%,
+		sorting=\cthesis@bibsorting%
+	]{biblatex}
+	\bibliography{\cthesis@bibfile}
+	\DefineBibliographyStrings{ngerman}{%
+		andothers = {{et\,al\adddot}}, % 'et al.' instead of 'u.a.'
+		backrefpage = {{zitiert auf Seite}},%
+		backrefpages = {{zitiert auf den Seiten}},%
+	}
+\fi
 
 % **************************************************
 % Text Format
 % **************************************************
 \setstretch{1.2}					% value for line spacing, use \setstretch{} or \singlespacing or \onehalfspacing or \doublespacing
-\setlength{\parindent}{0em}			% value for paragraph indentation
+%\setlength{\parindent}{0em}			% value for paragraph indentation
 \clubpenalty = 10000				% prevent single lines at the beginning of a paragraph (Schusterjungen)
 \widowpenalty = 10000				% prevent single lines at the end of a paragraph (Hurenkinder)
 \displaywidowpenalty = 10000		%
 
 % **************************************************
+% Listing Format
+% **************************************************
+\ifct@cthesis@configurelistings
+	\RequirePackage{listings}			% package for listings
+	\lstset{%
+		backgroundcolor=\color{ctcolorgraylighter},
+		linewidth=\textwidth,
+		xleftmargin=10pt,
+		captionpos=b,
+		showspaces=false,
+		showstringspaces=false,
+		showtabs=false,
+		tabsize=2,
+		basicstyle=\footnotesize\ttfamily,
+		frame=leftline,
+		framerule=3pt,
+		framexleftmargin=4pt,
+		rulecolor=\color{ctcolorgraylight},
+		numbers=left,
+		numberstyle=\footnotesize\sffamily\color{ctcolorgray},
+		numbersep=15pt
+	}
+\fi
+
+% **************************************************
 % List Definitions
 % **************************************************
 \newenvironment{my_list}%
@@ -355,70 +401,99 @@
 % **************************************************
 % Header and Footer
 % **************************************************
-\pagestyle{fancy}
+
+\automark[section]{chapter}         % automatically marks sections as rightmark
+                                    % and chapters as leftmark
+\setlength{\footheight}{120pt}      % avoids scrlayer-scrpage warning:
+                                    % footheight to low warning
+\setlength{\footskip}{185pt}        % BAD HACK that moves the foot downwards
+\KOMAoption{footwidth}{foot:53pt}   % BAD HACK that moves the foot towards
+                                    % the outer border
+\setkomafont{pagefoot}{\ctfontfootertext}           % font for footer
+\setkomafont{pagenumber}{\ctfontfooterpagenumber}   % font for page numbers
+
+%% Redefinition of the chaptermark (used for footer mark on even (left) pages)
 \renewcommand{\chaptermark}[1]{%
-	\markboth{%
-		\footnotesize%
-		{\color{ctcolorfootermark}\textbf{\chaptername\ \thechapter}}%
-		\quad%
-		{\color{ctcolorfootertitle}#1}%
-	}{}%
+    \markboth{%
+        \ctfontfootertext
+        % use \@chapapp instead of \chaptername to avoid
+        % 'Chapter A Appendix ...', thanks to @farbverlust (issue #47)
+        {\color{ctcolorfootermark}\textbf{\@chapapp\ \thechapter}}%
+        \quad%
+        \protect\begin{minipage}[t]{.65\textwidth}%
+            #1%
+        \protect\end{minipage}%
+    }{}%
 }
+
+%% Redefinition of the sectionmark (used for footer mark on odd (right) pages)
+\newlength{\lensectionnumber}
 \renewcommand{\sectionmark}[1]{%
-	\markright{%
-		\footnotesize%
-		{\color{ctcolorfootermark}\textbf{\thesection}}%
-		\quad%
-		{\color{ctcolorfootertitle}#1}%
-	}%
+    \markright{%
+        \ctfontfootertext
+        \setlength{\lensectionnumber}{0em}
+        \settowidth{\lensectionnumber}{\textbf{\thesection}\quad}
+        \protect\begin{minipage}[t]{.72\textwidth}%
+            {\ }% bad hack to prevent a wrong baseline for the minipage
+            \protect\raggedleft%
+            \hangindent=\lensectionnumber%
+            {\color{ctcolorfootermark}\textbf{\thesection}}%
+            \quad%
+            #1%
+        \protect\end{minipage}%
+    }%
 }
-%
-\fancypagestyle{plain}{%
-	\fancyhf{}
-	\fancyfootoffset[OR]{1.85cm}
-	\fancyfoot[OR]{%
-		{\ }\tgherosfont%
-		{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
-		\hspace*{10pt}\begin{minipage}[b]{1.5cm}%
-			\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
-		\end{minipage}%
-	}
-	\fancyfootoffset[EL]{1.85cm}
-	\fancyfoot[EL]{%
-		\tgherosfont%
-		\begin{minipage}[b]{1.5cm}%
-			\raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
-		\end{minipage}%
-		\hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
-	}
-	\renewcommand{\headrulewidth}{0pt}
-	\renewcommand{\footrulewidth}{0pt}
+
+%% Vertical line in the footer (between page number and mark)
+\newcommand{\ctfooterline}{%
+    \color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}%
 }
-%
-\fancypagestyle{maincontentstyle}{%
-	\pagestyle{plain}
-	\fancyhf{}
-	\fancyfootoffset[OR]{1.85cm}
-	\fancyfoot[OR]{%
-		{\ }\tgherosfont\footnotesize%
-		\rightmark%
-		\hspace*{0.75cm}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
-		\hspace*{10pt}\begin{minipage}[b]{1.5cm}%
-			\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
-		\end{minipage}%
-	}
-	\fancyfootoffset[EL]{1.85cm}
-	\fancyfoot[EL]{%
-		\tgherosfont\footnotesize%
-		\begin{minipage}[b]{1.5cm}%
-			\raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
-		\end{minipage}%
-		\footnotesize%
-		\hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
-		\hspace*{0.75cm}\leftmark%
-	}
+
+%% Page number for odd (right) pages
+\newcommand{\ctfooterrightpagenumber}{%
+    \ctfooterline%
+    \hspace*{10pt}%
+    \begin{minipage}[b]{1.5cm}%
+        \pagemark\ %
+    \end{minipage}%
 }
 
+%% Page number for even (left) pages
+\newcommand{\ctfooterleftpagenumber}{%
+    \begin{minipage}[b]{1.5cm}%
+        \raggedleft\pagemark%
+    \end{minipage}%
+    \hspace*{10pt}%
+    \ctfooterline%
+}
+
+%% Defines the content for header and footer
+\lehead{}
+\cehead{}
+\rehead{}
+\lohead{}
+\cohead{}
+\rohead{}
+\lefoot[%   > plain
+    \ctfooterleftpagenumber%
+]{%         > srcheadings
+    \ctfooterleftpagenumber%
+    \hspace*{0.75cm}%
+    \headmark%
+}
+\cefoot{}
+\refoot{}
+\lofoot{}
+\cofoot{}
+\rofoot[%   > plain
+    \ctfooterrightpagenumber%
+]{%         > srcheadings
+    \headmark%
+    \hspace*{0.75cm}%
+    \ctfooterrightpagenumber%
+}
+
+
 % **************************************************
 % New Commands
 % **************************************************
@@ -485,13 +560,22 @@
 \newcommand{\book}{\fontfamily{pbk}\fontseries{m}\fontsize{11}{13}\selectfont}
 \newcommand{\tgherosfont}{\fontfamily{qhv}\selectfont}
 
-\newcommand{\thesispartlabelfont}{\color{ctcolorpartnum}\book\fontsize{60}{60}\selectfont}
-\newcommand{\thesispartfont}{\color{ctcolorparttext}\huge \tgherosfont\selectfont}
-\newcommand{\thesischapterfont}{\color{ctcolorblack}\huge \fontfamily{phv}\selectfont}
-%\newcommand{\thesissectionfont}{\color{ctcolormain}\LARGE\bfseries \tgherosfont}
-\newcommand{\thesissectionfont}{\color{ctcolorsection}\LARGE \tgherosfont}
-\newcommand{\thesissubsectionfont}{\color{ctcolorsubsection}\Large \tgherosfont}
-\newcommand{\thesisparagraphfont}{\color{ctcolorparagraph}\tgherosfont\small\bfseries}
+\newcommand{\thesispartlabelfont}{\color{ctcolorpartnum}\nobreak\book\fontsize{60}{60}\selectfont}
+\newcommand{\thesispartfont}{\color{ctcolorparttext}\nobreak\normalfont\huge \tgherosfont\selectfont}
+\newcommand{\thesischapterfont}{\color{ctcolorblack}\nobreak\normalfont\huge \fontfamily{phv}\selectfont}
+%\newcommand{\thesissectionfont}{\color{ctcolormain}\nobreak\LARGE\bfseries \tgherosfont}
+\newcommand{\thesissectionfont}{\color{ctcolorsection}\nobreak\normalfont\LARGE \tgherosfont}
+\newcommand{\thesissubsectionfont}{\color{ctcolorsubsection}\nobreak\normalfont\Large \tgherosfont}
+\newcommand{\thesisparagraphfont}{\color{ctcolorparagraph}\nobreak\tgherosfont\small\bfseries}
+
+\newcommand{\ctfontfooterpagenumber}{%
+    \color{ctcolorfooterpage}%
+    \normalfont\normalsize\bfseries \tgherosfont%
+}
+\newcommand{\ctfontfootertext}{%
+    \color{ctcolorfootertitle}%
+    \normalfont\footnotesize \tgherosfont%
+}
 %
 % headings
 \setkomafont{part}{\thesispartfont} % for chapter entries
@@ -514,118 +598,103 @@
 % -- modifications regarding sectioning (structural) commands,
 %    i.e. \part, \chapter, \section, \subsection, \subsubsection, \paragraph
 %
-%
-% The package titlesec enables us to modify (style) the sectioning commands
-% -- usage: \titlespacing{\command}{left}{before-sep}{after-sep}[right-sep]
-% -- usage: \titleformat{\command}[shape]{format}{label}{sep}{before}[after]
-% -- usage: \titleclass{\command}{class}
-%    -- classes: page (single page), top (like chapters),
-%                straight (title in the middle)
-\RequirePackage{titlesec}
-%
+% ---------------------------
 % > formats: \part
-\titleclass{\part}{top} % <-- display:
-\assignpagestyle{\part}{empty}	% <-- no page numbers/decorations
-\titleformat{\part}%
-	[display]%
-	{\usekomafont{part}}%
-	{\raggedleft{%
-		{\thesispartlabelfont%
-			\partname\ \thepart\ \quad}%
-		{\color{ctcolorpartline}%
-			\hspace*{-200pt}\rule[20pt]{600pt}{2pt}}
-		}%
-	}%
-	{0em}%
-	{\raggedleft}%
-	[\phantomsection]
+% ---------------------------
+\renewcommand*{\partpagestyle}{empty}
+\renewcommand*{\raggedpart}{\raggedleft}
+\renewcommand*\partheadmidvskip{\par\vspace*{3em}}
+\renewcommand*{\partformat}{%
+    \usekomafont{part}%
+    \thesispartlabelfont%
+    \partname\ \thepart\quad%
+    {\color{ctcolorpartline}\hspace*{-200pt}\rule[0pt]{600pt}{2pt}}%
+}
 %
+% ---------------------------
 % > formats: \chapter
+% ---------------------------
+\renewcommand*\chapterheadstartvskip{\vspace*{-8.75em}}
+\renewcommand*\chapterheadendvskip{\vspace*{2.5\baselineskip}}
+\renewcommand*{\chapterformat}{%
+    \ctchapternumber{\thechapter}%
+}
+\renewcommand{\chapterlinesformat}[3]{%
+    \ctchaptertitle{#3}%
+    #2%
+}
+%\renewcommand{\chapterlineswithprefixformat}[3]{%
+%    \ctchaptertitle{\@chapapp\ \thechapter: #3}%
+%    #2%
+%}
+\newcommand{\ctchapternumber}[1]{%
+    \usekomafont{chapter}%
+    \begin{minipage}[t]{0.3\textwidth}%
+        \raggedleft{%
+            {\color{ctcolorchapterline}\rule[-5pt]{2pt}{5cm}}%
+            \quad%
+            {\color{ctcolorchapternum}\fontsize{60}{60}\selectfont#1}%
+        }%
+    \end{minipage}%
+}
+\newcommand{\ctchaptertitle}[1]{%
+    \usekomafont{chapter}%
+    \begin{minipage}[t]{0.7\textwidth}%
+        \vspace*{5.85em}%
+        \raggedright%
+        #1%
+    \end{minipage}%
+}
 %
-% The following command is used to avoid overlapping
-% of the chapter headline text, see bug/ticket #1
-% Solution adapted according to the comment from "Gonzalo Medina" - Thanks
-% http://tex.stackexchange.com/questions/165878/width-of-chapter-section-with-titlesec
-\newcommand\ctformatchapter[1]{\parbox[t]{\dimexpr\textwidth-4em\relax}{\raggedright#1}}
-%
-\titleformat{\chapter}[display]%
-	{\usekomafont{chapter}}%
-	{\vspace{-8em}\raggedleft{%
-		{\color{ctcolorchapterline}%
-			\rule[-5pt]{2pt}{5cm}}\quad%
-		{\color{ctcolorchapternum}
-			\fontsize{60}{60}\selectfont\thechapter}%
-		}%
-	}%
-	{-2.1em}%
-	{\ctformatchapter}%
-	[\phantomsection]
-%
+% ---------------------------
 % > formats: \section
-\titlespacing{\section}{0em}{.75em}{.2em}%[0pt]
-%\ifthenelse{\boolean{@sectionlabeloutside}}%
+% ---------------------------
 \ifct@cthesis@hangsection
-%	{%
-		\titleformat{\section}[hang]%
-			{\usekomafont{section}}%
-			{\color{ctcolorblack}\thesection\hspace*{10pt}}%
-			{0pt}%
-			{\raggedright}%
-			[\phantomsection]
-%	}{%
+    \renewcommand*{\sectionformat}{%
+        \usekomafont{section}%
+        \makebox[0pt][r]{\color{ctcolorblack}\thesection\hspace*{10pt}}%
+    }
 \else
-		\titleformat{\section}[block]%
-			{\usekomafont{section}}%
-			{\color{ctcolorblack}\thesection\hspace*{10pt}}%
-			{0pt}%
-			{\raggedright}%
-			[\phantomsection]
-%	}
+    \renewcommand*{\sectionformat}{%
+        \usekomafont{section}%
+        {\color{ctcolorblack}\thesection\hspace*{10pt}}%
+    }
 \fi
 %
+% ---------------------------
 % > formats: \subsection
-\titlespacing{\subsection}{0em}{.5em}{0em}%[0pt]
-%\ifthenelse{\boolean{@subsectionlabeloutside}}%
+% ---------------------------
 \ifct@cthesis@hangsubsection
-%	{%
-		\titleformat{\subsection}[hang]%
-			{\usekomafont{subsection}}%
-			{\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
-			{0pt}%
-			{\raggedright}%
-			[\phantomsection]
-%	}{%
+    \renewcommand*{\subsectionformat}{%
+        \usekomafont{subsection}%
+        \makebox[0pt][r]{\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
+    }
 \else
-		\titleformat{\subsection}[block]%
-			{\usekomafont{subsection}}%
-			{\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
-			{0pt}%
-			{\raggedright}%
-			[\phantomsection]
-%	}
+    \renewcommand*{\subsectionformat}{%
+        \usekomafont{subsection}%
+        {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
+    }
 \fi
 %
-% > formats: \paragraph
-\titlespacing{\paragraph}{0pt}{\parsep}{1em}%[0pt]
-% \titleformat{\paragraph}[runin]%
-	% {\usekomafont{paragraph}}%
-	% {}%
-	% {}%
-	% {}%
-	% []
-%
 %
 % **************************************************
-% ToC, LoF, LoT
+% ToC, LoF, LoT, LoL
 % **************************************************
 %
 % -- modifications regarding the table of contents,
-%    the list of figures and the list of tables
+%    the list of figures, list of tables,
+%    and list of listings
 %
 %
 % The tocloft package enables us to control the typographic design of the
 % table of contents, list of figures and list of tables
 \RequirePackage{tocloft}
+% - fixes wrong fonts in the toc, thanks to magnucki
+\renewcommand{\cftchapfont}{\usefont{T1}{bch}{b}{n}\selectfont}
+\renewcommand{\cfttoctitlefont}{\thesischapterfont}
+\renewcommand{\cftloftitlefont}{\thesischapterfont}
+\renewcommand{\cftlottitlefont}{\thesischapterfont}
+%
 %
 % > adjusts the indention for figure and table entries (lof and lot)
 %   -- \cftsetindents{entry}{indent}{numwidth} sets the entry's indent to
@@ -634,6 +703,23 @@
 \cftsetindents{table}{0em}{3em}
 %
 %
+\ifct@cthesis@configurelistings
+	% makes lol to look like lof
+	\makeatletter
+	\begingroup\let\newcounter\@gobble\let\setcounter\@gobbletwo
+		\globaldefs\@ne \let\c@loldepth\@ne
+		\newlistof{listings}{lol}{\lstlistlistingname}
+	\endgroup
+	\let\l@lstlisting\l@listings
+	\AtBeginDocument{\addtocontents{lol}{\protect\addvspace{10\p@}}}
+	\makeatother
+	\renewcommand{\lstlistoflistings}{\listoflistings}
+	\renewcommand\lstlistlistingname{List of Listings}
+	\renewcommand{\cftloltitlefont}{\thesischapterfont}
+	\cftsetindents{listings}{0em}{3em}
+\fi
+%
+%
 %
 % **************************************************
 % Mishmash