diff --git a/ScreenPlay/qml/Installed/InstalledView.qml b/ScreenPlay/qml/Installed/InstalledView.qml
index 9423166d..ffc69c8a 100644
--- a/ScreenPlay/qml/Installed/InstalledView.qml
+++ b/ScreenPlay/qml/Installed/InstalledView.qml
@@ -242,7 +242,7 @@ Item {
                 // call popup when we are in the closing animtion.
                 if (contextMenu.visible || contextMenu.opened)
                     return;
-                if (delegate.type === InstalledType.GodotWallpaper) {
+                if (delegate.type === ContentTypes.InstalledType.GodotWallpaper) {
                     contextMenu.godotItem = editGodotWallpaperComp.createObject();
                     contextMenu.insertItem(0, contextMenu.godotItem);
                 }
@@ -260,7 +260,7 @@ Item {
         MenuItem {
             text: qsTr("Edit Wallpaper")
             objectName: "editWallpaper"
-            enabled: contextMenu.type === InstalledType.GodotWallpaper
+            enabled: contextMenu.type === ContentTypes.InstalledType.GodotWallpaper
             icon.source: "qrc:/qml/ScreenPlayApp/assets/icons/icon_edit.svg"
             onClicked: {
                 App.util.openGodotEditor(contextMenu.absoluteStoragePath);
diff --git a/ScreenPlay/qml/Installed/ScreenPlayItem.qml b/ScreenPlay/qml/Installed/ScreenPlayItem.qml
index 77800fed..85b9fea9 100644
--- a/ScreenPlay/qml/Installed/ScreenPlayItem.qml
+++ b/ScreenPlay/qml/Installed/ScreenPlayItem.qml
@@ -12,7 +12,7 @@ Item {
     property string customTitle
     property string screenId
     property url absoluteStoragePath
-    property int type: InstalledType.Unknown
+    property int type: ContentTypes.InstalledType.Unknown
     // Must be var to make it work wit 64bit ints
     property var publishedFileID: 0
     property int itemIndex
diff --git a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
index a60eedc7..213afce4 100644
--- a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
+++ b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
@@ -6,7 +6,7 @@ Item {
     property string absoluteStoragePath
     property string sourceImage
     property string sourceImageGIF
-    property var type: InstalledType.Unknown
+    property var type: ContentTypes.InstalledType.Unknown
 
     function enter() {
         if (root.sourceImageGIF != "")
diff --git a/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml b/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
index 7aab110a..7077e638 100644
--- a/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
+++ b/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
@@ -17,7 +17,7 @@ Item {
 
     property string previewImage
     property string appID
-    property var installedType: InstalledType.QMLWallpaper
+    property var installedType: ContentTypes.InstalledType.QMLWallpaper
     property bool monitorWithoutContentSelectable: true
     property bool hasContent: appID !== ""
     property int fontSize: 10
diff --git a/ScreenPlay/qml/Monitors/MonitorsView.qml b/ScreenPlay/qml/Monitors/MonitorsView.qml
index b5cb3c17..73460367 100644
--- a/ScreenPlay/qml/Monitors/MonitorsView.qml
+++ b/ScreenPlay/qml/Monitors/MonitorsView.qml
@@ -6,7 +6,6 @@ import QtQuick.Layouts
 import QtQuick.Controls.Material.impl
 import ScreenPlayApp
 import ScreenPlay
-
 import ScreenPlayUtil as Util
 
 Util.Popup {
@@ -80,7 +79,7 @@ Util.Popup {
                 availableWidth: width - 20
                 availableHeight: 150
                 onRequestProjectSettings: function (index, installedType, appID) {
-                    if (installedType === InstalledType.VideoWallpaper) {
+                    if (installedType === Util.ContentTypes.InstalledType.VideoWallpaper) {
                         videoControlWrapper.state = "visible";
                         customPropertiesGridView.visible = false;
                         const wallpaper = App.screenPlayManager.getWallpaperByAppID(appID);
diff --git a/ScreenPlayWallpaper/qml/Wallpaper.qml b/ScreenPlayWallpaper/qml/Wallpaper.qml
index 6dc096bd..368a0e75 100644
--- a/ScreenPlayWallpaper/qml/Wallpaper.qml
+++ b/ScreenPlayWallpaper/qml/Wallpaper.qml
@@ -13,8 +13,8 @@ Rectangle {
     function start() {
         fadeInImageSetup();
         switch (Wallpaper.type) {
-        case InstalledType.VideoWallpaper:
-            if (Wallpaper.videoCodec === VideoCodec.Unknown) {
+        case ContentTypes.InstalledType.VideoWallpaper:
+            if (Wallpaper.videoCodec === Video.VideoCodec.Unknown) {
                 Wallpaper.terminate();
             }
 
@@ -30,20 +30,20 @@ Rectangle {
                 loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
             }
             break;
-        case InstalledType.HTMLWallpaper:
+        case ContentTypes.InstalledType.HTMLWallpaper:
             loader.setSource("qrc:/qml/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml", {
                     "url": Qt.resolvedUrl(Wallpaper.projectSourceFileAbsolute)
                 });
             break;
-        case InstalledType.QMLWallpaper:
+        case ContentTypes.InstalledType.QMLWallpaper:
             loader.source = Qt.resolvedUrl(Wallpaper.projectSourceFileAbsolute);
             break;
-        case InstalledType.WebsiteWallpaper:
+        case ContentTypes.InstalledType.WebsiteWallpaper:
             loader.setSource("qrc:/qml/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml", {
                     "url": Wallpaper.projectSourceFileAbsolute
                 });
             break;
-        case InstalledType.GifWallpaper:
+        case ContentTypes.InstalledType.GifWallpaper:
             loader.setSource("qrc:/qml/ScreenPlayWallpaper/qml/GifWallpaper.qml", {
                     "source": Qt.resolvedUrl(Wallpaper.projectSourceFileAbsolute)
                 });
@@ -170,7 +170,7 @@ Rectangle {
         function onReloadVideo(oldType) {
             // We need to check if the old type
             // was also Video not get called twice
-            if (oldType === InstalledType.VideoWallpaper)
+            if (oldType === ContentTypes.InstalledType.VideoWallpaper)
                 return;
             loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
         }
@@ -183,7 +183,7 @@ Rectangle {
         //asynchronous: true
         onStatusChanged: {
             if (loader.status === Loader.Ready) {
-                if (Wallpaper.type === InstalledType.QMLWallpaper) {
+                if (Wallpaper.type === ContentTypes.InstalledType.QMLWallpaper) {
                     root.fadeIn();
                 }
             }
diff --git a/ScreenPlayWidget/qml/Widget.qml b/ScreenPlayWidget/qml/Widget.qml
index e47d30c8..d5f68ddc 100644
--- a/ScreenPlayWidget/qml/Widget.qml
+++ b/ScreenPlayWidget/qml/Widget.qml
@@ -77,10 +77,10 @@ Item {
         asynchronous: true
         Component.onCompleted: {
             switch (Widget.type) {
-            case InstalledType.QMLWidget:
+            case ContentTypes.InstalledType.QMLWidget:
                 loader.source = Qt.resolvedUrl(Widget.projectSourceFileAbsolute);
                 break;
-            case InstalledType.HTMLWidget:
+            case ContentTypes.InstalledType.HTMLWidget:
                 loader.sourceComponent = webViewComponent;
                 break;
             }