udesoftec (23jun14)

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

1 files changed, 510 insertions, 559 deletions

diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
index 92b79b27274..f887d20c281 100644
--- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
+++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
@@ -1,7 +1,7 @@
 % !Mode:: "TeX:UTF-8"
 %% udesoftec.cls
-%% Copyright 2014 J. Peter M. Schuler
-%% 2014/05/13 v1.3.8 udesoftec
+%% Copyright 2013-2014 J. Peter M. Schuler
+%% 2014/06/22 v1.4.2 udesoftec
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -32,15 +32,23 @@
 % and
 % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesClass{udesoftec}[2014/05/13 v1.3.8 Thesis class and bibstyle for UDE SOFTEC]%
-
-\LoadClass[%
-	twoside=true,
-	headings=openright,															% same as documentclassoption openany/openright
-	numbers=noenddot,                 							% section numbering without dot
-	bibliography=totoc,index=totoc,listof=totoc,		% put everything relevant in toc
-	]{scrbook}
-
+\ProvidesClass{udesoftec}[2014/06/22 v1.4.2 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% class is based on KOMA-script http://www.ctan.org/pkg/koma-script
+\LoadClass{scrbook}    
+\KOMAoptions{
+    twoside=true,
+	headings=openright,					% same as documentclassoption openany/openright
+	numbers=noenddot,                 	% section numbering without dot
+	bibliography=totoc,
+    index=totoc,
+    listof=totoc,
+	headlines=1.5     % the size of the header in lines (1.5 because of pagemark and sepline); 1.25 is default; 1 would be appropriate if only text and no sepline)
+}
+%\usepackage{udesoftec-cmd}
 %%%% nag %%%%%%%%%%%%% 
 % purpose: identifies deprecated code and suggests better pckgs
 % source:  http://www.ctan.org/pkg/nag
@@ -54,17 +62,20 @@
 %%%%%%%%%%%%%%%%%%%%%%
 
 
-\KOMAoptions{
-	headlines=1.5                                   % the size of the header in lines (1.5 because of pagemark and sepline); 1.25 is default; 1 would be appropriate if only text and no sepline)
-}
+
+
+\usepackage{libertine}
+
 \pdfminorversion=6
 \newif\ifdebugThisClass
