diff --git a/ScStwMonitor.pro b/ScStwMonitor.pro
index 0d46679..52a6a7d 100644
--- a/ScStwMonitor.pro
+++ b/ScStwMonitor.pro
@@ -3,10 +3,12 @@ CONFIG += ordered console
 
 SUBDIRS += \
            ScStwLibraries \
+           ScStwStyling \
            ScStwMonitorSrc
 
 ScStwMonitorSrc.depends = Qt-Secret
 ScStwLibraries.file = shared-libraries/ScStwLibraries/ScStwLibraries.pro
+ScStwStyling.file =  shared-libraries/ScStwStyling/ScStwStyling.pro
 
 contains(QMAKE_CXX, .*raspbian.*arm.*):{
     GLOBAL_TARGET_PATH = "/home/pi/ScStwMonitor"
diff --git a/ScStwMonitorSrc/ScStwMonitorSrc.pro b/ScStwMonitorSrc/ScStwMonitorSrc.pro
index 489a945..88ddfa4 100755
--- a/ScStwMonitorSrc/ScStwMonitorSrc.pro
+++ b/ScStwMonitorSrc/ScStwMonitorSrc.pro
@@ -29,7 +29,7 @@ RESOURCES += \
 
 # include submodules
 include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri)
-#include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri)
+include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri)
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
diff --git a/ScStwMonitorSrc/main.cpp b/ScStwMonitorSrc/main.cpp
index ab55a3e..5cfbf24 100755
--- a/ScStwMonitorSrc/main.cpp
+++ b/ScStwMonitorSrc/main.cpp
@@ -5,10 +5,8 @@
 #include <QRect>
 #include <QScreen>
 
-#include <scstwrace.h>
-#include <scstwtimer.h>
-#include <ScStw.hpp>
-#include <scstwclient.h>
+#include <scstwlibraries.h>
+#include <scstwstyling.h>
 
 #include "headers/scstwmonitorbackend.h"
 #if defined(Q_OS_IOS)
@@ -25,17 +23,12 @@ int main(int argc, char *argv[])
     app.setOrganizationDomain("itsblue.de");
 
     qmlRegisterType<ScStwMonitorBackend>("de.itsblue.ScStwMonitor", 2, 0, "ScStwMonitorBackend");
-    // setup speed backend and App themes
-    qmlRegisterType<ScStwRace>("de.itsblue.ScStw", 2, 0, "ScStwRace");
-    qmlRegisterType<ScStwTimer>("de.itsblue.ScStw", 2, 0, "ScStwTimer");
-    qmlRegisterType<ScStw>("de.itsblue.ScStw", 2, 0, "ScStw");
-    qmlRegisterType<ScStwClient>("de.itsblue.ScStw", 2, 0, "ScStwClient");
-    //qmlRegisterUncreatableType<ScStwAppTheme>("de.itsblue.ScStw", 2, 0, "ScStwAppTheme", "The ScStwAppTheme has to be managed by a ScStwAppTheme manager and is therefore not creatable");
-    //qmlRegisterType<ScStwAppThemeManager>("de.itsblue.ScStw", 2, 0, "ScStwAppThemeManager");
-
 
     QQmlApplicationEngine engine;
 
+    ScStwLibraries::init();
+    ScStwStyling::init(&engine);
+
     QSize size = app.screens().first()->size();
     engine.rootContext()->setContextProperty("XscreenHeight", size.height());
     engine.rootContext()->setContextProperty("XscreenWidth", size.width());