13 files changed, 1067 insertions, 1562 deletions
diff --git a/Master/texmf-dist/doc/latex/ebsthesis/LICENSE b/Master/texmf-dist/doc/latex/ebsthesis/README
index ca45060daf4..ca45060daf4 100755..100644
--- a/Master/texmf-dist/doc/latex/ebsthesis/LICENSE
+++ b/Master/texmf-dist/doc/latex/ebsthesis/README
diff --git a/Master/texmf-dist/doc/latex/ebsthesis/ebsthesis.pdf b/Master/texmf-dist/doc/latex/ebsthesis/ebsthesis.pdf
new file mode 100644
index 00000000000..91b9e49dfb0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ebsthesis/ebsthesis.pdf
diff --git a/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.dtx b/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.dtx
index fc6ce3bd97f..5b48005cccb 100755
--- a/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.dtx
+++ b/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-%% The ebsthesis document class and ebstools package
-%% Copyright (c) 2003 Philipp N. Baecker. All right reserved.
+%% The ebsthesis document class
+%% Copyright (c) 2006 Philipp N. Baecker. All right reserved.
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License distributed from CTAN archives
@@ -10,7 +10,7 @@
 %
 %<*dtx>
 \ProvidesFile{ebsthesis.dtx}
-             [2003/10/01 v0.9i EBS Thesis Class and Tools Package (PNB)]
+             [2006/12/31 v1.0 EBS Thesis Class (PNB)]
 %</dtx>
 %<driver>\ProvidesFile{ebsthesis.drv}
 %<*driver>
@@ -34,12 +34,12 @@
 \begin{document}
 \DocInput{ebsthesis.dtx}
 \PrintChanges
-\PrintIndex
+% \PrintIndex
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{837}
+% \CheckSum{1195}
 %
 %%
 %% \CharacterTable
@@ -59,365 +59,42 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 %
-% \changes{v0.9}{2003/08/09}{First public release}
-% \changes{v0.9a}{2003/08/12}{Removed some redundant commands}
-% \changes{v0.9b}{2003/08/13}{New summary of contents}
-% \changes{v0.9b}{2003/08/13}{Added support for appendices}
-% \changes{v0.9b}{2003/08/13}{Added comments}
-% \changes{v0.9b}{2003/08/13}{Corrected typo in installation file}
-% \changes{v0.9b}{2003/08/13}{Changed appearence of numbering}
-% \changes{v0.9b}{2003/08/13}{Added support for parts}
-% \changes{v0.9i}{2003/10/01}{Changed section numbering and format}
-% \changes{v0.9j}{2003/11/11}{Fixed typo pointed out by Andr� Kudra}
+% \changes{v1.0}{2003/08/09}{Final version}
 %
-% \def\fileversion{v0.9}
-% \def\filedate{2003/08/09}
-% \def\fileversion{v0.9a}
-% \def\filedate{2003/08/12}
-% \def\fileversion{v0.9b}
-% \def\filedate{2003/08/13}
-% \def\fileversion{v0.9c}
-% \def\filedate{2003/08/14}
-% \def\fileversion{v0.9d}
-% \def\filedate{2003/08/15}
-% \def\fileversion{v0.9e}
-% \def\filedate{2003/08/16}
-% \def\fileversion{v0.9f}
-% \def\filedate{2003/08/17}
-% \def\fileversion{v0.9g}
-% \def\filedate{2003/08/20}
-% \def\fileversion{v0.9h}
-% \def\filedate{2003/09/05}
-% \def\fileversion{v0.9i}
-% \def\filedate{2003/10/01}
-% \def\fileversion{v0.9j}
-% \def\filedate{2003/11/11}
+% \def\fileversion{v1.0}
+% \def\filedate{2006/12/31}
 %
-% \GetFileInfo{ebsthesis.dtx}
-% \title{The \class{ebsthesis} document class and \class{ebstools}
-%   package\\for use with \LaTeXe\thanks{This file has version number
-%     \fileversion, last revised \filedate.  I am grateful for helpful
+% \GetFileInfo{ebsthesis.dtx} \title{The \class{ebsthesis} document
+%   class\\for use with \LaTeXe\thanks{This file has version number
+%     \fileversion, last revised \filedate. I am grateful for helpful
 %     comments I received from Andr\'e Kudra and others.}}
 % \author{Philipp N. Baecker\\
 %   European Business School\\
-%   \url{mailto:philipp.baecker@ebs.edu}}
-% \date{\filedate}
+%   \url{mailto:philipp.baecker@ebs.edu}} \date{\filedate}
 % \maketitle
 % \begin{abstract}
-%   The \class{ebsthesis} class and \class{ebstools} package
-%   facilitate the production of camera-ready manuscripts in
-%   conformance with the guidelines of Gabler Verlag and typographical
-%   rules established by European Business School. If you do not like
-%   the output, find somebody else to complain to.
+%   The \class{ebsthesis} class facilitates the production of
+%   camera-ready manuscripts in conformance with the guidelines of
+%   Gabler Verlag and typographical rules established by European
+%   Business School.
 % \end{abstract}
 % \tableofcontents
 % \section{User Documentation}
-% \subsection{Introduction}
-% The \class{ebsthesis} class relies heavily on a number of packages.
-% Some people will probably object to this and suggest that all the code
-% be included into the class itself (as it is the case with the some
-% other classes). IMHO, it is against common practice (and against
-% common sense, for that matter) to ``reinvent the wheel'' or to copy
-% library code that is otherwise maintained and frequently updated
-% verbatim into your own programs. Indeed, I assume packages were
-% introduced to save you time (that is, for example, better invested
-% into one's thesis). Finally, there is usually no need to pass options
-% to the required packages other than those used by the class.
-% \par
-% In addition, since MiK\TeX\ is widely used in my department, it is more
-% or less safe (for me) to rely on the availability of these packages.
-% For the same reason, I chose to specify fairly recent dates for all
-% dependencies, so I can guarantee that the class will function as
-% expected, provided an up-to-date Mik\TeX\ distribution (or equivalent)
-% is installed on the machine you are using. If you have any suggestions
-% for further improvements likely to increase portability I am happy to
-% hear from you.
-% \subsection{Features}
-% \subsubsection{Overview}
-% Loosely speaking, the \class{ebsthesis} class currently consists of
-% two files: \file{ebsthesis.cls} (the actual document class) and
-% \file{ebstools.sty} (a supplementary package). For reasons of
-% convenience, I separated all commands not essential to the
-% implementation from the class and included them into the package. This
-% documentation as well as the class and the package can be produced
-% from the main distribution file \file{ebsthesis.dtx} by running
-% \file{ebsthesis.ins} through \TeX.
-% \subsubsection{An Example}
-% \DescribeMacro{\frontmatter}
-% \DescribeMacro{\mainmatter}
-% \DescribeMacro{\backmatter}
-% The commands provided by the class and package are more or less
-% self-explanatory. As far as usage is concerned, the class is similar
-% to the standard \class{book} class, including commands such as
-% \cs{frontmatter}, \cs{mainmatter}, and \cs{backmatter}.\footnote{It is
-%   actually derived from the \class{extbook} class, a non-standard
-%   extension providing additional font sizes.}
-% \par
-% To use the \class{ebsthesis} class just include the following lines
-% (or something similar) into the preamble of your document.
-% \begin{verbatim}
-% \documentclass[singlespacing,noheadrules]{ebsthesis}
-% \name{Dipl.-Kfm. Philipp N. Baecker}
-% \titel{Platform Investment Under Uncertainty}
-% \untertitel{Exemplified by an Option-Based Analysis
-%   of Business Models in the Biotechnology Industry}
-% \geburtsort{Mainz}
-% \referenten{%
-%   Prof. Ulrich Hommel, Ph.D.
-%   \and Prof. Albus Dumbledore
-% }
-% \einreichungstermin{19. Dezember 2000}
-% \pruefungstermin{7. September 2001}
-% \erscheinungsjahr{2004}
-% \end{verbatim}
-% Your document might continue as shown below.
-% \begin{verbatim}
-% \begin{document}
-% \frontmatter
-% \maketitle
-% \include{geleitwort}
-% \include{vorwort}
-% \inhaltsuebersicht
-% \tableofcontents
-% \listoffigures
-% \listoftables
-% \include{abkuerzungsverzeichnis}
-% \symbolverzeichnis
-% \mainmatter
-% \include{einleitung}
-% \include{hauptteil}
-% \include{schluss}
-% \backmatter
-% \include{literaturverzeichnis}
-% \include{anhang}
-% \end{document}
-% \end{verbatim}
-% The file \file{geleitwort.tex} commences as follows.
-% \begin{verbatim}
-% \geleitwort
-% Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-% eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
-% minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-% aliquip ex ea commodo consequat.
-% \end{verbatim}
-% Below is the beginning of the file \file{vorwort.tex}.
-% \begin{verbatim}
-% \vorwort
-% Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-% dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-% proident, sunt in culpa qui officia deserunt mollit anim id est
-% laborum.
-% \end{verbatim}
-% Following is an example of a file \file{abkuerzungsverzeichnis.tex}.
-% \begin{verbatim}
-% \abkuerzungsverzeichnis
-% \begin{acronym}
-%   \acro{ANSI}{American National Standards Institute}
-%   \acro{ATLAS}{Automatically Tuned Linear Algebra Software}
-%   \acro{CBLAS}{Complex Basic Linear Algebra Subprograms}
-%   \acro{FTCS}{Forward Time Centered Space}
-%   \acro{GAlib}{Genetic Algorithms Library}
-%   \acro{GCC}{GNU Compiler Collection}
-%   \acro{GNU}{GNU's Not Unix}
-%   \acro{GSL}{GNU Scientific Library}
-%   \acro{PRNG}{Pseudo-Random Number Generator}
-%   \acro{UNURAN}{Universal Non-Uniform Random Number Generator}
-% \end{acronym}
-% \end{verbatim}
-% The following listing is an example for \file{anhang.tex}.
-% \begin{verbatim}
-% \appendices
-% \listofappendices
-% \input{beweise}
-% \input{interviews}
-% \end{verbatim}
-% Obviously, you may choose different names for the included files,
-% should you wish to do so.
-% \par
-% Assuming you are already familar with \LaTeX, it should now be
-% straightforward for you to produce a thesis conforming to European
-% Business School guidelines.
-% \subsubsection{Options}
-% \DescribeMacro{headrules}
-% \DescribeMacro{noheadrules}
-% \DescribeMacro{singlespacing}
-% \DescribeMacro{onehalfspacing}
-% The example shown above makes use of the \option{singlespacing} and
-% \option{noheadrules} options, which, as you might have guessed, turn
-% on singlespacing (actually 1.1) and turn off headrules, respectively.
-% The corresponding (default) options are \option{onehalfspacing}
-% (actually 1.3) and \option{headrules}.
-% \par
-% \DescribeMacro{tools}
-% \DescribeMacro{notools}
-% The \package{ebstools} package provides additional functionality I
-% found useful in my daily work. As I figured that not everybody
-% needs or likes these commands, the package is not loaded by default.
-% Specifying the \option{tools} option is equivalent to issuing the
-% corresponding \cs{usepackage} command.
-% \begin{verbatim}
-% \documentclass[singlespacing,noheadrules,tools]{ebsthesis}
-% \end{verbatim}
-% \par
-% \DescribeMacro{mathematica}
-% \DescribeMacro{nomathematica}
-% If you have Mathematica installed on your machine, you may wish to
-% employ the Mathematica fonts (which are especially useful if you would
-% like to or are forced to use Times as your body text font). At
-% present, the \option{mathematica} option is only available for the
-% \package{ebstools} package and cannot be accessed using a class option.
-% To activate support for the Mathematica fonts, you have to load the
-% \option{ebstools} package separately.
-% \begin{verbatim}
-% \documentclass[singlespacing,noheadrules]{ebsthesis}
-% \usepackage[mathematica]{ebstools}
-% \end{verbatim}
-% \par
-% Bypassing this mechanism and loading the underlying \package{wrisym}
-% package directly is strongly disouraged, as the \package{ebstools}
-% package defines several commands that potentially conflict with it.
-% \par
-% \DescribeMacro{fancyfoot}
-% \DescribeMacro{nofancyfoot}
-% The \class{ebsthesis} class uses the \package{footmisc} package to
-% provide hanging indentation for footnotes and stable footnotes that
-% can be included in headings and other unusual places (which is not the
-% case in standard \LaTeX). While it makes perfect sense to use
-% superscript numbers for footnote markers, I find it silly to use
-% superscript numbers in the actual footnote text. Since the Chicago
-% Manual of Style seems to share my opinion on this important issue, you
-% may change the standard layout of footnotes by requesting the
-% \option{fancyfoot} option. The default setting is \option{nofancyfoot}
-% which leaves the footnote layout untouched.
-% \subsubsection{Appendices}
-% \DescribeMacro{\appendices}
-% \DescribeMacro{\appendicesname}
-% \DescribeMacro{\appendixname}
-% Similar to the \cs{appendix} command of the base classes, the
-% \class{ebsthesis} class provides the command \cs{appendices}. It starts
-% a new chapter using the heading \cs{appendicesname}. The following
-% sections are labeled using uppercase letters and the prefix
-% \cs{appendixname}.
-% \par
-% \DescribeMacro{\listofappendices}
-% The summary and table of contents will contain a single chapter-level
-% entry. To generate a list of appendices, issue the command
-% \cs{listofappendices} after starting the appendix with the command
-% \cs{appendices}.
-% \subsubsection{Language Support}
-% Support for other languages is activated by loading the babel package.
-% The following command activates support for German (reformed). All
-% custom headings and names are automatically translated.
-% \begin{verbatim}
-% \usepackage[ngerman]{babel}
-% \end{verbatim}
-% \par
-% The \class{ebsthesis} class currently supports English (default)
-% and German (reformed). Feel free to mail me if you have translated the
-% \class{ebsthesis} macros into other languages.
-% \subsubsection{Lists of Abbreviations and Symbols}
-% The \class{ebsthesis} class relies on the \package{acronym} and
-% \package{nomencl} packages for implementing lists of abbreviations and
-% symbols. The output is adjusted to better reflect the specific
-% requirements. Please consult the relevant manuals for detailed
-% information.
-% \par
-% \DescribeMacro{\acroindent}
-% \DescribeMacro{\glossindent}
-% The lengths \cs{acroindent} and \cs{glossindent} can be redefined if
-% the default indentations do not provide sufficient space for
-% abbreviations or symbols. The following commands give you plenty of
-% space.
-% \begin{verbatim}
-% \setlength{\acroindent}{10em}
-% \setlength{\glossindent}{6em}
-% \end{verbatim}
-% \subsubsection{Package Macros}
-% \DescribeMacro{\D}
-% \DescribeMacro{\E}
-% \DescribeMacro{\I}
-% You may use the commands \cs{D}, \cs{E}, and \cs{I} to generate the
-% differential operator (the equivalent of \cs{partial} for ODEs), Euler's
-% number $\mathrm{e}$, and the imaginary unit $\mathrm{i}$, respectively.
-% \par
-% The output generated by these commands differs depending on whether
-% Mathematica fonts are being used.  Together with the
-% \option{mathematica} option they produce the strange doublestruck
-% symbols typically found in Mathematica notebooks. If you do not like
-% them, stick to Computer Modern.
-% \par
-% \DescribeMacro{\evaluatedat}
-% The command
-% \cs{evaluatedat}\oarg{superscript}\marg{subscript}\marg{expression}
-% enables you to typeset vertical bars used for the frequently used
-% ``evaluated at'' notation. The commands
-% \begin{verbatim}
-% \begin{equation*}
-%   \evaluatedat[y=0]{x=0}{\frac{\partial^2 f}{\partial x\partial y}}=1
-% \end{equation*}
-% \end{verbatim}
-% produce
-% \begin{equation*}
-%   \left.\frac{\partial^2f}{\partial x\partial y}\right\rvert_{x=0}^{y=0}=1.
-% \end{equation*}
-% \par
-% All other macros are still ``under development'' and considered
-% experimental. As interfaces and implementation might by subject to
-% future changes, use them at your own risk.
-% \subsubsection{BibTeX Style}
-% Currently, I am developing a Bib\TeX\ style in conformance with the
-% Gabler and European Business School guidelines. It will be added as
-% soon as it is finished. In the meantime, I strongly recommend using
-% the \package{natbib} package and its associated style files.
-% \subsection{Known Bugs and Issues}
-% For some reason, redefinitions of the \cs{figurename} and
-% \cs{tablename} commands are not reflected in the output.
-% \par
-% Despite my adjustments, chapter headings still do not show up at the
-% top of the page but slightly below it.
-% \par
-% Please let me know if you have a solution to any of these problems.
-% \subsection{Final Remarks}
-% The \class{ebsthesis} class typesets your thesis on A5 paper. Consult
-% the dvips manual to find out how to properly convert, scale, and print
-% the resulting files. Another possibility to generate A4 output is
-% provided by means of the \package{scale} package. Just add
-% \begin{verbatim}
-% \usepackage{scale}
-% \end{verbatim}
-% to the preamble of your document.
-% \par
-% Feature requests can be send to \texttt{philipp.baecker@ebs.edu}, and I
-% will look at them as soon as I get around to it (usually that is very
-% soon, as any distraction from my thesis is all too welcome).
-% \par
-% Since I am not a native speaker, any corrections to the documentation
-% are also very much appreciated. Until then, Happy \TeX ing!
+% This final release is incompatible with earlier versions.
+% I apologize for not providing decent documentation.
 % \StopEventually{\relax}
 % \section{Code}
-% Unless you intend to assist in improving the documentation, debugging,
-% or cleaning up the code there is no reason for you to read on. Of
-% course you may continue, if you are simply curious how this class has
-% been implemented.
-% \par
-% Class and package both require a recent version of \LaTeXe.
-%    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}[2001/06/01]
-%    \end{macrocode}
-% \subsection{The Class}
-% \subsubsection{Options}
-% This subsection shows how the class options are defined.
 %    \begin{macrocode}
 %<*ebsthesis>
-\ProvidesClass{ebsthesis}
-              [2003/11/11 v0.9j EBS Thesis Class (PNB)]
-%    \end{macrocode}
-% Declare options and introduce new booleans later used to selectively
-% execute class code.
-%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2003/12/01]
+\ProvidesClass{ebsthesis}%
+              [2006/12/31 v1.0 EBS Thesis Class (PNB)]
+\newif\if@gabler
+\DeclareOption{gabler}{\@gablertrue}
+\DeclareOption{grundregeln}{\@gablerfalse}
 \newif\if@singlespacing
-\DeclareOption{onehalfspacing}{\@singlespacingfalse}
 \DeclareOption{singlespacing}{\@singlespacingtrue}
+\DeclareOption{onehalfspacing}{\@singlespacingfalse}
 \newif\if@headrules
 \DeclareOption{headrules}{\@headrulestrue}
 \DeclareOption{noheadrules}{\@headrulesfalse}
@@ -427,576 +104,402 @@
 \newif\if@fancyfoot
 \DeclareOption{fancyfoot}{\@fancyfoottrue}
 \DeclareOption{nofancyfoot}{\@fancyfootfalse}
-%    \end{macrocode}
-% Deactivate the various size options.
-%    \begin{macrocode}
+\newif\if@indentcaptions
+\DeclareOption{indentcaptions}{\@indentcaptionstrue}
+\DeclareOption{noindentcaptions}{\@indentcaptionsfalse}
+\newif\if@mathematica
+\DeclareOption{mathematica}{\@mathematicatrue}
+\DeclareOption{nomathematica}{\@mathematicafalse}
 \DeclareOption{8pt}{\OptionNotUsed}
+\DeclareOption{9pt}{\OptionNotUsed}
 \DeclareOption{10pt}{\OptionNotUsed}
 \DeclareOption{11pt}{\OptionNotUsed}
 \DeclareOption{12pt}{\OptionNotUsed}
 \DeclareOption{14pt}{\OptionNotUsed}
 \DeclareOption{17pt}{\OptionNotUsed}
 \DeclareOption{20pt}{\OptionNotUsed}
-%    \end{macrocode}
-% Pass all remaining options on to the \class{extbook} class.
-%    \begin{macrocode}
+\DeclareOption{oneside}{\OptionNotUsed}
+\DeclareOption{twoside}{\OptionNotUsed}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{extbook}}
-\ExecuteOptions{onehalfspacing,headrules,notools,nomathematica,nofancyfoot}
+\ExecuteOptions{%
+  grundregeln,%
+  onehalfspacing,%
+  noheadrules,%
+  notools,%
+  nofancyfoot,%
+  noindentcaptions,%
+  nomathematica%
+}
 \ProcessOptions\relax
-%    \end{macrocode}
-% Load the \class{extbook} class for intermediary font sizes.
-%    \begin{macrocode}
-\LoadClass[9pt]{extbook}[1999/01/07]
-%    \end{macrocode}
-% \subsubsection{Customization}
-% This subsection shows the customizations specific to the
-% \class{ebsthesis} class.
-% \begin{macro}{\contentsname}
-% \begin{macro}{\figurename}
-% \begin{macro}{\tablename}
-% Redefine some commands to better correspond to the newly defined
-% generic headings.
-%    \begin{macrocode}
-%% Modified generic headings and names
+\if@gabler
+  \PassOptionsToClass{a5paper,9pt,twoside}{extbook}
+\else
+  \PassOptionsToClass{a4paper,12pt,oneside}{extbook}
+\fi
+\LoadClass{extbook}[1999/01/07]
+% Modified generic headings and names
 \renewcommand{\contentsname}{Table of Contents}
 \renewcommand{\figurename}{Fig.}
 \renewcommand{\tablename}{Table}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\abkuerzungsverzeichnisname}
-% \begin{macro}{\geleitwortname}
-% \begin{macro}{\inhaltsubersichtname}
-% \begin{macro}{\symbolverzeichnisname}
-% \begin{macro}{\vorwortname}
-% Define headings for special chapters. We stick to German and avoid the
-% hassle of having to come up with fancy english names.
-%    \begin{macrocode}
-%% New generic headings and names
+% New generic headings and names
 \newcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}
