diff --git a/src/HsH-classes.dtx b/src/HsH-classes.dtx
index 71a15821a3eed8175ee1d19663991f8bcf45b5bd..282db27d48e0b26e712b10cbb787a1a6a6d58047 100644
--- a/src/HsH-classes.dtx
+++ b/src/HsH-classes.dtx
@@ -435,6 +435,7 @@ http://www.latex-project.org/lppl.txt
 %     \item[amsmath,amssymb,amsfonts] more options when typesetting math
 %     \item[lmodern] sets up the Latin-Modern font
 %     \item[setspace] used for configuring linespacing
+%     \item[enumitem] more powerfull item-lists and enumerations
 %   \end{packages}
 %
 %   There are also some packages for internal functionalaty that shouln't conserne the
@@ -454,10 +455,18 @@ http://www.latex-project.org/lppl.txt
 %     \item[todonotes] loaded depending on \opt{todos}
 %   \end{packages}
 %
-% \subsection{Pre-configured Packages}
+% \subsection{Pre-configured, but not loaded Packages}
 %   These packages are coonfigured by the class to work in a cooperative way. The
-%   user must load them in this preable via |\usepackage|\marg{pkg-name} however, as
-%   loading them allways bears additional, unnecicary overhead.
+%   user must load them manually in this preable via |\usepackage|\marg{pkg-name},
+%   as loading them allways bears additional, unnecicary overhead.
+%   \begin{packages}
+%     \item[biblatex] create a bibliography
+%     \item[siunitx] use units in text and equations
+%     \item[listings] typset sourcecode snippets
+%     \item[csvsimple] import csv-files into tables
+%     \item[pgfplots / tikz] A powerfull package for drawing and plotting data
+%     \item[circuitikz] A TikZ libary for drawing circuits
+%   \end{packages}
 %
 %
 %   \StopEventually{^^A
@@ -960,12 +969,12 @@ http://www.latex-project.org/lppl.txt
 %
 %   \subsubsection{Generally usefull packages}
 %
-%     We load \pkg{hyperref} for clikable links and configure it to write meta-date to
-%     the PDF.
+%     We load \pkg{hyperref} for clickable links, a interacitve document outline
+%     in the PDF and configure it to write meta-date to the PDF.
 %    \begin{macrocode}
+%<*!standalone>
 \RequirePackage[hidelinks]{hyperref} % must load before `bookmarks'
 \RequirePackage{bookmark}
-%<*!standalone>
 \AtBeginDocument{
   \hypersetup{
     pdfinfo={
@@ -976,19 +985,42 @@ http://www.latex-project.org/lppl.txt
     }
   }
 }
+\PassOptionsToPackage{hyperref}{xcolor}
 %</!standalone>
 %    \end{macrocode}
 %
+%     The \pkg{hyperref} package has a problem when linking to images,
+%     clicking a linke to one leads to the \emph{bottom} of the float
+%     (where the caption is located), instead of to the \emph{top}.
+%     Loading the \pkg{captoion} package with the \opt{hypercap} option
+%     fixes that.
+%    \begin{macrocode}
+\RequirePackage[hypcap=true]{caption}
+%    \end{macrocode}
+%
+%     To display images (mostly through the |\includegraphics| command)
+%     we require the \pkg{graphicx} package.
+%    \begin{macrocode}
+\RequirePackage{graphicx}
+%    \end{macrocode}
+%
+%     The \pkg{ams} family of packages containes a wide collection of math
+%     related commands that are generally usefull.
+%    \begin{macrocode}
+\RequirePackage{amsmath,amssymb,amsfonts}
+%    \end{macrocode}
+%
 %     The \pkg{todonotes} package is greate for anotation, but extremly expensive on
 %     compiletime. So we load it only if the user requests it. Also its commands are
 %     stubed, so that they can be left in the sourcecode and jut not output anything.
 %    \begin{macrocode}
 \if@todos
-  \PassOptionsToPackage{
+  \PassOptionsToPackage{svgnames}{xcolor}
+  \AtBeginOfDocument{\RequirePackage{xcolor}}
+  \RequirePackage[
     textsize=small,
     figwidth=.6\textwidth
-  }{todonotes}
-  \RequirePackage{todonotes}
+  ]{todonotes}
 \else
   \newcommand{\listoftodos}[1]{}
   \newcommand{\todo}[2][]{}
@@ -996,11 +1028,9 @@ http://www.latex-project.org/lppl.txt
 \fi
 %    \end{macrocode}
 %
+%     Some more micalanious packages:
 %    \begin{macrocode}
-\RequirePackage[hypcap=true]{caption}
-\RequirePackage{graphicx}
-\RequirePackage{amsmath,amssymb,amsfonts}
-\RequirePackage[svgnames]{xcolor}
+\RequirePackage{xcolor}
 %    \end{macrocode}
 %
 %   \subsubsection{Options for packages that could be loaded by the user}
diff --git a/src/HsH-classes.pdf b/src/HsH-classes.pdf
index e3f21febc9ced4e9d83eb92fe3533442a009d6d6..882e212519532bc5e3e609ec200a7920e96d9ac8 100644
--- a/src/HsH-classes.pdf
+++ b/src/HsH-classes.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bc729a11b7fbd8dc33e12345463827f2f5960005f3a6251e118dd5b6ec8bcc7
-size 315871
+oid sha256:4e2f1639bbcb527e597d6984a97191816120bcf2af9f75c9ec3bfffa59af0db4
+size 317747