-\debugThisClasstrue
 \debugThisClassfalse
 \newcommand{\classdebug}[1]{\ifdebugThisClass\ClassWarning{udesoftec}{#1}\fi}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% all template conditions %%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%% all template conditions
 \newif\ifdocumentIsFinal
 \newif\ifdocumentIsProposal
 \newif\iftemplateUseSansSerifFont
@@ -81,6 +92,7 @@
 
 \newif\ifdocumentOmitSD
 \newif\ifdocumentOmitLOT
+\newif\ifdocumentOmitLOL
 \newif\ifdocumentOmitLOF
 \newif\ifdocumentOmitLOA
 \newif\ifdocumentOmitTOC
@@ -90,16 +102,18 @@
 \newif\ifdocumentHasShortA
 \newif\ifdocumentUsedTodos
 
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% all default values and the options %%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%% all default values and the options 
 \documentIsFinalfalse
 \documentIsProposalfalse
 \documentOmitLOTfalse
 \documentOmitSDfalse
 \documentOmitLOFfalse
 \documentOmitLOAfalse
+\documentOmitLOLfalse
 \documentOmitTOCfalse
 \documentOmitTodosfalse
 \documentOmitAfalse
@@ -116,23 +130,14 @@
 \templateAddChapterToFigureNumberingfalse
 \templateUseCustomMaketitletrue    
 \primaryDocumentLanguageGermantrue
-\bibliographystyle{udesoftec}
 
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% Document options
 \DeclareOption{draft}       {\documentIsFinalfalse}
 \DeclareOption{final}       {\documentIsFinaltrue}
-\DeclareOption{de}          {\primaryDocumentLanguageGermantrue}
-\DeclareOption{en}          {\primaryDocumentLanguageGermanfalse}
-\DeclareOption{omit-lot}    {\documentOmitLOTtrue}
-\DeclareOption{omit-lof}    {\documentOmitLOFtrue}
-\DeclareOption{omit-loa}    {\documentOmitLOAtrue}
-\DeclareOption{omit-toc}    {\documentOmitTOCtrue}
-\DeclareOption{omit-sd}     {\documentOmitSDtrue}
-\DeclareOption{omit-todos}  {\documentOmitTodostrue}
-\DeclareOption{omit-a}      {\documentOmitAtrue}
-\DeclareOption{long-a}      {\documentHasShortAfalse}
-\DeclareOption{omit-aen}      {\documentOmitAentrue}
-\DeclareOption{confidential}{\documentOmitCCfalse}
-
 \DeclareOption{proposal}{
     \documentIsProposaltrue
     \documentOmitLOTtrue
@@ -155,6 +160,19 @@
   \fi
 \else%
 \fi%
+\DeclareOption{de}          {\primaryDocumentLanguageGermantrue}
+\DeclareOption{en}          {\primaryDocumentLanguageGermanfalse}
+\DeclareOption{omit-lot}    {\documentOmitLOTtrue}
+\DeclareOption{omit-lof}    {\documentOmitLOFtrue}
+\DeclareOption{omit-loa}    {\documentOmitLOAtrue}
+\DeclareOption{omit-lol}    {\documentOmitLOLtrue}
+\DeclareOption{omit-toc}    {\documentOmitTOCtrue}
+\DeclareOption{omit-sd}     {\documentOmitSDtrue}
+\DeclareOption{omit-todos}  {\documentOmitTodostrue}
+\DeclareOption{omit-a}      {\documentOmitAtrue}
+\DeclareOption{long-a}      {\documentHasShortAfalse}
+\DeclareOption{omit-aen}      {\documentOmitAentrue}
+\DeclareOption{confidential}{\documentOmitCCfalse}
 
 \DeclareOption{printlayout}{
 	\templateUseColorfulLinksfalse
@@ -175,24 +193,23 @@
   \templateVawiBambergtrue
 }
 \DeclareOption*{\ClassWarning{udesoftec}{Unknown option \CurrentOption}}
-
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
+%Process all document options
 \ProcessOptions\relax
 
+\ifprimaryDocumentLanguageGerman
+	\def\udesoftec@documentLanguage{english,ngerman}         % all used languages, primary LAST
+\else
+	\def\udesoftec@documentLanguage{ngerman,english}
+\fi
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
-
-
-%%%%%%%%%%%%%%%%%%%%%%
-\def \udesoftec@templatePageMarkPrefix {} 	              % might be something like "S. "
-
-%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%
+% document title page and configuration commands
 \newcommand{\city}[1]{\def\udesoftec@city{#1}}
 \newcommand{\typeofdoc}[1]{\def\udesoftec@typeofdoc{#1}}
 \newcommand{\labelPreTopic}[1]{\def\udesoftec@labelPreTopic{#1}}
@@ -206,8 +223,13 @@
 \newcommand{\abstract}[1]{\def\udesoftec@abstract{#1}}                   
 \newcommand{\abstractEn}[1]{\def\udesoftec@abstracten{#1}}               
 
+\def \udesoftec@templatePageMarkPrefix {} 	   % might be something like "S. "
+
+%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%
-%%%% labels %%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% default configuration for title page and configuration
 
 \title{Komplexer Titel einer Abschlussarbeit f\"ur ein Dokument}
 \author{Max Mustermann}
@@ -235,154 +257,148 @@
 	\\
 \end{tabularx}	
 }
-
-\abstract{Jede wissenschaftliche Arbeit sollte eine Kurzfassung am Anfang aufweisen. Diese Kurzfassung sollte etwa eine halbe Seite lang sein.}
-\abstractEn{As all theses have an English title, there should be an English abstract as well. 
-
-Folglich sollten auch deutsche Arbeiten einen englischen Abstract haben. Falls die Abstracts zu lang werden, gibt es im Handbuch eine Hilfestellung.}
-
-\newcommand{\confidentialityclausegerman}{
-					Die vorliegende \udesoftec@typeofdoc ~enth\"alt vertrauliche Informationen der \emph{\udesoftec@confidentialitySource}, die der Geheimhaltung unterliegen. Ver\"offentlichungen oder Vervielf\"altigungen der \udesoftec@typeofdoc ~-- auch nur auszugsweise -- sind ohne ausdr\"uckliche Genehmigung der \emph{\udesoftec@confidentialitySource} nicht gestattet. Die \udesoftec@typeofdoc ~ist nur den Mitarbeitern des betreuenden Lehrstuhls sowie den Mitgliedern des Pr\"ufungsausschusses zug\"anglich zu machen.
-			
-					Dieser Sperrvermerk gilt f\"ur die n\"achsten 2 Jahre. Die sich aus diesem Sperrvermerk ergebenden Einschr\"ankungen entfallen nach Ablauf dieses Zeitraums.
-}
-\newcommand{\confidentialityclause}{
-					\chapter*{Sperrvermerk}
-                    \confidentialityclausegerman}
- 
-
-\newcommand{\statutorydeclarationheading}{
-\chapter*{Eidesstattliche Versicherung}
-}
-\newcommand{\statutorydeclaration}{
-\statutorydeclarationheading
-Ich versichere an Eides statt durch meine Unterschrift, dass ich die vorstehende Arbeit 
-selbst\"andig und ohne fremde Hilfe angefertigt und alle Stellen, die ich w\"ortlich oder 
-ann\"ahrend w\"ortlich aus Ver\"offentlichungen entnommen habe, als solche kenntlich gemacht 
-habe, mich auch keiner anderen als der angegebenen Literatur oder sonstiger Hilfsmittel 
-bedient habe. Die Arbeit hat in dieser oder \"ahnlicher Form noch keiner anderen 
-Pr\"ufungsbeh\"orde vorgelegen.
-
-
-\vspace*{40pt}
-\parbox{4cm}{\udesoftec@city, \today\hrule\strut \footnotesize Ort, Datum} \hfill
-\parbox{7cm}{\textcolor{white}{Hier wurde im Original unterschrieben}\hrule\strut \footnotesize Unterschrift} \hfill
-}
-
-\newcommand{\chapterHeading}[1]{
-    \let\oldcleardoublepage\cleardoublepage
-    \let\oldclearpage\clearpage
-    \let\clearpage\relax
-    \let\cleardoublepage\relax
-    
-    \let\backupskip\chapterheadstartvskip
-    \renewcommand*\chapterheadstartvskip{\vspace*{-\topskip}\vspace*{10pt}} 
-
-    \chapter*{#1}
-    \let\cleardoublepage\oldcleardoublepage
-    \let\clearpage\oldclearpage
-    \let\chapterheadstartvskip\backupskip
-}
-
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% Abstract
 \newcaptionname{ngerman}{\labelabstracttitle}{Kurzfassung}
 \newcaptionname{english}{\labelabstracttitle}{Abstract}
-
-
-\newcommand{\printabstractDe}{%        
-\chapter*{\labelabstracttitle}
-\label{sec:abstract}\pdfbookmark{\labelabstracttitle}{sec:abstract}%
-\udesoftec@abstract
-
-\ifdocumentOmitAen
-\else
-\selectlanguage{english}
-
-\ifdocumentHasShortA%
-
-\chapterWithoutPageBreak{\labelabstracttitle}
-\else
-
-\chapter*{\labelabstracttitle}
-\fi
-\label{sec:abstracten}\pdfbookmark{\labelabstracttitle}{sec:abstracten}%
-\udesoftec@abstracten
-\selectlanguage{ngerman}
-\fi
+\def\udesoftec@defaultabstractde{Jede wissenschaftliche Arbeit sollte eine Kurzfassung am Anfang aufweisen. Diese Kurzfassung sollte etwa eine halbe Seite lang sein.}
+\def\udesoftec@defaultabstractdeen{As all theses have an English title, there should be an English abstract as well.\par Folglich sollten auch deutsche Arbeiten einen englischen Abstract haben. Falls die Abstracts zu lang werden, gibt es im Handbuch eine Hilfestellung.}
+\def\udesoftec@defaultabstracten{Every thesis should have an abstract at the beginning. This abstract should be about have an page long. Of course an English thesis doesn't need an German abstract, as it doesn't even have a German title.}
+\abstract{\udesoftec@defaultabstractde}
+\abstractEn{\udesoftec@defaultabstractdeen}
+
+
+\newcommand{\printabstract}{%       
+    \chapter*{\labelabstracttitle}%
+    \label{sec:abstract}
+    \pdfbookmark[0]{\labelabstracttitle}{sec:abstract}%
+    \udesoftec@abstract
+    
+    \iflanguage{ngerman}{%
+        % German theses should have German and English abstract
+        \ifdocumentOmitAen
+            % no second abstract here
+        \else
+            \selectlanguage{english}
+            \ifdocumentHasShortA%
+                \chapterWithoutPageBreak{\labelabstracttitle}
+                \label{sec:abstracten}
+            \else
+                \chapter*{\labelabstracttitle}
+                \label{sec:abstracten}
+            \fi
+            \udesoftec@abstracten
+            \selectlanguage{ngerman}
+        \fi
+    }{}
 }
 
-\newcommand{\printabstractEn}{%
-\chapter*{\labelabstracttitle}
-\label{sec:abstract}\pdfbookmark{\labelabstracttitle}{sec:abstract}%
-\udesoftec@abstract
-}
 
-\newcommand{\printabstract}{\printabstractDe}
-\ifprimaryDocumentLanguageGerman
-\else
-\renewcommand{\printabstract}{\printabstractEn}
-\abstract{Every thesis should have an abstract at the beginning. This abstract should be about have an page long. Of course an English thesis doesn't need an German abstract, as it doesn't even have a German title.}
-\entitle{}
-\abstractEn{}
 
-\renewcommand*{\confidentialityclause}{
-                   \chapter*{Confidentially Clause}
-					
-                    
-					This \udesoftec@typeofdoc ~contains confidential data of \emph{\udesoftec@confidentialitySource}. Any publication or duplication of this \udesoftec@typeofdoc ~-- even in part -- is prohibited, excluding cases with explicit permission by \emph{\udesoftec@confidentialitySource}. The \udesoftec@typeofdoc ~is to be made accessible only to the staff of the research group supervising it and the board of examiners.
-					
-					This confidentially clause is valid for the next 2 years. Any limitations resulting from this confidentially clause do not apply after this period.
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% confidentiality clause
+\newcaptionname{ngerman}{\labelconfidentialityclausetitle}{Sperrvermerk}
+\newcaptionname{english}{\labelconfidentialityclausetitle}{Confidentially Clause}
+\def\udesoftec@defaultconfidentialityclause{Die vorliegende \udesoftec@typeofdoc ~enth\"alt vertrauliche Informationen der \emph{\udesoftec@confidentialitySource}, die der Geheimhaltung unterliegen. Ver\"offentlichungen oder Vervielf\"altigungen der \udesoftec@typeofdoc ~-- auch nur auszugsweise -- sind ohne ausdr\"uckliche Genehmigung der \emph{\udesoftec@confidentialitySource} nicht gestattet. Die \udesoftec@typeofdoc ~ist nur den Mitarbeitern des betreuenden Lehrstuhls sowie den Mitgliedern des Pr\"ufungsausschusses zug\"anglich zu machen.\par{} Dieser Sperrvermerk gilt f\"ur die n\"achsten 2 Jahre. Die sich aus diesem Sperrvermerk ergebenden Einschr\"ankungen entfallen nach Ablauf dieses Zeitraums.\par{}}
+\def\udesoftec@defaultconfidentialityclauseen{This \udesoftec@typeofdoc ~contains confidential data of \emph{\udesoftec@confidentialitySource}. Any publication or duplication of this \udesoftec@typeofdoc ~-- even in part -- is prohibited, excluding cases with explicit permission by \emph{\udesoftec@confidentialitySource}. The \udesoftec@typeofdoc ~is to be made accessible only to the staff of the research group supervising it and the board of examiners.\par{} This confidentially clause is valid for the next 2 years. Any limitations resulting from this confidentially clause do not apply after this period.\par{}}
 					
-                    \chapterHeading{Sperrvermerk}
-                    
-                    \confidentialityclausegerman
+% there should always be an additional German cc in English theses
+\newcommand{\confidentialityclause}{%
+    \iflanguage{english}{%
+        \chapter*{\labelconfidentialityclausetitle}     % English heading
+        \udesoftec@defaultconfidentialityclauseen   % English text
+        \selectlanguage{ngerman}                        % prepare German
+        \chapterWithoutPageBreak{\labelconfidentialityclausetitle} % German heading 
+        \udesoftec@defaultconfidentialityclause         % German text
+        \selectlanguage{english}                        % switching back to English
+    }{
+        \chapter*{\labelconfidentialityclausetitle}
+        \udesoftec@defaultconfidentialityclause
+    }
 }
-\renewcommand*{\statutorydeclarationheading}{
-\chapter*{Statutory Declaration}
-The statutory declaration needs to be in german, so the following excerpt is in german:
+ 
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% Statutory declaration
+\newcaptionname{ngerman}{\labelstatutorydeclarationheading}{Eidesstattliche Versicherung}
+\newcaptionname{english}{\labelstatutorydeclarationheading}{Statutory Declaration}
+\def\udesoftec@defaultstatutorydeclaration{Ich versichere an Eides statt durch meine Unterschrift, dass ich die vorstehende Arbeit selbst\"andig und ohne fremde Hilfe angefertigt und alle Stellen, die ich w\"ortlich oder ann\"ahrend w\"ortlich aus Ver\"offentlichungen entnommen habe, als solche kenntlich gemacht habe, mich auch keiner anderen als der angegebenen Literatur oder sonstiger Hilfsmittel  bedient habe. Die Arbeit hat in dieser oder \"ahnlicher Form noch keiner anderen  Pr\"ufungsbeh\"orde vorgelegen.\par{} \vspace*{40pt}\parbox{4cm}{\udesoftec@city, \today\hrule\strut \footnotesize Ort, Datum} \hfill\parbox{7cm}{\textcolor{white}{Hier wurde im Original unterschrieben}\hrule\strut \footnotesize Unterschrift} \hfill}
+\def\udesoftec@defaultstatutorydeclarationenprefix{The statutory declaration needs to be in German, so the following excerpt is in German:}
 
-\section*{Eidesstattliche Versicherung}
-}
-\typeofdoc{Master Thesis}
-\labelPreTopic{about the topic}
-\labelRespectConfidentiality{(Adhere confidentially clause --- Sperrvermerk beachten)}
-\academicfield{Business Information Systems}
-\institution{Presented to the Faculty of Economics and Business Administration\par of  University of Duisburg-Essen}
-\semester{Winter semester 2011/2012, 8th Semester  in \academicfield}                                                                
-\confidentialitySource{Name der Firma, die auf die Vertraulichkeitserkl\"arung besteht}
-\date{Version: \today}
-\authorbox{
-\begin{tabularx}{.7\linewidth}{ll}
-  Author:&Max Mustermann\\
-	    &Musterstrasse 123\\
-			&12345 Musterstadt\\
-	\\
-  Examiner:&Prof. Dr. Stefan Eicker\\
-	         &Prof. Dr. John Doe\\
-	\\
-	Supervisor:&Dipl.-Wirt.-Inf Some Body\\
-	\\
-\end{tabularx}	
+\newcommand{\statutorydeclaration}{
+
+    \iflanguage{english}{
+        \chapter*{\labelstatutorydeclarationheading}
+        \udesoftec@defaultstatutorydeclarationenprefix
+        \selectlanguage{ngerman} 
+        \chapterWithoutPageBreak{\labelstatutorydeclarationheading}
+        \udesoftec@defaultstatutorydeclaration
+        \selectlanguage{english} 
+    }{
+        \chapter*{\labelstatutorydeclarationheading}
+        \udesoftec@defaultstatutorydeclaration
+        
+    }
 }
-\fi
 
 \ifprimaryDocumentLanguageGerman
-	\def\@documentLanguage{english,ngerman}         % all used languages, primary LAST
 \else
-	\def\@documentLanguage{ngerman,english}
+    \abstract{\udesoftec@defaultabstracten}
+    \entitle{}
+    \abstractEn{}
+    \typeofdoc{Master Thesis}
+    \labelPreTopic{about the topic}
+    \labelRespectConfidentiality{(Adhere confidentially clause --- Sperrvermerk beachten)}
+    \academicfield{Business Information Systems}
+    \institution{Presented to the Faculty of Economics and Business Administration\par of  University of Duisburg-Essen}
+    \semester{Winter semester 2011/2012, 8th Semester  in \academicfield}                                                                
+    \confidentialitySource{Name of Company which wants the statutory declaration}
+    \date{Version: \today}
+    \authorbox{
+    \begin{tabularx}{.7\linewidth}{ll}
+      Author:&Max Mustermann\\
+            &Musterstrasse 123\\
+                &12345 Musterstadt\\
+        \\
+      Examiner:&Prof. Dr. Stefan Eicker\\
+                 &Prof. Dr. John Doe\\
+        \\
+        Supervisor:&Dipl.-Wirt.-Inf Some Body\\
+        \\
+    \end{tabularx}	
+    }
 \fi
 
 
-\def\udesoftec@templateTitlePageBackground{udesoftec-cover-ude-de}
-
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% title page background
+% default
 \ifprimaryDocumentLanguageGerman
+    \def\udesoftec@templateTitlePageBackground{udesoftec-cover-ude-de}
 \else
-  \def\udesoftec@templateTitlePageBackground{udesoftec-cover-ude-en}
+    \def\udesoftec@templateTitlePageBackground{udesoftec-cover-ude-en}
 \fi
-
+% VAWi-Bamberg special (no matter what language)
 \iftemplateVawiBamberg
 	\def\udesoftec@templateTitlePageBackground{udesoftec-cover-uba}
 \fi
 
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+% VAWi special
 \iftemplateVawiEssen
 	\institution{Im Virtuellen Weiterbildungsstudiengang Wirtschaftsinformatik\par der Universit\"at Duisburg-Essen}
     \labelPreTopic{}
@@ -392,11 +408,6 @@ The statutory declaration needs to be in german, so the following excerpt is in
     \labelPreTopic{}
 \fi
 
-\iftemplateUseBookLayout
-	\KOMAoptions{twoside=true} 
-\else
-	\KOMAoptions{twoside=false}
-\fi
 
 %%%% xcolor %%%%%%%%%%
 % purpose: define some color names
@@ -412,9 +423,11 @@ The statutory declaration needs to be in german, so the following excerpt is in
 
 \definecolor{UDEcustombrightbeige}{RGB}{255,249,229}
 \definecolor{UDEcustombrightblue}{RGB}{229,236,255}
+\definecolor{UDEcustomdarkgreen}{RGB}{150,179,135}
 \definecolor{UDEcustommediumgreen}{RGB}{200,229,185}
 \definecolor{UDEcustombrightgreen}{RGB}{238,255,229}
-\definecolor{UDEcustomediumorange}{RGB}{200,229,185}
+\definecolor{UDEcustomdarkorange}{RGB}{226,173,0}
+\definecolor{UDEcustommediumorange}{RGB}{255,204,38}
 \definecolor{UDEcustombrightorange}{RGB}{255,249,229}
 \definecolor{UDEcustombrightgray}{RGB}{244,244,244}
 \definecolor{UDEcustommediumgray}{RGB}{159,159,189}
@@ -426,9 +439,11 @@ The statutory declaration needs to be in german, so the following excerpt is in
 \colorlet{UDEVariantsDarkBeige}{UDEbeige}
 \colorlet{UDEVariantsMediumBeige}{UDEbeige}
 \colorlet{UDEVariantsBrightBeige}{UDEcustombrightbeige}
+\colorlet{UDEVariantsDarkGreen}{UDEcustomdarkgreen}
 \colorlet{UDEVariantsMediumGreen}{UDEcustommediumgreen}
 \colorlet{UDEVariantsBrightGreen}{UDEcustombrightgreen}
-\colorlet{UDEVariantsMediumOrange}{UDEcustomediumorange}
+\colorlet{UDEVariantsDarkOrange}{UDEcustomdarkorange}
+\colorlet{UDEVariantsMediumOrange}{UDEcustommediumorange}
 \colorlet{UDEVariantsBrightOrange}{UDEcustombrightgreen}
 
 \colorlet{DocumentDark0}{UDEcustomdarkgray}
@@ -443,9 +458,11 @@ The statutory declaration needs to be in german, so the following excerpt is in
 \colorlet{DocumentMedium2}{UDEVariantsMediumBeige}
 \colorlet{DocumentBright2}{UDEVariantsBrightBeige}
 
-\colorlet{DocumentMedium3}{UDEVariantsMediumBeige}
+\colorlet{DocumentDark3}{UDEVariantsDarkGreen}
+\colorlet{DocumentMedium3}{UDEVariantsMediumGreen}
 \colorlet{DocumentBright3}{UDEVariantsBrightGreen}
 
+\colorlet{DocumentDark4}{UDEVariantsDarkOrange}
 \colorlet{DocumentMedium4}{UDEVariantsMediumOrange}
 \colorlet{DocumentBright4}{UDEVariantsBrightOrange}
 
@@ -491,7 +508,7 @@ The statutory declaration needs to be in german, so the following excerpt is in
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%55
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % http://www.golatex.de/nummerierung-der-fussnoten-durchgehend-im-gesamten-dokument-t2042.html
 % change counters for figures, footnotes, etc
 \usepackage{chngcntr} 
@@ -500,9 +517,8 @@ The statutory declaration needs to be in german, so the following excerpt is in
 %%%% l18n %%%%%%%%%%%%% 
 % purpose: localization and utf-8 config
 % babel has primary language last
-\usepackage[\@documentLanguage]{babel}
+\usepackage[\udesoftec@documentLanguage]{babel}
 \usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
 \usepackage{hyphenat}  % helps with \nohyphens command, which allows to remove hypens from quotes.
 %%%%%%%%%%%%%%%%%%%%%%
 
@@ -510,35 +526,22 @@ The statutory declaration needs to be in german, so the following excerpt is in
 
 %%%% helvet %%%%%%%%%%
 % purpose: use helvetica
-% special load font before fontenc!
+%% special set font before fontenc!
+\fontfamily{LinuxLibertineT-TLF}
+\usepackage[T1]{fontenc}
+
 \iftemplateUseSansSerifFont
-	\usepackage[scaled]{helvet}
-	\renewcommand*\familydefault{\sfdefault}
+	\renewcommand*{\familydefault}{\sfdefault}
 \else
-	\usepackage{lmodern} 
 	\renewcommand*\familydefault{\rmdefault}
-% KOMAfont Definitionen: caption captionlabel chapter chapterentry chapterentrypagenumber chapterentry chapterprefix dictum dictumauthor dictumtext  disposition footnote footnotelabel footnotereference footnoterule labelinglabel labelingseparator  minisec pagefoot pagehead pageheadfoot pagenumber pagination paragraph  part partentry partentrypagenumber partentry partnumber section sectionentry sectionentrypagenumber sectionentry sectioning subject subparagraph subsection subsubsection subtitle title
 \fi
-	\setkomafont{descriptionlabel}{\normalfont\bfseries}
-	\setkomafont{dictumtext}{\normalfont\normalcolor\small}
-	\setkomafont{disposition}{\normalfont\normalcolor\bfseries}
-	\setkomafont{caption}{\normalfont\normalcolor\scriptsize}
+\setkomafont{descriptionlabel}{\normalfont\bfseries}
+\setkomafont{dictumtext}{\normalfont\normalcolor\small}
+\setkomafont{disposition}{\normalfont\normalcolor\bfseries}
+\setkomafont{caption}{\normalfont\normalcolor\scriptsize}
 %%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%
-%%%% setspacing %%%%%%
-% purpose: give options for changing line spacing \doublespacing, \singlespacing, 
-%          \onehalfspacing
-\usepackage[onehalfspacing]{setspace}
-%%%%%%%%%%%%%%%%%%%%%%
-%
-%%%% setspacing %%%%%%
- %special: novbox in order for tabularx to get correct width
-%\ifdocumentIsFinal
-%\else
-%\usepackage[novbox]{pdfsync}
-%\fi
-%%%%%%%%%%%%%%%%%%%%%%
+
 
 %%%% microtype %%%%%%
 % purpose: character protrusion (also known as margin kerning) and font expansion 
@@ -584,172 +587,14 @@ The statutory declaration needs to be in german, so the following excerpt is in
 \usepackage{enumitem}
 %\def \breaklabel{\ClassWarning{udesoftec}{\\breaklabel deprecated use "style=newline"}}
 
-%%% natbib %%%%%%%%%%
-% purpose: real cite options (in parentheses, out of parentheses, suppressing author etc)
-\usepackage[elide]{natbib}	
-%%%%%%%%%%%%%%%%%%%%%
-
-%%% bibstyleconf %%%%
-% based on: natbib plainnat
-% purpose:  plainnat-peet changes natbib plainnat for using \bbland with cite instead of 
-%           fixed string and changes authors in bibliography to "ll, f; ll, f; ll, f"'
-\bibpunct{(}{)}{;}{a}{}{}{} 
-\newcommand*{\doi}[1]{\href{http://dx.doi.org/#1}{\color{LinkDoi}doi:\detokenize{#1}}} %use real doi links with doi:<num> as label
-\newcommand{\bblisbn}[1]{\small{ISBN:\mbox{#1}}}
-\newcommand{\bblissn}[1]{\small{ISSN:\mbox{#1}}}
-\newcommand{\bbland}{\& }
-\newcommand{\bblAuthorYearSep}{ } % possible to add \newline 
-\newcommand{\bblAuthorTitleSep}{: } % possible to add \newline 
-\newcommand{\bblAuthorTitleSepInEd}{: }
-\providecaptionname{ngerman}{\bblin}{In: }%
-\providecaptionname{english}{\bblin}{In: }%
-\providecaptionname{ngerman}{\bbled}{~(Hrsg.)}%
-\providecaptionname{english}{\bbled}{~(Ed.)}%
-\providecaptionname{ngerman}{\bbleds}{~(Hrsg.)}%
-\providecaptionname{english}{\bbleds}{~(Eds.)}%
-\providecaptionname{ngerman}{\bbledn}{~Aufl.}%
-\providecaptionname{english}{\bbledn}{~edn}%
-\providecaptionname{ngerman}{\bbletal}{et~al.}%
-\providecaptionname{english}{\bbletal}{et~al.}%
-\providecaptionname{ngerman}{\bblpp}{S.~}%
-\providecaptionname{english}{\bblpp}{pp.}%
-\providecaptionname{ngerman}{\bblp}{S.~}%
-\providecaptionname{english}{\bblp}{p.~}%
-\providecaptionname{ngerman}{\bblvol}{Nr.}%
-\providecaptionname{english}{\bblvol}{No}%
-\providecaptionname{ngerman}{\bblof}{von}%
-\providecaptionname{english}{\bblof}{of}%
-\providecaptionname{ngerman}{\bblnoyear}{o.J.}%
-\providecaptionname{english}{\bblnoyear}{n.d.}%
-\providecaptionname{ngerman}{\bblnoyearlong}{ohne Jahresangabe}%
-\providecaptionname{english}{\bblnoyearlong}{no date}%
-\providecaptionname{ngerman}{\bbllastaccesswas}{Zuletzt geprüft: }%
-\providecaptionname{english}{\bbllastaccesswas}{Last checked: }%
-
-\renewcommand*{\bibfont}{\raggedright}
-\newcommand{\bblurldate}[1]{ (\bbllastaccesswas #1)}
-\newcommand{\bblVolumeOfSeries}[2]{ (#2~#1)}
-\newcommand{\bblSeries}[1]{ (#1)}
-\newcommand{\bblFontAuthorInText}[1]{\nohyphens{\textsc{#1}}}
-\newcommand{\bblFontAuthorInList}[1]{\textbf{#1}}
-\newcommand{\bblFontYearInList}[1]{\textbf{(#1)}}
-\newcommand{\bblFontBookTitle}[1]{\emph{#1}}
-\newcommand{\bblFontInBookTitle}[1]{#1}
-\newcommand{\bblFontJournalTitle}[1]{#1}
-\newcommand{\bblWarning}[2]{
-	\message{LaTeX Warning: Error with citation of #2 -- #1 }%
-	\textbf{\emph{\color{red}{BibError: #2 -- #1}}}%
-}
-%\renewcommand{\bblWarning}[1]{} %for production
-\newcommand{\bblyear}[1]{\ifnumber{#1}{#1}{\bblnoyear}}
-
-\newcommand{\bbledGenerateEdition}[1]{\ifnumber{#1}{\bbledOrdinal{#1}~\bbledn}{#1}}
-
-\newcommand*{\englishordinal}[1]{\ifcase #1\or 1\textsuperscript{st}\or 2\textsuperscript{nd}\or 3\textsuperscript{rd}\else #1\textsuperscript{th}\fi}
-\newcommand*{\germanordinal}[1]{#1.}
-\iflanguage{ngerman}{%
-	\newcommand*{\bbledOrdinal}[1]{\germanordinal{#1}}
-}{%
-	\newcommand*{\bbledOrdinal}[1]{\englishordinal{#1}}
-}
-
-%http://www.tug.org/applications/hyperref/manual.html#TBL-23
-%evtl mit \addto\extrasngerman{%  
-  %\def\subsectionautorefname{Unterkapitel}%  
-%}
-
-\setlength{\bibhang} {2em} %hanging indentation for list of references
-\setlength{\bibsep} {.5em} %vertical sep between bibitems in list of references
-%\renewcommand{\bibfont}{\small}
-%\renewcommand{\bibfont}{\sc}
-%%%%%%%%%%%%%%%%%%%%%
-
-%http://tex.stackexchange.com/questions/9325/bump-right-aligned-text-to-next-line-if-no-room
-\newcommand\putRightIfRoom[1]{{%
-  \leftskip=0ptplus1fil\rightskip=-\leftskip\parfillskip=\leftskip%
-  \hfill \phantom{ } \mbox{#1}\par}}
-
-\newcommand{\inquotequote}[1]{\glq{}#1\grq{}}
-\newcommand{\blockquote}[3][]{
-\message{LaTeX Warning: \noexpand\blockquote is deprecated, use \noexpand\citequotepar on input line \the\inputlineno }
-\citequotepar[#1]{#2}{#3}
-}
-\newcommand{\intextquote}[3][]{
-\message{LaTeX Warning: \noexpand\intextquote is deprecated, use \noexpand\citequote on input line \the\inputlineno }
-\citequote[#1]{#2}{#3}}
-\newcommand{\inlinequote}[3][]{
-\message{LaTeX Warning: \noexpand\intextquote is deprecated, use \noexpand\citequote on input line \the\inputlineno }
-\citequote[#1]{#2}{#3}}
-\newcommand{\citequote}[3][]{\glqq#3\grqq \ \cite[#1]{#2}}
-\newcommand{\citequotehidden}[3][]{\cite[#1]{#2}}
-\newcommand{\citetquotehidden}[3][]{\citet[#1]{#2}}
-
-% !Mode:: "TeX:UTF-8"
-%%%% todonotes %%%%%%%
-% purpose: get (orange) todo comments in text or in margin
-% use option "disable" to disable the complete packages (leaving all commands intact, just removing output)
-\usepackage[
-ngerman,
-textsize=scriptsize,
-backgroundcolor=DocumentBright1,
-bordercolor=DocumentMedium1,
-linecolor=DocumentBright1,
-colorinlistoftodos
-]{todonotes}%
-%% alternative for deactivation:
-%\newcommand*{\todo}[2][]{}
-%\newcommand*{\listoftodos}[1][]{}
-%\newcommand*{\missingfigure}[2][]{}
-
-
-\ifdocumentOmitTodos
-	\renewcommand{\listoftodos}{}
-	\renewcommand{\todo}[2][]{}
-	\newcommand*{\todoDesign}[1]{}
-	\newcommand*{\todoText}[1]{}
-	\newcommand*{\todoFigure}[1]{}
-    \newcommand*{\inlinetodo}[1]{}
-    \newcommand*{\todoinline}[1]{}
-\else
-	\let\defaultTodo\todo
-	\renewcommand{\todo}[1]{%
-	  \documentUsedTodostrue%
-		\defaultTodo[]{#1}%
-	}
-	\newcommand*{\todoDesign}[1]{%
-	  \documentUsedTodostrue%
-		\defaultTodo[fancyline,backgroundcolor=DocumentBright2]{#1}%
-	}
-	\newcommand*{\todoText}[1]{%
-	  \documentUsedTodostrue%
-		\defaultTodo[fancyline,backgroundcolor=DocumentBright3]{#1}%
-	}
-	\newcommand*{\todoFigure}[1]{%
-	  \documentUsedTodostrue%
-		\defaultTodo[fancyline,backgroundcolor=DocumentBright4]{#1}%
-	}
-	\newcommand{\inlinetodo}[1]{\documentUsedTodostrue\defaultTodo[inline]{#1}}
-	\newcommand{\todoinline}[1]{\inlinetodo{#1}}
-
-	\let\defaultListoftodos\listoftodos
-	\renewcommand{\listoftodos}{
-		\let\originalHbadness\hbadness
-		\hbadness 100000
-		\defaultListoftodos
-		\hbadness \originalHbadness
-	}
-\fi
-% !Mode:: "TeX:UTF-8"
 
 %%%% chapterdesign %%%
-\usepackage{type1cm}
-\usepackage{fix-cm}
 \addtokomafont{chapter}{\color{chapter}}
 \addtokomafont{sectioning}{\color{section}}
 \addtokomafont{subsubsection}{\color{subsection}}
 %have a section level which doesn't use numbers never and will work no matter how deep secnum is.
 \newcommand{\unnumberedsection}[1]{%
-\subparagraph{#1}\hspace{0cm}\\%
+    \subparagraph{#1}\hspace{0cm}\\%
 }
 % Chapter-Numbering for 4 levels, i.e. PART B Chapter 5.7.3.1; in order to have unnumbered headings use \paragraph{}
 \setcounter{secnumdepth}{3} 
@@ -759,30 +604,29 @@ colorinlistoftodos
 % we need type1cm and cm-super for the bigger fonts - else there would be warnings
 % source: https://groups.google.com/forum/#!msg/de.comp.text.tex/rVcjvNQI6IA/N-NsfyQzXRwJ
 \makeatletter% siehe De-TeX-FAQ
-\renewcommand*{\chapterformat}{%
-\begingroup% damit \unitlength-Aenderung lokal bleibt
-\setlength{\unitlength}{1mm}%
-\begin{picture}(20,40)(0,5)%
-\setlength{\fboxsep}{0pt}%
-%\put(0,0){\framebox(20,30){}}%
-%\put(0,20){\makebox(20,20){\rule{20\unitlength}{20\unitlength}}}%
-\put(20,15){\color{ChapterHeadingSeperatorLine}\line(1,0){\dimexpr
-\textwidth-20\unitlength\relax\@gobble}}%
-\put(-6,2.5){\makebox(20,20)[r]{%
-\fontsize{23\unitlength}{28\unitlength}\selectfont\color{ChapterHeadingBigChapterNumber}\thechapter
-%\kern-.04em% Ziffer in der Zeichenzelle nach rechts schieben
-}}%
-\put(20,15){\makebox(\dimexpr
-\textwidth-20\unitlength\relax\@gobble,\ht\strutbox\@gobble)[l]{%
-\ifdefined\chapterAuthor
-\ \normalsize\color{ChapterHeadingSmallChapterNumer}\chapterAuthor\autodot
-\else
-%\ \normalsize\color{ChapterHeadingSmallChapterNumer}\chapapp~\thechapter\autodot
-\ \normalsize\color{ChapterHeadingSmallChapterNumer}\chapapp~\autodot
-\fi
-}}%
-\end{picture} % <-- Leerzeichen ist hier beabsichtigt!
-\endgroup
+\let\defaultchapterformat\chapterformat
+\renewcommand{\chapterformat}{%
+    \begingroup% 
+        \setlength{\unitlength}{1mm}%
+        \begin{picture}(20,40)(-2,8)%
+            \setlength{\fboxsep}{0pt}%
+            \put(20,15){\color{ChapterHeadingSeperatorLine}\line(1,0){\dimexpr\textwidth-20\unitlength\relax\@gobble}}%
+            \put(-6,4.0){
+                \makebox(20,20)[r]{%
+                    \fontsize{19\unitlength}{23\unitlength}\selectfont\color{ChapterHeadingBigChapterNumber}\thechapter
+                }%
+            }%
+                \put(20,15){%
+                \makebox(\dimexpr\textwidth-20\unitlength\relax\@gobble,\ht\strutbox\@gobble)[l]{%
+                    \ifdefined\chapterAuthor%
+                        \normalsize\color{ChapterHeadingSmallChapterNumer}\chapterAuthor%
+                    \else
+                        \normalsize\color{ChapterHeadingSmallChapterNumer}\chapapp%
+                    \fi%
+                }
+            }%
+        \end{picture} % <-- Leerzeichen ist hier beabsichtigt!
+    \endgroup
 }
 %%%%%%%%%%%%%%%%%%%%%%
 
@@ -800,10 +644,7 @@ colorinlistoftodos
 % change color of headsepline
 \addtokomafont{headsepline}{\color{Headsepline}}
 \setheadsepline{.4pt}%{\color{Headsepline}}
-
 % create headermarks so the chapter is shown on left page and section on right
-
-
 % new pagestyle "chapter": pagenumber top outer, no line no headmark
 \iftemplateUseBookLayout
 		\ihead[\headmark]{\headmark}
@@ -870,8 +711,10 @@ colorinlistoftodos
 %          to adjust for regular printing (e.g. use in a folder), see below "geometry"
 \usepackage[includehead=false,includefoot=false]{geometry}
 \iftemplateUseBookLayout
-        \KOMAoptions{BCOR=12mm,DIV=calc} % for helvetica	
+	\KOMAoptions{twoside=true} 
+    \KOMAoptions{BCOR=12mm,DIV=calc} % for helvetica	
 \else
+	\KOMAoptions{twoside=false}
 	\KOMAoptions{BCOR=0mm,DIV=calc} % for helvetica	
 \fi
 
@@ -880,122 +723,100 @@ colorinlistoftodos
 
 \usepackage{wallpaper}
 \newcommand{\udesoftecmaketitle} {
-	
-		\newgeometry{bottom=1cm, inner=0cm,outer=0cm,top=4cm}
-	
-  \begin{titlepage}
-			\begin{center}
-				\ThisCenterWallPaper{1}{\udesoftec@templateTitlePageBackground}
-				\vspace*{30pt}
-					\begin{minipage}[30em]{.7\linewidth}
-						\begin{center}
-							\Large\udesoftec@typeofdoc\normalsize
-
-							\udesoftec@labelPreTopic
-							
-							{\color{documentTitle}\Huge\singlespacing\textbf{\@title}\par}
-							{\color{documentTitle}\huge\singlespacing\textbf{\@subtitle}\par}			
-							\vspace*{20pt}				
-							{\color{documentTitle}\large\singlespacing\textbf{\udesoftec@entitle}\par}
-							
-							\vspace*{50pt}
-								
-							\large\udesoftec@institution
-						\end{center}
-					\end{minipage}
-								\vfill
-				
-							
-				\begin{minipage}{.7\linewidth}
-					\begin{center}
-					\ifdocumentOmitCC
-                    \else
-                    
-                    \udesoftec@labelRespectConfidentiality
-                    
-					\fi				
-						\vspace*{20pt}\Large\@date
-					\end{center}
-					\vspace*{30pt}
-				\end{minipage}
-				\udesoftec@authorbox
-				\begin{minipage}{.7\linewidth}
-					\begin{center}
-								
-					\vspace*{40pt}
-					\large\udesoftec@semester 
-					\end{center}
-				\end{minipage}%
-			\end{center}%
-\end{titlepage}%
-		\restoregeometry
-	}
-
-	\newcommand{\udesoftecvawibambergmaketitle}{
-
-		\newgeometry{bottom=1cm, left=2cm,right=1cm,top=4cm}
-		
-  \begin{titlepage}
-			\begin{center}
-				\ThisCenterWallPaper{1}{\udesoftec@templateTitlePageBackground}
-				\vspace*{0pt}
-					\begin{minipage}[30em]{.7\linewidth}
-						\begin{center}
-
-							
-							{\color{documentTitle}\Huge\singlespacing\textbf{\@title}\par}
-							{\color{documentTitle}\huge\singlespacing\textbf{\@subtitle}\par}			
-							\vspace*{20pt}				
-							{\color{documentTitle}\large\singlespacing\textbf{\udesoftec@entitle}\par}
-							
-							\vspace*{50pt}
-							\hrule
-							\vspace*{20pt}
-								\Large\textbf{\udesoftec@typeofdoc}\normalsize
-							
-							\large\udesoftec@institution
-						
-							\vspace*{20pt}
-							\hrule
-							\vspace*{20pt}
-							\end{center}
-					\end{minipage}
-								\vfill
-				
-							
-				\begin{minipage}{.7\linewidth}
-					\begin{center}
-					\ifdocumentOmitCC
-                    \else
-                    
-                    \udesoftec@labelRespectConfidentiality
-                    
-					\fi
-						\vspace*{15pt}\Large\@date
-					\end{center}
-					\vspace*{20pt}
-				\end{minipage}
-				\udesoftec@authorbox
-				\begin{minipage}{.7\linewidth}
-					\begin{center}
-								
-					\vspace{20pt}
-					\large\udesoftec@semester 
-					\vspace{20pt}
-					\end{center}%
-				\end{minipage}%
-			\end{center}%
-  \end{titlepage}%
-		\restoregeometry
+    \newgeometry{bottom=1cm, inner=0cm,outer=0cm,top=4cm}
+    \begin{titlepage}
+        \begin{center}
+            \ThisCenterWallPaper{1}{\udesoftec@templateTitlePageBackground}
+			\vspace*{30pt}
+			\begin{minipage}[30em]{.7\linewidth}
+                \begin{center}
+                    \Large\udesoftec@typeofdoc\par
+                    \normalsize\udesoftec@labelPreTopic\par
+                    \vspace*{20pt}
+                    {\color{documentTitle}\Huge\textbf{\@title}\par}
+                    \vspace*{20pt}
+                    {\color{documentTitle}\huge\textbf{\@subtitle}\par}			
+                    \vspace*{20pt}				
+                    {\color{documentTitle}\large\textbf{\udesoftec@entitle}\par}
+                    \vspace*{50pt}				
+                    \large\udesoftec@institution
+                \end{center}
+            \end{minipage}
+			\vfill
+			\begin{minipage}{.7\linewidth}
+                \begin{center}
+                \ifdocumentOmitCC
+                \else           
+                \udesoftec@labelRespectConfidentiality\par
+                \fi				
+                \vspace*{20pt}\Large\@date
+                \end{center}
+                \vspace*{30pt}
+            \end{minipage}
+            \udesoftec@authorbox\par
+            \begin{minipage}{.7\linewidth}
+                \begin{center}                            
+                \vspace*{40pt}
+                \large\udesoftec@semester\par 
+                \end{center}
+            \end{minipage}%
+        \end{center}%
+    \end{titlepage}%
+	\restoregeometry
 }
 
+\newcommand{\udesoftecvawibambergmaketitle}{
+    \newgeometry{bottom=1cm, left=2cm,right=1cm,top=4cm}
+    \begin{titlepage}
+    \begin{center}
+        \ThisCenterWallPaper{1}{\udesoftec@templateTitlePageBackground}
+        \vspace*{0pt}
+        \begin{minipage}[30em]{.7\linewidth}
+            \begin{center}
+            {\color{documentTitle}\Huge\textbf{\@title}\par}			
+                \vspace*{20pt}	
+                {\color{documentTitle}\huge\textbf{\@subtitle}\par}			
+                \vspace*{20pt}				
+                {\color{documentTitle}\large\textbf{\udesoftec@entitle}\par}
+                \vspace*{50pt}
+                \hrule
+                \vspace*{20pt}
+                \Large\textbf{\udesoftec@typeofdoc}\par                   
+                \large\udesoftec@institution\par
+                \vspace*{20pt}
+                \hrule
+                \vspace*{20pt}
+                \end{center}
+        \end{minipage}
+        \vfill     
+        \begin{minipage}{.7\linewidth}
+            \begin{center}
+                \ifdocumentOmitCC
+                \else
+                \udesoftec@labelRespectConfidentiality\par
+                \fi
+                \vspace*{15pt}\Large\@date
+            \end{center}
+            \vspace*{20pt}
+        \end{minipage}
+        \udesoftec@authorbox\par
+        \begin{minipage}{.7\linewidth}
+            \begin{center}
+            \vspace{20pt}
+            \large\udesoftec@semester\par
+            \vspace{20pt}
+            \end{center}%
+        \end{minipage}%
+    \end{center}%
+    \end{titlepage}%
+    \restoregeometry
+}
 
 \renewcommand{\maketitle}{\udesoftecmaketitle}
 \iftemplateVawiBamberg
     \renewcommand{\maketitle}{\udesoftecvawibambergmaketitle}
 \fi
 \let\oldmaketitle\maketitle
-
 \renewcommand{\maketitle}{
 	\let\oldhbadness\hbadness
 	\let\oldvbadness\vbadness
@@ -1018,20 +839,26 @@ colorinlistoftodos
 
 \renewcommand*{\marginfont}[1]{\scriptsize#1}
 
-\newcommand*{\marginalText}[2][]{
+\providecommand{\marginalText}[2][]{
 \message{LaTeX Warning: \noexpand\marginalText is deprecated, use \noexpand\marginnote on input line \the\inputlineno }
 \marginnote[#1]{#2}
 }
-\renewcommand*{\marginline}[2][]{
+\providecommand{\marginline}[2][]{
 \message{LaTeX Warning: \noexpand\marginline is deprecated, use \noexpand\marginnote on input line \the\inputlineno }
 \marginnote[#1]{#2}
 }
 
-\newcommand{\chapterWithoutPageBreak}[1]{
-\let\backupchapterskip\chapterheadstartvskip%
-\renewcommand*\chapterheadstartvskip{\vspace*{-.4\topskip}}%
-\global\@topnum\z@\@afterindentfalse\secdef\@chapter\@schapter*{#1}
-\let\chapterheadstartvskip\backupchapterskip%
+\newcommand{\chapterWithoutPageBreak}[1]{%
+    \let\oldcleardoublepage\cleardoublepage%
+    \let\oldclearpage\clearpage%
+    \let\clearpage\relax%
+    \let\cleardoublepage\relax%
+    \let\backupskip\chapterheadstartvskip%
+    \renewcommand\chapterheadstartvskip{\vspace*{-\topskip}\vspace*{10pt}}%
+    \par\chapter*{#1}%
+    \let\cleardoublepage\oldcleardoublepage%
+    \let\clearpage\oldclearpage%
+    \let\chapterheadstartvskip\backupskip%
 }
 
 \newcommand{\ignoreHbadness}[1]{%
@@ -1041,7 +868,6 @@ colorinlistoftodos
 	\hbadness \originalHbadness%
 }
 
-\renewcommand{\figurename}{Abb.}
 \newcommand{\figref}[1]{\autoref{fig:#1}}
 
 
@@ -1074,60 +900,72 @@ colorinlistoftodos
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
-%%% DEMO AND TESTING AREA HERE
-%%%%%%%%%%%%%%%%%%%%%%%%%
 % have quote boxes with big quotation marks
 % big quotation marks based on, reduced code and used mdframed
 % http://tex.stackexchange.com/questions/16964/block-quote-with-big-quotation-marks
 \usepackage{tikz}
 \usepackage{mdframed}
-\usepackage{libertine} % or any other font package
+\newlength{\udesoftec@outerboxmargin}
+\setlength{\udesoftec@outerboxmargin}{1ex}
+\mdfsetup{%
+        innertopmargin=2ex,%
+        leftmargin=-\udesoftec@outerboxmargin,%
+        rightmargin=-\udesoftec@outerboxmargin,%
+        innerleftmargin=\udesoftec@outerboxmargin,%
+        innerrightmargin=\udesoftec@outerboxmargin,%
+        innerbottommargin=2ex,%
+}
+\usepackage{csquotes}
 \newcommand*\quotefont{\fontfamily{LinuxLibertineT-LF}} % selects Libertine as the quote font
+%\newcommand*\quotefont{\normalfont\fontfamily{\sfdefault}} % selects Libertine as the quote font
 \newcommand*\quotesize{60} % if quote size changes, need a way to make shifts relative
 % Make commands for the quotes
-\newcommand*{\openquote}
-   {\tikz[remember picture,overlay,xshift=-4ex,yshift=-.5]
-   \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\glqq};\kern0pt}
-\newcommand*{\closequote}
-  {\tikz[remember picture,overlay,xshift=4ex,yshift=2ex]
-   \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\grqq};}
-
-\newenvironment{quoteBox}{%
-\mdfsetup{%
-innertopmargin=2ex,%
-backgroundcolor=DocumentBright2,%
-linecolor=DocumentMedium2,%
-linewidth=.5pt,
-nobreak=true,
-}\setlength\paperheight {297mm}%
-    \setlength\paperwidth  {210mm}
-\begin{mdframed}\begin{quote}%
-\openquote%
+\providecommand{\pictureopenquote}{\tikz[remember picture,overlay,xshift=-3ex,yshift=-.5] \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};}
+\providecommand{\pictureclosequote}{\tikz[remember picture,overlay,xshift=4ex,yshift=2ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};}
+
+\providecommand{\pictureopenquoteen}{\tikz[remember picture,overlay,xshift=-3ex,yshift=-1ex] \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};}
+\providecommand{\pictureclosequoteen}{\tikz[remember picture,overlay,xshift=4ex,yshift=1.5ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};}
+
+
+
+\newenvironment{citequoteparenv}{%
+    \mdfsetup{%
+        innerleftmargin=6ex,%
+        innerrightmargin=6ex,%
+        backgroundcolor=DocumentBright2,%
+        linecolor=DocumentMedium2,%
+        linewidth=.5pt,
+        nobreak=true,
+    }
+    \begin{mdframed}%
+    \iflanguage{ngerman}{\pictureopenquote}{\pictureopenquoteen}%         
 }{
-\closequote%
-\end{quote}\end{mdframed}%
+    \iflanguage{ngerman}{\pictureclosequote}{\pictureclosequoteen}
+    \end{mdframed}%
 }
-
-\newcommand{\citequotepar}[3][]
-{%
-\begin{quoteBox}
-\sloppy{\small\nohyphens{#3}}%
-\par\hfill\small\cite[#1]{#2}%
-\end{quoteBox}%
+\newcommand{\citequotepar}[3][]{%
+    \begin{citequoteparenv}%
+        \sloppy{\small\nohyphens{\enquote{#3}}}%
+        \par\hfill\small\cite[#1]{#2}%
+    \end{citequoteparenv}%
 }
 
+
 \newenvironment{exampleBox}[1][]{%
-\mdfsetup{%
-frametitle={%
-\tikz[baseline=(current bounding box.east),outer sep=0pt]
-\node[anchor=east,rectangle,draw=DocumentMedium1,line width=.5pt,fill=DocumentBright1,]
-{\strut #1};}%
-}%
-\mdfsetup{innertopmargin=.5em,linecolor=DocumentMedium1,%
-backgroundcolor=DocumentBright1,%
-linewidth=.5pt,topline=true,
-frametitleaboveskip=\dimexpr-\ht\strutbox\relax,}
-\begin{mdframed}%
+    \mdfsetup{%
+        frametitle={%
+            \tikz[baseline=(current bounding box.east),outer sep=0pt]
+            \node[anchor=east,rectangle,draw=DocumentMedium1,line width=.5pt,fill=DocumentBright1,font=\small]
+            {#1};
+        },%
+        innertopmargin=.0\udesoftec@outerboxmargin, %due to heading-box
+        innerbottommargin=\udesoftec@outerboxmargin,
+        linecolor=DocumentMedium1,%
+        backgroundcolor=DocumentBright1,%
+        linewidth=.5pt,topline=true,
+        frametitleaboveskip=\dimexpr-\ht\strutbox\relax,
+        }
+        \begin{mdframed}%
 }{\end{mdframed}}
 
 \newcommand{\parExample}[2][!]{%
@@ -1148,10 +986,8 @@ frametitleaboveskip=\dimexpr-\ht\strutbox\relax,}
 
 
 %%%%%%%%%%%%%%%%
-\usepackage{verbatim}
 \usepackage{multicol}
 \usepackage{listings}
-\usepackage[listings]{scrhack} 
 \lstset{%
 frame=single,%
 basicstyle=\scriptsize,%
@@ -1160,7 +996,7 @@ backgroundcolor=\color{DocumentBright0},%
 rulecolor=\color{DocumentMedium0},%
 keywordstyle=\color{DocumentDark1},
 stringstyle=\color{DocumentDark2},
-commentstyle=\color{DocumentMedium0}
+commentstyle=\color{DocumentMedium0},
 }
 %add support for german utf-8 umlauts:
 % source: http://stackoverflow.com/questions/1116266/listings-in-latex-with-utf-8-or-at-least-german-umlauts
@@ -1173,23 +1009,109 @@ commentstyle=\color{DocumentMedium0}
            {Ü}{{\"U}}1
            {ß}{{\ss}}1
 }
+%default design
+\lstset{%
+    frame=single,%
+    basicstyle=\fontfamily{\ttdefault}\tiny,%
+    breaklines=true,%
+    backgroundcolor=\color{DocumentBright0},%
+    rulecolor=\color{DocumentMedium0},% 
+    keywordstyle=\color{DocumentDark1},
+    stringstyle=\color{DocumentDark2},
+    commentstyle=\color{DocumentMedium0},
+    framesep=\udesoftec@outerboxmargin,
+    rulesep=0ex,
+    numberbychapter=true,
+    captionpos=b,
+}
+\lstnewenvironment{lstlistinglatex}[1][]{%
+    \lstset{
+        language={[LaTeX]TeX},
+        breaklines=true,
+        moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms},
+        morekeywords={figure,document,itemize,enumerate,description,final,omit-todos,tabularx},
+        emph={style,leftmargin},
+        texcsstyle=*\color{DocumentDark1},
+        keywordstyle=\color{DocumentDark3}\textbf,
+        emphstyle=\color{DocumentDark4},
+    }
+    \lstset{#1} %allow options for new listing
+}{}
+\def\lstinlinelatex{\lstinline[%
+language={[LaTeX]TeX},
+        breaklines=true,
+        moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms},
+        morekeywords={figure,document,description,itemize,enumerate,final,omit-todos,tabularx},
+        texcsstyle=*\color{DocumentDark1},
+        keywordstyle=\color{DocumentDark3}\textbf,
+]}
+
+\providecommand{\ctanlink}[1]{\href{http://www.ctan.org/pkg/#1}{#1}}
+
+
+\usepackage[
+ngerman,
+textsize=tiny,
+backgroundcolor=DocumentBright1,
+bordercolor=DocumentMedium1,
+linecolor=DocumentBright1,
+colorinlistoftodos
+]{todonotes}%
+%% alternative for deactivation:
+%\newcommand*{\todo}[2][]{}
+%\newcommand*{\listoftodos}[1][]{}
+%\newcommand*{\missingfigure}[2][]{}
 
 
-\newcommand{\ctanlink}[1]{\href{http://www.ctan.org/pkg/#1}{#1}}
+\ifdocumentOmitTodos
+	\renewcommand{\listoftodos}{}
+	\renewcommand{\todo}[2][]{}
+	\providecommand{\todoDesign}[1]{}
+	\providecommand{\todoText}[1]{}
+	\providecommand{\todoFigure}[1]{}
+    \providecommand{\inlinetodo}[1]{}
+    \providecommand{\todoinline}[1]{}
+\else
+	\let\defaultTodo\todo
+	\renewcommand{\todo}[1]{%
+        \documentUsedTodostrue%
+        \defaultTodo[]{#1}%
+	}
+	\providecommand{\todoDesign}[1]{%
+	  \documentUsedTodostrue%
+		\defaultTodo[fancyline,backgroundcolor=DocumentBright2]{#1}%
+	}
+	\providecommand{\todoText}[1]{%
+	  \documentUsedTodostrue%
+		\defaultTodo[fancyline,backgroundcolor=DocumentBright3]{#1}%
+	}
+	\providecommand{\todoFigure}[1]{%
+	  \documentUsedTodostrue%
+		\defaultTodo[fancyline,backgroundcolor=DocumentBright4]{#1}%
+	}
+	\providecommand{\inlinetodo}[1]{\documentUsedTodostrue\defaultTodo[inline]{#1}}
+	\providecommand{\todoinline}[1]{\inlinetodo{#1}}
+
+	\let\defaultListoftodos\listoftodos
+	\renewcommand{\listoftodos}{
+		\defaultListoftodos
+	}
+\fi
+
 
 
 
 %%%% hyperref %%%%%%%%
 %% special: hyperref needs to be loaded last! (exception hycap)
 %% purpose: make internal and external links working and colored
-\usepackage[colorlinks=true,
+\usepackage[pdftex,colorlinks=true,
 						linkcolor=LinkInternal,
 						anchorcolor=LinkAnchor,
 						citecolor=LinkBibliography,
 						filecolor=LinkExternal,
 						urlcolor=LinkExternal,
-						hyperindex,linktoc=section,pdfstartview=FitV,plainpages=false,
-                        pdfpagelabels,pdftex,
+						hyperindex,linktoc=section,pdfstartview=FitV,
+                        pdfpagelabels,
 bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{hyperref}%
 \AtBeginDocument{\def\subsectionautorefname{\sectionautorefname}}
 \AtBeginDocument{\def\subsubsectionautorefname{\sectionautorefname}}
@@ -1238,15 +1160,42 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h
 \glossaryentryfield{##2}{##3}{##4}{##5}{##6}}%
 }
 
+% !Mode:: "TeX:UTF-8"
+%%%% todonotes %%%%%%%
+% purpose: get (orange) todo comments in text or in margin
+% use option "disable" to disable the complete packages (leaving all commands intact, just removing output)
+\usepackage{udesoftec-bst}
+\usepackage[listings]{scrhack} 
+
+
+% make list of x conditional due to their usage
+% http://tex.stackexchange.com/questions/33193/how-to-determine-whether-a-list-of-figures-is-empty
+\AtEndEnvironment{figure}{\gdef\udesoftec@usedlistofitems@figure{}}%
+\AtEndDocument{\ifdefined\udesoftec@usedlistofitems@figure\label{udesoftec:needslof}\fi}% 
+\let\defaultlistoffigures\listoffigures
+\renewcommand{\listoffigures}{\@ifundefined{r@udesoftec:needslof}{}{\defaultlistoffigures}}%
+
+\AtEndEnvironment{lstlisting}{\gdef\udesoftec@usedlistofitems@listing{}}%
+\AtEndEnvironment{lstlisting-latex}{\gdef\udesoftec@usedlistofitems@listing{}}%
+\AtEndDocument{\ifdefined\udesoftec@usedlistofitems@listing\label{udesoftec:needslol}\fi}% 
+\let\defaultlstlistoflistings\lstlistoflistings
+\renewcommand{\lstlistoflistings}{\@ifundefined{r@udesoftec:needslol}{}{\defaultlstlistoflistings}}%
+              
+\AtEndEnvironment{table}{\gdef\udesoftec@usedlistofitems@table{}}%\AtBeginDocument{\ifdefined\udesoftec@usedlistofitems@table\label{udesoftec:needslot}\fi}% 
+\AtEndDocument{\ifdefined\udesoftec@usedlistofitems@table\label{udesoftec:needslot}\fi}% 
+\let\defaultlistoftables\listoftables
+\renewcommand{\listoftables}{\@ifundefined{r@udesoftec:needslot}{}{\defaultlistoftables}}%
+
+
+
 \newcommand{\udesoftecoverride}{}
 \AtBeginDocument{
-    \udesoftecoverride
+    \udesoftecoverride%
     \pagenumbering{alph}    % title page is "a" - internal trick to prevent two pages with same name
-    \hypertarget{titlepage}{}
-    \pdfbookmark[-1]{\@title}{titlepage}
-    
+    \hypertarget{titlepage}{}\pdfbookmark[-1]{\@title}{titlepage} %
+    %
     \maketitle                                                      % Komplett automatisch generiert anhand von Metadaten
-    \cleardoublepage
+    \cleardoublepage%
     \pagenumbering{Roman}   % I,II,III,IV... - all pre-content pages are roman upper
 	
     \ifdocumentOmitCC\else\cleardoublepage\confidentialityclause\fi%
@@ -1258,10 +1207,12 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h
     \fi
     \ifdocumentOmitLOF\else\cleardoublepage\listoffigures\fi
     \ifdocumentOmitLOT\else\cleardoublepage\listoftables\fi
+    \ifdocumentOmitLOL\else\cleardoublepage\lstlistoflistings\fi
     \ifdocumentOmitLOA\else\cleardoublepage\printacronyms\fi
                 
     \newlength{\imagewidth}
     \setlength\imagewidth\linewidth
+    \mainmatter
 }
 
 \AtEndDocument{