+\newcommand{\appendicesname}{Appendices}
 \newcommand{\geleitwortname}{Foreword}
-\newcommand{\inhaltsubersichtname}{Summary of Contents}
+\newcommand{\inhaltsuebersichtname}{Summary of Contents}
+\newcommand{\listappendixname}{List of Appendices}
 \newcommand{\symbolverzeichnisname}{List of Symbols}
 \newcommand{\vorwortname}{Preface}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\appendicesname}
-% \begin{macro}{\listappendixname}
-% \changes{v0.9b}{2003/08/13}{Added generic headings for appendices}
-% Define generic headings for appendices.
-%    \begin{macrocode}
-\newcommand{\appendicesname}{Appendices}
-\newcommand{\listappendixname}{List of Appendices}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\captionsenglish}
-% \begin{macro}{\extrasenglish}
-% \begin{macro}{\captionsngerman}
-% \begin{macro}{\extrasngerman}
-% \changes{v0.9b}{2003/08/13}{Added babel support for appendix commands}
-% Add translation of the above chapter titles to the corresponding hooks
-% of the \package{babel} package. Redefinitions of \cs{figurename} and
-% \cs{tablename} fail for some reason.
-%    \begin{macrocode}
-%% Babel support
+% Babel support
 \AtBeginDocument{%
   \@ifpackageloaded{babel}{%
-     \addto\captionsenglish{%
-       \renewcommand{\contentsname}{Table of Contents}%
-       \renewcommand{\figurename}{Fig.}%
-       \renewcommand{\tablename}{Table}%
-     }%
-     \addto\extrasenglish{%
-       \renewcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}%
-       \renewcommand{\geleitwortname}{Foreword}%
-       \renewcommand{\inhaltsubersichtname}{Summary of Contents}%
-       \renewcommand{\symbolverzeichnisname}{List of Symbols}%
-       \renewcommand{\vorwortname}{Preface}%
-       \renewcommand{\appendicesname}{Appendices}%
-       \renewcommand{\listappendixname}{List of Appendices}%
-     }
-     \addto{\captionsngerman}{%
-       \renewcommand{\figurename}{Abb.}%
-       \renewcommand{\tablename}{Tab.}%
-     }
-     \addto{\extrasngerman}{%
-       \renewcommand{\abkuerzungsverzeichnisname}{Abk�rzungsverzeichnis}%
-       \renewcommand{\geleitwortname}{Geleitwort}%
-       \renewcommand{\inhaltsubersichtname}{Inhalts�bersicht}%
-       \renewcommand{\symbolverzeichnisname}{Symbolverzeichnis}%
-       \renewcommand{\vorwortname}{Vorwort}%
-       \renewcommand{\appendicesname}{Anhang}%
-       \renewcommand{\listappendixname}{Verzeichnis des Anhangs}%
-     }%
-   }{\relax}%
- }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% Load the \package{geometry} package and adjust paper size and margins.
-%    \begin{macrocode}
-%% New paper format and margins
+    \addto{\captionsenglish}{%
+      \renewcommand{\contentsname}{Table of Contents}%
+      \renewcommand{\figurename}{Fig.}%
+      \renewcommand{\tablename}{Table}%
+    }%
+    \addto{\extrasenglish}{%
+      \renewcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}%
+      \renewcommand{\appendicesname}{Appendices}%
+      \renewcommand{\geleitwortname}{Foreword}%
+      \renewcommand{\inhaltsuebersichtname}{Summary of Contents}%
+      \renewcommand{\listappendixname}{List of Appendices}%
+      \renewcommand{\symbolverzeichnisname}{List of Symbols}%
+      \renewcommand{\vorwortname}{Preface}%
+    }%
+    \addto{\captionsngerman}{%
+      \renewcommand{\figurename}{Abb.}%
+      \renewcommand{\tablename}{Tab.}%
+    }%
+    \addto{\extrasngerman}{%
+      \renewcommand{\abkuerzungsverzeichnisname}{Abk\"urzungsverzeichnis}%
+      \renewcommand{\appendicesname}{Anhang}%
+      \renewcommand{\geleitwortname}{Geleitwort}%
+      \renewcommand{\inhaltsuebersichtname}{Inhalts\"ubersicht}%
+      \renewcommand{\listappendixname}{Verzeichnis des Anhangs}%
+      \renewcommand{\symbolverzeichnisname}{Symbolverzeichnis}%
+      \renewcommand{\vorwortname}{Vorwort}%
+    }%
+  }{\relax}%
+}
+% New paper format and margins
 \RequirePackage{geometry}[2002/07/08]
-\geometry{%
-  a5paper,%
-  includeheadfoot,%
-  centering,%
-  totalwidth=11.5cm,%
-  totalheight=18cm}
-%    \end{macrocode}
-% Load the \package{setspace} package and adjust linespacing according
-% to guidelines. If \option{singlespacing} has been requested, adjust
-% linespacing for best legibility.
-%    \begin{macrocode}
-%% New linespacing
+\if@gabler
+  \geometry{%
+    totalwidth=11.5cm,%
+    totalheight=18cm,%
+    includeheadfoot,%
+    centering,%
+    mag=1414
+  }
+\else
+  \geometry{%
+    left=4cm,%
+    right=2cm,%
+    top=3cm,%
+    bottom=2cm,%
+    headsep=1cm,%
+    footnotesep=\baselineskip
+  }
+\fi
+% New linespacing
 \RequirePackage[nodisplayskipstretch]{setspace}[2000/12/01]
+\if@gabler
+  \renewcommand{\singlespacing}{\setstretch{1.1}%
+    \vskip \baselineskip}
+  \renewcommand{\onehalfspacing}{\setstretch{1.3}%
+    \vskip \baselineskip}
+  \newcommand*{\ebsindent}{\relax}
+\else
+  \renewcommand{\singlespacing}{\setstretch{1.0}%
+    \vskip \baselineskip}
+  \renewcommand{\onehalfspacing}{\setstretch{1.5}%
+    \vskip \baselineskip}
+  \newcommand*{\ebsindent}{\addvspace{\medskipamount}\noindent}
+\fi
 \if@singlespacing
-\setstretch{1.1}
+  \singlespacing
 \else
-\setstretch{1.3}
+  \onehalfspacing
 \fi
-%    \end{macrocode}
-% Load the \package{float} package and define new floatstyles. Tables
-% appear with caption on top. Figures appear with caption at the bottom.
-%    \begin{macrocode}
-%% New figures and tables
-\RequirePackage{float}[2001/11/08]
-%    \end{macrocode}
-% \begin{macro}{\floatc@ebs}
-% \changes{v0.9f}{2003/08/17}{Changed caption format}
-% Define the caption format.
-%    \begin{macrocode}
-\newcommand\floatc@ebs[2]{\small{\@fs@cfont #1}\enspace#2\par}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\fs@ebsbottom}
-% Define floatstyle with captions on at the bottom.
-%    \begin{macrocode}
-\newcommand\fs@ebsbottom{%
-  \def\@fs@cfont{\bfseries}
-  \let\@fs@capt\floatc@ebs%
-  \def\@fs@pre{}%
-  \def\@fs@mid{\vspace\abovecaptionskip\relax}%
-  \def\@fs@post{}%
-  \let\@fs@iftopcapt\iffalse}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\fs@ebstop}
-% Define floatstyle with captions on top.
-%    \begin{macrocode}
-\newcommand\fs@ebstop{%
-  \def\@fs@cfont{\bfseries}%
-  \let\@fs@capt\floatc@ebs%
-  \def\@fs@pre{}%
-  \def\@fs@mid{\vspace\belowcaptionskip\relax}%
-  \def\@fs@post{}%
-  \let\@fs@iftopcapt\iftrue}
-%    \end{macrocode}
-% \end{macro}
-% Restyle figures and tables.
-%    \begin{macrocode}
-\floatstyle{ebsbottom}
-\restylefloat{figure}
-\floatstyle{ebstop}
-\restylefloat{table}
-\setlength{\belowcaptionskip}{10pt}
-%    \end{macrocode}
-% \changes{v0.9h}{2003/09/05}{Changed footnote layout}
-% Load the \package{footmisc} package and activate hanging indentation
-% for footnotes. Produces awkward-looking output if \cs{par} is used
-% within footnotes.
-%    \begin{macrocode}
-%% New footnotes
-\RequirePackage[hang,splitrule,stable]{footmisc}[2003/01/27]
-\setlength{\footnotemargin}{\parindent}
+% New figures and tables
+\RequirePackage{rotfloat}[2004/01/04]
+\RequirePackage{caption}[2004/07/16]
+\DeclareCaptionLabelSeparator{period-enspace}{.\enspace}
+\DeclareCaptionLabelFormat{tight}{#1\,#2}
+\captionsetup{%
+%   margin=0.05\columnwidth,
+  font=small,
+  labelfont=bf,%
+  labelsep=period-enspace%
+}
+\captionsetup[figure]{%
+  labelformat=tight%
+}
+\captionsetup[table]{%
+  position=top%
+}
+\if@indentcaptions
+  \captionsetup{%
+    format=hang%
+  }
+\fi
+% New footnotes
+\RequirePackage{ragged2e}[2003/03/25]
+\RequirePackage[ragged,%
+                bottom,%
+                hang,%
+                splitrule,%
+                stable,%
+                multiple]{footmisc}[2004/05/02]
 \renewcommand{\mpfootnoterule}{\relax}
-%    \end{macrocode}
-% \begin{macro}{\@makefntext}
-% \changes{v0.9g}{2003/08/20}{Added Chicago style footnote option}
-% The following is a brutal hack of the modifications performed by the
-% \package{footmisc} package. As it might not be compatible with future
-% versions of the package, it is optional.
-%    \begin{macrocode}
+\RequirePackage{remreset}
+\@removefromreset{footnote}{chapter}
 \if@fancyfoot
-  \def\@makefntext#1{%
-    \ifFN@hangfoot
-      \@hangfrom{%
-        \ifdim\footnotemargin>0pt
-          \hb@xt@\footnotemargin{\hbox{\normalfont\@thefnmark}.\hss}%
-        \else
-          \@makefnmark
-        \fi
-      }%
-    \else
-      \parindent1em
-      \noindent
+  \long\def\@makefntext#1{%
+    \bgroup
+      \setbox\@tempboxa\hbox{%
       \ifdim\footnotemargin>0pt
-        \hb@xt@ \footnotemargin{\hss\@makefnmark}%
+        \hb@xt@\footnotemargin{\rlap\normalfont%
+          \@thefnmark.\hss}%
       \else
-        \ifdim\footnotemargin=0pt
-          \llap{\textsuperscript{\@thefnmark}}%
-        \else
-          \llap{\hb@xt@ -\footnotemargin{\textsuperscript{\@thefnmark}\hss}}%
-        \fi
+        \rlap\normalfont\@thefnmark.
       \fi
-    \fi
+    }%
+    \leftmargin\wd\@tempboxa
+    \rightmargin\z@
+    \linewidth \columnwidth
+    \advance \linewidth -\leftmargin
+    \parshape \@ne \leftmargin \linewidth
+    \footnotesize
+    \parskip\hangfootparskip\relax
+    \parindent\hangfootparindent\relax
+    \@setpar{{\@@par}}%
+    \leavevmode
+    \llap{\box\@tempboxa}%
     \footnotelayout#1%
+    \par\egroup%
   }
 \fi
-%    \end{macrocode}
-% \end{macro}
-% Load the \package{titlesec} package and define appropriate formats for
-% the part, chapter, and section headings. Use the \package{calc} package
-% to move the part and chapter headings to the top of the page. Why is
-% there still a small gap?
-%    \begin{macrocode}
-%% New headings
-\RequirePackage[nobottomtitles*,%
-                newparttoc,%
-                clearempty,%
-                pagestyles]{titlesec}[2002/04/07]
-                \RequirePackage{calc}[1998/07/07]
-%    \end{macrocode}
-% \begin{macro}{\part}
-% \changes{v0.9b}{2003/08/13}{Added definition for parts}
-% Define part format and spacing.
-%    \begin{macrocode}
+% New headings
+\RequirePackage[nobottomtitles*,
+                newparttoc,
+                clearempty,
+                toctitles,
+                newlinetospace,
+                pagestyles]{titlesec}[2005/01/22]
+\RequirePackage{calc}[1998/07/07]
 \titleformat{\part}[display]{%
-  \thispagestyle{empty}\normalfont\huge\mdseries}{%
+  \thispagestyle{empty}\normalfont\huge\mdseries\singlespacing\filright}{%
   \bfseries\partname~\thepart}{0pt}{}
 \titlespacing*{\part}{%
-  0pt}{-\headheight-\headsep}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\chapter}
-% Define chapter format and spacing.
-%    \begin{macrocode}
+  0pt}{-\headheight-\headsep}{1.15ex plus .1ex}
 \titleformat{\chapter}{%
-  \normalfont\Large\bfseries}{%
+  \normalfont\LARGE\bfseries\singlespacing\filright}{%
   \thechapter}{1em}{}
 \titlespacing*{\chapter}{%
-  0pt}{-\headheight-\headsep}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\section}
-% Define section format and spacing.
-%    \begin{macrocode}
+  0pt}{-\headheight-\headsep}{1.15ex plus .1ex}
 \titleformat{\section}{%
-  \normalfont\large\bfseries}{%
+  \normalfont\Large\bfseries\singlespacing\filright}{%
   \thesection}{1em}{}
 \titlespacing*{\section}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\subsection}
