From b0c36c4c673370c7695aa77eaca86e566292e2d7 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Fri, 10 Sep 2021 12:45:15 +0200
Subject: [PATCH] Remove versioned qml imports #2

Fix some labs file dialogs
---
 ScreenPlay/main.qml                           |  10 +-
 ScreenPlay/qml/Common/Background.qml          |   4 +-
 ScreenPlay/qml/Common/CloseIcon.qml           |   4 +-
 ScreenPlay/qml/Common/ColorPicker.qml         |   6 +-
 .../qml/Common/Dialogs/CriticalError.qml      |  10 +-
 .../Common/Dialogs/MonitorConfiguration.qml   |   8 +-
 .../qml/Common/Dialogs/SteamNotAvailable.qml  |   6 +-
 ScreenPlay/qml/Common/FileSelector.qml        |  12 +-
 ScreenPlay/qml/Common/Grow.qml                |   2 +-
 ScreenPlay/qml/Common/GrowIconLink.qml        |   2 +-
 ScreenPlay/qml/Common/Headline.qml            |   4 +-
 ScreenPlay/qml/Common/HeadlineSection.qml     |   4 +-
 ScreenPlay/qml/Common/ImageSelector.qml       |   8 +-
 ScreenPlay/qml/Common/LicenseSelector.qml     |   8 +-
 ScreenPlay/qml/Common/RippleEffect.qml        |   2 +-
 ScreenPlay/qml/Common/Search.qml              |   2 +-
 ScreenPlay/qml/Common/Shake.qml               |   2 +-
 ScreenPlay/qml/Common/Slider.qml              |   6 +-
 ScreenPlay/qml/Common/Tag.qml                 |   6 +-
 ScreenPlay/qml/Common/TagSelector.qml         |   6 +-
 ScreenPlay/qml/Common/TextField.qml           |  10 +-
 ScreenPlay/qml/Community/Community.qml        |  10 +-
 ScreenPlay/qml/Community/CommunityNavItem.qml |   6 +-
 ScreenPlay/qml/Community/XMLNewsfeed.qml      |   8 +-
 ScreenPlay/qml/Create/Create.qml              |  10 +-
 ScreenPlay/qml/Create/Sidebar.qml             |  10 +-
 ScreenPlay/qml/Create/StartInfo.qml           |  10 +-
 ScreenPlay/qml/Create/StartInfoLinkImage.qml  |  10 +-
 ScreenPlay/qml/Create/Wizard.qml              |   8 +-
 .../qml/Create/Wizards/GifWallpaper.qml       |   9 +-
 .../qml/Create/Wizards/HTMLWallpaper.qml      |   8 +-
 ScreenPlay/qml/Create/Wizards/HTMLWidget.qml  |   8 +-
 .../ImportVideoAndConvert/CreateWallpaper.qml |  49 +++---
 .../CreateWallpaperInit.qml                   |  12 +-
 .../CreateWallpaperResult.qml                 |   8 +-
 .../CreateWallpaperVideoImportConvert.qml     |   8 +-
 .../Create/Wizards/ImportWebm/ImportWebm.qml  |  10 +-
 .../Wizards/ImportWebm/ImportWebmConvert.qml  |   8 +-
 .../Wizards/ImportWebm/ImportWebmInit.qml     |  12 +-
 .../qml/Create/Wizards/QMLWallpaper.qml       |   8 +-
 ScreenPlay/qml/Create/Wizards/QMLWidget.qml   |   8 +-
 .../qml/Create/Wizards/WebsiteWallpaper.qml   |   8 +-
 ScreenPlay/qml/Create/Wizards/WizardPage.qml  |  10 +-
 .../Create/WizardsFiles/QMLWallpaperMain.qml  |   2 +-
 .../qml/Create/WizardsFiles/QMLWidgetMain.qml |   2 +-
 ScreenPlay/qml/Installed/Installed.qml        |  10 +-
 .../qml/Installed/InstalledWelcomeScreen.qml  |   6 +-
 ScreenPlay/qml/Installed/Navigation.qml       |   6 +-
 ScreenPlay/qml/Installed/ScreenPlayItem.qml   |   6 +-
 .../qml/Installed/ScreenPlayItemImage.qml     |   2 +-
 ScreenPlay/qml/Installed/Sidebar.qml          |  10 +-
 .../qml/Monitors/DefaultVideoControls.qml     |   8 +-
 ScreenPlay/qml/Monitors/MonitorSelection.qml  |   7 +-
 .../qml/Monitors/MonitorSelectionItem.qml     |   4 +-
 ScreenPlay/qml/Monitors/Monitors.qml          |  10 +-
 .../Monitors/MonitorsProjectSettingItem.qml   |   8 +-
 ScreenPlay/qml/Monitors/SaveNotification.qml  |   8 +-
 ScreenPlay/qml/Navigation/Navigation.qml      |   8 +-
 ScreenPlay/qml/Navigation/NavigationItem.qml  |   4 +-
 .../NavigationWallpaperConfiguration.qml      |   6 +-
 ScreenPlay/qml/Settings/SettingBool.qml       |   8 +-
 ScreenPlay/qml/Settings/Settings.qml          |   9 +-
 ScreenPlay/qml/Settings/SettingsButton.qml    |   8 +-
 ScreenPlay/qml/Settings/SettingsComboBox.qml  |   8 +-
 ScreenPlay/qml/Settings/SettingsExpander.qml  |   9 +-
 ScreenPlay/qml/Settings/SettingsHeader.qml    |   4 +-
 .../Settings/SettingsHorizontalSeperator.qml  |   4 +-
 ScreenPlay/qml/Settings/SettingsPage.qml      |  11 +-
 ScreenPlay/qml/Workshop/Background.qml        |   2 +-
 ScreenPlay/qml/Workshop/Navigation.qml        |   8 +-
 ScreenPlay/qml/Workshop/PopupOffline.qml      |   4 +-
 ScreenPlay/qml/Workshop/ScreenPlayItem.qml    |   3 +-
 .../qml/Workshop/ScreenPlayItemImage.qml      |   2 +-
 ScreenPlay/qml/Workshop/Sidebar.qml           | 148 ++++++++----------
 ScreenPlay/qml/Workshop/SteamProfile.qml      |   8 +-
 ScreenPlay/qml/Workshop/SteamWorkshop.qml     |   8 +-
 ScreenPlay/qml/Workshop/Workshop.qml          |   8 +-
 ScreenPlay/qml/Workshop/WorkshopInstalled.qml |   4 +-
 ScreenPlay/qml/Workshop/WorkshopItem.qml      |   6 +-
 .../upload/PopupSteamWorkshopAgreement.qml    |   8 +-
 .../qml/Workshop/upload/UploadProject.qml     |   8 +-
 .../Workshop/upload/UploadProjectBigItem.qml  |  10 +-
 .../qml/Workshop/upload/UploadProjectItem.qml |  10 +-
 ScreenPlay/translations/ScreenPlay_vi.qm      | Bin 37082 -> 36920 bytes
 ScreenPlayShader/ShadertoyShader.qml          |   4 +-
 .../kde/ScreenPlay/contents/ui/config.qml     |   6 +-
 .../kde/ScreenPlay/contents/ui/main.qml       |   6 +-
 ScreenPlayWallpaper/main.cpp                  |   4 +-
 ScreenPlayWallpaper/qml/Test.qml              |   6 +-
 ScreenPlayWallpaper/qml/Wallpaper.qml         |   6 +-
 ScreenPlayWallpaper/qml/WebView.qml           |   2 +-
 ScreenPlayWallpaper/qml/WebsiteWallpaper.qml  |   4 +-
 ScreenPlayWidget/qml/Test.qml                 |   2 +-
 ScreenPlayWidget/qml/Widget.qml               |   8 +-
 94 files changed, 394 insertions(+), 419 deletions(-)

