diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
index f717836e..9f16675b 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
@@ -43,41 +43,41 @@ Item {
     Connections {
         function onCreateWallpaperStateChanged(state) {
             switch (state) {
-            case ImportVideoState.ConvertingPreviewImage:
+            case Import.State.ConvertingPreviewImage:
                 txtConvert.text = qsTr("Generating preview image...");
                 break;
-            case ImportVideoState.ConvertingPreviewThumbnailImage:
+            case Import.State.ConvertingPreviewThumbnailImage:
                 txtConvert.text = qsTr("Generating preview thumbnail image...");
                 break;
-            case ImportVideoState.ConvertingPreviewImageFinished:
+            case Import.State.ConvertingPreviewImageFinished:
                 imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
                 imgPreview.visible = true;
                 break;
-            case ImportVideoState.ConvertingPreviewVideo:
+            case Import.State.ConvertingPreviewVideo:
                 txtConvert.text = qsTr("Generating 5 second preview video...");
                 break;
-            case ImportVideoState.ConvertingPreviewGif:
+            case Import.State.ConvertingPreviewGif:
                 txtConvert.text = qsTr("Generating preview gif...");
                 break;
-            case ImportVideoState.ConvertingPreviewGifFinished:
+            case Import.State.ConvertingPreviewGifFinished:
                 gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
                 imgPreview.visible = false;
                 gifPreview.visible = true;
                 gifPreview.playing = true;
                 break;
-            case ImportVideoState.ConvertingAudio:
+            case Import.State.ConvertingAudio:
                 txtConvert.text = qsTr("Converting Audio...");
                 break;
-            case ImportVideoState.ConvertingVideo:
+            case Import.State.ConvertingVideo:
                 txtConvert.text = qsTr("Converting Video... This can take some time!");
                 break;
-            case ImportVideoState.ConvertingVideoError:
+            case Import.State.ConvertingVideoError:
                 txtConvert.text = qsTr("Converting Video ERROR!");
                 break;
-            case ImportVideoState.AnalyseVideoError:
+            case Import.State.AnalyseVideoError:
                 txtConvert.text = qsTr("Analyse Video ERROR!");
                 break;
-            case ImportVideoState.Finished:
+            case Import.State.Finished:
                 txtConvert.text = "";
                 conversionFinishedSuccessful = true;
                 busyIndicator.running = false;
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
index 4732d307..83373dd9 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
@@ -38,44 +38,44 @@ Item {
     Connections {
         function onCreateWallpaperStateChanged(state) {
             switch (state) {
-            case ImportVideoState.AnalyseVideo:
+            case Import.State.AnalyseVideo:
                 txtConvert.text = qsTr("AnalyseVideo...");
                 break;
-            case ImportVideoState.ConvertingPreviewImage:
+            case Import.State.ConvertingPreviewImage:
                 txtConvert.text = qsTr("Generating preview image...");
                 break;
-            case ImportVideoState.ConvertingPreviewThumbnailImage:
+            case Import.State.ConvertingPreviewThumbnailImage:
                 txtConvert.text = qsTr("Generating preview thumbnail image...");
                 break;
-            case ImportVideoState.ConvertingPreviewImageFinished:
+            case Import.State.ConvertingPreviewImageFinished:
                 imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
                 imgPreview.visible = true;
                 break;
-            case ImportVideoState.ConvertingPreviewVideo:
+            case Import.State.ConvertingPreviewVideo:
                 txtConvert.text = qsTr("Generating 5 second preview video...");
                 break;
-            case ImportVideoState.ConvertingPreviewGif:
+            case Import.State.ConvertingPreviewGif:
                 txtConvert.text = qsTr("Generating preview gif...");
                 break;
-            case ImportVideoState.ConvertingPreviewGifFinished:
+            case Import.State.ConvertingPreviewGifFinished:
                 gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
                 imgPreview.visible = false;
                 gifPreview.visible = true;
                 gifPreview.playing = true;
                 break;
-            case ImportVideoState.ConvertingAudio:
+            case Import.State.ConvertingAudio:
                 txtConvert.text = qsTr("Converting Audio...");
                 break;
-            case ImportVideoState.ConvertingVideo:
+            case Import.State.ConvertingVideo:
                 txtConvert.text = qsTr("Converting Video... This can take some time!");
                 break;
-            case ImportVideoState.ConvertingVideoError:
+            case Import.State.ConvertingVideoError:
                 txtConvert.text = qsTr("Converting Video ERROR!");
                 break;
-            case ImportVideoState.AnalyseVideoError:
+            case Import.State.AnalyseVideoError:
                 txtConvert.text = qsTr("Analyse Video ERROR!");
                 break;
-            case ImportVideoState.Finished:
+            case Import.State.Finished:
                 txtConvert.text = "";
                 conversionFinishedSuccessful = true;
                 busyIndicator.running = false;
diff --git a/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml b/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml
index f93071ac..55cf0919 100644
--- a/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml
+++ b/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml
@@ -38,44 +38,44 @@ Item {
     Connections {
         function onCreateWallpaperStateChanged(state) {
             switch (state) {
-            case ImportVideoState.AnalyseVideo:
+            case Import.State.AnalyseVideo:
                 txtConvert.text = qsTr("AnalyseVideo...");
                 break;
-            case ImportVideoState.ConvertingPreviewImage:
+            case Import.State.ConvertingPreviewImage:
                 txtConvert.text = qsTr("Generating preview image...");
                 break;
-            case ImportVideoState.ConvertingPreviewThumbnailImage:
+            case Import.State.ConvertingPreviewThumbnailImage:
                 txtConvert.text = qsTr("Generating preview thumbnail image...");
                 break;
-            case ImportVideoState.ConvertingPreviewImageFinished:
+            case Import.State.ConvertingPreviewImageFinished:
                 imgPreview.source = "file:///" + App.create.workingDir + "/preview.jpg";
                 imgPreview.visible = true;
                 break;
-            case ImportVideoState.ConvertingPreviewVideo:
+            case Import.State.ConvertingPreviewVideo:
                 txtConvert.text = qsTr("Generating 5 second preview video...");
                 break;
-            case ImportVideoState.ConvertingPreviewGif:
+            case Import.State.ConvertingPreviewGif:
                 txtConvert.text = qsTr("Generating preview gif...");
                 break;
-            case ImportVideoState.ConvertingPreviewGifFinished:
+            case Import.State.ConvertingPreviewGifFinished:
                 gifPreview.source = "file:///" + App.create.workingDir + "/preview.gif";
                 imgPreview.visible = false;
                 gifPreview.visible = true;
                 gifPreview.playing = true;
                 break;
-            case ImportVideoState.ConvertingAudio:
+            case Import.State.ConvertingAudio:
                 txtConvert.text = qsTr("Converting Audio...");
                 break;
-            case ImportVideoState.ConvertingVideo:
+            case Import.State.ConvertingVideo:
                 txtConvert.text = qsTr("Converting Video... This can take some time!");
                 break;
-            case ImportVideoState.ConvertingVideoError:
+            case Import.State.ConvertingVideoError:
                 txtConvert.text = qsTr("Converting Video ERROR!");
                 break;
-            case ImportVideoState.AnalyseVideoError:
+            case Import.State.AnalyseVideoError:
                 txtConvert.text = qsTr("Analyse Video ERROR!");
                 break;
-            case ImportVideoState.Finished:
+            case Import.State.Finished:
                 txtConvert.text = "";
                 conversionFinishedSuccessful = true;
                 busyIndicator.running = false;
diff --git a/ScreenPlayUtil/src/util.cpp b/ScreenPlayUtil/src/util.cpp
index b78d4e27..0e8064fd 100644
--- a/ScreenPlayUtil/src/util.cpp
+++ b/ScreenPlayUtil/src/util.cpp
@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
 #include "ScreenPlayUtil/util.h"
 #include "qguiapplication.h"
+
 #include <QDesktopServices>
 #include <QFile>
 #include <QJsonParseError>
 #include <QRandomGenerator>
 
+#include "core/qcoroprocess.h"
 /*!
     \module ScreenPlayUtil
     \title ScreenPlayUtil
diff --git a/ScreenPlayWidget/qml/Widget.qml b/ScreenPlayWidget/qml/Widget.qml
index 601dfa84..5093ce99 100644
--- a/ScreenPlayWidget/qml/Widget.qml
+++ b/ScreenPlayWidget/qml/Widget.qml
@@ -76,10 +76,10 @@ Item {
         asynchronous: true
         Component.onCompleted: {
             switch (Widget.type) {
-            case ContentTypes.InstalledType.QMLWidget:
+            case Util.ContentTypes.InstalledType.QMLWidget:
                 loader.source = Qt.resolvedUrl(Widget.projectSourceFileAbsolute);
                 break;
-            case ContentTypes.InstalledType.HTMLWidget:
+            case Util.ContentTypes.InstalledType.HTMLWidget:
                 loader.sourceComponent = webViewComponent;
                 break;
             }
diff --git a/ScreenPlayWorkshop/CMakeLists.txt b/ScreenPlayWorkshop/CMakeLists.txt
index 7ea7f690..0317e549 100644
--- a/ScreenPlayWorkshop/CMakeLists.txt
+++ b/ScreenPlayWorkshop/CMakeLists.txt
@@ -133,6 +133,7 @@ if(${SCREENPLAY_STEAM})
         configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${MACOS_FRAMEWORKS_DIR} COPYONLY)
         configure_file(${STEAM_BIN} ${MACOS_FRAMEWORKS_DIR} COPYONLY)
     else()
+        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY)
         configure_file(${STEAM_BIN} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY)
     endif()
 
diff --git a/ScreenPlayWorkshop/qml/PopupOffline.qml b/ScreenPlayWorkshop/qml/PopupOffline.qml
index 3ae03910..db0eaed7 100644
--- a/ScreenPlayWorkshop/qml/PopupOffline.qml
+++ b/ScreenPlayWorkshop/qml/PopupOffline.qml
@@ -5,6 +5,8 @@ import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
 import ScreenPlayWorkshop
 import ScreenPlayUtil
+import ScreenPlay
+import ScreenPlayApp
 
 Popup {
     id: root