-% Define subsection format and spacing.
-%    \begin{macrocode}
+  0pt}{1.75ex plus .5ex minus .1ex}{1.15ex plus .1ex}
 \titleformat{\subsection}{%
-  \normalfont\normalsize\mdseries\itshape}{%
-  \upshape\thesubsection}{1em}{}
+  \normalfont\large\bfseries\singlespacing\filright}{%
+  \thesubsection}{1em}{}
 \titlespacing*{\subsection}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\subsection}
-% Define subsubsection format and spacing.
-%    \begin{macrocode}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\subsubsection}{%
-  \normalfont\normalsize\mdseries\upshape}{%
+  \normalfont\normalsize\bfseries\filright}{%
   \thesubsubsection}{1em}{}
 \titlespacing*{\subsubsection}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\paragraph}
-% Define paragraph format and spacing.
-%    \begin{macrocode}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\paragraph}{%
-  \normalfont\normalsize\mdseries\itshape}{%
+  \normalfont\normalsize\mdseries\itshape\filright}{%
   \upshape\theparagraph}{1em}{}
 \titlespacing*{\paragraph}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\subparagraph}
-% Define subparagraph format and spacing.
-%    \begin{macrocode}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\subparagraph}{%
-  \normalfont\normalsize\mdseries\upshape}{%
-  \thesubparagraph}{1em}{}
+  \normalfont\normalsize\mdseries\itshape\filright}{%
+  \upshape\thesubparagraph.}{1em}{}
 \titlespacing*{\subparagraph}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%    \end{macrocode}
-% \end{macro}
-% Include numbers for all levels.
-%    \begin{macrocode}
-%% New numbering
-\setcounter{secnumdepth}{3}
-%    \end{macrocode}
-% Define new pagestyles with custom headers and footers. Plain pages
-% have no header and page numbers at the bottom. All other pages have
-% running heads with chapter/section number and title. Produce headrule
-% unless the \option{noheadrules} option has been requested.
-%    \begin{macrocode}
-%% New headers and footers
-\renewpagestyle{plain}[\small]{
-  \sethead[][][]%
-          {}{}{}
-  \setfoot[\usepage][][]%
-          {}{}{\usepage}
-}
-%    \end{macrocode}
-% \begin{macro}{\headrulewidth}
-% \changes{v0.9b}{2003/08/13}{Added length for width of headrule}
-% Define width of headrule.
-%    \begin{macrocode}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+\renewcommand{\thesubparagraph}{\alph{subparagraph}}
+\titleclass{\subsubparagraph}{straight}[\subparagraph]
+\newcounter{subsubparagraph}[subparagraph]
+\renewcommand{\thesubsubparagraph}{\roman{subsubparagraph}}
+\titleformat{\subsubparagraph}{%
+  \normalfont\normalsize\mdseries\filright}{%
+  \thesubsubparagraph.}{1em}{}
+\titlespacing*{\subsubparagraph}{%
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+\setcounter{secnumdepth}{6}
+% New headers and footers
 \if@headrules
-\newlength{\headrulewidth}
-\setlength{\headrulewidth}{0.05em}
+  \newlength{\headrulewidth}
+  \setlength{\headrulewidth}{0.05em}
 \fi
-%    \end{macrocode}
-% \end{macro}
-% \changes{v0.9h}{2003/09/05}{Changed headers}
-% Use newly defined width to specify pagestyle.
-%    \begin{macrocode}
-\newpagestyle{ebs}[\small]{
+\renewpagestyle{plain}[\small]{%
+  \if@gabler
+    \sethead[][][]%
+            {}{}{}
+    \setfoot[\usepage][][]%
+            {}{}{\usepage}
+  \else
+    \if@headrules
+      \headrule
+      \setheadrule{\headrulewidth}
+    \fi
+    \sethead[][--\,\usepage\,--][]%
+            {}{--\,\usepage\,--}{}
+    \setfoot[][][]%
+            {}{}{}
+  \fi%
+}
+\newpagestyle{ebs}[\small]{%
   \if@headrules
-  \headrule
-  \setheadrule{\headrulewidth}
+    \headrule
+    \setheadrule{\headrulewidth}
+  \fi
+  \if@gabler
+    \sethead[\usepage][][\ifthechapter{\thechapter\quad}{}\textit{\chaptertitle}]%
+            {\ifthesection{\thesection\quad}{}\textit{\sectiontitle}}{}{\usepage}
+  \else
+    \sethead[][--\,\usepage\,--][]%
+            {}{--\,\usepage\,--}{}
   \fi
-  \sethead[\usepage][][\ifthechapter{\thechapter\quad}{}\textit{\chaptertitle}]%
-          {\ifthesection{\thesection\quad}{}\textit{\sectiontitle}}{}{\usepage}
   \setfoot[][][]%
-          {}{}{}
+          {}{}{}%
 }
 \pagestyle{ebs}
-%    \end{macrocode}
-% Load \package{titletoc} package for partial TOCs.
-%    \begin{macrocode}
-\RequirePackage{titletoc}[2002/03/27]
-%    \end{macrocode}
-% \begin{macro}{\titlecontents}
-% \changes{v0.9e}{2003/08/16}{Customized table of contents for parts}
-% Customize appearance of part entries in table of contents.
-%    \begin{macrocode}
-%% New part TOC entry
+\RequirePackage{titletoc}[2005/01/22]
+% New part TOC entry
 \titlecontents{part}[0pt]{%
   \addvspace{10pt}\filright}{%
-  \textbf{\partname\space\thecontentslabel:\enspace}}{}{}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\listofappendices}
-% \changes{v0.9b}{2003/08/13}{Added command for list of appendices}
-% \changes{v0.9e}{2003/08/16}{Fixed appendix headers}
-% Define command for the list of appendices.
-%    \begin{macrocode}
-%% Appendix
+  \textbf{\partname\space\textsc{\MakeLowercase{\thecontentslabel}}:\enspace}}{}{}
+\newlength{\digitlength}
+\settowidth{\digitlength}{9.}
+\newlength{\pnumwidth@roman}
+\settowidth{\pnumwidth@roman}{XVIII}
+\newlength{\pnumwidth@arabic}
+\settowidth{\pnumwidth@arabic}{999}
+\addtolength{\pnumwidth@arabic}{0.25em}
+\contentsmargin{\pnumwidth@arabic}
+\titlecontents{chapter}[2\digitlength]{\addvspace{5pt}\bfseries\contentsmargin{\pnumwidth@roman}}{\contentslabel{2\digitlength}}{\hspace*{-2\digitlength}}{\titlerule*[0.75em]{}\contentspage}
+\dottedcontents{section}[5\digitlength]{}{3\digitlength}{0.75em}
+\dottedcontents{subsection}[9\digitlength]{}{4\digitlength}{0.75em}
+\dottedcontents{subsubsection}[14\digitlength]{}{5\digitlength}{0.75em}
+\dottedcontents{paragraph}[20\digitlength]{}{6\digitlength}{0.75em}
+\dottedcontents{subparagraph}[27\digitlength]{}{7\digitlength}{0.75em}
+\dottedcontents{subsubparagraph}[35\digitlength]{}{8\digitlength}{0.75em}
+% Appendix
 \newcommand{\listofappendices}{%
   \section*{\listappendixname\sectionmark{\listappendixname}}
-  \printcontents[appendix]{1}{1}{\setcounter{tocdepth}{3}}
+  \printcontents[appendix]{1}{1}{\setcounter{tocdepth}{4}}
+  \titlecontents{section}[2\digitlength]{\addvspace{5pt}\bfseries\contentsmargin{\pnumwidth@roman}}{\contentslabel{2\digitlength}}{\hspace*{-2\digitlength}}{\titlerule*[0.75em]{}\contentspage}
+  \dottedcontents{subsection}[5\digitlength]{}{3\digitlength}{0.75em}
+  \dottedcontents{subsubsection}[9\digitlength]{}{4\digitlength}{0.75em}
+  \dottedcontents{paragraph}[14\digitlength]{}{5\digitlength}{0.75em}
+  \dottedcontents{subparagraph}[20\digitlength]{}{6\digitlength}{0.75em}
+  \dottedcontents{subsubparagraph}[27\digitlength]{}{7\digitlength}{0.75em}
 }
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\appendix}
-% \changes{v0.9b}{2003/08/13}{Redefined old appendix command}
-% Redefine |\appendix| to issue a warning and call |\appendices|.
-%    \begin{macrocode}
 \renewcommand{\appendix}{%
   \ClassWarningNoLine{ebsthesis}{%
-    Use \noexpand\appendices to start the appendix}
-  \appendices}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\appendices}
-% \changes{v0.9b}{2003/08/13}{Added command for appendices}
-% \changes{v0.9e}{2003/08/16}{Fixed appendix headers}
-% Start the appendix. Found the header hack with \cs{ttl@toclabelfalse}
-% and \cs{ttl@setifthe} by trial and error. Any better way to
-% make \cs{ifthechapter} yield false?
-%    \begin{macrocode}
-\newcommand{\appendices}{%
+    Use \noexpand\startappendices and \noexpand\stopappendices instead of \noexpand\appendix}
+}
+\newcommand{\startappendices}{%
   \ttl@toclabelfalse
   \ttl@setifthe{chapter}
   \setcounter{chapter}{0}
   \setcounter{section}{0}
   \renewcommand{\chaptername}{\appendixname}
   \renewcommand{\thesection}{\Alph{section}}
+  \numberwithin{equation}{section}
+  \numberwithin{figure}{section}
+  \numberwithin{table}{section}
+  \numberwithin{thm}{section}
+  \numberwithin{cor}{section}
+  \numberwithin{defn}{section}
+  \numberwithin{conj}{section}
+  \numberwithin{exmp}{section}
   \chapter*{\appendicesname\chaptermark{\appendicesname}}
   \addcontentsline{toc}{chapter}{\appendicesname}
   \titleformat{\section}{%
     \normalfont\large\bfseries}{%
     \chaptertitlename~\thesection}{1em}{}
-  \stopcontents[main]
-  \startcontents[appendix]
+  \titlespacing*{\section}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \titleformat{\subsection}{%
+    \normalfont\normalsize\bfseries}{%
+    \thesubsection}{1em}{}
+  \titlespacing*{\subsection}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \titleformat{\subsubsection}{%
+    \normalfont\normalsize\mdseries\itshape}{%
+    \upshape\thesubsubsection}{1em}{}
+  \titlespacing*{\subsubsection}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \stopcontents[main]%
+  \resumecontents[appendix]%
+  \stoplist[main]{lof}%
+  \resumelist[appendix]{lof}%
+  \stoplist[main]{lot}%
+  \resumelist[appendix]{lot}%
 }
-%    \end{macrocode}
-% \end{macro}
-% Define various commands for information to go on titlepage. Some
-% command have defaults. All of them are quite mnemonic.
-% \begin{macro}{\thegrad}
-% \begin{macro}{\grad}
-% The degree saught.
-%    \begin{macrocode}
-%% New titlepage
+\newcommand{\stopappendices}{%
+  \stopcontents[appendix]%
+  \resumecontents[main]%
+}
+% New titlepage
 \newcommand{\thegrad}{Doctor rerum politicarum}
-\newcommand{\grad}[1]{%
+\newcommand*{\grad}[1]{%
   \renewcommand{\thegrad}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thetitel}
-% \begin{macro}{\titel}
-% The title.
-%    \begin{macrocode}
 \newcommand{\thetitel}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\titel angegeben}}