diff --git a/ScreenPlay/main.qml b/ScreenPlay/main.qml
index e6fc9ec4..5368e25b 100644
--- a/ScreenPlay/main.qml
+++ b/ScreenPlay/main.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import Settings 1.0
 import Qt5Compat.GraphicalEffects
diff --git a/ScreenPlay/qml/Common/Background.qml b/ScreenPlay/qml/Common/Background.qml
index 955bd7c2..e8482710 100644
--- a/ScreenPlay/qml/Common/Background.qml
+++ b/ScreenPlay/qml/Common/Background.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
 import QtQuick.Particles 2.0
 
diff --git a/ScreenPlay/qml/Common/CloseIcon.qml b/ScreenPlay/qml/Common/CloseIcon.qml
index fb9f61b9..5a4f94d1 100644
--- a/ScreenPlay/qml/Common/CloseIcon.qml
+++ b/ScreenPlay/qml/Common/CloseIcon.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.3
+import QtQuick.Controls.Material
 
 /*!
    \qmltype Close Icon
diff --git a/ScreenPlay/qml/Common/ColorPicker.qml b/ScreenPlay/qml/Common/ColorPicker.qml
index 0fcbdc6e..912aa256 100644
--- a/ScreenPlay/qml/Common/ColorPicker.qml
+++ b/ScreenPlay/qml/Common/ColorPicker.qml
@@ -24,9 +24,9 @@
     SOFTWARE.
 */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 import QtQuick.Shapes 1.12
 
 Pane {
diff --git a/ScreenPlay/qml/Common/Dialogs/CriticalError.qml b/ScreenPlay/qml/Common/Dialogs/CriticalError.qml
index 71fa78ab..b27bbcaf 100644
--- a/ScreenPlay/qml/Common/Dialogs/CriticalError.qml
+++ b/ScreenPlay/qml/Common/Dialogs/CriticalError.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls.Material 2.12
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Window
 import Qt5Compat.GraphicalEffects
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Common/Dialogs/MonitorConfiguration.qml b/ScreenPlay/qml/Common/Dialogs/MonitorConfiguration.qml
index 47a1c37b..2c946a08 100644
--- a/ScreenPlay/qml/Common/Dialogs/MonitorConfiguration.qml
+++ b/ScreenPlay/qml/Common/Dialogs/MonitorConfiguration.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Dialog {
diff --git a/ScreenPlay/qml/Common/Dialogs/SteamNotAvailable.qml b/ScreenPlay/qml/Common/Dialogs/SteamNotAvailable.qml
index 164c86c2..bca4cdca 100644
--- a/ScreenPlay/qml/Common/Dialogs/SteamNotAvailable.qml
+++ b/ScreenPlay/qml/Common/Dialogs/SteamNotAvailable.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Dialog {
     id: dialogSteam
diff --git a/ScreenPlay/qml/Common/FileSelector.qml b/ScreenPlay/qml/Common/FileSelector.qml
index d023db32..d9613ee9 100644
--- a/ScreenPlay/qml/Common/FileSelector.qml
+++ b/ScreenPlay/qml/Common/FileSelector.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Dialogs
 import ScreenPlay 1.0
 
 /*!
@@ -141,8 +141,8 @@ Item {
 
             title: qsTr("Please choose a file")
             onAccepted: {
-                root.file = fileDialog.fileUrl;
-                txtName.text = fileDialog.fileUrl.toString();
+                root.file = fileDialog.currentFile ;
+                txtName.text = fileDialog.currentFile.toString();
             }
         }
 
diff --git a/ScreenPlay/qml/Common/Grow.qml b/ScreenPlay/qml/Common/Grow.qml
index e04290e0..5413947e 100644
--- a/ScreenPlay/qml/Common/Grow.qml
+++ b/ScreenPlay/qml/Common/Grow.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Scale {
     id: root
diff --git a/ScreenPlay/qml/Common/GrowIconLink.qml b/ScreenPlay/qml/Common/GrowIconLink.qml
index 3c07ccdd..53409750 100644
--- a/ScreenPlay/qml/Common/GrowIconLink.qml
+++ b/ScreenPlay/qml/Common/GrowIconLink.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 
 Rectangle {
     id: root
diff --git a/ScreenPlay/qml/Common/Headline.qml b/ScreenPlay/qml/Common/Headline.qml
index fc43da7b..aaeee49c 100644
--- a/ScreenPlay/qml/Common/Headline.qml
+++ b/ScreenPlay/qml/Common/Headline.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Common/HeadlineSection.qml b/ScreenPlay/qml/Common/HeadlineSection.qml
index d660a500..fe749788 100644
--- a/ScreenPlay/qml/Common/HeadlineSection.qml
+++ b/ScreenPlay/qml/Common/HeadlineSection.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Text {
diff --git a/ScreenPlay/qml/Common/ImageSelector.qml b/ScreenPlay/qml/Common/ImageSelector.qml
index efc0301a..08b3f4c3 100644
--- a/ScreenPlay/qml/Common/ImageSelector.qml
+++ b/ScreenPlay/qml/Common/ImageSelector.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Dialogs
 import ScreenPlay 1.0
 
 /*!
diff --git a/ScreenPlay/qml/Common/LicenseSelector.qml b/ScreenPlay/qml/Common/LicenseSelector.qml
index 762928f8..cbd2f3e2 100644
--- a/ScreenPlay/qml/Common/LicenseSelector.qml
+++ b/ScreenPlay/qml/Common/LicenseSelector.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 
 ColumnLayout {
diff --git a/ScreenPlay/qml/Common/RippleEffect.qml b/ScreenPlay/qml/Common/RippleEffect.qml
index a109780e..da833dfc 100644
--- a/ScreenPlay/qml/Common/RippleEffect.qml
+++ b/ScreenPlay/qml/Common/RippleEffect.qml
@@ -6,7 +6,7 @@
 
 import QtQuick 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 
 Item {
     id: root
diff --git a/ScreenPlay/qml/Common/Search.qml b/ScreenPlay/qml/Common/Search.qml
index 1374a3a6..059e94b8 100644
--- a/ScreenPlay/qml/Common/Search.qml
+++ b/ScreenPlay/qml/Common/Search.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick.Controls
 import QtQuick.Controls.Material 2.0
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Common/Shake.qml b/ScreenPlay/qml/Common/Shake.qml
index f17d0ee0..bc1ba60b 100644
--- a/ScreenPlay/qml/Common/Shake.qml
+++ b/ScreenPlay/qml/Common/Shake.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Translate {
     id: root
diff --git a/ScreenPlay/qml/Common/Slider.qml b/ScreenPlay/qml/Common/Slider.qml
index 01cf17b7..694a0940 100644
--- a/ScreenPlay/qml/Common/Slider.qml
+++ b/ScreenPlay/qml/Common/Slider.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
+import QtQuick
 import QtQuick.Controls.Material 2.0 as QQCM
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.2 as QQC
+import QtQuick.Layouts
+import QtQuick.Controls as QQC
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Common/Tag.qml b/ScreenPlay/qml/Common/Tag.qml
index 86379791..5c56f093 100644
--- a/ScreenPlay/qml/Common/Tag.qml
+++ b/ScreenPlay/qml/Common/Tag.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Common/TagSelector.qml b/ScreenPlay/qml/Common/TagSelector.qml
index 3be4ebaf..5554852c 100644
--- a/ScreenPlay/qml/Common/TagSelector.qml
+++ b/ScreenPlay/qml/Common/TagSelector.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Common/TextField.qml b/ScreenPlay/qml/Common/TextField.qml
index d45d6eec..78c1e9c7 100644
--- a/ScreenPlay/qml/Common/TextField.qml
+++ b/ScreenPlay/qml/Common/TextField.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Window 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls 2.14 as QQC
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls.Material
+import QtQuick.Controls as QQC
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.14
+import QtQuick.Layouts
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Community/Community.qml b/ScreenPlay/qml/Community/Community.qml
index d2e9b473..60fae792 100644
--- a/ScreenPlay/qml/Community/Community.qml
+++ b/ScreenPlay/qml/Community/Community.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 import ScreenPlay 1.0
-import QtWebEngine 1.8
+import QtWebEngine
 
 Item {
     id: root
diff --git a/ScreenPlay/qml/Community/CommunityNavItem.qml b/ScreenPlay/qml/Community/CommunityNavItem.qml
index 0de84736..25f71c62 100644
--- a/ScreenPlay/qml/Community/CommunityNavItem.qml
+++ b/ScreenPlay/qml/Community/CommunityNavItem.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 TabButton {
diff --git a/ScreenPlay/qml/Community/XMLNewsfeed.qml b/ScreenPlay/qml/Community/XMLNewsfeed.qml
index b19e8766..28f4e77c 100644
--- a/ScreenPlay/qml/Community/XMLNewsfeed.qml
+++ b/ScreenPlay/qml/Community/XMLNewsfeed.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 import QtQml.XmlListModel
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Create/Create.qml b/ScreenPlay/qml/Create/Create.qml
index 9a963522..7d2af216 100644
--- a/ScreenPlay/qml/Create/Create.qml
+++ b/ScreenPlay/qml/Create/Create.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import QtQuick.Particles 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.QMLUtilities 1.0
diff --git a/ScreenPlay/qml/Create/Sidebar.qml b/ScreenPlay/qml/Create/Sidebar.qml
index 7d6d1f98..59eeb452 100644
--- a/ScreenPlay/qml/Create/Sidebar.qml
+++ b/ScreenPlay/qml/Create/Sidebar.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import QtQuick.Particles 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.QMLUtilities 1.0
diff --git a/ScreenPlay/qml/Create/StartInfo.qml b/ScreenPlay/qml/Create/StartInfo.qml
index 65fdef35..a2a96678 100644
--- a/ScreenPlay/qml/Create/StartInfo.qml
+++ b/ScreenPlay/qml/Create/StartInfo.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts 
+import QtQuick.Controls.Material
 import QtQuick.Particles 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.QMLUtilities 1.0
diff --git a/ScreenPlay/qml/Create/StartInfoLinkImage.qml b/ScreenPlay/qml/Create/StartInfoLinkImage.qml
index 65c6d3e0..7cece2ec 100644
--- a/ScreenPlay/qml/Create/StartInfoLinkImage.qml
+++ b/ScreenPlay/qml/Create/StartInfoLinkImage.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts 
+import QtQuick.Controls.Material
 import QtQuick.Particles 2.0
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.QMLUtilities 1.0
diff --git a/ScreenPlay/qml/Create/Wizard.qml b/ScreenPlay/qml/Create/Wizard.qml
index 6362805d..678e30d6 100644
--- a/ScreenPlay/qml/Create/Wizard.qml
+++ b/ScreenPlay/qml/Create/Wizard.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.3
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../Common"
diff --git a/ScreenPlay/qml/Create/Wizards/GifWallpaper.qml b/ScreenPlay/qml/Create/Wizards/GifWallpaper.qml
index f3912f40..e657fb22 100644
--- a/ScreenPlay/qml/Create/Wizards/GifWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/GifWallpaper.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Controls.Material
+import QtQuick.Controls
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import "../../Common" as Common
 
diff --git a/ScreenPlay/qml/Create/Wizards/HTMLWallpaper.qml b/ScreenPlay/qml/Create/Wizards/HTMLWallpaper.qml
index dbe77d13..fb8b47e8 100644
--- a/ScreenPlay/qml/Create/Wizards/HTMLWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/HTMLWallpaper.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../../Common" as Common
diff --git a/ScreenPlay/qml/Create/Wizards/HTMLWidget.qml b/ScreenPlay/qml/Create/Wizards/HTMLWidget.qml
index 0c8084b5..c32c08fd 100644
--- a/ScreenPlay/qml/Create/Wizards/HTMLWidget.qml
+++ b/ScreenPlay/qml/Create/Wizards/HTMLWidget.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls.Material
+import QtQuick.Controls
+import QtQuick.Layouts
 
 import ScreenPlay 1.0
 import "../../Common" as Common
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaper.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaper.qml
index f25eb0c0..06e55608 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaper.qml
@@ -1,17 +1,17 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 
 Item {
     id: root
 
-    signal wizardStarted()
-    signal wizardExited()
-    signal next()
+    signal wizardStarted
+    signal wizardExited
+    signal next
 
     SwipeView {
         id: swipeView
@@ -21,26 +21,25 @@ Item {
         clip: true
 
         CreateWallpaperInit {
-            onNext: startConvert(filePath,codec);
-            function startConvert(filePath,codec){
-                root.wizardStarted();
-                swipeView.currentIndex = 1;
-                createWallpaperVideoImportConvert.codec = codec;
-                createWallpaperVideoImportConvert.filePath = filePath;
-                ScreenPlay.create.createWallpaperStart(filePath, codec, quality);
+            onNext: (filePath, codec) => {
+                         startConvert(filePath, codec)
+                    }
 
-            }
+        function startConvert(filePath, codec) {
+            root.wizardStarted()
+            swipeView.currentIndex = 1
+            createWallpaperVideoImportConvert.codec = codec
+            createWallpaperVideoImportConvert.filePath = filePath
+            ScreenPlay.create.createWallpaperStart(filePath, codec, quality)
         }
-
-        CreateWallpaperVideoImportConvert {
-            id: createWallpaperVideoImportConvert
-
-            onAbort: root.wizardExited()
-        }
-
-        CreateWallpaperResult {
-        }
-
     }
 
+    CreateWallpaperVideoImportConvert {
+        id: createWallpaperVideoImportConvert
+
+        onAbort: root.wizardExited()
+    }
+
+    CreateWallpaperResult {}
+}
 }
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
index 81092de0..fb45c608 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
-import Qt.labs.platform 1.1
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Dialogs
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../../../Common" as Common
@@ -141,7 +141,7 @@ Item {
 
             nameFilters: ["Video files (*.mp4  *.mpg *.mp2 *.mpeg *.ogv *.avi *.wmv *.m4v *.3gp *.flv)"]
             onAccepted: {
-                root.next(fileDialogImportVideo.fileUrl, model.get(comboBoxCodec.currentIndex).value);
+                root.next(fileDialogImportVideo.currentFile , model.get(comboBoxCodec.currentIndex).value);
             }
         }
 
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperResult.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperResult.qml
index 1f2bb31c..23bb5dcc 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperResult.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperResult.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 
 import Qt5Compat.GraphicalEffects
 import ScreenPlay 1.0
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
index 42e9ba68..28593eeb 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.Enums.ImportVideoState 1.0
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebm.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebm.qml
index 59dd43e9..0ba316b6 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebm.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebm.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 
@@ -21,7 +21,7 @@ Item {
         clip: true
 
         ImportWebmInit {
-            onNext: {
+            onNext: (filePath) =>{
                 root.wizardStarted();
                 swipeView.currentIndex = 1;
                 createWallpaperVideoImportConvert.filePath = filePath;
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
index b0e81079..e70619d5 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import ScreenPlay.Enums.ImportVideoState 1.0
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
index e42b071f..20cfca0c 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
-import Qt.labs.platform 1.1
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Dialogs
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../../../Common" as Common
@@ -168,7 +168,7 @@ Item {
 
             nameFilters: ["Video files (*.webm)"]
             onAccepted: {
-                root.next(fileDialogImportVideo.fileUrl);
+                root.next(fileDialogImportVideo.currentFile);
             }
         }
 
diff --git a/ScreenPlay/qml/Create/Wizards/QMLWallpaper.qml b/ScreenPlay/qml/Create/Wizards/QMLWallpaper.qml
index 557d351d..715ec1ec 100644
--- a/ScreenPlay/qml/Create/Wizards/QMLWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/QMLWallpaper.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../../Common" as Common
diff --git a/ScreenPlay/qml/Create/Wizards/QMLWidget.qml b/ScreenPlay/qml/Create/Wizards/QMLWidget.qml
index b2bcffde..c652c74d 100644
--- a/ScreenPlay/qml/Create/Wizards/QMLWidget.qml
+++ b/ScreenPlay/qml/Create/Wizards/QMLWidget.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls.Material
+import QtQuick.Controls
+import QtQuick.Layouts
 
 import ScreenPlay 1.0
 import "../../Common" as Common
diff --git a/ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml b/ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml
index 4c384368..8e646a2f 100644
--- a/ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 import "../../Common" as Common
diff --git a/ScreenPlay/qml/Create/Wizards/WizardPage.qml b/ScreenPlay/qml/Create/Wizards/WizardPage.qml
index b98ac3b7..c8d083f6 100644
--- a/ScreenPlay/qml/Create/Wizards/WizardPage.qml
+++ b/ScreenPlay/qml/Create/Wizards/WizardPage.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.3
-import QtQuick.Layouts 1.12
-import QtQuick.Window 2.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Window
 import ScreenPlay 1.0
 import ScreenPlay.Create 1.0
 
diff --git a/ScreenPlay/qml/Create/WizardsFiles/QMLWallpaperMain.qml b/ScreenPlay/qml/Create/WizardsFiles/QMLWallpaperMain.qml
index 608812bf..49486b4a 100644
--- a/ScreenPlay/qml/Create/WizardsFiles/QMLWallpaperMain.qml
+++ b/ScreenPlay/qml/Create/WizardsFiles/QMLWallpaperMain.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.14
+import QtQuick
 
 Item {
     id: root
diff --git a/ScreenPlay/qml/Create/WizardsFiles/QMLWidgetMain.qml b/ScreenPlay/qml/Create/WizardsFiles/QMLWidgetMain.qml
index 608812bf..49486b4a 100644
--- a/ScreenPlay/qml/Create/WizardsFiles/QMLWidgetMain.qml
+++ b/ScreenPlay/qml/Create/WizardsFiles/QMLWidgetMain.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.14
+import QtQuick
 
 Item {
     id: root
diff --git a/ScreenPlay/qml/Installed/Installed.qml b/ScreenPlay/qml/Installed/Installed.qml
index 47c81e65..846c8306 100644
--- a/ScreenPlay/qml/Installed/Installed.qml
+++ b/ScreenPlay/qml/Installed/Installed.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 import ScreenPlay.Enums.SearchType 1.0
@@ -244,7 +244,7 @@ Item {
             publishedFileID: m_publishedFileID
             itemIndex: index
             isScrolling: gridView.isScrolling
-            onOpenContextMenu: {
+            onOpenContextMenu: (position)=>{
                 // Set the menu to the current item informations
                 contextMenu.publishedFileID = delegate.publishedFileID;
                 contextMenu.absoluteStoragePath = delegate.absoluteStoragePath;
diff --git a/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml b/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
index dd4d327d..a7fc6836 100644
--- a/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
+++ b/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Material 2.2
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 import "../Common"
 
diff --git a/ScreenPlay/qml/Installed/Navigation.qml b/ScreenPlay/qml/Installed/Navigation.qml
index 69bf0baa..e82ce636 100644
--- a/ScreenPlay/qml/Installed/Navigation.qml
+++ b/ScreenPlay/qml/Installed/Navigation.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.0
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 import ScreenPlay.Enums.SearchType 1.0
diff --git a/ScreenPlay/qml/Installed/ScreenPlayItem.qml b/ScreenPlay/qml/Installed/ScreenPlayItem.qml
index 1c4abdd5..86330f60 100644
--- a/ScreenPlay/qml/Installed/ScreenPlayItem.qml
+++ b/ScreenPlay/qml/Installed/ScreenPlayItem.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Controls
 import ScreenPlay 1.0
 import ScreenPlay.Enums.InstalledType 1.0
diff --git a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
index 9145fa3b..429e7deb 100644
--- a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
+++ b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Item {
     id: root
diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml
index 9624e2a5..ddfd6d0b 100644
--- a/ScreenPlay/qml/Installed/Sidebar.qml
+++ b/ScreenPlay/qml/Installed/Sidebar.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Enums.FillMode 1.0
 import ScreenPlay.Enums.InstalledType 1.0
diff --git a/ScreenPlay/qml/Monitors/DefaultVideoControls.qml b/ScreenPlay/qml/Monitors/DefaultVideoControls.qml
index 18a91324..df5e2bb7 100644
--- a/ScreenPlay/qml/Monitors/DefaultVideoControls.qml
+++ b/ScreenPlay/qml/Monitors/DefaultVideoControls.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.2
-import QtQuick.Layouts 1.3
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 import ScreenPlay.Enums.FillMode 1.0
 import "../Common/" as SP
diff --git a/ScreenPlay/qml/Monitors/MonitorSelection.qml b/ScreenPlay/qml/Monitors/MonitorSelection.qml
index c5324762..b6ca8212 100644
--- a/ScreenPlay/qml/Monitors/MonitorSelection.qml
+++ b/ScreenPlay/qml/Monitors/MonitorSelection.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Rectangle {
diff --git a/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml b/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
index bdb52732..d33f044c 100644
--- a/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
+++ b/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 
diff --git a/ScreenPlay/qml/Monitors/Monitors.qml b/ScreenPlay/qml/Monitors/Monitors.qml
index 6517fdb8..1326bc58 100644
--- a/ScreenPlay/qml/Monitors/Monitors.qml
+++ b/ScreenPlay/qml/Monitors/Monitors.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.2
-import QtQuick.Layouts 1.3
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 import "../Common/" as SP
diff --git a/ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml b/ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml
index 7bc181d3..1cf1833d 100644
--- a/ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml
+++ b/ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 import Qt.labs.platform 1.1
-import QtQuick.Controls.Material 2.2
-import QtQuick.Layouts 1.3
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Monitors/SaveNotification.qml b/ScreenPlay/qml/Monitors/SaveNotification.qml
index cd5f7fb8..121180de 100644
--- a/ScreenPlay/qml/Monitors/SaveNotification.qml
+++ b/ScreenPlay/qml/Monitors/SaveNotification.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 
 Rectangle {
diff --git a/ScreenPlay/qml/Navigation/Navigation.qml b/ScreenPlay/qml/Navigation/Navigation.qml
index 3193d94e..7b8c0dc6 100644
--- a/ScreenPlay/qml/Navigation/Navigation.qml
+++ b/ScreenPlay/qml/Navigation/Navigation.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import "../Workshop"
 import "../Common"
diff --git a/ScreenPlay/qml/Navigation/NavigationItem.qml b/ScreenPlay/qml/Navigation/NavigationItem.qml
index 8e819dd9..87b3eee0 100644
--- a/ScreenPlay/qml/Navigation/NavigationItem.qml
+++ b/ScreenPlay/qml/Navigation/NavigationItem.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml b/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
index b01f3a09..17e22941 100644
--- a/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
+++ b/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
 import ScreenPlay 1.0
 import "../Common"
diff --git a/ScreenPlay/qml/Settings/SettingBool.qml b/ScreenPlay/qml/Settings/SettingBool.qml
index 358e60fa..a7bc78ed 100644
--- a/ScreenPlay/qml/Settings/SettingBool.qml
+++ b/ScreenPlay/qml/Settings/SettingBool.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml
index 8a481ad7..34868f08 100644
--- a/ScreenPlay/qml/Settings/Settings.qml
+++ b/ScreenPlay/qml/Settings/Settings.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.12
-import Qt.labs.platform 1.1
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import ScreenPlay 1.0
 import ScreenPlay.Enums.FillMode 1.0
diff --git a/ScreenPlay/qml/Settings/SettingsButton.qml b/ScreenPlay/qml/Settings/SettingsButton.qml
index 6e8afa2c..afd0e47b 100644
--- a/ScreenPlay/qml/Settings/SettingsButton.qml
+++ b/ScreenPlay/qml/Settings/SettingsButton.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Settings/SettingsComboBox.qml b/ScreenPlay/qml/Settings/SettingsComboBox.qml
index b634ab77..e3a0f787 100644
--- a/ScreenPlay/qml/Settings/SettingsComboBox.qml
+++ b/ScreenPlay/qml/Settings/SettingsComboBox.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Control {
diff --git a/ScreenPlay/qml/Settings/SettingsExpander.qml b/ScreenPlay/qml/Settings/SettingsExpander.qml
index 780f8612..2b754c70 100644
--- a/ScreenPlay/qml/Settings/SettingsExpander.qml
+++ b/ScreenPlay/qml/Settings/SettingsExpander.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import ScreenPlay 1.0
 
 Item {
diff --git a/ScreenPlay/qml/Settings/SettingsHeader.qml b/ScreenPlay/qml/Settings/SettingsHeader.qml
index c4d80f52..141b87ee 100644
--- a/ScreenPlay/qml/Settings/SettingsHeader.qml
+++ b/ScreenPlay/qml/Settings/SettingsHeader.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml b/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml
index f8f0bbfc..27fff741 100644
--- a/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml
+++ b/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls.Material
 
 Item {
     property real customWidth: parent.width
diff --git a/ScreenPlay/qml/Settings/SettingsPage.qml b/ScreenPlay/qml/Settings/SettingsPage.qml
index 21a0afa6..4f880a90 100644
--- a/ScreenPlay/qml/Settings/SettingsPage.qml
+++ b/ScreenPlay/qml/Settings/SettingsPage.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.12
-
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 
 Page {
     width: parent.width
diff --git a/ScreenPlay/qml/Workshop/Background.qml b/ScreenPlay/qml/Workshop/Background.qml
index 0970a2db..f1d210e0 100644
--- a/ScreenPlay/qml/Workshop/Background.qml
+++ b/ScreenPlay/qml/Workshop/Background.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.13
+import QtQuick
 import Qt5Compat.GraphicalEffects
 import Workshop 1.0
 
diff --git a/ScreenPlay/qml/Workshop/Navigation.qml b/ScreenPlay/qml/Workshop/Navigation.qml
index 559a400e..f1ea03aa 100644
--- a/ScreenPlay/qml/Workshop/Navigation.qml
+++ b/ScreenPlay/qml/Workshop/Navigation.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtQuick.Controls.Material 2.13
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material.impl
 import Workshop 1.0
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Workshop/PopupOffline.qml b/ScreenPlay/qml/Workshop/PopupOffline.qml
index bed052b8..3fc421f9 100644
--- a/ScreenPlay/qml/Workshop/PopupOffline.qml
+++ b/ScreenPlay/qml/Workshop/PopupOffline.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
-import QtQuick.Controls 2.13
-import QtQuick.Controls.Material 2.13
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
 import Workshop 1.0
 import ScreenPlay 1.0
diff --git a/ScreenPlay/qml/Workshop/ScreenPlayItem.qml b/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
index ba72fa97..8735a8e8 100644
--- a/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
+++ b/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
 import QtQuick.Controls
 
 Item {
diff --git a/ScreenPlay/qml/Workshop/ScreenPlayItemImage.qml b/ScreenPlay/qml/Workshop/ScreenPlayItemImage.qml
index b79451a7..2f4c1e52 100644
--- a/ScreenPlay/qml/Workshop/ScreenPlayItemImage.qml
+++ b/ScreenPlay/qml/Workshop/ScreenPlayItemImage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Item {
     id: screenPlayItemImage
diff --git a/ScreenPlay/qml/Workshop/Sidebar.qml b/ScreenPlay/qml/Workshop/Sidebar.qml
index 8b90138a..a5fbc57b 100644
--- a/ScreenPlay/qml/Workshop/Sidebar.qml
+++ b/ScreenPlay/qml/Workshop/Sidebar.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.11
-import QtWebEngine 1.8
-import QtQuick.Controls.Material 2.2
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtWebEngine
+import QtQuick.Controls.Material
 import Workshop 1.0
 import ScreenPlay 1.0
 
@@ -24,24 +24,24 @@ Drawer {
     function setWorkshopItem(publishedFileID, imgUrl, videoPreview, subscriptionCount) {
         if (root.publishedFileID === publishedFileID) {
             if (!root.visible)
-                root.open();
+                root.open()
             else
-                root.close();
-            return ;
+                root.close()
+            return
         }
-        webView.opacity = 0;
-        root.publishedFileID = publishedFileID;
-        root.imgUrl = imgUrl;
-        root.subscriptionCount = subscriptionCount;
-        root.videoPreview = videoPreview;
-        root.subscribed = false;
-        txtVotesUp.highlighted = false;
-        txtVotesDown.highlighted = false;
+        webView.opacity = 0
+        root.publishedFileID = publishedFileID
+        root.imgUrl = imgUrl
+        root.subscriptionCount = subscriptionCount
+        root.videoPreview = videoPreview
+        root.subscribed = false
+        txtVotesUp.highlighted = false
+        txtVotesDown.highlighted = false
         if (!root.visible)
-            root.open();
+            root.open()
 
-        steamWorkshop.requestWorkshopItemDetails(publishedFileID);
-        webView.setVideo();
+        steamWorkshop.requestWorkshopItemDetails(publishedFileID)
+        webView.setVideo()
     }
 
     edge: Qt.RightEdge
@@ -51,43 +51,43 @@ Drawer {
     width: 400
     interactive: false
     Component.onCompleted: {
-        WebEngine.settings.localContentCanAccessFileUrls = true;
-        WebEngine.settings.localContentCanAccessRemoteUrls = true;
-        WebEngine.settings.allowRunningInsecureContent = true;
-        WebEngine.settings.accelerated2dCanvasEnabled = true;
-        WebEngine.settings.javascriptCanOpenWindows = false;
-        WebEngine.settings.showScrollBars = false;
-        WebEngine.settings.playbackRequiresUserGesture = false;
-        WebEngine.settings.focusOnNavigationEnabled = true;
+        WebEngine.settings.localContentCanAccessFileUrls = true
+        WebEngine.settings.localContentCanAccessRemoteUrls = true
+        WebEngine.settings.allowRunningInsecureContent = true
+        WebEngine.settings.accelerated2dCanvasEnabled = true
+        WebEngine.settings.javascriptCanOpenWindows = false
+        WebEngine.settings.showScrollBars = false
+        WebEngine.settings.playbackRequiresUserGesture = false
+        WebEngine.settings.focusOnNavigationEnabled = true
     }
 
     Connections {
         function onRequestItemDetailReturned(title, tags, steamIDOwner, description, votesUp, votesDown, url, fileSize, publishedFileId) {
-            tagListModel.clear();
+            tagListModel.clear()
             // Even if the tags array is empty it still contains
             // one empty string, resulting in an empty button
             if (tags.length > 1) {
                 for (var i in tags) {
                     tagListModel.append({
-                        "name": tags[i]
-                    });
+                                            "name": tags[i]
+                                        })
                 }
-                rpTagList.model = tagListModel;
+                rpTagList.model = tagListModel
             } else {
-                rpTagList.model = null;
+                rpTagList.model = null
             }
-            txtTitle.text = title;
-            const size = Math.floor((1000 * ((fileSize / 1024) / 1000)) / 1000);
-            txtFileSize.text = qsTr("Size: ") + size + qsTr(" MB");
-            pbVotes.to = votesDown + votesUp;
-            pbVotes.value = votesUp;
-            txtVotesDown.text = votesDown;
-            txtVotesUp.text = votesUp;
+            txtTitle.text = title
+            const size = Math.floor((1000 * ((fileSize / 1024) / 1000)) / 1000)
+            txtFileSize.text = qsTr("Size: ") + size + qsTr(" MB")
+            pbVotes.to = votesDown + votesUp
+            pbVotes.value = votesUp
+            txtVotesDown.text = votesDown
+            txtVotesUp.text = votesUp
             if (description === "")
-                description = qsTr("No description...");
+                description = qsTr("No description...")
 
-            txtDescription.text = description;
-            pbVotes.hoverText = votesUp + " / " + votesDown;
+            txtDescription.text = description
+            pbVotes.hoverText = votesUp + " / " + votesDown
         }
 
         target: steamWorkshop
@@ -112,22 +112,23 @@ Drawer {
             property bool ready: false
 
             function getUpdateVideoCommand() {
-                let src = "";
-                src += "var video = document.getElementById('video');\n";
-                src += "video.src = '" + root.videoPreview + "';\n";
+                let src = ""
+                src += "var video = document.getElementById('video');\n"
+                src += "video.src = '" + root.videoPreview + "';\n"
                 // Incase a workshop item has no gif preview
-                src += "video.poster = '" + root.videoPreview + "';\n";
-                src += "video.play();\n";
-                return src;
+                src += "video.poster = '" + root.videoPreview + "';\n"
+                src += "video.play();\n"
+                return src
             }
 
             function setVideo() {
                 if (!root.videoPreview.toString().startsWith("https"))
-                    return ;
+                    return
 
-                webView.runJavaScript(getUpdateVideoCommand(), function(result) {
-                    webView.opacity = 1;
-                });
+                webView.runJavaScript(getUpdateVideoCommand(),
+                                      function (result) {
+                                          webView.opacity = 1
+                                      })
             }
 
             anchors.fill: parent
@@ -139,9 +140,7 @@ Drawer {
                 NumberAnimation {
                     duration: 200
                 }
-
             }
-
         }
 
         LinearGradient {
@@ -166,9 +165,7 @@ Drawer {
                     position: 1
                     color: "#00000000"
                 }
-
             }
-
         }
 
         Text {
@@ -189,7 +186,6 @@ Drawer {
                 margins: 20
                 left: parent.left
             }
-
         }
 
         MouseArea {
@@ -210,9 +206,7 @@ Drawer {
                 fillMode: Image.PreserveAspectFit
                 anchors.centerIn: parent
             }
-
         }
-
     }
 
     ColumnLayout {
@@ -248,9 +242,9 @@ Drawer {
                         ToolTip.visible: hovered
                         ToolTip.text: qsTr("Click here if you like the content")
                         onClicked: {
-                            steamWorkshop.vote(root.publishedFileID, true);
-                            txtVotesUp.highlighted = true;
-                            txtVotesDown.highlighted = false;
+                            steamWorkshop.vote(root.publishedFileID, true)
+                            txtVotesUp.highlighted = true
+                            txtVotesDown.highlighted = false
                         }
                     }
 
@@ -263,12 +257,11 @@ Drawer {
                         ToolTip.visible: hovered
                         ToolTip.text: qsTr("Click here if you do not like the content")
                         onClicked: {
-                            steamWorkshop.vote(root.publishedFileID, false);
-                            txtVotesUp.highlighted = false;
-                            txtVotesDown.highlighted = true;
+                            steamWorkshop.vote(root.publishedFileID, false)
+                            txtVotesUp.highlighted = false
+                            txtVotesDown.highlighted = true
                         }
                     }
-
                 }
 
                 ProgressBar {
@@ -281,7 +274,6 @@ Drawer {
                     ToolTip.visible: hovered
                     ToolTip.text: hoverText
                 }
-
             }
 
             Flickable {
@@ -314,11 +306,8 @@ Drawer {
                             font.family: ScreenPlay.settings.font
                             onClicked: root.tagClicked(txtTags.text)
                         }
-
                     }
-
                 }
-
             }
 
             RowLayout {
@@ -347,7 +336,6 @@ Drawer {
                     font.pointSize: 11
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                 }
-
             }
 
             Rectangle {
@@ -373,13 +361,9 @@ Drawer {
                         font.pointSize: 12
                         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                     }
-
                 }
-
             }
-
         }
-
     }
 
     RowLayout {
@@ -400,7 +384,8 @@ Drawer {
             icon.source: "qrc:/assets/icons/icon_open_in_new.svg"
             height: 25
             text: qsTr("Open In Steam")
-            onClicked: Qt.openUrlExternally("steam://url/CommunityFilePage/" + root.publishedFileID)
+            onClicked: Qt.openUrlExternally(
+                           "steam://url/CommunityFilePage/" + root.publishedFileID)
         }
 
         Button {
@@ -411,15 +396,15 @@ Drawer {
             icon.source: "qrc:/assets/icons/icon_download.svg"
             text: root.subscribed ? qsTr("Subscribed!") : qsTr("Subscribe")
             onClicked: {
-                root.subscribed = true;
-                root.steamWorkshop.subscribeItem(root.publishedFileID);
+                root.subscribed = true
+                root.steamWorkshop.subscribeItem(root.publishedFileID)
             }
         }
-
     }
 
     background: Rectangle {
-        color: Material.theme === Material.Light ? "white" : Qt.darker(Material.background)
+        color: Material.theme === Material.Light ? "white" : Qt.darker(
+                                                       Material.background)
         opacity: 0.95
     }
 
@@ -428,7 +413,6 @@ Drawer {
             velocity: 10
             easing.type: Easing.InOutQuart
         }
-
     }
 
     exit: Transition {
@@ -436,7 +420,5 @@ Drawer {
             velocity: 10
             easing.type: Easing.InOutQuart
         }
-
     }
-
 }
diff --git a/ScreenPlay/qml/Workshop/SteamProfile.qml b/ScreenPlay/qml/Workshop/SteamProfile.qml
index 456b9021..a82393c6 100644
--- a/ScreenPlay/qml/Workshop/SteamProfile.qml
+++ b/ScreenPlay/qml/Workshop/SteamProfile.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtQuick.Controls.Material 2.13
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.12
+import QtQuick.Layouts
 import Workshop 1.0
 import ScreenPlay 1.0
 import "upload/"
diff --git a/ScreenPlay/qml/Workshop/SteamWorkshop.qml b/ScreenPlay/qml/Workshop/SteamWorkshop.qml
index 076a51ee..12b7f42b 100644
--- a/ScreenPlay/qml/Workshop/SteamWorkshop.qml
+++ b/ScreenPlay/qml/Workshop/SteamWorkshop.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtQuick.Controls.Material 2.13
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.12
+import QtQuick.Layouts
 import Workshop 1.0
 import ScreenPlay 1.0
 import "upload/"
diff --git a/ScreenPlay/qml/Workshop/Workshop.qml b/ScreenPlay/qml/Workshop/Workshop.qml
index d0b59966..91fd13ac 100644
--- a/ScreenPlay/qml/Workshop/Workshop.qml
+++ b/ScreenPlay/qml/Workshop/Workshop.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtQuick.Controls.Material 2.13
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.12
+import QtQuick.Layouts
 import Workshop 1.0
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Workshop/WorkshopInstalled.qml b/ScreenPlay/qml/Workshop/WorkshopInstalled.qml
index 5562750d..a24c36f1 100644
--- a/ScreenPlay/qml/Workshop/WorkshopInstalled.qml
+++ b/ScreenPlay/qml/Workshop/WorkshopInstalled.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 import Workshop 1.0 as SP
diff --git a/ScreenPlay/qml/Workshop/WorkshopItem.qml b/ScreenPlay/qml/Workshop/WorkshopItem.qml
index e16d96f0..c91bfb23 100644
--- a/ScreenPlay/qml/Workshop/WorkshopItem.qml
+++ b/ScreenPlay/qml/Workshop/WorkshopItem.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.2
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import Workshop 1.0
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml b/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
index e48eb754..c065255e 100644
--- a/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
+++ b/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import Workshop 1.0 as SP
 import ScreenPlay 1.0
 import "../../Common"
diff --git a/ScreenPlay/qml/Workshop/upload/UploadProject.qml b/ScreenPlay/qml/Workshop/upload/UploadProject.qml
index 888caabd..7d287f52 100644
--- a/ScreenPlay/qml/Workshop/upload/UploadProject.qml
+++ b/ScreenPlay/qml/Workshop/upload/UploadProject.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
 import Workshop 1.0
 import ScreenPlay 1.0
 
diff --git a/ScreenPlay/qml/Workshop/upload/UploadProjectBigItem.qml b/ScreenPlay/qml/Workshop/upload/UploadProjectBigItem.qml
index a48dfab9..cf3a2dc8 100644
--- a/ScreenPlay/qml/Workshop/upload/UploadProjectBigItem.qml
+++ b/ScreenPlay/qml/Workshop/upload/UploadProjectBigItem.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.12
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Controls.Material.impl
 import ScreenPlay 1.0
 import "../"
 
diff --git a/ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml b/ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
index c907c13f..6bdbbdd0 100644
--- a/ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
+++ b/ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material.impl 2.12
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQuick.Controls.Material.impl
 
 Page {
     // Everyting that is not OK is a fail. See steam_qt_enums_generated.h
diff --git a/ScreenPlay/translations/ScreenPlay_vi.qm b/ScreenPlay/translations/ScreenPlay_vi.qm
index f220af90808cb19ed0d0b449eccf8099924c7538..98bdb444822e1cd25cf79b22a97d47c79a3b7c35 100644
GIT binary patch
delta 1656
zcmXApdr(w$6vw~2d+$E(-re<q5RZ066m&3D0x2{U8QvlkB0>TJzCb`g0fk~gKyx5O
zZzvdy$V(9%3J9?=Mx2$zNFhZDiWt$HihR=KBw0uAU!VEiIlp_(_j|wRj+~Nq)kw?q
zlFdg98>Bn`IFjXL%&Y-(@N*zb14j4?KsA^%#lX5yFnuXN>=G~oivhDkB7;LjCO3g~
zod7;`2D_FhGY4D30LGueR$KvQ)ry>dL1eB%WRU^vX{vwY@oPH5#zuS)I3}{N0qnRX
zy|5H&vq2!i59*59z(=D(utd-0{RiJ;CLl;JWJwGvI|L+M29mRdlM-{Q+(dlv?-UKC
zMC7C^u+;&FtGh`|ws1pYq4Jj8E7}U=v<QzR28mqINzL7}dZm7v`&1ex&G3@}`Ek<1
z;AkMKS!Ak}^x&#WU^gQzj^9N3%A}>bJJcdph>_~0$#(>!)ZXY>C-WGZ5A5rg`L4+a
zI2&2`7Z!9DWXT<Mz)FoQuV5TV&ybZJO#?CwGE)q7jejKTkDEttpOg(WtOlHhnG6dO
zT{OXDIu-$z)*`JrkpVYF7T#iVLp#aE8m1s607k%$sqnuDd_2n3`;Z~~>zVqdTYzsT
z(>O?WZ~m0&Ipz$c9AySVDoCa?Gi)LT8=0SkT;e@us(T%<WR$fprgLNzyKwX=u<Ind
zsF&n#y2*N`pQC%d?8aIN@Rl2U@UJ!!mdTdITo#&TYDt)IUZ!7@R>Pj1Jr{@xV%vPF
zu;>7LX~!iRXp+6r5)Z6Wu!Cp9fYb^0_DcFha~`lG%j$u&ZR|)tIk;<FuwV=kTKTN&
z4}ox{e0l5l^fXdrwm}|vevHm)d7@1%wZAJbFQIV6zbkJEnL+ZG$-k?jvFs-0_xrtR
z>`M7dYwGgmA%%4lO%?U4aF{W8x+=;CGJxy>MPsBJ-AYz8X1`*+qQ#v|h+eDc?M?u4
zrxe3F(qMm4F?q8T(2ppdwR8YU?ZP9*TpC#=C|JF-zo2aGUj!7?DqF7;t(!##?oyhP
zsOJhV<&!`?C9FgFJYtCAClkV1d!zqtRnYdAbnQ1)sEZSzn-*#NyDG`QfbyQN%Bk}J
z;v7`v`=e;sL{;UL%@mQ@suM#bDV<d{I8n6LUQk^-N%x~NICEzcuqBvVT6YQvvE*Ei
z=L3n;+<V$`z`T`P^@_^r*A%8%OJmTV+}6|Gv_9V4j*zQlV-}b8^_PIwPUKuqZcoo$
zn$dwXKA>4$Q@OL%6zlXhuIn1r&uJ1F|BcABTU=iR#a6L~yOy^b*gKaSa(+Vf?{E)C
z_fz`J)Us+bz%NX#i-?BsnS7@EmPWPLvoK)WKWd-;w}Atp>R2DD3A9otj<2Uh-=I!+
zX8`GlI%jbMU{fG6<wxNcxrIb2{4IB|jNmO6l2<Fv^R{i*sc#K$AKgc5wNY?WyxR0|
zh29vO#IIXAOi{PulkWQfj2WNoY71;U$A1z*#&IJecjodX4leZdm+{A)TWI6m`P#Z9
zAg_@>9Z$@y=Fi=rBxiZ?Cgy!$k2l{NF_Tu}FyB|BB_Sq$=o!(ak{_!gAwgyQV_GFg
zq%F`eBc-$wej4-CXu#b~V>##yWE|I6zGw%mc8d(~5DZGaRpyW;VVLIH7peKUnGA~U
z)D+K%1N>ctaOEmXUSqntl5A=f8Qdwd&`xMoT1YtITczH8?^EsSF7hxZSX()?fc}G*
zwQXHJfa4Xd={c>3RgcJkVv&Ur+6OPT02|H-2GtS|FP+!m6#eSjbO{;~y4_V*o^k?M
tzg$<fX@dR{gSsDVJ7|^H>&6mE*Ng&@^I~at4s^7as5sB|rGaO?{|CeV?dbpj

delta 1749
zcmXAp2~ZPf6vzKbc5`etL;-_<4bdu!2P%q8Qw7Be$`NSQYCKRtjwlJpAs&UG5UGRX
z(JcxpRSv<kc92%=)T<M%DCJP83|4Wd)}d8V!O<C8+ozkEo!@?6-tK$v|NY-K9+Gxd
zN_Xicsk?nXm!>&(=la`ojbMuR1G#lzgzo`VfH_hEn4W-XvH|f;VA{q5?%PDh{3X&h
z8*Jboz|v;0QAC*z>~;ny$OT(=8E~x<Ir6N?{7R7yTGvth&}Z*C4#S3t8&T^;IzqtS
z_oNr@fZDwsu=GG(<_6^D2r&{px49hQdz?UYqmV1{QJq6X+RuQ^T{tMwdD$6!_U`}{
zRfQ#w1A(MV*jaHNh;bKMB_677$pc3c@I{!=C-IRS60}mCas5i^T+KrY?UUxrl>wXo
zkru_o0daFgW;95PL&|}yZ=@xO%c#Gx(jD5{l;VxBLaLYA)(Up1uRU~zEVyGNurXN{
z9=aLehRGIv=RxZUGHXLMFkK@nD7;T^(aLsxwH8=+R_0tmSyye7H7AS!vbW0G4$lPq
zJDD60YI<uPvu>ON@bnhx&54Y(igehR{P{nSiiem&TLkRDhfLYLpMd-vrY4L8DGX+6
zj@|<1#xk|-BzOF1=F*-3AbmX37F$MbHZz@0Vyq|gyO2-JX9mujfQffl-x69cdBu*o
z^8(2Di1oWd?Ju{ovocQtTUN541gn5qa&~c*1eg%S7Qd_)_RHKPeZnc3J~Y$F9&<AQ
zD;}}+;S{jdz+OzfNCj<WTTdhcAquwr$U<Ok9{byLI-((u*sjSnKqlC(W>PR?qo8Gc
z%tz#|El+_(Rq|=4ex<SpL~cAQk34ga)`#V*hgFfTJ@V4+WRAp}@)NOx$RyY0*ALW_
z8js}<o99s3Q{->GDa!}j6y8Uvs<;B7nDOyzRg|{n0Gn1TYL^6&XbMH`#&-->oG_9I
zaepeVoVNh>9YQOk^Rh-Oed<>LzKP1wnfm}$h|*O5k}NPy_>a*CL`+bgYW4$)rYldi
z5WSC!j8Z9`X_WKh*~;gUdLY@Pd~NQatQA5G>&r!CsG?Ke(qn~!oz+F;d8;;62LlP0
zRHa*%Qxu~rzr2zh;ilTxK^<fsR2}vwCq>U!T|4McHEKCsfRh~5%T21Tqys$7P2Ee*
zTeC;#X8m1F#avR|dBEDurN&;Ru)%_l+{1o}vp=Goff?Mf3bJQb6xVo-{vC2u<f=s?
zGi_Xxne3+s<*pTE0qcL{Is%?k5jVJ}cec>DeXEvLxRbm3)LL^Kz`qjd6R7sQ*-OJT
zQ$4$XA&~O5I;?pLnc#^!K8)hI$OiT5`wOUxXTk-!&MQ4jU1B69rRnM##cg0lgSyd{
zPeWEE^vOqi_VXTNf=R$L{P6k~V1tqOjccN+UkDQw@8&l~p|>Z<dDEm$8u11`?O_<e
zxbxP);ea`u|I$qQa9twPhVt7-Po*=y&hHI4L1%l5uc}U?L72(cB@*pH{K;1GXYO6z
z$$Ux^+09=u4<>`}<eLt;P%CkKM?Z0DIe+f}wPG5}KcfK|hqV_pOxF&;(WB92kQT-u
zjb}Se+PcXa&o`$5uPl)foq~r_@0FXbv2;>h8wNCa$4R1uSWU^G1Yll^5Tgv4T&r<j
zoeo6J6B!#Tvgn-V!5}?-ReMB^?A843Fwv*1M!2BVyKdO-GP99n-PG$+-Z6^ASSIu-
zb*_=4T%50I3X1w&9=%yb(-bOrs3r#A)y{4o0G35*EgI@HrBz#MBU>+M(;iqxpNgex
zv^Rz~&?G+9-djzL4Js5lBHjWNn@$(0xLNka2-R1@1_KiHb?=#hRDCrp?{?^}5*z4l
zKC+R7cv!_<q!ZV{qW^_r4D{6f_fcaoc0`J-X+$!{!cPhM$>|zyPR}vel9E;#veONj
eIX1)m?4)?BAvrzMke$j}vJ6JQ)9WKH&iNmQ%mp6+

diff --git a/ScreenPlayShader/ShadertoyShader.qml b/ScreenPlayShader/ShadertoyShader.qml
index 819e5c5c..2f53c6a1 100644
--- a/ScreenPlayShader/ShadertoyShader.qml
+++ b/ScreenPlayShader/ShadertoyShader.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 ShaderEffect {
     id: root
diff --git a/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/config.qml b/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/config.qml
index a79b0347..d508a3bf 100644
--- a/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/config.qml
+++ b/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/config.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.4 as QQC
-import QtQuick.Window 2.0
+import QtQuick
+import QtQuick.Controls as QQC
+import QtQuick.Window
 import Qt5Compat.GraphicalEffects
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.wallpapers.image 2.0 as Wallpaper
diff --git a/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/main.qml b/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/main.qml
index 750dd909..d69899f0 100644
--- a/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/main.qml
+++ b/ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/main.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.11
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Window 2.0
+import QtQuick.Window
 import Qt.WebSockets 1.15
-import QtWebEngine 1.8
+import QtWebEngine
 
 Rectangle {
     id: root
diff --git a/ScreenPlayWallpaper/main.cpp b/ScreenPlayWallpaper/main.cpp
index d8dd11de..f2d6512c 100644
--- a/ScreenPlayWallpaper/main.cpp
+++ b/ScreenPlayWallpaper/main.cpp
@@ -32,8 +32,8 @@ int main(int argc, char* argv[])
     // For testing purposes when starting the ScreenPlayWallpaper directly.
     if (argumentList.length() == 1) {
 #if defined(Q_OS_WIN)
-        WinWindow window1({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", true, true);
-        //WinWindow window1({ 0 }, "C:/Program Files (x86)/Steam/steamapps/workshop/content/672870/_tmp_171806", "appID=test", "1", "fill", "videoWallpaper", true, true);
+        //WinWindow window1({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", true, true);
+        WinWindow window1({ 0 }, "C:/Program Files (x86)/Steam/steamapps/workshop/content/672870/2453869686", "appID=test", "1", "fill", "videoWallpaper", true, true);
 #elif defined(Q_OS_LINUX)
         LinuxWindow window({ 0 }, "test", "appID=test", "1", "fill", "videoWallpaper", false, true);
 #elif defined(Q_OS_OSX)
diff --git a/ScreenPlayWallpaper/qml/Test.qml b/ScreenPlayWallpaper/qml/Test.qml
index e67ea5e9..b11ef8bc 100644
--- a/ScreenPlayWallpaper/qml/Test.qml
+++ b/ScreenPlayWallpaper/qml/Test.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Particles 2.12
 import QtQuick.Shapes 1.12
 import ScreenPlayWallpaper 1.0
diff --git a/ScreenPlayWallpaper/qml/Wallpaper.qml b/ScreenPlayWallpaper/qml/Wallpaper.qml
index cb214e26..11632c81 100644
--- a/ScreenPlayWallpaper/qml/Wallpaper.qml
+++ b/ScreenPlayWallpaper/qml/Wallpaper.qml
@@ -1,6 +1,6 @@
-import QtQml 2.14
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQml
+import QtQuick
+import QtQuick.Controls
 import ScreenPlayWallpaper 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 
diff --git a/ScreenPlayWallpaper/qml/WebView.qml b/ScreenPlayWallpaper/qml/WebView.qml
index e48b707c..fc055270 100644
--- a/ScreenPlayWallpaper/qml/WebView.qml
+++ b/ScreenPlayWallpaper/qml/WebView.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtWebEngine 1.8
+import QtWebEngine
 import ScreenPlay.Enums.InstalledType 1.0
 import ScreenPlayWallpaper 1.0
 
diff --git a/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml b/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
index f1e43a77..ecb2e0fd 100644
--- a/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
+++ b/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtWebEngine 1.8
+import QtQuick
+import QtWebEngine
 import ScreenPlayWallpaper 1.0
 
 Item {
diff --git a/ScreenPlayWidget/qml/Test.qml b/ScreenPlayWidget/qml/Test.qml
index 33577896..fb84673d 100644
--- a/ScreenPlayWidget/qml/Test.qml
+++ b/ScreenPlayWidget/qml/Test.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Rectangle {
     anchors.fill: parent
diff --git a/ScreenPlayWidget/qml/Widget.qml b/ScreenPlayWidget/qml/Widget.qml
index b3ad6fdd..c6bbc8c6 100644
--- a/ScreenPlayWidget/qml/Widget.qml
+++ b/ScreenPlayWidget/qml/Widget.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtWebEngine 1.8
+import QtQuick
+import QtQuick.Controls
+import QtWebEngine
 import ScreenPlayWidget 1.0
 import ScreenPlay.Enums.InstalledType 1.0
 
@@ -18,7 +18,7 @@ Item {
         }
 
         function onQmlSceneValueReceived(key, value) {
-            var obj2 = 'import QtQuick 2.14; Item {Component.onCompleted: loader.item.' + key + ' = ' + value + '; }';
+            var obj2 = 'import QtQuick; Item {Component.onCompleted: loader.item.' + key + ' = ' + value + '; }';
             var newObject = Qt.createQmlObject(obj2.toString(), root, "err");
             newObject.destroy(10000);
         }