diff --git a/bootstrap.sh b/bootstrap.sh
index fafd381..fb14847 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -112,6 +112,7 @@ GENERATED FILES
     * build-resource-file.sh - build resource.qrc file from a resource directory
     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
+    * test/runtests.sh - template file to run test scripts, i.e. docker based
     * AUTHORS - replace your name in AUTHORS before first run
     * NEWS - empty file add your project's news
     * README - add project description (first line is header, followed by an empty line)
@@ -197,7 +198,7 @@ FILES
                   <ou can access the readme by calling
                   ${DEFAULT_PROJECT_NAME}::description().
   * ChangeLog:    Your changelog is automatically maintained from
-                  subversion history, using svn2cl | subversion-tools. You don't need to
+                  subversion history, using svn2cl. You don't need to
                   care about.
   * configure.ac: This file becomes very short and simple. You provide
                   the project name, the major and minor version. The
@@ -720,6 +721,7 @@ ${HEADER}dist_bin_SCRIPTS =
 MAINTAINERCLEANFILES = makefile.in
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
+to --condition AX_BUILD_TEST test/runtests.sh < test/runtests.sh
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
 cat <<EOF2
@@ -773,6 +775,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
         doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
         doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
+        doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""'
         doxyreplace ENABLE_PREPROCESSING YES
         doxyreplace MACRO_EXPANSION YES
         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
@@ -824,7 +827,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace CLASS_GRAPH YES
         doxyreplace TEMPLATE_RELATIONS YES
         doxyreplace DOT_IMAGE_FORMAT svg
-        doxyreplace INTERACTIVE_SVG YES
+        doxyreplace INTERACTIVE_SVG NO
         doxyreplace DOT_TRANSPARENT YES
     fi
 fi
@@ -1052,7 +1055,7 @@ if test -f makefile; then
 fi
 
 #### Bootstrap Before Configure ####
-run --no-check svn2cl | subversion-tools
+run --no-check svn2cl
 run aclocal
 if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
 run automake -a
diff --git a/debian/control.in b/debian/control.in
index 224de50..cf7588d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Maintainer: @AUTHOR@
 Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, libpcscxx-dev, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools
 
 Package: @PACKAGE_NAME@
-Section: admin
+Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: @DESCRIPTION@
diff --git a/debian/rules b/debian/rules
index fd07771..6b751be 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Wed, 11 November 2015 12:59:08 +0100
+##  -  on Wed, 11 November 2015 13:46:50 +0100
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
diff --git a/doc/doxyfile.in b/doc/doxyfile.in
index b9079f4..c709c17 100644
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@@ -221,6 +221,7 @@ TAB_SIZE               = 2
 # newlines.
 
 ALIASES                = "id=\par File-ID\n"
+ALIASES += "api=\xrefitem api \"API Call\" \"\""
 ALIASES += "mutex=\par Reentrant:\nAccess is locked with mutex @c "
 ALIASES += "instancemutex=\par Reentrant:\nAccess is locked with per instance mutex @c "
 ALIASES += "classmutex=\par Reentrant:\nAccess is locked with class static mutex @c "
@@ -2221,7 +2222,7 @@ DOT_IMAGE_FORMAT       = svg
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INTERACTIVE_SVG        = YES
+INTERACTIVE_SVG        = NO
 
 # The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
diff --git a/src/languages.qrc b/src/languages.qrc
new file mode 100644
index 0000000..db34436
--- /dev/null
+++ b/src/languages.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/language">
+        <file>tokentool_de.qm</file>
+        <file>tokentool_fr.qm</file>
+        <file>tokentool_it.qm</file>
+        <file>tokentool_en.qm</file>
+    </qresource>
+</RCC>
diff --git a/src/languages.qrc.in b/src/languages.qrc.in
deleted file mode 100644
index 57f0a61..0000000
--- a/src/languages.qrc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/language">
-        <file>@PACKAGENAME@_de.qm</file>
-        <file>@PACKAGENAME@_fr.qm</file>
-        <file>@PACKAGENAME@_it.qm</file>
-        <file>@PACKAGENAME@_en.qm</file>
-    </qresource>
-</RCC>
diff --git a/src/makefile.am b/src/makefile.am
index 526be27..1a7e3d3 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -55,14 +55,17 @@ tokentool_TR_FILES = main.cxx version.cxx
 tokentool_SOURCES = ${tokentool_TR_FILES} ${BUILT_SOURCES}
 
 ## automatic assembly, no need to change
-BUILT_SOURCES = ${tokentool_MOCFILES}                 ${tokentool_UIFILES}                 ${tokentool_TRANSLATIONS}                 ${tokentool_RESOURCES}
+BUILT_SOURCES = ${tokentool_MOCFILES} ${tokentool_UIFILES}		\
+                ${tokentool_TRANSLATIONS} ${tokentool_RESOURCES}
 
 ## automatic assembly, no need to change
-EXTRA_DIST_TR = ${tokentool_MOCFILES:moc_%.cxx=%.hxx}                 ${tokentool_UIFILES:ui_%.hxx=%.ui}
+EXTRA_DIST_TR = ${tokentool_MOCFILES:moc_%.cxx=%.hxx}	\
+                ${tokentool_UIFILES:ui_%.hxx=%.ui}
 
 ## automatic assembly, no need to change
 ## except: adapt the pre-delivered qt_%.qm list (language files you copy from qt
-EXTRA_DIST = ${EXTRA_DIST_TR}              ${tokentool_RESOURCES:qrc_%.cxx:%.qrc}              ${tokentool_TRANSLATIONS:%.qm=%.ts}              qt_de.qm qt_fr.qm
+EXTRA_DIST = ${EXTRA_DIST_TR} ${tokentool_RESOURCES:qrc_%.cxx:%.qrc}	\
+             ${tokentool_TRANSLATIONS:%.qm=%.ts} qt_de.qm qt_fr.qm
 
 ## automatic assembly, no need to change
 LANGUAGE_FILES = ${EXTRA_DIST_TR} ${tokentool_TR_FILES}
diff --git a/src/tokentool.hxx b/src/tokentool.hxx
index fbf7e44..3c7af69 100644
--- a/src/tokentool.hxx
+++ b/src/tokentool.hxx
@@ -13,7 +13,7 @@
 #include <QProgressBar>
 #include <QDateTime>
 #include <QSslCertificate>
-#include <ui_tokentool.h>
+#include <ui_tokentool.hxx>
 #include <memory>
 
 #include <QDebug>
diff --git a/src/version.cxx b/src/version.cxx
new file mode 100644
index 0000000..c87b294
--- /dev/null
+++ b/src/version.cxx
@@ -0,0 +1,40 @@
+/*! @file
+
+    @id $
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+#include <string>
+
+namespace NAMESPACE {
+  std::string package_string() {
+    return PACKAGE_STRING;
+  }
+  std::string package_name() {
+    return PACKAGE_NAME;
+  }
+  std::string version() {
+    return PACKAGE_VERSION;
+  }
+  std::string build_date() {
+    return BUILD_DATE;
+  }
+  std::string author() {
+    return AUTHOR;
+  }
+  std::string description() {
+    return DESCRIPTION;
+  }
+  std::string readme() {
+    return README;
+  }
+  std::string logo() {
+    return PROJECT_LOGO;
+  }
+  std::string icon() {
+    return PROJECT_ICON;
+  }
+  const std::string WHAT("#(@) " PACKAGE_STRING);
+  const std::string IDENT("$Id: " PACKAGE_STRING);
+}