-\newcommand{\titel}[1]{%
+\newcommand*{\titel}[1]{%
   \renewcommand{\thetitel}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\theuntertitel}
-% \begin{macro}{\untertitel}
-% The subtitle.
-%    \begin{macrocode}
 \newcommand{\theuntertitel}{}
-\newcommand{\untertitel}[1]{%
+\newcommand*{\untertitel}[1]{%
   \renewcommand{\theuntertitel}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thefachbereich}
-% \begin{macro}{\fachbereich}
-% The department.
-%    \begin{macrocode}
 \newcommand{\thefachbereich}{Betriebswirtschaftslehre}
-\newcommand{\fachbereich}[1]{%
+\newcommand*{\fachbereich}[1]{%
   \renewcommand{\thefachbereich}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thehochschule}
-% \begin{macro}{\hochschule}
-% The institution of higher education.
-%    \begin{macrocode}
 \newcommand{\thehochschule}{%
   European Business School}
-\newcommand{\hochschule}[1]{%
+\newcommand*{\hochschule}[1]{%
   \renewcommand{\thehochschule}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thename}
-% \begin{macro}{\name}
-% The student's name.
-%    \begin{macrocode}
-\newcommand{\thename}{%
+\newcommand{\thekandidat}{%
   \ClassWarningNoLine{ebsthesis}{%
-    Kein \noexpand\name angegeben}}
-\newcommand{\name}[1]{%
-  \renewcommand{\thename}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thegeburtsort}
-% \begin{macro}{\geburtsort}
-% The place of birth.
-%    \begin{macrocode}
+    Kein \noexpand\kandidat angegeben}}
+\newcommand*{\kandidat}[1]{%
+  \renewcommand{\thekandidat}{#1}}
+\renewcommand*{\author}[1]{%
+  \renewcommand{\thekandidat}{#1}}
 \newcommand{\thegeburtsort}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\geburtsort angegeben}}
-\newcommand{\geburtsort}[1]{%
+\newcommand*{\geburtsort}[1]{%
   \renewcommand{\thegeburtsort}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thereferenten}
-% \begin{macro}{\referenten}
-% The thesis committee.
-%    \begin{macrocode}
 \newcommand{\thereferenten}{%
   \ClassWarningNoLine{ebsthesis}{%
     Keine \noexpand\referenten angegeben}}
-\newcommand{\referenten}[1]{%
+\newcommand*{\referenten}[1]{%
   \renewcommand{\thereferenten}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\theeinreichungstermin}
-% \begin{macro}{\einreichungstermin}
-% The filing date.
-%    \begin{macrocode}
 \newcommand{\theeinreichungstermin}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\einreichungstermin angegeben}}
-\newcommand{\einreichungstermin}[1]{%
+\newcommand*{\einreichungstermin}[1]{%
   \renewcommand{\theeinreichungstermin}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thepruefungstermin}
-% \begin{macro}{\pruefungstermin}
-% The examination date.
-%    \begin{macrocode}
 \newcommand{\thepruefungstermin}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\pruefungstermin angegeben}}
-\newcommand{\pruefungstermin}[1]{%
+\newcommand*{\pruefungstermin}[1]{%
   \renewcommand{\thepruefungstermin}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\theerscheinungsort}
-% \begin{macro}{\erscheinungsort}
-% The place of publication.
-%    \begin{macrocode}
-\newcommand{\theerscheinungsort}{Wiesbaden}
-\newcommand{\erscheinungsort}[1]{%
-  \renewcommand{\theerscheinungsort}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\theerscheinungsjahr}
-% \begin{macro}{\erscheinungsjahr}
-% The date of publication.
-%    \begin{macrocode}
-\newcommand{\theerscheinungsjahr}{%
-  \ClassWarningNoLine{ebsthesis}{%
-    Kein \noexpand\erscheinungsjahr angegeben}}
-\newcommand{\erscheinungsjahr}[1]{%
-  \renewcommand{\theerscheinungsjahr}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\thehochschulkennziffer}
-% \begin{macro}{\hochschulkennziffer}
-% The university's identification number.
-%    \begin{macrocode}
-\newcommand{\thehochschulkennziffer}{154}
-\newcommand{\hochschulkennziffer}[1]{%
-  \renewcommand{\thehochschulkennziffer}{#1}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\maketitle}
-% \changes{v0.9e}{2003/08/16}{Changed font size to match part headings}
-% Redefine \cs{maketitle} to include the required information. Load
-% the \package{array} package for adjusting the table spacing.
-%    \begin{macrocode}
-\RequirePackage{array}[1998/05/13]
+\newcommand{\thehochschulsignatur}{1540}
+\newcommand*{\hochschulsignatur}[1]{%
+  \renewcommand{\thehochschulsignatur}{#1}}
+\RequirePackage{array}[2003/12/17]
 \renewcommand{\maketitle}{%
-%    \end{macrocode}
-% Redefine the separator to allow for tabular appearence.
-%    \begin{macrocode}
   \renewcommand{\and}{\tabularnewline &}
   \begin{titlepage}
     \begin{singlespacing}
@@ -1004,65 +507,42 @@
         {\Large\bfseries Dissertation}\\
         zur Erlangung des akademischen Grades\\
         \thegrad\par
-        \vspace{\stretch{1}}
-        {\huge\bfseries\thetitel\par\mdseries\theuntertitel\par}
-%    \end{macrocode}
-% Use the golden ratio to adjust proportions.
-%    \begin{macrocode}
-        \vspace{\stretch{1.618033988}}
-%    \end{macrocode}
-% Print the remaing information specified.
-%    \begin{macrocode}
+        \vspace{\stretch{1000}}
+        {\LARGE\bfseries\thetitel\par\medskip\Large\mdseries\theuntertitel\par}
+        \vspace{\stretch{1618}}
         \begin{tabular}{@{}>{\bfseries}ll@{}}
           Fachbereich:&\thefachbereich\tabularnewline
           Hochschule:&\thehochschule\tabularnewline
-          Name:&\thename\tabularnewline
+          Hochschulsignatur:&\thehochschulsignatur\tabularnewline
+          Kandidat:&\thekandidat\tabularnewline
           Geburtsort:&\thegeburtsort\tabularnewline
           Referenten:&\thereferenten\tabularnewline
           Einreichungstermin:&\theeinreichungstermin\tabularnewline
-          Pr�fungstermin:&\thepruefungstermin\tabularnewline
-          Erscheinungsort:&\theerscheinungsort\tabularnewline
-          Erscheinungsjahr:&\theerscheinungsjahr\tabularnewline
-          Hochschulkennziffer:&\thehochschulkennziffer\tabularnewline
+          Pr\"ufungstermin:&\thepruefungstermin\tabularnewline
         \end{tabular}
       \end{center}
     \end{singlespacing}
   \end{titlepage}
-%    \end{macrocode}
-% \changes{v0.9b}{2003/08/13}{Added start of main TOC section}
-% Start the main TOC section.
-%    \begin{macrocode}
-  \startcontents[main]
+  \startcontents[main]%
+  \startcontents[appendix]%
+  \stopcontents[appendix]%
+  \startlist[main]{lof}%
+  \startlist[appendix]{lof}%
+  \stoplist[appendix]{lof}%
+  \startlist[main]{lot}%
+  \startlist[appendix]{lot}%
+  \stoplist[appendix]{lot}%
 }
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\inhaltsuebersicht}
-% \changes{v0.9b}{2003/08/13}{Removed dependency}
-% \changes{v0.9d}{2003/08/15}{Reduced depth of summary of contents}
-% \changes{v0.9e}{2003/08/16}{Redefined command to include parts}
-% Provide a command for the summary of contents.
-%    \begin{macrocode}
-%% Summary and table of contents
+% Summary and table of contents
 \newcommand{\inhaltsuebersicht}{%
-  \chapter*{\inhaltsubersichtname\chaptermark{\inhaltsubersichtname}}
-  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{1}}
+  \chapter*{\inhaltsuebersichtname\chaptermark{\inhaltsuebersichtname}}
+  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{1}}%
 }
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\tableofcontents}
-% \changes{v0.9b}{2003/08/13}{Use different package for table of contents}
-% \changes{v0.9e}{2003/08/16}{Redefined command to include parts}
-% Redefine |\tableofcontents| to exclude the appendix details.
-%    \begin{macrocode}
 \renewcommand{\tableofcontents}{%
   \chapter*{\contentsname\chaptermark{\contentsname}}
-  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{3}}
+  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{4}}%
 }
-%    \end{macrocode}
-% \end{macro}
-% Adjust some internal commands that affect page composition.
-%    \begin{macrocode}
-%% Page composition
+% Page composition
 \setcounter{topnumber}{3}
 \setcounter{bottomnumber}{2}
 \setcounter{totalnumber}{4}
@@ -1074,381 +554,254 @@
 \clubpenalty=10000
 \widowpenalty=10000
 \displaywidowpenalty=10000
-%    \end{macrocode}
-% \begin{macro}{\frontmatter}
-% \changes{v0.9b}{2003/08/13}{Added start of main TOC section}
-% Use uppercase roman numerals in frontmatter.
-%    \begin{macrocode}
 \renewcommand{\frontmatter}{%
   \cleardoublepage
   \@mainmatterfalse
-  \pagenumbering{Roman}
+  \pagenumbering{Roman}%
 }
-%    \end{macrocode}
-% \end{macro}
-% Load \package{tocbibind} to include index and various lists in table of
-% contents. Exclude the table of contents itself.
-%    \begin{macrocode}
-\RequirePackage[nottoc]{tocbibind}[2003/02/04]
-%    \end{macrocode}
-% \begin{macro}{\geleitwort}
-% \begin{macro}{\vorwort}
-% Define commands for foreword and preface. Do not include them into the
-% table of contents.
-%    \begin{macrocode}
-%% Preface and Foreword
+% \newcounter{frontmatterpages}
+\renewcommand{\mainmatter}{%
+  \cleardoublepage
+  \@mainmattertrue
+%   \setcounter{frontmatterpages}{\value{page}}%
+  \pagenumbering{arabic}%
+}
+\renewcommand{\backmatter}{%
+  \if@openright
+    \cleardoublepage
+  \else
+    \clearpage
+  \fi
+  \@mainmatterfalse
+%   \pagenumbering{Roman}%
+%   \setcounter{page}{\value{frontmatterpages}}%
+}
+\RequirePackage[nottoc]{tocbibind}[2003/03/13]
+% Foreword and Preface
 \newcommand{\geleitwort}{%
-  \chapter*{\geleitwortname\chaptermark{\geleitwortname}}
+  \chapter*{\geleitwortname\chaptermark{\geleitwortname}}%
 }
 \newcommand{\vorwort}{%
-  \chapter*{\vorwortname\chaptermark{\vorwortname}}
+  \chapter*{\vorwortname\chaptermark{\vorwortname}}%
 }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\symbolverzeichnis}
-% \begin{macro}{\symbolverzeichnisname}
-% \begin{macro}{\glossindent}
-% Load \package{nomencl} package for the list of symbols. Use the
-% \package{mdwlist} package to adjust the layout. Indentation is
-% determined by \cs{glossindent}.
-%    \begin{macrocode}
-%% List of Symbols
-\RequirePackage{nomencl}[2000/12/03]
+% List of Symbols
+\RequirePackage[noprefix]{nomencl}[2005/03/31]
 \RequirePackage{mdwlist}[1996/05/02]
-\newcommand{\symbolverzeichnis}{\printglossary}
+\newcommand{\symbolverzeichnis}{\printnomenclature}
 \renewcommand{\nomname}{\symbolverzeichnisname}
-\newlength{\glossindent}
-\setlength{\glossindent}{3em}
-\def\theglossary{%
+\newlength{\nomindent}
+\setlength{\nomindent}{3em}
+\def\thenomenclature{%
   \chapter*{\nomname\chaptermark{\nomname}}
   \addcontentsline{toc}{chapter}{\nomname}
   \nompreamble
   \addvspace{10pt}
   \begin{basedescript}{%
-      \desclabelwidth{\glossindent}
+      \desclabelwidth{\nomindent}
       \desclabelstyle{\nextlinelabel}
-      \renewcommand{\makelabel}[1]{##1}
-      \parskip\z@\itemsep\z@
-    }
+      \renewcommand*{\makelabel}[1]{##1}
+      \parskip\z@\itemsep\z@%
+    }%
 }
-\def\endtheglossary{%
+\def\endthenomenclature{%
   \end{basedescript}
-  \nompostamble
+  \nompostamble%
 }
-\makeglossary
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\abkuerzungsverzeichnis}
-% Provide a command for the list of abbreviations.
-%    \begin{macrocode}
-%% List of Abbreviations
+\makenomenclature
+% List of Abbreviations
 \newcommand{\abkuerzungsverzeichnis}{%
   \chapter*{\abkuerzungsverzeichnisname\chaptermark{%
       \abkuerzungsverzeichnisname}}
   \addcontentsline{toc}{chapter}{\abkuerzungsverzeichnisname}
   \addvspace{10pt}%
 }
-%    \end{macrocode}
-% \end{macro}
-% Load \package{acronym} package.
-%    \begin{macrocode}
-\RequirePackage{acronym}[2000/05/21]
-%    \end{macrocode}
-% \begin{macro}{\acroindent}
-% Define indentation of explanatory text.
-%    \begin{macrocode}
+% \RequirePackage[printonlyused]{acronym}[2004/11/10]
+\RequirePackage{acronym}[2004/11/10]
+\renewcommand*{\acsfont}[1]{\textsc{\MakeLowercase{#1}}}
 \newlength{\acroindent}
 \setlength{\acroindent}{6em}
-%    \end{macrocode}
-% \end{macro}
-% Redefine the \texttt{acronym} environment to use custom indentation
-% and plain labels.
-%    \begin{macrocode}
-\renewenvironment{acronym}{%
-  \begin{basedescript}{%
-      \desclabelwidth{\acroindent}
-      \desclabelstyle{\nextlinelabel}
-      \renewcommand{\makelabel}[1]{##1}
-      \parskip\z@\itemsep\z@
-    }
-    \providecommand*{\acro}[1]{\AC@dblargafter{##1}\AC@acro}%
-  }{%
-  \end{basedescript}%
-}
-%    \end{macrocode}
-% \changes{v0.9c}{2003/08/14}{Changed alignment of equations}
-% Load \package{amsmath} package. Place equation numbers on the left.
-%    \begin{macrocode}
-%% Advanced mathematics functions and equation alignment
-\RequirePackage[leqno,centertags]{amsmath}[2000/07/18]
-%    \end{macrocode}
-% Load \package{ebstools} package if the \option{tools} option has been
-% requested and provide additional functionality.
-%    \begin{macrocode}
-\if@tools
-\RequirePackage{ebstools}[2003/11/11]
+\renewenvironment{acronym}[1][1]{%
+   \providecommand*{\acro}{\AC@acro}%
+   \long\def\acroextra##1{##1}%
+   \ifx1#1
+      \global\expandafter\let\csname ac@des@mark\endcsname\AC@used
+      \begin{basedescript}{%
+          \desclabelwidth{\acroindent}
+          \desclabelstyle{\nextlinelabel}
+          \renewcommand*{\makelabel}[1]{##1}
+          \parskip\z@\itemsep\z@%
+        }
+   \else
+      \begin{AC@deflist}{#1}%
+   \fi%
+  }%
+  {%
+   \ifx\AC@populated\AC@used\else
+      \item[]\relax
+   \fi
+   \expandafter\ifx\csname ac@des@mark\endcsname\AC@used
+      \end{basedescript}%
+   \else
+      \end{AC@deflist}%
+   \fi}
+% Advanced mathematics functions and equation alignment
+\RequirePackage[tbtags]{amsmath}[2000/07/18]
+\RequirePackage[all]{onlyamsmath}[2001/10/04]
+% Scaling factor for graphics
+\if@gabler
+  \newcommand{\graphicsmag}{1.0000}
+  \newcommand{\smallgraphicsmag}{0.7500}
+  \newcommand{\tinygraphicsmag}{0.5625}
+\else
+  \newcommand{\graphicsmag}{1.3333}
+  \newcommand{\smallgraphicsmag}{1.0000}
+  \newcommand{\tinygraphicsmag}{0.7500}
 \fi
-%</ebsthesis>
-%    \end{macrocode}
-% \subsection{The Package}
-% \subsubsection{Options}
-% This subsection shows how the package options are defined.
-%    \begin{macrocode}
-%<*ebstools>
-\ProvidesPackage{ebstools}%
-                [2003/11/11 v0.9j EBS Tools (PNB)]
-%    \end{macrocode}
-% Declare options and introduce booleans.
-%    \begin{macrocode}
-\newif\if@mathematica
-\DeclareOption{mathematica}{\@mathematicatrue}
-\DeclareOption{nomathematica}{\@mathematicafalse}
-%    \end{macrocode}
-% Do not load mathematica fonts by default.
-%    \begin{macrocode}
-\ExecuteOptions{nomathematica}
-\ProcessOptions\relax
-%    \end{macrocode}
-% \subsubsection{Customization}
-% This section describes the \package{ebstools} package in detail.
-% \par
-% Load the \package{wrisym} package if the \option{mathematica} option
-% has been requested. Define some frequently used mathematical symbols
-% and constants.
-%    \begin{macrocode}
+% Comments
+\RequirePackage{comment}
+\if@gabler
+  \includecomment{gabler}
+  \excludecomment{grundregeln}
+\else
+  \includecomment{grundregeln}
+  \excludecomment{gabler}
+\fi
+% Support for Mathematica fonts
 \if@mathematica
-%% We are using Mathematica fonts
-\RequirePackage{wrisym}[1999/04/20]
-%    \end{macrocode}
-% \begin{macro}{\D}
-% Define differential operator for Mathematica fonts.
-%    \begin{macrocode}
-\newcommand{\D}{\DifferentialD}
-%    \end{macrocode}
-% \end{macro}
-%    \begin{macrocode}
+% We are using Mathematica fonts
+  \RequirePackage{wrisym}[1999/04/20]
+  \newcommand{\D}{\DifferentialD}
 \else
-%    \end{macrocode}
-% \begin{macro}{\E}
-% \begin{macro}{\D}
-% \begin{macro}{\I}
-% Define Euler's number, the differential operator, and imaginary unit
-% for Computer Modern.
-%    \begin{macrocode}
-%% We are using Computer Modern fonts
-\newcommand{\E}{\mathrm{e}}
-\DeclareMathSymbol{\D}{\mathord}{operators}{`d}
-\newcommand{\I}{\mathrm{i}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\MathLogo}
-% \changes{v0.9b}{2003/08/13}{Added mathematica logo}
-% Define Mathematica logo for Computer Modern.
-%    \begin{macrocode}
-\providecommand{\MathLogo}{\emph{Mathematica}}
+% We are using Computer Modern fonts
+  \RequirePackage{amssymb}[2002/01/22]
+  \RequirePackage{dsfont}[1995/08/01]
+  \renewcommand{\mathbb}[1]{\mathds{#1}}
+  \DeclareMathSymbol{\D}{\mathord}{operators}{`d}
+  \newcommand{\E}{\mathrm{e}}
+  \newcommand{\I}{\mathrm{i}}
+  \newcommand{\MathLogo}{\emph{Mathematica}}
 \fi
+\if@tools
+  % Statistics
+  \DeclareRobustCommand\expect{%
+    \@ifnextchar[{\ebs@expect}{\ebs@expect[]}%
+  }
+  \def\ebs@expectop{\mathbf{E}}
+  \def\ebs@expect{%
+    \@ifnextchar[{\ebs@@expect}{\ebs@@expect[]}%
+  }
+  \def\ebs@@expect[#1]{%
+    \@ifnextchar[{\ebs@@@expect[#1]}{\ebs@@@expect[][#1]}%
+  }
+  \def\ebs@@@expect[#1][#2]#3{%
+    \@expectx[#1][#2]{#3}%
+  }
+  \def\@expectx[#1][#2]#3{%
+    \ifx\relax#1\relax
+      \ifx\relax#2\relax
+        \ebs@expectop\!\left[#3\right]
+      \else
+        \ebs@expectop\!\left[#3\,\middle|\,#2\right]
+      \fi
+    \else
+      \ifx\relax#2\relax
+        \ebs@expectop_{#1}\!\left[#3\right]
+      \else
+        \ebs@expectop_{#1}\!\left[#3\,\middle|\,#2\right]
+      \fi
+    \fi
+  }
+  \newcommand{\indic}[1]{\mathbf{1}_{#1}}
+  \newcommand{\var}[1]{\mathbf{V}\!\left[#1\right]}
+  \newcommand{\Var}{\mathrm{Var}}
+  \newcommand{\Cov}{\mathrm{Cov}}
+  \newcommand{\normal}{\mathrm{N}}
+  % Order
+  \newcommand{\order}[1]{\mathrm{O}\!\left(#1\right)}
+  % Sets
+  \newcommand{\Cset}{\mathbf{C}}
+  \newcommand{\Hset}{\mathbf{H}}
+  \newcommand{\Nset}{\mathbf{N}}
+  \newcommand{\Qset}{\mathbf{Q}}
+  \newcommand{\Rset}{\mathbf{R}}
+  \newcommand{\Zset}{\mathbf{Z}}
+  % Absolute value and sign
+  \providecommand{\abs}[1]{\left\lvert#1\right\rvert}
+  \DeclareMathOperator{\sign}{sign}
+  % Evaluated at
+  \RequirePackage{ifthen}[2001/05/26]
+  \newcommand{\evaluatedat}[3][]{%
+    \left.#3\right\rvert_{#2}\ifthenelse{\equal{#1}{}}{\relax}{^{#1}}}
+  % Other mathematical expressions
+  \DeclareMathOperator*{\argmax}{argmax}
+  % Common (English) abbreviations
+  \newcommand{\eg}{e.g.}
+  \newcommand{\ie}{i.e.}
+  \newcommand{\iid}{i.i.d.}
+  % Common (German) abbreviations
+%   \renewcommand{\dh}{d.\,h.}
+  \newcommand{\cp}{c.\,p.}
+  \newcommand{\idR}{i.\,d.\,R.}
+  \newcommand{\mE}{m.\,E.}
+  \newcommand{\uU}{u.\,U.}
+  \newcommand{\zB}{z.\,B.}
+  % Theorems
+  \newcommand{\theoremname}{Theorem}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Proposition}
+  \newcommand{\corollaryname}{Corollary}
+  \newcommand{\definitionname}{Definition}
+  \newcommand{\conjecturename}{Conjecture}
+  \newcommand{\examplename}{Example}
+  \newcommand{\remarkname}{Remark}
+%   \newcommand{\notename}{Note}
+  \newcommand{\casename}{Case}
+  % Babel support for theorems
+  \AtBeginDocument{%
+    \@ifpackageloaded{babel}{%
+       \addto\extrasenglish{%
+         \renewcommand{\theoremname}{Theorem}
+         \renewcommand{\lemmaname}{Lemma}
+         \renewcommand{\propositionname}{Proposition}
+         \renewcommand{\corollaryname}{Corollary}
+         \renewcommand{\definitionname}{Definition}
+         \renewcommand{\conjecturename}{Conjecture}
+         \renewcommand{\examplename}{Example}
+         \renewcommand{\remarkname}{Remark}
+%          \renewcommand{\notename}{Note}
+         \renewcommand{\casename}{Case}%
+       }
+       \addto{\extrasngerman}{%
+         \renewcommand{\theoremname}{Theorem}
+         \renewcommand{\lemmaname}{Lemma}
+         \renewcommand{\propositionname}{Satz}
+         \renewcommand{\corollaryname}{Korollar}
+         \renewcommand{\definitionname}{Definition}
+         \renewcommand{\conjecturename}{Vermutung}
+         \renewcommand{\examplename}{Beispiel}
+         \renewcommand{\remarkname}{Bemerkung}
+%          \renewcommand{\notename}{Anmerkung}
+         \renewcommand{\casename}{Fall}%
+       }%
+     }{\relax}%
+   }
+ \RequirePackage{amsthm}[2004/08/06]
+ \theoremstyle{plain}
+ \newtheorem{thm}{\theoremname}[chapter]
+ \newtheorem{lem}[thm]{\lemmaname}
+ \newtheorem{prop}[thm]{\propositionname}
+ \newtheorem{cor}{\corollaryname}[chapter]
+ \theoremstyle{definition}
+ \newtheorem{defn}{\definitionname}[chapter]
+ \newtheorem{conj}{\conjecturename}[chapter]
+ \newtheorem{exmp}{\examplename}[chapter]
+ \theoremstyle{remark}
+ \newtheorem*{rem}{\remarkname}
+%  \newtheorem*{note}{\notename}
+ \newtheorem{case}{\casename}
+\fi
+\endinput
+%</ebsthesis>
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\expect}
-% \begin{macro}{\Var}
-% \begin{macro}{\Cov}
-% Define operators useful in statistics.
-%    \begin{macrocode}
-%% Statistical operators
-\DeclareMathOperator{\expect}{E}
-\DeclareMathOperator{\Var}{Var}
-\DeclareMathOperator{\Cov}{Cov}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\order}
-% Define ``order'' operator.
-%    \begin{macrocode}
-%% Order
-\DeclareMathOperator{\order}{O}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\Nset}
-% \begin{macro}{\Zset}
-% \begin{macro}{\Qset}
-% \begin{macro}{\Rset}
-% \begin{macro}{\Cset}
-% \begin{macro}{\Hset}
-% \changes{v0.9b}{2003/08/13}{Added additional commands for sets}
-% Define commands for sets similar to Elsevier macros.
-%    \begin{macrocode}
-%% Sets
-\newcommand{\Nset}{\mathbf{N}}
-\newcommand{\Zset}{\mathbf{Z}}
-\newcommand{\Qset}{\mathbf{Q}}
-\newcommand{\Rset}{\mathbf{R}}
-\newcommand{\Cset}{\mathbf{C}}
-\newcommand{\Hset}{\mathbf{H}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\abs}
-% \begin{macro}{\sign}
-% Define additional operators.
-%    \begin{macrocode}
-%% Absolute value and sign
-\providecommand{\abs}[1]{\left\lvert#1\right\rvert}
-\DeclareMathOperator{\sign}{sign}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\evaluatedat}
-% Define a command for vertical bars used for the ``evaluated at''
-% notation.
-%    \begin{macrocode}
-%% Evaluated at
-\RequirePackage{ifthen}[2001/05/26]
-\newcommand{\evaluatedat}[3][]{%
-  \left.#3\right\rvert_{#2}\ifthenelse{\equal{#1}{}}{\relax}{^#1}}
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\eg}
-% \begin{macro}{\ie}
-% Define convenient commands for common English abbreviations.
-%    \begin{macrocode}
-%% Common (English) abbreviations
-\newcommand{\eg}{e.g.}
-\newcommand{\ie}{i.e.}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\dh}
-% \begin{macro}{\zB}
-% \begin{macro}{\idR}
-% \begin{macro}{\mE}
-% \begin{macro}{\uU}
-% \begin{macro}{\cp}
-% \changes{v0.9b}{2003/08/13}{Added German abbreviations}
-% Define convenient commands for common German abbreviations.
-%    \begin{macrocode}
-%% Common (German) abbreviations
-%% \renewcommand{\dh}{d.\,h.}
-\newcommand{\zB}{z.\,B.}
-\newcommand{\idR}{i.\,d.\,R.}
-\newcommand{\mE}{m.\,E.}
-\newcommand{\uU}{u.\,U.}
-\newcommand{\cp}{c.\,p.}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\theoremname}
-% \begin{macro}{\lemmaname}
-% \begin{macro}{\propositionname}
-% \begin{macro}{\corollaryname}
-% \begin{macro}{\definitionname}
-% \begin{macro}{\conjecturename}
-% \begin{macro}{\examplename}
-% \begin{macro}{\remarkname}
-% \begin{macro}{\casename}
-% Provide theorem headers.
-%    \begin{macrocode}
-%% Theorems
-\newcommand{\theoremname}{Theorem}
-\newcommand{\lemmaname}{Lemma}
-\newcommand{\propositionname}{Proposition}
-\newcommand{\corollaryname}{Corollary}
-\newcommand{\definitionname}{Definition}
-\newcommand{\conjecturename}{Conjecture}
-\newcommand{\examplename}{Example}
-\newcommand{\remarkname}{Remark}
-\newcommand{\casename}{Case}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\extrasngerman}
-% \changes{v0.9c}{2003/08/14}{Added translations for theorems}
-% Add custom names appropriate hooks of the \package{babel} package.
-%    \begin{macrocode}
-%% Babel support for theorems
-\AtBeginDocument{%
-  \@ifpackageloaded{babel}{%
-     \addto\extrasenglish{%
-       \renewcommand{\theoremname}{Theorem}%
-       \renewcommand{\lemmaname}{Lemma}%
-       \renewcommand{\propositionname}{Proposition}%
-       \renewcommand{\corollaryname}{Corollary}%
-       \renewcommand{\definitionname}{Definition}%
-       \renewcommand{\conjecturename}{Conjecture}%
-       \renewcommand{\examplename}{Example}%
-       \renewcommand{\remarkname}{Remark}%
-       \renewcommand{\casename}{Case}%
-     }
-     \addto{\extrasngerman}{%
-       \renewcommand{\theoremname}{Theorem}%
-       \renewcommand{\lemmaname}{Lemma}%
-       \renewcommand{\propositionname}{Satz}%
-       \renewcommand{\corollaryname}{Korollar}%
-       \renewcommand{\definitionname}{Definition}%
-       \renewcommand{\conjecturename}{Vermutung}%
-       \renewcommand{\examplename}{Beispiel}%
-       \renewcommand{\remarkname}{Anmerkung}%
-       \renewcommand{\casename}{Fall}%
-     }%
-   }{\relax}%
- }
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{thm}
-% \begin{macro}{lem}
-% \begin{macro}{prop}
-% \begin{macro}{cor}
-% \begin{macro}{defn}
-% \begin{macro}{conj}
-% \begin{macro}{exmp}
-% \begin{macro}{rem}
-% \begin{macro}{case}
-% Load \package{amsthm} package and define theorems as suggested in the
-% \package{amsthm} documentation.
-%    \begin{macrocode}
-\RequirePackage{amsthm}[2000/10/26]
-\theoremstyle{plain}% default
-\newtheorem{thm}{\theoremname}[chapter]
-\newtheorem{lem}[thm]{\lemmaname}
-\newtheorem{prop}[thm]{\propositionname}
-\newtheorem{cor}{\corollaryname}[chapter]
-\theoremstyle{definition}
-\newtheorem{defn}{\definitionname}[chapter]
-\newtheorem{conj}{\conjecturename}[chapter]
-\newtheorem{exmp}{\examplename}[chapter]
-\theoremstyle{remark}
-\newtheorem*{rem}{\remarkname}
-\newtheorem{case}{\casename}
-%</ebstools>
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.ins b/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.ins
index edf1bc045f8..e6dbfef2ad3 100755
--- a/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.ins
+++ b/Master/texmf-dist/source/latex/ebsthesis/ebsthesis.ins
@@ -9,7 +9,6 @@
 \usedir{tex/latex/ebsthesis}
 
 \generate{\file{ebsthesis.cls}{\from{ebsthesis.dtx}{ebsthesis}}
-          \file{ebstools.sty}{\from{ebsthesis.dtx}{ebstools}}
           }
 
 \ifToplevel{
@@ -19,7 +18,6 @@
 \Msg{* files into a directory searched by TeX:}
 \Msg{*}
 \Msg{* \space\space ebsthesis.cls}
-\Msg{* \space\space ebstools.sty}
 \Msg{*}
 \Msg{* To produce the documentation run the files ending with}
 \Msg{* `.dtx' through LaTeX.}
diff --git a/Master/texmf-dist/tex/latex/ebsthesis/ebsthesis.cls b/Master/texmf-dist/tex/latex/ebsthesis/ebsthesis.cls
index be5beb3af51..56ca441c11c 100644
--- a/Master/texmf-dist/tex/latex/ebsthesis/ebsthesis.cls
+++ b/Master/texmf-dist/tex/latex/ebsthesis/ebsthesis.cls
@@ -6,8 +6,8 @@
 %%
 %% ebsthesis.dtx  (with options: `ebsthesis')
 %% 
-%% The ebsthesis document class and ebstools package
-%% Copyright (c) 2003 Philipp N. Baecker. All right reserved.
+%% The ebsthesis document class
+%% Copyright (c) 2006 Philipp N. Baecker. All right reserved.
 %%
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -25,12 +25,15 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-\NeedsTeXFormat{LaTeX2e}[2001/06/01]
-\ProvidesClass{ebsthesis}
-              [2003/11/11 v0.9j EBS Thesis Class (PNB)]
+\NeedsTeXFormat{LaTeX2e}[2003/12/01]
+\ProvidesClass{ebsthesis}%
+              [2006/12/31 v1.0 EBS Thesis Class (PNB)]
+\newif\if@gabler
+\DeclareOption{gabler}{\@gablertrue}
+\DeclareOption{grundregeln}{\@gablerfalse}
 \newif\if@singlespacing
-\DeclareOption{onehalfspacing}{\@singlespacingfalse}
 \DeclareOption{singlespacing}{\@singlespacingtrue}
+\DeclareOption{onehalfspacing}{\@singlespacingfalse}
 \newif\if@headrules
 \DeclareOption{headrules}{\@headrulestrue}
 \DeclareOption{noheadrules}{\@headrulesfalse}
@@ -40,278 +43,388 @@
 \newif\if@fancyfoot
 \DeclareOption{fancyfoot}{\@fancyfoottrue}
 \DeclareOption{nofancyfoot}{\@fancyfootfalse}
+\newif\if@indentcaptions
+\DeclareOption{indentcaptions}{\@indentcaptionstrue}
+\DeclareOption{noindentcaptions}{\@indentcaptionsfalse}
+\newif\if@mathematica
+\DeclareOption{mathematica}{\@mathematicatrue}
+\DeclareOption{nomathematica}{\@mathematicafalse}
 \DeclareOption{8pt}{\OptionNotUsed}
+\DeclareOption{9pt}{\OptionNotUsed}
 \DeclareOption{10pt}{\OptionNotUsed}
 \DeclareOption{11pt}{\OptionNotUsed}
 \DeclareOption{12pt}{\OptionNotUsed}
 \DeclareOption{14pt}{\OptionNotUsed}
 \DeclareOption{17pt}{\OptionNotUsed}
 \DeclareOption{20pt}{\OptionNotUsed}
+\DeclareOption{oneside}{\OptionNotUsed}
+\DeclareOption{twoside}{\OptionNotUsed}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{extbook}}
-\ExecuteOptions{onehalfspacing,headrules,notools,nomathematica,nofancyfoot}
+\ExecuteOptions{%
+  grundregeln,%
+  onehalfspacing,%
+  noheadrules,%
+  notools,%
+  nofancyfoot,%
+  noindentcaptions,%
+  nomathematica%
+}
 \ProcessOptions\relax
-\LoadClass[9pt]{extbook}[1999/01/07]
-%% Modified generic headings and names
+\if@gabler
+  \PassOptionsToClass{a5paper,9pt,twoside}{extbook}
+\else
+  \PassOptionsToClass{a4paper,12pt,oneside}{extbook}
+\fi
+\LoadClass{extbook}[1999/01/07]
 \renewcommand{\contentsname}{Table of Contents}
 \renewcommand{\figurename}{Fig.}
 \renewcommand{\tablename}{Table}
-%% New generic headings and names
 \newcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}
+\newcommand{\appendicesname}{Appendices}
 \newcommand{\geleitwortname}{Foreword}
-\newcommand{\inhaltsubersichtname}{Summary of Contents}
+\newcommand{\inhaltsuebersichtname}{Summary of Contents}
+\newcommand{\listappendixname}{List of Appendices}
 \newcommand{\symbolverzeichnisname}{List of Symbols}
 \newcommand{\vorwortname}{Preface}
-\newcommand{\appendicesname}{Appendices}
-\newcommand{\listappendixname}{List of Appendices}
-%% Babel support
 \AtBeginDocument{%
   \@ifpackageloaded{babel}{%
-     \addto\captionsenglish{%
-       \renewcommand{\contentsname}{Table of Contents}%
-       \renewcommand{\figurename}{Fig.}%
-       \renewcommand{\tablename}{Table}%
-     }%
-     \addto\extrasenglish{%
-       \renewcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}%
-       \renewcommand{\geleitwortname}{Foreword}%
-       \renewcommand{\inhaltsubersichtname}{Summary of Contents}%
-       \renewcommand{\symbolverzeichnisname}{List of Symbols}%
-       \renewcommand{\vorwortname}{Preface}%
-       \renewcommand{\appendicesname}{Appendices}%
-       \renewcommand{\listappendixname}{List of Appendices}%
-     }
-     \addto{\captionsngerman}{%
-       \renewcommand{\figurename}{Abb.}%
-       \renewcommand{\tablename}{Tab.}%
-     }
-     \addto{\extrasngerman}{%
-       \renewcommand{\abkuerzungsverzeichnisname}{Abk�rzungsverzeichnis}%
-       \renewcommand{\geleitwortname}{Geleitwort}%
-       \renewcommand{\inhaltsubersichtname}{Inhalts�bersicht}%
-       \renewcommand{\symbolverzeichnisname}{Symbolverzeichnis}%
-       \renewcommand{\vorwortname}{Vorwort}%
-       \renewcommand{\appendicesname}{Anhang}%
-       \renewcommand{\listappendixname}{Verzeichnis des Anhangs}%
-     }%
-   }{\relax}%
- }
-%% New paper format and margins
+    \addto{\captionsenglish}{%
+      \renewcommand{\contentsname}{Table of Contents}%
+      \renewcommand{\figurename}{Fig.}%
+      \renewcommand{\tablename}{Table}%
+    }%
+    \addto{\extrasenglish}{%
+      \renewcommand{\abkuerzungsverzeichnisname}{List of Abbreviations}%
+      \renewcommand{\appendicesname}{Appendices}%
+      \renewcommand{\geleitwortname}{Foreword}%
+      \renewcommand{\inhaltsuebersichtname}{Summary of Contents}%
+      \renewcommand{\listappendixname}{List of Appendices}%
+      \renewcommand{\symbolverzeichnisname}{List of Symbols}%
+      \renewcommand{\vorwortname}{Preface}%
+    }%
+    \addto{\captionsngerman}{%
+      \renewcommand{\figurename}{Abb.}%
+      \renewcommand{\tablename}{Tab.}%
+    }%
+    \addto{\extrasngerman}{%
+      \renewcommand{\abkuerzungsverzeichnisname}{Abk\"urzungsverzeichnis}%
+      \renewcommand{\appendicesname}{Anhang}%
+      \renewcommand{\geleitwortname}{Geleitwort}%
+      \renewcommand{\inhaltsuebersichtname}{Inhalts\"ubersicht}%
+      \renewcommand{\listappendixname}{Verzeichnis des Anhangs}%
+      \renewcommand{\symbolverzeichnisname}{Symbolverzeichnis}%
+      \renewcommand{\vorwortname}{Vorwort}%
+    }%
+  }{\relax}%
+}
 \RequirePackage{geometry}[2002/07/08]
-\geometry{%
-  a5paper,%
-  includeheadfoot,%
-  centering,%
-  totalwidth=11.5cm,%
-  totalheight=18cm}
-%% New linespacing
+\if@gabler
+  \geometry{%
+    totalwidth=11.5cm,%
+    totalheight=18cm,%
+    includeheadfoot,%
+    centering,%
+    mag=1414
+  }
+\else
+  \geometry{%
+    left=4cm,%
+    right=2cm,%
+    top=3cm,%
+    bottom=2cm,%
+    headsep=1cm,%
+    footnotesep=\baselineskip
+  }
+\fi
 \RequirePackage[nodisplayskipstretch]{setspace}[2000/12/01]
+\if@gabler
+  \renewcommand{\singlespacing}{\setstretch{1.1}%
+    \vskip \baselineskip}
+  \renewcommand{\onehalfspacing}{\setstretch{1.3}%
+    \vskip \baselineskip}
+  \newcommand*{\ebsindent}{\relax}
+\else
+  \renewcommand{\singlespacing}{\setstretch{1.0}%
+    \vskip \baselineskip}
+  \renewcommand{\onehalfspacing}{\setstretch{1.5}%
+    \vskip \baselineskip}
+  \newcommand*{\ebsindent}{\addvspace{\medskipamount}\noindent}
+\fi
 \if@singlespacing
-\setstretch{1.1}
+  \singlespacing
 \else
-\setstretch{1.3}
+  \onehalfspacing
+\fi
+\RequirePackage{rotfloat}[2004/01/04]
+\RequirePackage{caption}[2004/07/16]
+\DeclareCaptionLabelSeparator{period-enspace}{.\enspace}
+\DeclareCaptionLabelFormat{tight}{#1\,#2}
+\captionsetup{%
+  font=small,
+  labelfont=bf,%
+  labelsep=period-enspace%
+}
+\captionsetup[figure]{%
+  labelformat=tight%
+}
+\captionsetup[table]{%
+  position=top%
+}
+\if@indentcaptions
+  \captionsetup{%
+    format=hang%
+  }
 \fi
-%% New figures and tables
-\RequirePackage{float}[2001/11/08]
-\newcommand\floatc@ebs[2]{\small{\@fs@cfont #1}\enspace#2\par}
-\newcommand\fs@ebsbottom{%
-  \def\@fs@cfont{\bfseries}
-  \let\@fs@capt\floatc@ebs%
-  \def\@fs@pre{}%
-  \def\@fs@mid{\vspace\abovecaptionskip\relax}%
-  \def\@fs@post{}%
-  \let\@fs@iftopcapt\iffalse}
-\newcommand\fs@ebstop{%
-  \def\@fs@cfont{\bfseries}%
-  \let\@fs@capt\floatc@ebs%
-  \def\@fs@pre{}%
-  \def\@fs@mid{\vspace\belowcaptionskip\relax}%
-  \def\@fs@post{}%
-  \let\@fs@iftopcapt\iftrue}
-\floatstyle{ebsbottom}
-\restylefloat{figure}
-\floatstyle{ebstop}
-\restylefloat{table}
-\setlength{\belowcaptionskip}{10pt}
-%% New footnotes
-\RequirePackage[hang,splitrule,stable]{footmisc}[2003/01/27]
-\setlength{\footnotemargin}{\parindent}
+\RequirePackage{ragged2e}[2003/03/25]
+\RequirePackage[ragged,%
+                bottom,%
+                hang,%
+                splitrule,%
+                stable,%
+                multiple]{footmisc}[2004/05/02]
 \renewcommand{\mpfootnoterule}{\relax}
+\RequirePackage{remreset}
+\@removefromreset{footnote}{chapter}
 \if@fancyfoot
-  \def\@makefntext#1{%
-    \ifFN@hangfoot
-      \@hangfrom{%
-        \ifdim\footnotemargin>0pt
-          \hb@xt@\footnotemargin{\hbox{\normalfont\@thefnmark}.\hss}%
-        \else
-          \@makefnmark
-        \fi
-      }%
-    \else
-      \parindent1em
-      \noindent
+  \long\def\@makefntext#1{%
+    \bgroup
+      \setbox\@tempboxa\hbox{%
       \ifdim\footnotemargin>0pt
-        \hb@xt@ \footnotemargin{\hss\@makefnmark}%
+        \hb@xt@\footnotemargin{\rlap\normalfont%
+          \@thefnmark.\hss}%
       \else
-        \ifdim\footnotemargin=0pt
-          \llap{\textsuperscript{\@thefnmark}}%
-        \else
-          \llap{\hb@xt@ -\footnotemargin{\textsuperscript{\@thefnmark}\hss}}%
-        \fi
+        \rlap\normalfont\@thefnmark.
       \fi
-    \fi
+    }%
+    \leftmargin\wd\@tempboxa
+    \rightmargin\z@
+    \linewidth \columnwidth
+    \advance \linewidth -\leftmargin
+    \parshape \@ne \leftmargin \linewidth
+    \footnotesize
+    \parskip\hangfootparskip\relax
+    \parindent\hangfootparindent\relax
+    \@setpar{{\@@par}}%
+    \leavevmode
+    \llap{\box\@tempboxa}%
     \footnotelayout#1%
+    \par\egroup%
   }
 \fi
-%% New headings
-\RequirePackage[nobottomtitles*,%
-                newparttoc,%
-                clearempty,%
-                pagestyles]{titlesec}[2002/04/07]
-                \RequirePackage{calc}[1998/07/07]
+\RequirePackage[nobottomtitles*,
+                newparttoc,
+                clearempty,
+                toctitles,
+                newlinetospace,
+                pagestyles]{titlesec}[2005/01/22]
+\RequirePackage{calc}[1998/07/07]
 \titleformat{\part}[display]{%
-  \thispagestyle{empty}\normalfont\huge\mdseries}{%
+  \thispagestyle{empty}\normalfont\huge\mdseries\singlespacing\filright}{%
   \bfseries\partname~\thepart}{0pt}{}
 \titlespacing*{\part}{%
-  0pt}{-\headheight-\headsep}{1.5ex plus .2ex}
+  0pt}{-\headheight-\headsep}{1.15ex plus .1ex}
 \titleformat{\chapter}{%
-  \normalfont\Large\bfseries}{%
+  \normalfont\LARGE\bfseries\singlespacing\filright}{%
   \thechapter}{1em}{}
 \titlespacing*{\chapter}{%
-  0pt}{-\headheight-\headsep}{1.5ex plus .2ex}
+  0pt}{-\headheight-\headsep}{1.15ex plus .1ex}
 \titleformat{\section}{%
-  \normalfont\large\bfseries}{%
+  \normalfont\Large\bfseries\singlespacing\filright}{%
   \thesection}{1em}{}
 \titlespacing*{\section}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
+  0pt}{1.75ex plus .5ex minus .1ex}{1.15ex plus .1ex}
 \titleformat{\subsection}{%
-  \normalfont\normalsize\mdseries\itshape}{%
-  \upshape\thesubsection}{1em}{}
+  \normalfont\large\bfseries\singlespacing\filright}{%
+  \thesubsection}{1em}{}
 \titlespacing*{\subsection}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\subsubsection}{%
-  \normalfont\normalsize\mdseries\upshape}{%
+  \normalfont\normalsize\bfseries\filright}{%
   \thesubsubsection}{1em}{}
 \titlespacing*{\subsubsection}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\paragraph}{%
-  \normalfont\normalsize\mdseries\itshape}{%
+  \normalfont\normalsize\mdseries\itshape\filright}{%
   \upshape\theparagraph}{1em}{}
 \titlespacing*{\paragraph}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
 \titleformat{\subparagraph}{%
-  \normalfont\normalsize\mdseries\upshape}{%
-  \thesubparagraph}{1em}{}
+  \normalfont\normalsize\mdseries\itshape\filright}{%
+  \upshape\thesubparagraph.}{1em}{}
 \titlespacing*{\subparagraph}{%
-  0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}
-%% New numbering
-\setcounter{secnumdepth}{3}
-%% New headers and footers
-\renewpagestyle{plain}[\small]{
-  \sethead[][][]%
-          {}{}{}
-  \setfoot[\usepage][][]%
-          {}{}{\usepage}
-}
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+\renewcommand{\thesubparagraph}{\alph{subparagraph}}
+\titleclass{\subsubparagraph}{straight}[\subparagraph]
+\newcounter{subsubparagraph}[subparagraph]
+\renewcommand{\thesubsubparagraph}{\roman{subsubparagraph}}
+\titleformat{\subsubparagraph}{%
+  \normalfont\normalsize\mdseries\filright}{%
+  \thesubsubparagraph.}{1em}{}
+\titlespacing*{\subsubparagraph}{%
+  0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+\setcounter{secnumdepth}{6}
 \if@headrules
-\newlength{\headrulewidth}
-\setlength{\headrulewidth}{0.05em}
+  \newlength{\headrulewidth}
+  \setlength{\headrulewidth}{0.05em}
 \fi
-\newpagestyle{ebs}[\small]{
+\renewpagestyle{plain}[\small]{%
+  \if@gabler
+    \sethead[][][]%
+            {}{}{}
+    \setfoot[\usepage][][]%
+            {}{}{\usepage}
+  \else
+    \if@headrules
+      \headrule
+      \setheadrule{\headrulewidth}
+    \fi
+    \sethead[][--\,\usepage\,--][]%
+            {}{--\,\usepage\,--}{}
+    \setfoot[][][]%
+            {}{}{}
+  \fi%
+}
+\newpagestyle{ebs}[\small]{%
   \if@headrules
-  \headrule
-  \setheadrule{\headrulewidth}
+    \headrule
+    \setheadrule{\headrulewidth}
+  \fi
+  \if@gabler
+    \sethead[\usepage][][\ifthechapter{\thechapter\quad}{}\textit{\chaptertitle}]%
+            {\ifthesection{\thesection\quad}{}\textit{\sectiontitle}}{}{\usepage}
+  \else
+    \sethead[][--\,\usepage\,--][]%
+            {}{--\,\usepage\,--}{}
   \fi
-  \sethead[\usepage][][\ifthechapter{\thechapter\quad}{}\textit{\chaptertitle}]%
-          {\ifthesection{\thesection\quad}{}\textit{\sectiontitle}}{}{\usepage}
   \setfoot[][][]%
-          {}{}{}
+          {}{}{}%
 }
 \pagestyle{ebs}
-\RequirePackage{titletoc}[2002/03/27]
-%% New part TOC entry
+\RequirePackage{titletoc}[2005/01/22]
 \titlecontents{part}[0pt]{%
   \addvspace{10pt}\filright}{%
-  \textbf{\partname\space\thecontentslabel:\enspace}}{}{}
-%% Appendix
+  \textbf{\partname\space\textsc{\MakeLowercase{\thecontentslabel}}:\enspace}}{}{}
+\newlength{\digitlength}
+\settowidth{\digitlength}{9.}
+\newlength{\pnumwidth@roman}
+\settowidth{\pnumwidth@roman}{XVIII}
+\newlength{\pnumwidth@arabic}
+\settowidth{\pnumwidth@arabic}{999}
+\addtolength{\pnumwidth@arabic}{0.25em}
+\contentsmargin{\pnumwidth@arabic}
+\titlecontents{chapter}[2\digitlength]{\addvspace{5pt}\bfseries\contentsmargin{\pnumwidth@roman}}{\contentslabel{2\digitlength}}{\hspace*{-2\digitlength}}{\titlerule*[0.75em]{}\contentspage}
+\dottedcontents{section}[5\digitlength]{}{3\digitlength}{0.75em}
+\dottedcontents{subsection}[9\digitlength]{}{4\digitlength}{0.75em}
+\dottedcontents{subsubsection}[14\digitlength]{}{5\digitlength}{0.75em}
+\dottedcontents{paragraph}[20\digitlength]{}{6\digitlength}{0.75em}
+\dottedcontents{subparagraph}[27\digitlength]{}{7\digitlength}{0.75em}
+\dottedcontents{subsubparagraph}[35\digitlength]{}{8\digitlength}{0.75em}
 \newcommand{\listofappendices}{%
   \section*{\listappendixname\sectionmark{\listappendixname}}
-  \printcontents[appendix]{1}{1}{\setcounter{tocdepth}{3}}
+  \printcontents[appendix]{1}{1}{\setcounter{tocdepth}{4}}
+  \titlecontents{section}[2\digitlength]{\addvspace{5pt}\bfseries\contentsmargin{\pnumwidth@roman}}{\contentslabel{2\digitlength}}{\hspace*{-2\digitlength}}{\titlerule*[0.75em]{}\contentspage}
+  \dottedcontents{subsection}[5\digitlength]{}{3\digitlength}{0.75em}
+  \dottedcontents{subsubsection}[9\digitlength]{}{4\digitlength}{0.75em}
+  \dottedcontents{paragraph}[14\digitlength]{}{5\digitlength}{0.75em}
+  \dottedcontents{subparagraph}[20\digitlength]{}{6\digitlength}{0.75em}
+  \dottedcontents{subsubparagraph}[27\digitlength]{}{7\digitlength}{0.75em}
 }
 \renewcommand{\appendix}{%
   \ClassWarningNoLine{ebsthesis}{%
-    Use \noexpand\appendices to start the appendix}
-  \appendices}
-\newcommand{\appendices}{%
+    Use \noexpand\startappendices and \noexpand\stopappendices instead of \noexpand\appendix}
+}
+\newcommand{\startappendices}{%
   \ttl@toclabelfalse
   \ttl@setifthe{chapter}
   \setcounter{chapter}{0}
   \setcounter{section}{0}
   \renewcommand{\chaptername}{\appendixname}
   \renewcommand{\thesection}{\Alph{section}}
+  \numberwithin{equation}{section}
+  \numberwithin{figure}{section}
+  \numberwithin{table}{section}
+  \numberwithin{thm}{section}
+  \numberwithin{cor}{section}
+  \numberwithin{defn}{section}
+  \numberwithin{conj}{section}
+  \numberwithin{exmp}{section}
   \chapter*{\appendicesname\chaptermark{\appendicesname}}
   \addcontentsline{toc}{chapter}{\appendicesname}
   \titleformat{\section}{%
     \normalfont\large\bfseries}{%
     \chaptertitlename~\thesection}{1em}{}
-  \stopcontents[main]
-  \startcontents[appendix]
+  \titlespacing*{\section}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \titleformat{\subsection}{%
+    \normalfont\normalsize\bfseries}{%
+    \thesubsection}{1em}{}
+  \titlespacing*{\subsection}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \titleformat{\subsubsection}{%
+    \normalfont\normalsize\mdseries\itshape}{%
+    \upshape\thesubsubsection}{1em}{}
+  \titlespacing*{\subsubsection}{%
+    0pt}{1.625ex plus .5ex minus .1ex}{.75ex plus .1ex}
+  \stopcontents[main]%
+  \resumecontents[appendix]%
+  \stoplist[main]{lof}%
+  \resumelist[appendix]{lof}%
+  \stoplist[main]{lot}%
+  \resumelist[appendix]{lot}%
+}
+\newcommand{\stopappendices}{%
+  \stopcontents[appendix]%
+  \resumecontents[main]%
 }
-%% New titlepage
 \newcommand{\thegrad}{Doctor rerum politicarum}
-\newcommand{\grad}[1]{%
+\newcommand*{\grad}[1]{%
   \renewcommand{\thegrad}{#1}}
 \newcommand{\thetitel}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\titel angegeben}}
-\newcommand{\titel}[1]{%
+\newcommand*{\titel}[1]{%
   \renewcommand{\thetitel}{#1}}
 \newcommand{\theuntertitel}{}
-\newcommand{\untertitel}[1]{%
+\newcommand*{\untertitel}[1]{%
   \renewcommand{\theuntertitel}{#1}}
 \newcommand{\thefachbereich}{Betriebswirtschaftslehre}
-\newcommand{\fachbereich}[1]{%
+\newcommand*{\fachbereich}[1]{%
   \renewcommand{\thefachbereich}{#1}}
 \newcommand{\thehochschule}{%
   European Business School}
-\newcommand{\hochschule}[1]{%
+\newcommand*{\hochschule}[1]{%
   \renewcommand{\thehochschule}{#1}}
-\newcommand{\thename}{%
+\newcommand{\thekandidat}{%
   \ClassWarningNoLine{ebsthesis}{%
-    Kein \noexpand\name angegeben}}
-\newcommand{\name}[1]{%
-  \renewcommand{\thename}{#1}}
+    Kein \noexpand\kandidat angegeben}}
+\newcommand*{\kandidat}[1]{%
+  \renewcommand{\thekandidat}{#1}}
+\renewcommand*{\author}[1]{%
+  \renewcommand{\thekandidat}{#1}}
 \newcommand{\thegeburtsort}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\geburtsort angegeben}}
-\newcommand{\geburtsort}[1]{%
+\newcommand*{\geburtsort}[1]{%
   \renewcommand{\thegeburtsort}{#1}}
 \newcommand{\thereferenten}{%
   \ClassWarningNoLine{ebsthesis}{%
     Keine \noexpand\referenten angegeben}}
-\newcommand{\referenten}[1]{%
+\newcommand*{\referenten}[1]{%
   \renewcommand{\thereferenten}{#1}}
 \newcommand{\theeinreichungstermin}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\einreichungstermin angegeben}}
-\newcommand{\einreichungstermin}[1]{%
+\newcommand*{\einreichungstermin}[1]{%
   \renewcommand{\theeinreichungstermin}{#1}}
 \newcommand{\thepruefungstermin}{%
   \ClassWarningNoLine{ebsthesis}{%
     Kein \noexpand\pruefungstermin angegeben}}
-\newcommand{\pruefungstermin}[1]{%
+\newcommand*{\pruefungstermin}[1]{%
   \renewcommand{\thepruefungstermin}{#1}}
-\newcommand{\theerscheinungsort}{Wiesbaden}
-\newcommand{\erscheinungsort}[1]{%
-  \renewcommand{\theerscheinungsort}{#1}}
-\newcommand{\theerscheinungsjahr}{%
-  \ClassWarningNoLine{ebsthesis}{%
-    Kein \noexpand\erscheinungsjahr angegeben}}
-\newcommand{\erscheinungsjahr}[1]{%
-  \renewcommand{\theerscheinungsjahr}{#1}}
-\newcommand{\thehochschulkennziffer}{154}
-\newcommand{\hochschulkennziffer}[1]{%
-  \renewcommand{\thehochschulkennziffer}{#1}}
-\RequirePackage{array}[1998/05/13]
+\newcommand{\thehochschulsignatur}{1540}
+\newcommand*{\hochschulsignatur}[1]{%
+  \renewcommand{\thehochschulsignatur}{#1}}
+\RequirePackage{array}[2003/12/17]
 \renewcommand{\maketitle}{%
   \renewcommand{\and}{\tabularnewline &}
   \begin{titlepage}
@@ -320,36 +433,40 @@
         {\Large\bfseries Dissertation}\\
         zur Erlangung des akademischen Grades\\
         \thegrad\par
-        \vspace{\stretch{1}}
-        {\huge\bfseries\thetitel\par\mdseries\theuntertitel\par}
-        \vspace{\stretch{1.618033988}}
+        \vspace{\stretch{1000}}
+        {\LARGE\bfseries\thetitel\par\medskip\Large\mdseries\theuntertitel\par}
+        \vspace{\stretch{1618}}
         \begin{tabular}{@{}>{\bfseries}ll@{}}
           Fachbereich:&\thefachbereich\tabularnewline
           Hochschule:&\thehochschule\tabularnewline
-          Name:&\thename\tabularnewline
+          Hochschulsignatur:&\thehochschulsignatur\tabularnewline
+          Kandidat:&\thekandidat\tabularnewline
           Geburtsort:&\thegeburtsort\tabularnewline
           Referenten:&\thereferenten\tabularnewline
           Einreichungstermin:&\theeinreichungstermin\tabularnewline
-          Pr�fungstermin:&\thepruefungstermin\tabularnewline
-          Erscheinungsort:&\theerscheinungsort\tabularnewline
-          Erscheinungsjahr:&\theerscheinungsjahr\tabularnewline
-          Hochschulkennziffer:&\thehochschulkennziffer\tabularnewline
+          Pr\"ufungstermin:&\thepruefungstermin\tabularnewline
         \end{tabular}
       \end{center}
     \end{singlespacing}
   \end{titlepage}
-  \startcontents[main]
+  \startcontents[main]%
+  \startcontents[appendix]%
+  \stopcontents[appendix]%
+  \startlist[main]{lof}%
+  \startlist[appendix]{lof}%
+  \stoplist[appendix]{lof}%
+  \startlist[main]{lot}%
+  \startlist[appendix]{lot}%
+  \stoplist[appendix]{lot}%
 }
-%% Summary and table of contents
 \newcommand{\inhaltsuebersicht}{%
-  \chapter*{\inhaltsubersichtname\chaptermark{\inhaltsubersichtname}}
-  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{1}}
+  \chapter*{\inhaltsuebersichtname\chaptermark{\inhaltsuebersichtname}}
+  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{1}}%
 }
 \renewcommand{\tableofcontents}{%
   \chapter*{\contentsname\chaptermark{\contentsname}}
-  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{3}}
+  \printcontents[main]{0}{-1}{\setcounter{tocdepth}{4}}%
 }
-%% Page composition
 \setcounter{topnumber}{3}
 \setcounter{bottomnumber}{2}
 \setcounter{totalnumber}{4}
@@ -364,65 +481,229 @@
 \renewcommand{\frontmatter}{%
   \cleardoublepage
   \@mainmatterfalse
-  \pagenumbering{Roman}
+  \pagenumbering{Roman}%
+}
+\renewcommand{\mainmatter}{%
+  \cleardoublepage
+  \@mainmattertrue
+  \pagenumbering{arabic}%
+}
+\renewcommand{\backmatter}{%
+  \if@openright
+    \cleardoublepage
+  \else
+    \clearpage
+  \fi
+  \@mainmatterfalse
 }
-\RequirePackage[nottoc]{tocbibind}[2003/02/04]
-%% Preface and Foreword
+\RequirePackage[nottoc]{tocbibind}[2003/03/13]
 \newcommand{\geleitwort}{%
-  \chapter*{\geleitwortname\chaptermark{\geleitwortname}}
+  \chapter*{\geleitwortname\chaptermark{\geleitwortname}}%
 }
 \newcommand{\vorwort}{%
-  \chapter*{\vorwortname\chaptermark{\vorwortname}}
+  \chapter*{\vorwortname\chaptermark{\vorwortname}}%
 }
-%% List of Symbols
-\RequirePackage{nomencl}[2000/12/03]
+\RequirePackage[noprefix]{nomencl}[2005/03/31]
 \RequirePackage{mdwlist}[1996/05/02]
-\newcommand{\symbolverzeichnis}{\printglossary}
+\newcommand{\symbolverzeichnis}{\printnomenclature}
 \renewcommand{\nomname}{\symbolverzeichnisname}
-\newlength{\glossindent}
-\setlength{\glossindent}{3em}
-\def\theglossary{%
+\newlength{\nomindent}
+\setlength{\nomindent}{3em}
+\def\thenomenclature{%
   \chapter*{\nomname\chaptermark{\nomname}}
   \addcontentsline{toc}{chapter}{\nomname}
   \nompreamble
   \addvspace{10pt}
   \begin{basedescript}{%
-      \desclabelwidth{\glossindent}
+      \desclabelwidth{\nomindent}
       \desclabelstyle{\nextlinelabel}
-      \renewcommand{\makelabel}[1]{##1}
-      \parskip\z@\itemsep\z@
-    }
+      \renewcommand*{\makelabel}[1]{##1}
+      \parskip\z@\itemsep\z@%
+    }%
 }
-\def\endtheglossary{%
+\def\endthenomenclature{%
   \end{basedescript}
-  \nompostamble
+  \nompostamble%
 }
-\makeglossary
-%% List of Abbreviations
+\makenomenclature
 \newcommand{\abkuerzungsverzeichnis}{%
   \chapter*{\abkuerzungsverzeichnisname\chaptermark{%
       \abkuerzungsverzeichnisname}}
   \addcontentsline{toc}{chapter}{\abkuerzungsverzeichnisname}
   \addvspace{10pt}%
 }
-\RequirePackage{acronym}[2000/05/21]
+\RequirePackage{acronym}[2004/11/10]
+\renewcommand*{\acsfont}[1]{\textsc{\MakeLowercase{#1}}}
 \newlength{\acroindent}
 \setlength{\acroindent}{6em}
-\renewenvironment{acronym}{%
-  \begin{basedescript}{%
-      \desclabelwidth{\acroindent}
-      \desclabelstyle{\nextlinelabel}
-      \renewcommand{\makelabel}[1]{##1}
-      \parskip\z@\itemsep\z@
-    }
-    \providecommand*{\acro}[1]{\AC@dblargafter{##1}\AC@acro}%
-  }{%
-  \end{basedescript}%
-}
-%% Advanced mathematics functions and equation alignment
-\RequirePackage[leqno,centertags]{amsmath}[2000/07/18]
+\renewenvironment{acronym}[1][1]{%
+   \providecommand*{\acro}{\AC@acro}%
+   \long\def\acroextra##1{##1}%
+   \ifx1#1
+      \global\expandafter\let\csname ac@des@mark\endcsname\AC@used
+      \begin{basedescript}{%
+          \desclabelwidth{\acroindent}
+          \desclabelstyle{\nextlinelabel}
+          \renewcommand*{\makelabel}[1]{##1}
+          \parskip\z@\itemsep\z@%
+        }
+   \else
+      \begin{AC@deflist}{#1}%
+   \fi%
+  }%
+  {%
+   \ifx\AC@populated\AC@used\else
+      \item[]\relax
+   \fi
+   \expandafter\ifx\csname ac@des@mark\endcsname\AC@used
+      \end{basedescript}%
+   \else
+      \end{AC@deflist}%
+   \fi}
+\RequirePackage[tbtags]{amsmath}[2000/07/18]
+\RequirePackage[all]{onlyamsmath}[2001/10/04]
+\if@gabler
+  \newcommand{\graphicsmag}{1.0000}
+  \newcommand{\smallgraphicsmag}{0.7500}
+  \newcommand{\tinygraphicsmag}{0.5625}
+\else
+  \newcommand{\graphicsmag}{1.3333}
+  \newcommand{\smallgraphicsmag}{1.0000}
+  \newcommand{\tinygraphicsmag}{0.7500}
+\fi
+\RequirePackage{comment}
+\if@gabler
+  \includecomment{gabler}
+  \excludecomment{grundregeln}
+\else
+  \includecomment{grundregeln}
+  \excludecomment{gabler}
+\fi
+\if@mathematica
+  \RequirePackage{wrisym}[1999/04/20]
+  \newcommand{\D}{\DifferentialD}
+\else
+  \RequirePackage{amssymb}[2002/01/22]
+  \RequirePackage{dsfont}[1995/08/01]
+  \renewcommand{\mathbb}[1]{\mathds{#1}}
+  \DeclareMathSymbol{\D}{\mathord}{operators}{`d}
+  \newcommand{\E}{\mathrm{e}}
+  \newcommand{\I}{\mathrm{i}}
+  \newcommand{\MathLogo}{\emph{Mathematica}}
+\fi
 \if@tools
-\RequirePackage{ebstools}[2003/11/11]
+  % Statistics
+  \DeclareRobustCommand\expect{%
+    \@ifnextchar[{\ebs@expect}{\ebs@expect[]}%
+  }
+  \def\ebs@expectop{\mathbf{E}}
+  \def\ebs@expect{%
+    \@ifnextchar[{\ebs@@expect}{\ebs@@expect[]}%
+  }
+  \def\ebs@@expect[#1]{%
+    \@ifnextchar[{\ebs@@@expect[#1]}{\ebs@@@expect[][#1]}%
+  }
+  \def\ebs@@@expect[#1][#2]#3{%
+    \@expectx[#1][#2]{#3}%
+  }
+  \def\@expectx[#1][#2]#3{%
+    \ifx\relax#1\relax
+      \ifx\relax#2\relax
+        \ebs@expectop\!\left[#3\right]
+      \else
+        \ebs@expectop\!\left[#3\,\middle|\,#2\right]
+      \fi
+    \else
+      \ifx\relax#2\relax
+        \ebs@expectop_{#1}\!\left[#3\right]
+      \else
+        \ebs@expectop_{#1}\!\left[#3\,\middle|\,#2\right]
+      \fi
+    \fi
+  }
+  \newcommand{\indic}[1]{\mathbf{1}_{#1}}
+  \newcommand{\var}[1]{\mathbf{V}\!\left[#1\right]}
+  \newcommand{\Var}{\mathrm{Var}}
+  \newcommand{\Cov}{\mathrm{Cov}}
+  \newcommand{\normal}{\mathrm{N}}
+  % Order
+  \newcommand{\order}[1]{\mathrm{O}\!\left(#1\right)}
+  % Sets
+  \newcommand{\Cset}{\mathbf{C}}
+  \newcommand{\Hset}{\mathbf{H}}
+  \newcommand{\Nset}{\mathbf{N}}
+  \newcommand{\Qset}{\mathbf{Q}}
+  \newcommand{\Rset}{\mathbf{R}}
+  \newcommand{\Zset}{\mathbf{Z}}
+  % Absolute value and sign
+  \providecommand{\abs}[1]{\left\lvert#1\right\rvert}
+  \DeclareMathOperator{\sign}{sign}
+  % Evaluated at
+  \RequirePackage{ifthen}[2001/05/26]
+  \newcommand{\evaluatedat}[3][]{%
+    \left.#3\right\rvert_{#2}\ifthenelse{\equal{#1}{}}{\relax}{^{#1}}}
+  % Other mathematical expressions
+  \DeclareMathOperator*{\argmax}{argmax}
+  % Common (English) abbreviations
+  \newcommand{\eg}{e.g.}
+  \newcommand{\ie}{i.e.}
+  \newcommand{\iid}{i.i.d.}
+  % Common (German) abbreviations
+  \newcommand{\cp}{c.\,p.}
+  \newcommand{\idR}{i.\,d.\,R.}
+  \newcommand{\mE}{m.\,E.}
+  \newcommand{\uU}{u.\,U.}
+  \newcommand{\zB}{z.\,B.}
+  % Theorems
+  \newcommand{\theoremname}{Theorem}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Proposition}
+  \newcommand{\corollaryname}{Corollary}
+  \newcommand{\definitionname}{Definition}
+  \newcommand{\conjecturename}{Conjecture}
+  \newcommand{\examplename}{Example}
+  \newcommand{\remarkname}{Remark}
+  \newcommand{\casename}{Case}
+  % Babel support for theorems
+  \AtBeginDocument{%
+    \@ifpackageloaded{babel}{%
+       \addto\extrasenglish{%
+         \renewcommand{\theoremname}{Theorem}
+         \renewcommand{\lemmaname}{Lemma}
+         \renewcommand{\propositionname}{Proposition}
+         \renewcommand{\corollaryname}{Corollary}
+         \renewcommand{\definitionname}{Definition}
+         \renewcommand{\conjecturename}{Conjecture}
+         \renewcommand{\examplename}{Example}
+         \renewcommand{\remarkname}{Remark}
+         \renewcommand{\casename}{Case}%
+       }
+       \addto{\extrasngerman}{%
+         \renewcommand{\theoremname}{Theorem}
+         \renewcommand{\lemmaname}{Lemma}
+         \renewcommand{\propositionname}{Satz}
+         \renewcommand{\corollaryname}{Korollar}
+         \renewcommand{\definitionname}{Definition}
+         \renewcommand{\conjecturename}{Vermutung}
+         \renewcommand{\examplename}{Beispiel}
+         \renewcommand{\remarkname}{Bemerkung}
+         \renewcommand{\casename}{Fall}%
+       }%
+     }{\relax}%
+   }
+ \RequirePackage{amsthm}[2004/08/06]
+ \theoremstyle{plain}
+ \newtheorem{thm}{\theoremname}[chapter]
+ \newtheorem{lem}[thm]{\lemmaname}
+ \newtheorem{prop}[thm]{\propositionname}
+ \newtheorem{cor}{\corollaryname}[chapter]
+ \theoremstyle{definition}
+ \newtheorem{defn}{\definitionname}[chapter]
+ \newtheorem{conj}{\conjecturename}[chapter]
+ \newtheorem{exmp}{\examplename}[chapter]
+ \theoremstyle{remark}
+ \newtheorem*{rem}{\remarkname}
+ \newtheorem{case}{\casename}
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/ebsthesis/ebstools.sty b/Master/texmf-dist/tex/latex/ebsthesis/ebstools.sty
deleted file mode 100644
index de465c6bc48..00000000000
--- a/Master/texmf-dist/tex/latex/ebsthesis/ebstools.sty
+++ /dev/null
@@ -1,129 +0,0 @@
-%%
-%% This is file `ebstools.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ebsthesis.dtx  (with options: `ebstools')
-%% 
-%% The ebsthesis document class and ebstools package
-%% Copyright (c) 2003 Philipp N. Baecker. All right reserved.
-%%
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\NeedsTeXFormat{LaTeX2e}[2001/06/01]
-\ProvidesPackage{ebstools}%
-                [2003/11/11 v0.9j EBS Tools (PNB)]
-\newif\if@mathematica
-\DeclareOption{mathematica}{\@mathematicatrue}
-\DeclareOption{nomathematica}{\@mathematicafalse}
-\ExecuteOptions{nomathematica}
-\ProcessOptions\relax
-\if@mathematica
-%% We are using Mathematica fonts
-\RequirePackage{wrisym}[1999/04/20]
-\newcommand{\D}{\DifferentialD}
-\else
-%% We are using Computer Modern fonts
-\newcommand{\E}{\mathrm{e}}
-\DeclareMathSymbol{\D}{\mathord}{operators}{`d}
-\newcommand{\I}{\mathrm{i}}
-\providecommand{\MathLogo}{\emph{Mathematica}}
-\fi
-%% Statistical operators
-\DeclareMathOperator{\expect}{E}
-\DeclareMathOperator{\Var}{Var}
-\DeclareMathOperator{\Cov}{Cov}
-%% Order
-\DeclareMathOperator{\order}{O}
-%% Sets
-\newcommand{\Nset}{\mathbf{N}}
-\newcommand{\Zset}{\mathbf{Z}}
-\newcommand{\Qset}{\mathbf{Q}}
-\newcommand{\Rset}{\mathbf{R}}
-\newcommand{\Cset}{\mathbf{C}}
-\newcommand{\Hset}{\mathbf{H}}
-%% Absolute value and sign
-\providecommand{\abs}[1]{\left\lvert#1\right\rvert}
-\DeclareMathOperator{\sign}{sign}
-%% Evaluated at
-\RequirePackage{ifthen}[2001/05/26]
-\newcommand{\evaluatedat}[3][]{%
-  \left.#3\right\rvert_{#2}\ifthenelse{\equal{#1}{}}{\relax}{^#1}}
-%% Common (English) abbreviations
-\newcommand{\eg}{e.g.}
-\newcommand{\ie}{i.e.}
-%% Common (German) abbreviations
-%% \renewcommand{\dh}{d.\,h.}
-\newcommand{\zB}{z.\,B.}
-\newcommand{\idR}{i.\,d.\,R.}
-\newcommand{\mE}{m.\,E.}
-\newcommand{\uU}{u.\,U.}
-\newcommand{\cp}{c.\,p.}
-%% Theorems
-\newcommand{\theoremname}{Theorem}
-\newcommand{\lemmaname}{Lemma}
-\newcommand{\propositionname}{Proposition}
-\newcommand{\corollaryname}{Corollary}
-\newcommand{\definitionname}{Definition}
-\newcommand{\conjecturename}{Conjecture}
-\newcommand{\examplename}{Example}
-\newcommand{\remarkname}{Remark}
-\newcommand{\casename}{Case}
-%% Babel support for theorems
-\AtBeginDocument{%
-  \@ifpackageloaded{babel}{%
-     \addto\extrasenglish{%
-       \renewcommand{\theoremname}{Theorem}%
-       \renewcommand{\lemmaname}{Lemma}%
-       \renewcommand{\propositionname}{Proposition}%
-       \renewcommand{\corollaryname}{Corollary}%
-       \renewcommand{\definitionname}{Definition}%
-       \renewcommand{\conjecturename}{Conjecture}%
-       \renewcommand{\examplename}{Example}%
-       \renewcommand{\remarkname}{Remark}%
-       \renewcommand{\casename}{Case}%
-     }
-     \addto{\extrasngerman}{%
-       \renewcommand{\theoremname}{Theorem}%
-       \renewcommand{\lemmaname}{Lemma}%
-       \renewcommand{\propositionname}{Satz}%
-       \renewcommand{\corollaryname}{Korollar}%
-       \renewcommand{\definitionname}{Definition}%
-       \renewcommand{\conjecturename}{Vermutung}%
-       \renewcommand{\examplename}{Beispiel}%
-       \renewcommand{\remarkname}{Anmerkung}%
-       \renewcommand{\casename}{Fall}%
-     }%
-   }{\relax}%
- }
-\RequirePackage{amsthm}[2000/10/26]
-\theoremstyle{plain}% default
-\newtheorem{thm}{\theoremname}[chapter]
-\newtheorem{lem}[thm]{\lemmaname}
-\newtheorem{prop}[thm]{\propositionname}
-\newtheorem{cor}{\corollaryname}[chapter]
-\theoremstyle{definition}
-\newtheorem{defn}{\definitionname}[chapter]
-\newtheorem{conj}{\conjecturename}[chapter]
-\newtheorem{exmp}{\examplename}[chapter]
-\theoremstyle{remark}
-\newtheorem*{rem}{\remarkname}
-\newtheorem{case}{\casename}
-\endinput
-%%
-%% End of file `ebstools.sty'.
diff --git a/Master/texmf-dist/tpm/ebsthesis.tpm b/Master/texmf-dist/tpm/ebsthesis.tpm
index 066dc3a16ff..ed91d481e4b 100644
--- a/Master/texmf-dist/tpm/ebsthesis.tpm
+++ b/Master/texmf-dist/tpm/ebsthesis.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/ebsthesis.zip">
     <TPM:Name>ebsthesis</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:52:32</TPM:Date>
+    <TPM:Date>2007/01/05 01:36:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Typesetting theses for economics</TPM:Title>
@@ -18,13 +18,15 @@ by European Business School.
     <TPM:Size>70495</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="20188">
+    <TPM:RunFiles size="24660">
 texmf-dist/tex/latex/ebsthesis/ebsthesis.cls
-texmf-dist/tex/latex/ebsthesis/ebstools.sty
 texmf-dist/tpm/ebsthesis.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="164">texmf-dist/doc/latex/ebsthesis/LICENSE</TPM:DocFiles>
-    <TPM:SourceFiles size="50143">
+    <TPM:DocFiles size="270486">
+texmf-dist/doc/latex/ebsthesis/README
+texmf-dist/doc/latex/ebsthesis/ebsthesis.pdf
+    </TPM:DocFiles>
+    <TPM:SourceFiles size="26759">
 texmf-dist/source/latex/ebsthesis/ebsthesis.dtx
 texmf-dist/source/latex/ebsthesis/ebsthesis.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf/lists/ebsthesis b/Master/texmf/lists/ebsthesis
index 08e7ccf5d49..53860995b6c 100644
--- a/Master/texmf/lists/ebsthesis
+++ b/Master/texmf/lists/ebsthesis
@@ -1,8 +1,8 @@
-texmf-dist/doc/latex/ebsthesis/LICENSE
+texmf-dist/doc/latex/ebsthesis/README
+texmf-dist/doc/latex/ebsthesis/ebsthesis.pdf
 texmf-dist/source/latex/ebsthesis/ebsthesis.dtx
 texmf-dist/source/latex/ebsthesis/ebsthesis.ins
 texmf-dist/tex/latex/ebsthesis/ebsthesis.cls
-texmf-dist/tex/latex/ebsthesis/ebstools.sty
 texmf-dist/tpm/ebsthesis.tpm
 
 texmf/lists/ebsthesis
diff --git a/Master/texmf/tpm/collection-context.tpm b/Master/texmf/tpm/collection-context.tpm
index 522692575a3..70d1e3ab4c2 100644
--- a/Master/texmf/tpm/collection-context.tpm
+++ b/Master/texmf/tpm/collection-context.tpm
@@ -6,7 +6,7 @@
     <TPM:Date>1970/01/01 00:00:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
-    <TPM:Title>ConText macro package</TPM:Title>
+    <TPM:Title>ConTeXt format</TPM:Title>
     <TPM:Description>Hans Hagen's powerful macro package, ConText</TPM:Description>
     <TPM:Author></TPM:Author>
     <TPM:Size>1161</TPM:Size>
diff --git a/Master/texmf/tpm/collection-documentation-tetex.tpm b/Master/texmf/tpm/collection-documentation-tetex.tpm
index d1b6b2b395e..9fa0b5a94bc 100644
--- a/Master/texmf/tpm/collection-documentation-tetex.tpm
+++ b/Master/texmf/tpm/collection-documentation-tetex.tpm
@@ -6,7 +6,7 @@
     <TPM:Date>1970/01/01 00:00:00</TPM:Date>
     <TPM:Version>3.0</TPM:Version>
     <TPM:Creator>werner</TPM:Creator>
-    <TPM:Title>English documentation for teTeX scheme</TPM:Title>
+    <TPM:Title>teTeX scheme English documentation</TPM:Title>
     <TPM:Description>Documentation for scheme-teTeX</TPM:Description>
     <TPM:Author>werner</TPM:Author>
     <TPM:Size>1636</TPM:Size>
diff --git a/Master/texmf/tpm/collection-fontsextra-tetex.tpm b/Master/texmf/tpm/collection-fontsextra-tetex.tpm
index 66cd1443bfa..9d9bf644f58 100644
--- a/Master/texmf/tpm/collection-fontsextra-tetex.tpm
+++ b/Master/texmf/tpm/collection-fontsextra-tetex.tpm
@@ -6,7 +6,7 @@
     <TPM:Date>1970/01/01 00:00:00</TPM:Date>
     <TPM:Version>3.0</TPM:Version>
     <TPM:Creator>werner</TPM:Creator>
-    <TPM:Title>Extra fonts for teTeX schmeme</TPM:Title>
+    <TPM:Title>teTeX scheme extra fonts</TPM:Title>
     <TPM:Description>Extra fonts for scheme-teTeX.</TPM:Description>
     <TPM:Author>werner</TPM:Author>
     <TPM:Size>1238</TPM:Size>
diff --git a/Master/texmf/tpm/collection-latex3.tpm b/Master/texmf/tpm/collection-latex3.tpm
index 764fa6f1755..782fc7c5165 100644
--- a/Master/texmf/tpm/collection-latex3.tpm
+++ b/Master/texmf/tpm/collection-latex3.tpm
@@ -6,8 +6,8 @@
     <TPM:Date>1970/01/01 00:00:00</TPM:Date>
     <TPM:Version>1.0</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
-    <TPM:Title>Experiment LaTeX3 packages</TPM:Title>
-    <TPM:Description>LaTeX3 packages</TPM:Description>
+    <TPM:Title>LaTeX3 packages</TPM:Title>
+    <TPM:Description></TPM:Description>
     <TPM:Author></TPM:Author>
     <TPM:Size>1275</TPM:Size>
     <TPM:License></TPM:License>
diff --git a/Master/texmf/tpm/collection-latexextra-tetex.tpm b/Master/texmf/tpm/collection-latexextra-tetex.tpm
index bd046d6136d..d21d2f2fa4f 100644
--- a/Master/texmf/tpm/collection-latexextra-tetex.tpm
+++ b/Master/texmf/tpm/collection-latexextra-tetex.tpm
@@ -6,7 +6,7 @@
     <TPM:Date>1970/01/01 00:00:00</TPM:Date>
     <TPM:Version>3.0</TPM:Version>
     <TPM:Creator>werner</TPM:Creator>
-    <TPM:Title>LaTeX supplementary packages for scheme-tetex</TPM:Title>
+    <TPM:Title>scheme-tetex extra LaTeX packages</TPM:Title>
     <TPM:Description>Extra LaTeX packages for scheme-tetex.</TPM:Description>
     <TPM:Author>werner</TPM:Author>
     <TPM:Size>4968</TPM:Size>