Remove QML import version numbers

Change-Id: I2810c412a595b2b5729fd57f8c4a3a1a2356c363
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

395 files changed, 2221 insertions, 2221 deletions

diff --git a/Main.qml b/Main.qml
index 77bfa501..29168ad5 100644
--- a/Main.qml
+++ b/Main.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
-import QtQuick.Window 2.3
-
-import centerconsole 1.0
-import notification 1.0
-import instrumentcluster 1.0
-import hud 1.0
-import stores 1.0
-
-import shared.utils 1.0
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
+
+import centerconsole
+import notification
+import instrumentcluster
+import hud
+import stores
+
+import shared.utils
+import shared.Style
 
 QtObject {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/AxisFront.qml b/apps/com.luxoft.vehicle/3d/entities/AxisFront.qml
index e233b6b1..8e3efc7a 100644
--- a/apps/com.luxoft.vehicle/3d/entities/AxisFront.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/AxisFront.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/AxisRear.qml b/apps/com.luxoft.vehicle/3d/entities/AxisRear.qml
index 7be08337..6885f791 100644
--- a/apps/com.luxoft.vehicle/3d/entities/AxisRear.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/AxisRear.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/Body.qml b/apps/com.luxoft.vehicle/3d/entities/Body.qml
index c0d9bd92..b4daa020 100644
--- a/apps/com.luxoft.vehicle/3d/entities/Body.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/Body.qml
@@ -29,15 +29,15 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
-
-import "../../helpers" 1.0
-import "../materials" 1.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
+
+import "../../helpers"
+import "../materials"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/LeftDoor.qml b/apps/com.luxoft.vehicle/3d/entities/LeftDoor.qml
index 18cd9a3c..580a5f0a 100644
--- a/apps/com.luxoft.vehicle/3d/entities/LeftDoor.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/LeftDoor.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import shared.animations 1.0
+import shared.animations
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/RearDoor.qml b/apps/com.luxoft.vehicle/3d/entities/RearDoor.qml
index 3355316d..5831dd8d 100644
--- a/apps/com.luxoft.vehicle/3d/entities/RearDoor.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/RearDoor.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import shared.animations 1.0
+import shared.animations
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/RightDoor.qml b/apps/com.luxoft.vehicle/3d/entities/RightDoor.qml
index 60418ef2..0c6d287e 100644
--- a/apps/com.luxoft.vehicle/3d/entities/RightDoor.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/RightDoor.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import shared.animations 1.0
+import shared.animations
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/Roof.qml b/apps/com.luxoft.vehicle/3d/entities/Roof.qml
index 218db839..a325f3ba 100644
--- a/apps/com.luxoft.vehicle/3d/entities/Roof.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/Roof.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import shared.animations 1.0
+import shared.animations
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/Seats.qml b/apps/com.luxoft.vehicle/3d/entities/Seats.qml
index 3065018e..b388940d 100644
--- a/apps/com.luxoft.vehicle/3d/entities/Seats.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/Seats.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Entity {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/entities/Shadow.qml b/apps/com.luxoft.vehicle/3d/entities/Shadow.qml
index d8874a35..8548a352 100644
--- a/apps/com.luxoft.vehicle/3d/entities/Shadow.qml
+++ b/apps/com.luxoft.vehicle/3d/entities/Shadow.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import Qt3D.Core 2.0
-import Qt3D.Render 2.9
-import Qt3D.Extras 2.9
-import Qt3D.Input 2.0
-import QtQuick.Scene3D 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import QtQuick.Scene3D
 
-import "../../helpers" 1.0
-import "../../3d/materials" 1.0
+import "../../helpers"
+import "../../3d/materials"
 
 Entity {
     CookTorranceMaterial {
diff --git a/apps/com.luxoft.vehicle/3d/materials/CookTorranceMaterial.qml b/apps/com.luxoft.vehicle/3d/materials/CookTorranceMaterial.qml
index 8c77929b..187ecd63 100644
--- a/apps/com.luxoft.vehicle/3d/materials/CookTorranceMaterial.qml
+++ b/apps/com.luxoft.vehicle/3d/materials/CookTorranceMaterial.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
-import Qt3D.Core 2.0
-import Qt3D.Render 2.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
 
-import "../../helpers" 1.0
+import "../../helpers"
 
 Material {
     id: root
diff --git a/apps/com.luxoft.vehicle/3d/settings/FrameGraph.qml b/apps/com.luxoft.vehicle/3d/settings/FrameGraph.qml
index 27cde059..416f677c 100644
--- a/apps/com.luxoft.vehicle/3d/settings/FrameGraph.qml
+++ b/apps/com.luxoft.vehicle/3d/settings/FrameGraph.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import Qt3D.Core 2.0
-import Qt3D.Render 2.0
+import Qt3D.Core
+import Qt3D.Render
 
-import "../entities" 1.0
+import "../entities"
 
 RenderSurfaceSelector {
     id: surfaceSelector
diff --git a/apps/com.luxoft.vehicle/Main.qml b/apps/com.luxoft.vehicle/Main.qml
index edbfb6d5..3ddd2355 100644
--- a/apps/com.luxoft.vehicle/Main.qml
+++ b/apps/com.luxoft.vehicle/Main.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
-import QtApplicationManager.Application 2.0
-import application.windows 1.0
-import shared.utils 1.0
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.com.pelagicore.systeminfo 1.0
-import shared.Style 1.0
+import QtQuick
+import QtApplicationManager.Application
+import application.windows
+import shared.utils
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.com.pelagicore.systeminfo
+import shared.Style
 
-import "views" 1.0
-import "stores" 1.0
+import "views"
+import "stores"
 
 QtObject {
     id: root
diff --git a/apps/com.luxoft.vehicle/MainIC.qml b/apps/com.luxoft.vehicle/MainIC.qml
index 0291073b..bb1bc5e1 100644
--- a/apps/com.luxoft.vehicle/MainIC.qml
+++ b/apps/com.luxoft.vehicle/MainIC.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import application.windows 1.0
+import application.windows
 
-import "views" 1.0
-import "stores" 1.0
+import "views"
+import "stores"
 
 ApplicationICWindow {
     id: root
diff --git a/apps/com.luxoft.vehicle/controls/VehicleButton.qml b/apps/com.luxoft.vehicle/controls/VehicleButton.qml
index a8ea4783..324dd5a9 100644
--- a/apps/com.luxoft.vehicle/controls/VehicleButton.qml
+++ b/apps/com.luxoft.vehicle/controls/VehicleButton.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/apps/com.luxoft.vehicle/helpers/Qt3DStudioAvailable.qml b/apps/com.luxoft.vehicle/helpers/Qt3DStudioAvailable.qml
index a4146edd..824089a3 100644
--- a/apps/com.luxoft.vehicle/helpers/Qt3DStudioAvailable.qml
+++ b/apps/com.luxoft.vehicle/helpers/Qt3DStudioAvailable.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import QtStudio3D.OpenGL 2.5
-import QtQuick 2.8
+import QtStudio3D.OpenGL
+import QtQuick
 
 Item {}
diff --git a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
index 4aee6fd2..54160396 100644
--- a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
+import shared.Style
 
-import shared.animations 1.0
-import shared.utils 1.0
+import shared.animations
+import shared.utils
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/EnergyPanel.qml b/apps/com.luxoft.vehicle/panels/EnergyPanel.qml
index 53bbe0e0..f63675b9 100644
--- a/apps/com.luxoft.vehicle/panels/EnergyPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/EnergyPanel.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import shared.utils 1.0
+import shared.utils
 
-import "../helpers" 1.0
-import "../controls" 1.0
+import "../helpers"
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
index bcf55926..ac6ea663 100644
--- a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import shared.utils 1.0
+import shared.utils
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/RoofPanel.qml b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
index 29ac8b5e..eaf8bfb9 100644
--- a/apps/com.luxoft.vehicle/panels/RoofPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import shared.animations 1.0
-import shared.utils 1.0
+import shared.animations
+import shared.utils
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/Settings3DPanel.qml b/apps/com.luxoft.vehicle/panels/Settings3DPanel.qml
index 9b5f3fed..015d6b50 100644
--- a/apps/com.luxoft.vehicle/panels/Settings3DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Settings3DPanel.qml
@@ -29,17 +29,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.animations
 
-import "../helpers" 1.0
-import "../controls" 1.0
+import "../helpers"
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/SupportPanel.qml b/apps/com.luxoft.vehicle/panels/SupportPanel.qml
index 9ddadc16..73d9a155 100644
--- a/apps/com.luxoft.vehicle/panels/SupportPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/SupportPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import shared.utils 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.controls
 
-import "../helpers" 1.0
+import "../helpers"
 
 ListView {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/TiresPanel.qml b/apps/com.luxoft.vehicle/panels/TiresPanel.qml
index e0e6db7e..61b2f698 100644
--- a/apps/com.luxoft.vehicle/panels/TiresPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/TiresPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import "../helpers" 1.0
-import "../controls" 1.0
+import "../helpers"
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/TopPanel.qml b/apps/com.luxoft.vehicle/panels/TopPanel.qml
index 21f1c805..27f4d6ce 100644
--- a/apps/com.luxoft.vehicle/panels/TopPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/TopPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 
-import shared.animations 1.0
+import shared.animations
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../helpers" 1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
index 6e9832f9..9e86a5a8 100644
--- a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import Qt5Compat.GraphicalEffects 1.0
+import QtQuick
+import Qt5Compat.GraphicalEffects
 
-import shared.animations 1.0
+import shared.animations
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
index 2fcc661a..48d9be04 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import shared.animations 1.0
-import shared.Sizes 1.0
+import shared.animations
+import shared.Sizes
 
-import "../controls" 1.0
-import "../helpers" 1.0
+import "../controls"
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
index 215317e8..e3137486 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.controls
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
index 2cb1202c..cbb48cc0 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
@@ -30,21 +30,21 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.14
-import Qt3D.Core 2.14
-import Qt3D.Render 2.14
-import Qt3D.Extras 2.14
-import Qt3D.Input 2.14
-import Qt3D.Logic 2.14
-import QtQuick.Scene3D 2.14
-import QtQuick.Controls 2.14
-
-import shared.Sizes 1.0
-
-import "../helpers"  1.0
-import "../3d/materials" 1.0
-import "../3d/entities" 1.0
-import "../3d/settings" 1.0
+import QtQuick
+import Qt3D.Core
+import Qt3D.Render
+import Qt3D.Extras
+import Qt3D.Input
+import Qt3D.Logic
+import QtQuick.Scene3D
+import QtQuick.Controls
+
+import shared.Sizes
+
+import "../helpers"
+import "../3d/materials"
+import "../3d/entities"
+import "../3d/settings"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DStudioPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DStudioPanel.qml
index 32a0704b..dbdb6660 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DStudioPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DStudioPanel.qml
@@ -29,15 +29,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtStudio3D.OpenGL 2.5
+import QtQuick
+import QtQuick.Controls
+import QtStudio3D.OpenGL
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import "../helpers" 1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
index 06f1141e..cbc8e8d6 100644
--- a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.5
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
-import shared.Style 1.0
+import shared.Sizes
+import shared.Style
 
-import "../helpers"  1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/stores/VehicleStore.qml b/apps/com.luxoft.vehicle/stores/VehicleStore.qml
index f1b3419f..93b69e83 100644
--- a/apps/com.luxoft.vehicle/stores/VehicleStore.qml
+++ b/apps/com.luxoft.vehicle/stores/VehicleStore.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.com.pelagicore.systeminfo 1.0
-import QtApplicationManager.Application 2.0
-import QtApplicationManager 2.0
-import Qt.labs.settings 1.0
+import QtQuick
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.com.pelagicore.systeminfo
+import QtApplicationManager.Application
+import QtApplicationManager
+import Qt.labs.settings
 
 QtObject {
     id: root
diff --git a/apps/com.luxoft.vehicle/stores/VehicleStoreIC.qml b/apps/com.luxoft.vehicle/stores/VehicleStoreIC.qml
index b02850a2..5d4f1919 100644
--- a/apps/com.luxoft.vehicle/stores/VehicleStoreIC.qml
+++ b/apps/com.luxoft.vehicle/stores/VehicleStoreIC.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
+import QtQuick
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
 
 
 QtObject {
diff --git a/apps/com.luxoft.vehicle/views/VehicleICView.qml b/apps/com.luxoft.vehicle/views/VehicleICView.qml
index 1024eab1..8f16330e 100644
--- a/apps/com.luxoft.vehicle/views/VehicleICView.qml
+++ b/apps/com.luxoft.vehicle/views/VehicleICView.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../panels" 1.0
-import "../stores" 1.0
+import "../panels"
+import "../stores"
 
 Item {
     id: root
diff --git a/apps/com.luxoft.vehicle/views/VehicleView.qml b/apps/com.luxoft.vehicle/views/VehicleView.qml
index bffae32b..fbe52f34 100644
--- a/apps/com.luxoft.vehicle/views/VehicleView.qml
+++ b/apps/com.luxoft.vehicle/views/VehicleView.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick
 
-import shared.utils 1.0
+import shared.utils
 
-import shared.Sizes 1.0
-import shared.animations 1.0
+import shared.Sizes
+import shared.animations
 
-import "../panels" 1.0
-import "../stores" 1.0
-import "../helpers"  1.0
+import "../panels"
+import "../stores"
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/Main.qml b/apps/com.pelagicore.apps.settings/Main.qml
index 82c885b3..647ded61 100644
--- a/apps/com.pelagicore.apps.settings/Main.qml
+++ b/apps/com.pelagicore.apps.settings/Main.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
+import QtQuick
+import application.windows
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 import "views"
 import "store"
diff --git a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
index f08f2ea7..3b1ea89b 100644
--- a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
+++ b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/helper/Helper.qml b/apps/com.pelagicore.apps.settings/helper/Helper.qml
index 8436e797..36e721ea 100644
--- a/apps/com.pelagicore.apps.settings/helper/Helper.qml
+++ b/apps/com.pelagicore.apps.settings/helper/Helper.qml
@@ -29,9 +29,9 @@
 **
 ****************************************************************************/
 
-import QtQml 2.2
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
+import QtQml
+import QtQuick
+import QtApplicationManager.Application
 
 QtObject {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
index 3a3c0247..3624ab5b 100644
--- a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
 import "../controls"
 
diff --git a/apps/com.pelagicore.apps.settings/panels/ConnectivityPanel.qml b/apps/com.pelagicore.apps.settings/panels/ConnectivityPanel.qml
index 3b2fd732..c2386c9d 100644
--- a/apps/com.pelagicore.apps.settings/panels/ConnectivityPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ConnectivityPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 import "../controls"
 
diff --git a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
index 6f2d0289..29ad9b81 100644
--- a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtQml.Models 2.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQml.Models
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.controls
+import shared.animations
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/panels/HotspotPanel.qml b/apps/com.pelagicore.apps.settings/panels/HotspotPanel.qml
index 8cd8380d..345c2f8b 100644
--- a/apps/com.pelagicore.apps.settings/panels/HotspotPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/HotspotPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 import "../controls"
 
diff --git a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
index f978940d..68fcc4f1 100644
--- a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
index 57bee674..fe1f21ce 100644
--- a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 import "../assets"
 
diff --git a/apps/com.pelagicore.apps.settings/panels/WiFiPanel.qml b/apps/com.pelagicore.apps.settings/panels/WiFiPanel.qml
index ec11c497..b0883b96 100644
--- a/apps/com.pelagicore.apps.settings/panels/WiFiPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/WiFiPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 import "../controls"
 import "../assets"
diff --git a/apps/com.pelagicore.apps.settings/popups/WiFiPopup.qml b/apps/com.pelagicore.apps.settings/popups/WiFiPopup.qml
index 657a9827..ef98f2cd 100644
--- a/apps/com.pelagicore.apps.settings/popups/WiFiPopup.qml
+++ b/apps/com.pelagicore.apps.settings/popups/WiFiPopup.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import application.windows 1.0
-import shared.utils 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import application.windows
+import shared.utils
+
+import shared.Style
+import shared.Sizes
 
 PopupWindow {
     id: root
diff --git a/apps/com.pelagicore.apps.settings/store/RootStore.qml b/apps/com.pelagicore.apps.settings/store/RootStore.qml
index 84c5a519..588a58d3 100644
--- a/apps/com.pelagicore.apps.settings/store/RootStore.qml
+++ b/apps/com.pelagicore.apps.settings/store/RootStore.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQml 2.2
-import QtQml.Models 2.3
+import QtQml
+import QtQml.Models
 
-import QtApplicationManager.Application 2.0
+import QtApplicationManager.Application
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Connectivity 1.0
-import shared.com.pelagicore.remotesettings 1.0
+import shared.utils
+import shared.Style
+import shared.Connectivity
+import shared.com.pelagicore.remotesettings
 
 import "../helper"
 
diff --git a/apps/com.pelagicore.apps.settings/views/SettingsView.qml b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
index c49b8a57..21dd60d7 100644
--- a/apps/com.pelagicore.apps.settings/views/SettingsView.qml
+++ b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
-import shared.controls 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
+import shared.controls
+
+import shared.Style
+import shared.Sizes
 
 import "../assets"
 import "../store"
diff --git a/apps/com.pelagicore.calendar/Main.qml b/apps/com.pelagicore.calendar/Main.qml
index e839a46b..1a266df6 100644
--- a/apps/com.pelagicore.calendar/Main.qml
+++ b/apps/com.pelagicore.calendar/Main.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
-import "stores" 1.0
-import "views" 1.0
+import QtQuick
+import application.windows
+import shared.utils
+import "stores"
+import "views"
 
 ApplicationCCWindow {
     id: root
diff --git a/apps/com.pelagicore.calendar/controls/EventList.qml b/apps/com.pelagicore.calendar/controls/EventList.qml
index f4e7cdbb..eb23221b 100644
--- a/apps/com.pelagicore.calendar/controls/EventList.qml
+++ b/apps/com.pelagicore.calendar/controls/EventList.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.controls 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 ListView {
     id: root
diff --git a/apps/com.pelagicore.calendar/controls/EventListItem.qml b/apps/com.pelagicore.calendar/controls/EventListItem.qml
index 4f1870d5..c0455522 100644
--- a/apps/com.pelagicore.calendar/controls/EventListItem.qml
+++ b/apps/com.pelagicore.calendar/controls/EventListItem.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ItemDelegate {
     id: root
diff --git a/apps/com.pelagicore.calendar/controls/WeatherWidget.qml b/apps/com.pelagicore.calendar/controls/WeatherWidget.qml
index 4945aaa1..16be9d07 100644
--- a/apps/com.pelagicore.calendar/controls/WeatherWidget.qml
+++ b/apps/com.pelagicore.calendar/controls/WeatherWidget.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
index 6a440633..22199e20 100644
--- a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.2
+import QtQuick
+import QtQml
 import QtQuick.Controls
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
-import shared.animations 1.0
-import "../controls" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Layouts
+import shared.utils
+import shared.animations
+import "../controls"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
index ee5e2f15..79540aff 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.2
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Layouts
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
index 1144db11..7f74b797 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.3
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.utils 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-import "../panels" 1.0
+import QtQuick.Layouts
+import shared.animations
+import shared.controls
+import shared.utils
+import "../stores"
+import "../controls"
+import "../panels"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
index 5c0cc75f..cc912045 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.2
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import "../controls" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQml
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import shared.utils
+import shared.animations
+import "../controls"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
index 79228288..025cafe7 100644
--- a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.2
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../controls" 1.0
+import QtQuick.Layouts
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
index 35944401..fc2f7c9a 100644
--- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.2
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Layouts
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 RowLayout {
     id: root
diff --git a/apps/com.pelagicore.calendar/stores/CalendarStore.qml b/apps/com.pelagicore.calendar/stores/CalendarStore.qml
index 7b02e6ea..c62d800f 100644
--- a/apps/com.pelagicore.calendar/stores/CalendarStore.qml
+++ b/apps/com.pelagicore.calendar/stores/CalendarStore.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import QtApplicationManager.Application 2.0
+import QtQuick
+import shared.utils
+import QtApplicationManager.Application
 
 Store {
     id: root
diff --git a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
index be4ece49..db29b8c3 100644
--- a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.3
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.utils 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-import "../panels" 1.0
+import QtQuick.Layouts
+import shared.animations
+import shared.controls
+import shared.utils
+import "../stores"
+import "../controls"
+import "../panels"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.calendar/views/CalendarView.qml b/apps/com.pelagicore.calendar/views/CalendarView.qml
index 1c729191..68bcc896 100644
--- a/apps/com.pelagicore.calendar/views/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/CalendarView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtQuick.Controls
-import QtQuick.Layouts 1.3
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.utils 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-import "../panels" 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Layouts
+import shared.animations
+import shared.controls
+import shared.utils
+import "../stores"
+import "../controls"
+import "../panels"
+
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.climate/Main.qml b/apps/com.pelagicore.climate/Main.qml
index fab1958d..1ba24d93 100644
--- a/apps/com.pelagicore.climate/Main.qml
+++ b/apps/com.pelagicore.climate/Main.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import application.windows 1.0
-import shared.utils 1.0
-import shared.com.pelagicore.remotesettings 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import application.windows
+import shared.utils
+import shared.com.pelagicore.remotesettings
+import shared.Style
+import shared.Sizes
 
-import "stores" 1.0
-import "views" 1.0
+import "stores"
+import "views"
 
 NeptuneWindow {
     id: root
diff --git a/apps/com.pelagicore.climate/controls/+lucee/TemperatureLabel.qml b/apps/com.pelagicore.climate/controls/+lucee/TemperatureLabel.qml
index 0c4fcd9f..1d7c1324 100644
--- a/apps/com.pelagicore.climate/controls/+lucee/TemperatureLabel.qml
+++ b/apps/com.pelagicore.climate/controls/+lucee/TemperatureLabel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 RowLayout {
     id: root
diff --git a/apps/com.pelagicore.climate/controls/ClimateButton.qml b/apps/com.pelagicore.climate/controls/ClimateButton.qml
index 689d00c1..94f4dc7e 100644
--- a/apps/com.pelagicore.climate/controls/ClimateButton.qml
+++ b/apps/com.pelagicore.climate/controls/ClimateButton.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Style
+import shared.Sizes
 
 Button {
     id: root
diff --git a/apps/com.pelagicore.climate/controls/TemperatureLabel.qml b/apps/com.pelagicore.climate/controls/TemperatureLabel.qml
index bd4fe1b4..f067b321 100644
--- a/apps/com.pelagicore.climate/controls/TemperatureLabel.qml
+++ b/apps/com.pelagicore.climate/controls/TemperatureLabel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 Label {
     property string seat
diff --git a/apps/com.pelagicore.climate/controls/TemperatureSlider.qml b/apps/com.pelagicore.climate/controls/TemperatureSlider.qml
index a92303ca..c75fa71f 100644
--- a/apps/com.pelagicore.climate/controls/TemperatureSlider.qml
+++ b/apps/com.pelagicore.climate/controls/TemperatureSlider.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.utils 1.0
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Slider {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/+lucee/ClimateIndicatorPanel.qml b/apps/com.pelagicore.climate/panels/+lucee/ClimateIndicatorPanel.qml
index 909e844f..6a1b3619 100644
--- a/apps/com.pelagicore.climate/panels/+lucee/ClimateIndicatorPanel.qml
+++ b/apps/com.pelagicore.climate/panels/+lucee/ClimateIndicatorPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../controls" 1.0
-import "../helpers" 1.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../controls"
+import "../helpers"
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 RowLayout {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
index e406e3a2..4991e65d 100644
--- a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
-import "../helpers" 1.0
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../helpers"
+import shared.animations
+import shared.utils
+import shared.Style
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/ClimateButtonsGridPanel.qml b/apps/com.pelagicore.climate/panels/ClimateButtonsGridPanel.qml
index c8626f76..ec4660f3 100644
--- a/apps/com.pelagicore.climate/panels/ClimateButtonsGridPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateButtonsGridPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.utils 1.0
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 GridLayout {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/ClimateContentPanel.qml b/apps/com.pelagicore.climate/panels/ClimateContentPanel.qml
index e7ab2def..47b62c46 100644
--- a/apps/com.pelagicore.climate/panels/ClimateContentPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateContentPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import shared.controls 1.0
-import application.windows 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import application.windows
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/ClimateHeaderPanel.qml b/apps/com.pelagicore.climate/panels/ClimateHeaderPanel.qml
index f4b144ed..72a585b7 100644
--- a/apps/com.pelagicore.climate/panels/ClimateHeaderPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateHeaderPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.climate/panels/ClimateIndicatorPanel.qml b/apps/com.pelagicore.climate/panels/ClimateIndicatorPanel.qml
index 96337143..f5922f93 100644
--- a/apps/com.pelagicore.climate/panels/ClimateIndicatorPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateIndicatorPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../controls" 1.0
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../controls"
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 RowLayout {
     id: root
diff --git a/apps/com.pelagicore.climate/popups/ClimatePopup.qml b/apps/com.pelagicore.climate/popups/ClimatePopup.qml
index a18d5faf..6f053a1b 100644
--- a/apps/com.pelagicore.climate/popups/ClimatePopup.qml
+++ b/apps/com.pelagicore.climate/popups/ClimatePopup.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import shared.controls 1.0
-import application.windows 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import application.windows
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../controls" 1.0
-import "../panels" 1.0
-import "../stores" 1.0
+import "../controls"
+import "../panels"
+import "../stores"
 
 PopupWindow {
     id: root
diff --git a/apps/com.pelagicore.climate/stores/ClimateStore.qml b/apps/com.pelagicore.climate/stores/ClimateStore.qml
index d8025f95..d1a91b8c 100644
--- a/apps/com.pelagicore.climate/stores/ClimateStore.qml
+++ b/apps/com.pelagicore.climate/stores/ClimateStore.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtInterfaceFramework.VehicleFunctions 1.0
+import QtQuick
+import QtInterfaceFramework.VehicleFunctions
 
 QtObject {
     id: root
diff --git a/apps/com.pelagicore.climate/views/ClimateView.qml b/apps/com.pelagicore.climate/views/ClimateView.qml
index 75aadfc6..4ec53681 100644
--- a/apps/com.pelagicore.climate/views/ClimateView.qml
+++ b/apps/com.pelagicore.climate/views/ClimateView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import shared.controls 1.0
-import shared.utils 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-import "../panels" 1.0
-import "../popups" 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.controls
+import shared.utils
+import "../stores"
+import "../controls"
+import "../panels"
+import "../popups"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.downloads/Main.qml b/apps/com.pelagicore.downloads/Main.qml
index edc18111..0b10e77a 100644
--- a/apps/com.pelagicore.downloads/Main.qml
+++ b/apps/com.pelagicore.downloads/Main.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
-import shared.Sizes 1.0
-import QtQuick.Controls 2.2
-import "views" 1.0
-import "stores" 1.0
+import QtQuick
+import application.windows
+import shared.utils
+import shared.Sizes
+import QtQuick.Controls
+import "views"
+import "stores"
 
 ApplicationCCWindow {
     id: root
diff --git a/apps/com.pelagicore.downloads/controls/DownloadAppList.qml b/apps/com.pelagicore.downloads/controls/DownloadAppList.qml
index a1f46251..b0c6818a 100644
--- a/apps/com.pelagicore.downloads/controls/DownloadAppList.qml
+++ b/apps/com.pelagicore.downloads/controls/DownloadAppList.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.utils
+import shared.Sizes
 
 ListView {
     id: root
diff --git a/apps/com.pelagicore.downloads/controls/DownloadsToolsColumn.qml b/apps/com.pelagicore.downloads/controls/DownloadsToolsColumn.qml
index 65ab16c3..6c3c615b 100644
--- a/apps/com.pelagicore.downloads/controls/DownloadsToolsColumn.qml
+++ b/apps/com.pelagicore.downloads/controls/DownloadsToolsColumn.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import shared.utils 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.Sizes
 
-import shared.controls 1.0
+import shared.controls
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
index 78b27e8f..2314ab5b 100644
--- a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
+++ b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml.StateMachine 1.0 as DSM
+import QtQuick
+import QtQml.StateMachine as DSM
 
 import "JSONBackend.js" as JSONBackend
-import shared.com.pelagicore.systeminfo 1.0
-import shared.utils 1.0
+import shared.com.pelagicore.systeminfo
+import shared.utils
 
 DSM.StateMachine {
     running: true
diff --git a/apps/com.pelagicore.downloads/stores/DownloadsStore.qml b/apps/com.pelagicore.downloads/stores/DownloadsStore.qml
index 4aeb72ec..2afa100e 100644
--- a/apps/com.pelagicore.downloads/stores/DownloadsStore.qml
+++ b/apps/com.pelagicore.downloads/stores/DownloadsStore.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
 import "JSONBackend.js" as JSONBackend
-import QtApplicationManager.Application 2.0
-import QtApplicationManager.SystemUI 2.0
-import shared.com.pelagicore.systeminfo 1.0
+import QtApplicationManager.Application
+import QtApplicationManager.SystemUI
+import shared.com.pelagicore.systeminfo
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.downloads/stores/JSONModel.qml b/apps/com.pelagicore.downloads/stores/JSONModel.qml
index 76d2beea..14b57146 100644
--- a/apps/com.pelagicore.downloads/stores/JSONModel.qml
+++ b/apps/com.pelagicore.downloads/stores/JSONModel.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import "JSONBackend.js" as JSONBackend
 
 ListModel {
diff --git a/apps/com.pelagicore.downloads/stores/ServerConfig.qml b/apps/com.pelagicore.downloads/stores/ServerConfig.qml
index 9df51653..5fb3d457 100644
--- a/apps/com.pelagicore.downloads/stores/ServerConfig.qml
+++ b/apps/com.pelagicore.downloads/stores/ServerConfig.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import "JSONBackend.js" as JSONBackend
-import QtApplicationManager.SystemUI 2.0
+import QtApplicationManager.SystemUI
 
-import shared.utils 1.0
+import shared.utils
 
 QtObject {
     id: root
diff --git a/apps/com.pelagicore.downloads/views/DownloadsView.qml b/apps/com.pelagicore.downloads/views/DownloadsView.qml
index f2f69398..96861dff 100644
--- a/apps/com.pelagicore.downloads/views/DownloadsView.qml
+++ b/apps/com.pelagicore.downloads/views/DownloadsView.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
-import shared.animations 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
+import shared.animations
+import "../stores"
+import "../controls"
+
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.hud/Main.qml b/apps/com.pelagicore.hud/Main.qml
index 8d66150e..5a0cd3af 100644
--- a/apps/com.pelagicore.hud/Main.qml
+++ b/apps/com.pelagicore.hud/Main.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import application.windows 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import application.windows
+import shared.Sizes
 import "stores"
 import "views"
 
diff --git a/apps/com.pelagicore.hud/panels/NaviPanel.qml b/apps/com.pelagicore.hud/panels/NaviPanel.qml
index 6c8e5b3d..8493deac 100644
--- a/apps/com.pelagicore.hud/panels/NaviPanel.qml
+++ b/apps/com.pelagicore.hud/panels/NaviPanel.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import QtQuick.Controls
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.animations 1.0
-import "../helpers" 1.0
+import shared.Style
+import shared.Sizes
+import shared.animations
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.hud/panels/SpeedPanel.qml b/apps/com.pelagicore.hud/panels/SpeedPanel.qml
index b019a196..1e113edf 100644
--- a/apps/com.pelagicore.hud/panels/SpeedPanel.qml
+++ b/apps/com.pelagicore.hud/panels/SpeedPanel.qml
@@ -29,10 +29,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.hud/stores/AbstractStore.qml b/apps/com.pelagicore.hud/stores/AbstractStore.qml
index e055fae5..57982f59 100644
--- a/apps/com.pelagicore.hud/stores/AbstractStore.qml
+++ b/apps/com.pelagicore.hud/stores/AbstractStore.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.pelagicore.hud/stores/RootStore.qml b/apps/com.pelagicore.hud/stores/RootStore.qml
index 4fe3c701..2fc204a2 100644
--- a/apps/com.pelagicore.hud/stores/RootStore.qml
+++ b/apps/com.pelagicore.hud/stores/RootStore.qml
@@ -28,9 +28,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.utils 1.0
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.utils
 
 AbstractStore {
     id: root
diff --git a/apps/com.pelagicore.hud/views/MainView.qml b/apps/com.pelagicore.hud/views/MainView.qml
index 68168bae..53bf4b41 100644
--- a/apps/com.pelagicore.hud/views/MainView.qml
+++ b/apps/com.pelagicore.hud/views/MainView.qml
@@ -29,11 +29,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
+import shared.utils
 import "../stores"
 import "../panels"
 
diff --git a/apps/com.pelagicore.map/Main.qml b/apps/com.pelagicore.map/Main.qml
index 830ab006..a0008160 100644
--- a/apps/com.pelagicore.map/Main.qml
+++ b/apps/com.pelagicore.map/Main.qml
@@ -30,20 +30,20 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import application.windows 1.0
-import shared.utils 1.0
-
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.com.pelagicore.systeminfo 1.0
-import shared.Style 1.0
-import shared.com.pelagicore.map 1.0
-import shared.Sizes 1.0
-
-import "views" 1.0
-import "stores" 1.0
-import "helpers" 1.0
+import QtQuick
+import application.windows
+import shared.utils
+
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.com.pelagicore.systeminfo
+import shared.Style
+import shared.com.pelagicore.map
+import shared.Sizes
+
+import "views"
+import "stores"
+import "helpers"
 
 QtObject {
     property var mainWindow: ApplicationCCWindow {
diff --git a/apps/com.pelagicore.map/controls/MapSearchTextField.qml b/apps/com.pelagicore.map/controls/MapSearchTextField.qml
index 58d47868..220bec77 100644
--- a/apps/com.pelagicore.map/controls/MapSearchTextField.qml
+++ b/apps/com.pelagicore.map/controls/MapSearchTextField.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../helpers" 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.Style
+import shared.Sizes
+import "../helpers"
 
 TextField {
     id: root
diff --git a/apps/com.pelagicore.map/controls/MapToolButton.qml b/apps/com.pelagicore.map/controls/MapToolButton.qml
index 6f3c10e1..1666da4c 100644
--- a/apps/com.pelagicore.map/controls/MapToolButton.qml
+++ b/apps/com.pelagicore.map/controls/MapToolButton.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/apps/com.pelagicore.map/helpers/StandAlone.qml b/apps/com.pelagicore.map/helpers/StandAlone.qml
index 1d1799e1..c745d90f 100644
--- a/apps/com.pelagicore.map/helpers/StandAlone.qml
+++ b/apps/com.pelagicore.map/helpers/StandAlone.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Window 2.3
-import QtQml 2.14
+import QtQuick
+import QtQuick.Window
+import QtQml
 
-import shared.utils 1.0
-import shared.Style 1.0
+import shared.utils
+import shared.Style
 
 import "../stores"
 import "../views"
diff --git a/apps/com.pelagicore.map/panels/FavDestinationButtonsPanel.qml b/apps/com.pelagicore.map/panels/FavDestinationButtonsPanel.qml
index 5ce37a4b..34f059ae 100644
--- a/apps/com.pelagicore.map/panels/FavDestinationButtonsPanel.qml
+++ b/apps/com.pelagicore.map/panels/FavDestinationButtonsPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Layouts 1.3
-import QtPositioning 5.9
+import QtQuick
+import QtQuick.Layouts
+import QtPositioning
 
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../controls" 1.0
-import "../helpers" 1.0
+import shared.animations
+import shared.utils
+import shared.Style
+import shared.Sizes
+import "../controls"
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
index d3e4fd48..fb6953b5 100644
--- a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
+++ b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.animations
+import shared.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../helpers" 1.0
+import shared.Style
+import shared.Sizes
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/HeaderBackgroundWidgetPanel.qml b/apps/com.pelagicore.map/panels/HeaderBackgroundWidgetPanel.qml
index e70c81ae..93998914 100644
--- a/apps/com.pelagicore.map/panels/HeaderBackgroundWidgetPanel.qml
+++ b/apps/com.pelagicore.map/panels/HeaderBackgroundWidgetPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.animations
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../helpers" 1.0
+import shared.Style
+import shared.Sizes
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/MapBoxPanel.qml b/apps/com.pelagicore.map/panels/MapBoxPanel.qml
index 94463e42..293b1ff5 100644
--- a/apps/com.pelagicore.map/panels/MapBoxPanel.qml
+++ b/apps/com.pelagicore.map/panels/MapBoxPanel.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtLocation 5.9
-import QtPositioning 5.9
-
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.animations 1.0
-import "../controls" 1.0
-import "../helpers" 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
+
+import shared.utils
+import shared.Style
+import shared.Sizes
+import shared.animations
+import "../controls"
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/MapHeaderPanel.qml b/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
index b9c4c66d..4f31034d 100644
--- a/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
+++ b/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-import QtPositioning 5.9
-
-import shared.utils 1.0
-import shared.Sizes 1.0
-import shared.controls 1.0 as NeptuneControls
-import shared.animations 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtPositioning
+
+import shared.utils
+import shared.Sizes
+import shared.controls as NeptuneControls
+import shared.animations
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
index 7a5207c9..8fe4f33d 100644
--- a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
+++ b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../helpers" 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
+import "../helpers"
 
 RowLayout {
     id: root
diff --git a/apps/com.pelagicore.map/panels/NavigationSearchPanel.qml b/apps/com.pelagicore.map/panels/NavigationSearchPanel.qml
index 792751c3..0d3ee989 100644
--- a/apps/com.pelagicore.map/panels/NavigationSearchPanel.qml
+++ b/apps/com.pelagicore.map/panels/NavigationSearchPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0 as NeptuneControls
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../helpers" 1.0
+import shared.controls as NeptuneControls
+import shared.utils
+import shared.Style
+import shared.Sizes
+import "../helpers"
 
 Row {
     id: root
diff --git a/apps/com.pelagicore.map/panels/ProxyErrorPanel.qml b/apps/com.pelagicore.map/panels/ProxyErrorPanel.qml
index 9beec9bb..830bc76c 100644
--- a/apps/com.pelagicore.map/panels/ProxyErrorPanel.qml
+++ b/apps/com.pelagicore.map/panels/ProxyErrorPanel.qml
@@ -29,15 +29,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
+import shared.animations
 
-import "../helpers" 1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
index 67e82185..42391d4c 100644
--- a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
+++ b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtLocation 5.9
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.utils
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 ColumnLayout {
     id: root
diff --git a/apps/com.pelagicore.map/stores/MapStore.qml b/apps/com.pelagicore.map/stores/MapStore.qml
index fe2725dc..29ea5168 100644
--- a/apps/com.pelagicore.map/stores/MapStore.qml
+++ b/apps/com.pelagicore.map/stores/MapStore.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
-import QtPositioning 5.9
-import QtLocation 5.9
-import Qt.labs.platform 1.0
-import shared.utils 1.0
-import shared.com.pelagicore.systeminfo 1.0
+import QtQuick
+import QtApplicationManager.Application
+import QtPositioning
+import QtLocation
+import Qt.labs.platform
+import shared.utils
+import shared.com.pelagicore.systeminfo
 
 QtObject {
     id: root
diff --git a/apps/com.pelagicore.map/stores/NavigationStore.qml b/apps/com.pelagicore.map/stores/NavigationStore.qml
index 525dd2ce..8995ac42 100644
--- a/apps/com.pelagicore.map/stores/NavigationStore.qml
+++ b/apps/com.pelagicore.map/stores/NavigationStore.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtLocation 5.9
-import QtPositioning 5.9
-import shared.animations 1.0
-import shared.com.pelagicore.drivedata 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
+import shared.animations
+import shared.com.pelagicore.drivedata
 
 /// class that takes route segments, prepares demo from it, and produces
 /// points and vehicle(arrow marker / map bearing) angle
diff --git a/apps/com.pelagicore.map/views/ICMapView.qml b/apps/com.pelagicore.map/views/ICMapView.qml
index d13fccf8..e4b76d1e 100644
--- a/apps/com.pelagicore.map/views/ICMapView.qml
+++ b/apps/com.pelagicore.map/views/ICMapView.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtLocation 5.9
-import QtPositioning 5.14
-import QtQuick.Controls 2.13
+import QtQuick
+import QtLocation
+import QtPositioning
+import QtQuick.Controls
 
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.animations
+import shared.Style
+import shared.Sizes
 
-import "../helpers" 1.0
-import "../panels" 1.0
+import "../helpers"
+import "../panels"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml
index 6d34bc3c..d76e7943 100644
--- a/apps/com.pelagicore.map/views/MapView.qml
+++ b/apps/com.pelagicore.map/views/MapView.qml
@@ -30,26 +30,26 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtPositioning 5.9
-import QtLocation 5.9
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtPositioning
+import QtLocation
 import Qt5Compat.GraphicalEffects
 
-import Qt.labs.platform 1.0
+import Qt.labs.platform
 
-import shared.utils 1.0
-import shared.controls 1.0 as NeptuneControls
-import shared.animations 1.0
+import shared.utils
+import shared.controls as NeptuneControls
+import shared.animations
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
-import "../panels" 1.0
-import "../stores" 1.0
-import "../helpers" 1.0
+import "../controls"
+import "../panels"
+import "../stores"
+import "../helpers"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/Main.qml b/apps/com.pelagicore.music/Main.qml
index 97e79ce0..4b6f9f57 100644
--- a/apps/com.pelagicore.music/Main.qml
+++ b/apps/com.pelagicore.music/Main.qml
@@ -30,20 +30,20 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
-import "stores" 1.0
-import "views" 1.0
-
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import application.windows
+import shared.utils
+import shared.animations
+import shared.controls
+import QtQuick.Controls
+import QtQuick.Layouts
+import "stores"
+import "views"
+
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.Style
+import shared.Sizes
 
 QtObject {
     property var mainWindow: ApplicationCCWindow {
diff --git a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
index 361524d9..59de7f70 100644
--- a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import shared.utils 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.3
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.effects 1.0
+import shared.utils
+import shared.controls
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
+import shared.effects
 
 Row {
     id: root
diff --git a/apps/com.pelagicore.music/controls/+lucee/TitleColumn.qml b/apps/com.pelagicore.music/controls/+lucee/TitleColumn.qml
index 31c4b813..3592356c 100644
--- a/apps/com.pelagicore.music/controls/+lucee/TitleColumn.qml
+++ b/apps/com.pelagicore.music/controls/+lucee/TitleColumn.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
+import QtQuick
+import shared.utils
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ColumnLayout {
     id: root
diff --git a/apps/com.pelagicore.music/controls/MusicControls.qml b/apps/com.pelagicore.music/controls/MusicControls.qml
index 02837107..9f7cb74e 100644
--- a/apps/com.pelagicore.music/controls/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/MusicControls.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import shared.utils 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.3
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.effects 1.0
+import shared.utils
+import shared.controls
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
+import shared.effects
 
 Row {
     id: root
diff --git a/apps/com.pelagicore.music/controls/MusicProgress.qml b/apps/com.pelagicore.music/controls/MusicProgress.qml
index 73ca2c7f..c618c251 100644
--- a/apps/com.pelagicore.music/controls/MusicProgress.qml
+++ b/apps/com.pelagicore.music/controls/MusicProgress.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.music/controls/MusicTools.qml b/apps/com.pelagicore.music/controls/MusicTools.qml
index 5c4f018e..9d98d07b 100644
--- a/apps/com.pelagicore.music/controls/MusicTools.qml
+++ b/apps/com.pelagicore.music/controls/MusicTools.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Row {
     id: root
diff --git a/apps/com.pelagicore.music/controls/RadialBar.qml b/apps/com.pelagicore.music/controls/RadialBar.qml
index 17b0a916..7f2e8e19 100644
--- a/apps/com.pelagicore.music/controls/RadialBar.qml
+++ b/apps/com.pelagicore.music/controls/RadialBar.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQml 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQml
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/controls/TitleColumn.qml b/apps/com.pelagicore.music/controls/TitleColumn.qml
index 1a313da8..a63585fc 100644
--- a/apps/com.pelagicore.music/controls/TitleColumn.qml
+++ b/apps/com.pelagicore.music/controls/TitleColumn.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
+import QtQuick
+import shared.utils
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ColumnLayout {
     id: root
diff --git a/apps/com.pelagicore.music/panels/+lucee/AlbumArtPanel.qml b/apps/com.pelagicore.music/panels/+lucee/AlbumArtPanel.qml
index a71baeee..f03e27ca 100644
--- a/apps/com.pelagicore.music/panels/+lucee/AlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/+lucee/AlbumArtPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
-import "../panels" 1.0
+import "../controls"
+import "../panels"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
index dff6fc04..e1b3958b 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.effects 1.0
-
-import "../controls" 1.0
+import QtQuick.Controls
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
+import shared.effects
+
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
index 1c568b85..406c68fd 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-
-import "../controls" 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
+
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
index 985a290e..5738a2c0 100644
--- a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
index b9d04501..deaceee0 100644
--- a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
+++ b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.2
-import "../helpers" 1.0
+import QtQuick
+import shared.utils
+import shared.controls
+import QtQuick.Controls
+import "../helpers"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
index 6a014911..169011ba 100644
--- a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
+++ b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
-import QtQuick.Controls 2.2
-import "../helpers" 1.0
+import QtQuick
+import shared.utils
+import shared.controls
+import shared.Sizes
+import shared.Style
+import QtQuick.Controls
+import "../helpers"
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml b/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml
index c8350b5c..5c82e490 100644
--- a/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml
+++ b/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import application.windows 1.0
+import QtQuick
+import QtQuick.Controls
+import application.windows
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 PopupWindow {
     id: root
diff --git a/apps/com.pelagicore.music/stores/MusicStore.qml b/apps/com.pelagicore.music/stores/MusicStore.qml
index d7895880..04f9fd24 100644
--- a/apps/com.pelagicore.music/stores/MusicStore.qml
+++ b/apps/com.pelagicore.music/stores/MusicStore.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
-import QtApplicationManager 2.0
+import QtQuick
+import QtApplicationManager.Application
+import QtApplicationManager
 import QtInterfaceFramework
 import QtInterfaceFramework.Media
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.pelagicore.music/views/+lucee/FullScreenBottomView.qml b/apps/com.pelagicore.music/views/+lucee/FullScreenBottomView.qml
index 15167078..56397500 100644
--- a/apps/com.pelagicore.music/views/+lucee/FullScreenBottomView.qml
+++ b/apps/com.pelagicore.music/views/+lucee/FullScreenBottomView.qml
@@ -30,19 +30,19 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.14
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
-
-import "../stores" 1.0
-import "../panels" 1.0
-import "../controls" 1.0
-import "../popups" 1.0
+import QtQuick
+import QtQml
+import shared.utils
+import shared.controls
+import shared.animations
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
+
+import "../stores"
+import "../panels"
+import "../controls"
+import "../popups"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/+lucee/MusicView.qml b/apps/com.pelagicore.music/views/+lucee/MusicView.qml
index 9362682f..1810e841 100644
--- a/apps/com.pelagicore.music/views/+lucee/MusicView.qml
+++ b/apps/com.pelagicore.music/views/+lucee/MusicView.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
 
-import "../stores" 1.0
-import "../panels" 1.0
-import "../controls" 1.0
+import "../stores"
+import "../panels"
+import "../controls"
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
index 2ef9095c..288eca12 100644
--- a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
@@ -30,19 +30,19 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.animations
 
-import "../panels" 1.0
-import "../controls" 1.0
+import "../panels"
+import "../controls"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/FullScreenBottomView.qml b/apps/com.pelagicore.music/views/FullScreenBottomView.qml
index 82767f33..3ccf3549 100644
--- a/apps/com.pelagicore.music/views/FullScreenBottomView.qml
+++ b/apps/com.pelagicore.music/views/FullScreenBottomView.qml
@@ -30,19 +30,19 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.14
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
-
-import shared.Sizes 1.0
-
-import "../stores" 1.0
-import "../panels" 1.0
-import "../controls" 1.0
-import "../popups" 1.0
+import QtQuick
+import QtQml
+import shared.utils
+import shared.controls
+import shared.animations
+import QtQuick.Controls
+
+import shared.Sizes
+
+import "../stores"
+import "../panels"
+import "../controls"
+import "../popups"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/FullScreenTopView.qml b/apps/com.pelagicore.music/views/FullScreenTopView.qml
index 69ee1766..13c33472 100644
--- a/apps/com.pelagicore.music/views/FullScreenTopView.qml
+++ b/apps/com.pelagicore.music/views/FullScreenTopView.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
 
-import "../panels" 1.0
+import "../panels"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/ICMusicView.qml b/apps/com.pelagicore.music/views/ICMusicView.qml
index 4149386d..b77490d6 100644
--- a/apps/com.pelagicore.music/views/ICMusicView.qml
+++ b/apps/com.pelagicore.music/views/ICMusicView.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import "../stores" 1.0
-import "../panels" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import "../stores"
+import "../panels"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/MusicView.qml b/apps/com.pelagicore.music/views/MusicView.qml
index a005071d..e1e09aff 100644
--- a/apps/com.pelagicore.music/views/MusicView.qml
+++ b/apps/com.pelagicore.music/views/MusicView.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
 
-import "../stores" 1.0
-import "../panels" 1.0
-import "../controls" 1.0
+import "../stores"
+import "../panels"
+import "../controls"
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml
index f2a051ff..60d7cf49 100644
--- a/apps/com.pelagicore.music/views/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/WidgetContentView.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.animations
 
-import "../panels" 1.0
-import "../controls" 1.0
+import "../panels"
+import "../controls"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml
index 37a1e780..09821032 100644
--- a/apps/com.pelagicore.phone/Main.qml
+++ b/apps/com.pelagicore.phone/Main.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
+import QtQuick
+import application.windows
+import shared.utils
+import shared.animations
+import shared.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import "views" 1.0
-import "controls" 1.0
-import "stores" 1.0
+import "views"
+import "controls"
+import "stores"
 
 ApplicationCCWindow {
     id: root
diff --git a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
index ffc89d3a..88001e84 100644
--- a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
+++ b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import Qt5Compat.GraphicalEffects
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.phone/controls/KeypadButton.qml b/apps/com.pelagicore.phone/controls/KeypadButton.qml
index fc220c26..cec5d694 100644
--- a/apps/com.pelagicore.phone/controls/KeypadButton.qml
+++ b/apps/com.pelagicore.phone/controls/KeypadButton.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.animations
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/apps/com.pelagicore.phone/controls/RoundImage.qml b/apps/com.pelagicore.phone/controls/RoundImage.qml
index bf7157ea..a0956d39 100644
--- a/apps/com.pelagicore.phone/controls/RoundImage.qml
+++ b/apps/com.pelagicore.phone/controls/RoundImage.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/apps/com.pelagicore.phone/controls/WidgetContact.qml b/apps/com.pelagicore.phone/controls/WidgetContact.qml
index d188276c..102d6fa5 100644
--- a/apps/com.pelagicore.phone/controls/WidgetContact.qml
+++ b/apps/com.pelagicore.phone/controls/WidgetContact.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 
-import shared.effects 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.effects
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml
index 726d4237..71187953 100644
--- a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml
+++ b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import "../controls" 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.animations
+import shared.controls
+import "../controls"
 
 Item {
     opacity: visible ? 1 : 0
diff --git a/apps/com.pelagicore.phone/stores/PhoneStore.qml b/apps/com.pelagicore.phone/stores/PhoneStore.qml
index ae3b28fe..df89e89d 100644
--- a/apps/com.pelagicore.phone/stores/PhoneStore.qml
+++ b/apps/com.pelagicore.phone/stores/PhoneStore.qml
@@ -31,10 +31,10 @@
 ****************************************************************************/
 
 
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
-import shared.utils 1.0
-import shared.com.pelagicore.systeminfo 1.0
+import QtQuick
+import QtApplicationManager.Application
+import shared.utils
+import shared.com.pelagicore.systeminfo
 
 Store {
     id: root
diff --git a/apps/com.pelagicore.phone/views/CallWidgetView.qml b/apps/com.pelagicore.phone/views/CallWidgetView.qml
index eeb69b94..c3debacb 100644
--- a/apps/com.pelagicore.phone/views/CallWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/CallWidgetView.qml
@@ -30,19 +30,19 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.animations
+import shared.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
-import "../stores" 1.0
+import "../controls"
+import "../stores"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.phone/views/ContactsView.qml b/apps/com.pelagicore.phone/views/ContactsView.qml
index 09a64269..eca20c44 100644
--- a/apps/com.pelagicore.phone/views/ContactsView.qml
+++ b/apps/com.pelagicore.phone/views/ContactsView.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.animations
+import shared.controls
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 ListView {
     id: root
diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
index e67bb021..8daf9711 100644
--- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.animations
+import shared.controls
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.phone/views/PhoneView.qml b/apps/com.pelagicore.phone/views/PhoneView.qml
index 2b457ea9..487b690a 100644
--- a/apps/com.pelagicore.phone/views/PhoneView.qml
+++ b/apps/com.pelagicore.phone/views/PhoneView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.animations
+import shared.controls
 
-import "../stores" 1.0
-import "../views" 1.0
+import "../stores"
+import "../views"
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.phone/views/RecentCallsView.qml b/apps/com.pelagicore.phone/views/RecentCallsView.qml
index 72554627..86567967 100644
--- a/apps/com.pelagicore.phone/views/RecentCallsView.qml
+++ b/apps/com.pelagicore.phone/views/RecentCallsView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-
-import "../stores" 1.0
-import "../controls" 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import shared.utils
+import shared.animations
+import shared.controls
+import shared.Style
+import shared.Sizes
+
+import "../stores"
+import "../controls"
 
 ListView {
     id: root
diff --git a/apps/com.pelagicore.tuner/Main.qml b/apps/com.pelagicore.tuner/Main.qml
index de4e59eb..e12b0259 100644
--- a/apps/com.pelagicore.tuner/Main.qml
+++ b/apps/com.pelagicore.tuner/Main.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
+import QtQuick
+import application.windows
+import shared.utils
+import shared.controls
+import shared.animations
 
-import "stores" 1.0
-import "views" 1.0
+import "stores"
+import "views"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ApplicationCCWindow {
     id: root
diff --git a/apps/com.pelagicore.tuner/controls/MusicControls.qml b/apps/com.pelagicore.tuner/controls/MusicControls.qml
index 5d6758d5..30c04596 100644
--- a/apps/com.pelagicore.tuner/controls/MusicControls.qml
+++ b/apps/com.pelagicore.tuner/controls/MusicControls.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import shared.utils 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.3
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.effects 1.0
+import shared.utils
+import shared.controls
+import QtQuick.Controls
+import shared.Style
+import shared.Sizes
+import shared.effects
 
 Row {
     id: root
diff --git a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
index 6dc0bd33..85061eed 100644
--- a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
+++ b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.controls
+import shared.animations
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.tuner/controls/TunerSlider.qml b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
index 2bda18a1..606ef5f1 100644
--- a/apps/com.pelagicore.tuner/controls/TunerSlider.qml
+++ b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Style
+import shared.Sizes
 
 Slider {
     //TODO adapt it to AM band frequencies
diff --git a/apps/com.pelagicore.tuner/panels/StationBrowseListPanel.qml b/apps/com.pelagicore.tuner/panels/StationBrowseListPanel.qml
index 61d7acdb..8464878e 100644
--- a/apps/com.pelagicore.tuner/panels/StationBrowseListPanel.qml
+++ b/apps/com.pelagicore.tuner/panels/StationBrowseListPanel.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.controls 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import shared.controls
+import QtQuick.Controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Control {
     id: root
diff --git a/apps/com.pelagicore.tuner/panels/StationInfoPanel.qml b/apps/com.pelagicore.tuner/panels/StationInfoPanel.qml
index 7ca17bae..e823e79c 100644
--- a/apps/com.pelagicore.tuner/panels/StationInfoPanel.qml
+++ b/apps/com.pelagicore.tuner/panels/StationInfoPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.animations
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml b/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml
index 4fa862c9..4e6d0e12 100644
--- a/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml
+++ b/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtApplicationManager 2.0
-import shared.utils 1.0
-import application.windows 1.0
+import QtQuick
+import QtQuick.Controls
+import QtApplicationManager
+import shared.utils
+import application.windows
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 PopupWindow {
     id: root
diff --git a/apps/com.pelagicore.tuner/stores/AmFmTuner.qml b/apps/com.pelagicore.tuner/stores/AmFmTuner.qml
index 0144d57a..81c369a2 100644
--- a/apps/com.pelagicore.tuner/stores/AmFmTuner.qml
+++ b/apps/com.pelagicore.tuner/stores/AmFmTuner.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
 QtObject {
     id: root
diff --git a/apps/com.pelagicore.tuner/stores/TunerStore.qml b/apps/com.pelagicore.tuner/stores/TunerStore.qml
index 52da18cf..77f7d815 100644
--- a/apps/com.pelagicore.tuner/stores/TunerStore.qml
+++ b/apps/com.pelagicore.tuner/stores/TunerStore.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtMultimedia
-import QtApplicationManager.Application 2.0
-import QtApplicationManager 2.0
-import shared.utils 1.0
+import QtApplicationManager.Application
+import QtApplicationManager
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
index 940c0428..eca724f4 100644
--- a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
+++ b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.utils
+import shared.controls
+import shared.animations
+import QtQuick.Controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../stores" 1.0
-import "../panels" 1.0
-import "../controls" 1.0
-import "../popups" 1.0
+import "../stores"
+import "../panels"
+import "../controls"
+import "../popups"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.tuner/views/FullScreenTopView.qml b/apps/com.pelagicore.tuner/views/FullScreenTopView.qml
index c49d3aa2..eb176236 100644
--- a/apps/com.pelagicore.tuner/views/FullScreenTopView.qml
+++ b/apps/com.pelagicore.tuner/views/FullScreenTopView.qml
@@ -30,19 +30,19 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.utils
+import shared.animations
 
-import "../controls" 1.0
-import "../panels" 1.0
-import "../helpers" 1.0
+import "../controls"
+import "../panels"
+import "../helpers"
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.tuner/views/StationInfoView.qml b/apps/com.pelagicore.tuner/views/StationInfoView.qml
index d46e15fe..e3a73f70 100644
--- a/apps/com.pelagicore.tuner/views/StationInfoView.qml
+++ b/apps/com.pelagicore.tuner/views/StationInfoView.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import shared.animations
+import shared.Sizes
 
-import "../controls" 1.0
-import "../panels" 1.0
+import "../controls"
+import "../panels"
 
 Item {
     id: root
diff --git a/apps/com.pelagicore.tuner/views/TunerView.qml b/apps/com.pelagicore.tuner/views/TunerView.qml
index c5a161f7..15ea8b58 100644
--- a/apps/com.pelagicore.tuner/views/TunerView.qml
+++ b/apps/com.pelagicore.tuner/views/TunerView.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import "../stores" 1.0
-import "../controls" 1.0
-import "../panels" 1.0
+import shared.controls
+import shared.utils
+import shared.animations
+import "../stores"
+import "../controls"
+import "../panels"
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/Main.qml b/apps/com.theqtcompany.cluster/Main.qml
index f347134a..07cd4c56 100644
--- a/apps/com.theqtcompany.cluster/Main.qml
+++ b/apps/com.theqtcompany.cluster/Main.qml
@@ -31,17 +31,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
-import shared.com.pelagicore.remotesettings 1.0
-import application.windows 1.0
+import QtQuick
+import QtQuick.Window
+import shared.com.pelagicore.remotesettings
+import application.windows
 
-import shared.utils 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
+import shared.utils
+import shared.Sizes
+import shared.Style
 
-import "views" 1.0
-import "stores" 1.0
+import "views"
+import "stores"
 
 NeptuneWindow {
     id: root
diff --git a/apps/com.theqtcompany.cluster/controls/Blinker.qml b/apps/com.theqtcompany.cluster/controls/Blinker.qml
index 0c2a1159..7541051e 100644
--- a/apps/com.theqtcompany.cluster/controls/Blinker.qml
+++ b/apps/com.theqtcompany.cluster/controls/Blinker.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQml 2.2
+import QtQml
 
 Timer {
     // public
diff --git a/apps/com.theqtcompany.cluster/helpers/Qt3DStudioAvailable.qml b/apps/com.theqtcompany.cluster/helpers/Qt3DStudioAvailable.qml
index a4146edd..824089a3 100644
--- a/apps/com.theqtcompany.cluster/helpers/Qt3DStudioAvailable.qml
+++ b/apps/com.theqtcompany.cluster/helpers/Qt3DStudioAvailable.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import QtStudio3D.OpenGL 2.5
-import QtQuick 2.8
+import QtStudio3D.OpenGL
+import QtQuick
 
 Item {}
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
index 05dc0c36..1269be66 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Shapes 1.12
-import shared.controls 1.0
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Shapes
+import shared.controls
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 /*
     Holds lucee style Battery gauge, current gear indicator, outside temperature
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
index 266f8d19..acd07409 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
@@ -29,16 +29,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Shapes 1.12
-import shared.controls 1.0
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Shapes
+import shared.controls
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
-import shared.utils 1.0
+import shared.utils
 
 /*
     Holds lucee style Speed, Time, Mileage, Route progress
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
index abf9aebf..f9777358 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
@@ -29,10 +29,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import shared.Sizes 1.0
-import QtQuick.Shapes 1.12
-import QtQuick.Controls 2.2
+import QtQuick
+import shared.Sizes
+import QtQuick.Shapes
+import QtQuick.Controls
 
 /*
   GaugesPanel
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
index 9936ce63..74c54cf6 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
@@ -29,11 +29,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Shapes 1.12
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Shapes
+import shared.Sizes
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 
 /*
   A component for left and right parts of circles inside GaugesPanel for lucee style
diff --git a/apps/com.theqtcompany.cluster/panels/ClusterTemperatureLabel.qml b/apps/com.theqtcompany.cluster/panels/ClusterTemperatureLabel.qml
index 5f5a7cba..063d05ea 100644
--- a/apps/com.theqtcompany.cluster/panels/ClusterTemperatureLabel.qml
+++ b/apps/com.theqtcompany.cluster/panels/ClusterTemperatureLabel.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 /*
     A lucee component for showing temperature in Cluster
diff --git a/apps/com.theqtcompany.cluster/panels/ClusterUnitsLabel.qml b/apps/com.theqtcompany.cluster/panels/ClusterUnitsLabel.qml
index e39c9b94..a6813714 100644
--- a/apps/com.theqtcompany.cluster/panels/ClusterUnitsLabel.qml
+++ b/apps/com.theqtcompany.cluster/panels/ClusterUnitsLabel.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 /*!
     \qmltype ClusterUnitsLabel
diff --git a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
index 36a68024..4761297d 100644
--- a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
@@ -31,12 +31,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Shapes 1.0
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Shapes
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
index aee69173..a85a884f 100644
--- a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
@@ -31,12 +31,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import QtQuick.Controls 2.3
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Controls
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
index 299040cb..bf77cb4b 100644
--- a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
@@ -31,14 +31,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import QtQuick.Shapes 1.0
-import shared.controls 1.0
-import "../helpers" 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick.Shapes
+import shared.controls
+import "../helpers"
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
index 5d39f06a..be93ae95 100644
--- a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
+++ b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Shapes 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Shapes
 
-import shared.Sizes 1.0
-import shared.Style 1.0
+import shared.Sizes
+import shared.Style
 
 /*
     A lucee component for rounded gauge
diff --git a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
index 29d420be..87a64b38 100644
--- a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
+++ b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
@@ -29,10 +29,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Shapes 1.12
-import shared.Sizes 1.0
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Shapes
+import shared.Sizes
+import QtQuick.Controls
 
 /*!
     A lucee component for selected mode and range it provides
diff --git a/apps/com.theqtcompany.cluster/panels/GaugesPanel.qml b/apps/com.theqtcompany.cluster/panels/GaugesPanel.qml
index f8a71ae9..03234661 100644
--- a/apps/com.theqtcompany.cluster/panels/GaugesPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/GaugesPanel.qml
@@ -31,9 +31,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import shared.Sizes 1.0
-import shared.utils 1.0
+import QtQuick
+import shared.Sizes
+import shared.utils
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
index 22882880..c2e64e25 100644
--- a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
+++ b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
@@ -29,15 +29,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import shared.Sizes 1.0
-import shared.Style 1.0
-import shared.utils 1.0
-import QtQuick.Shapes 1.12
-import QtQuick.Controls 2.2
-import QtStudio3D.OpenGL 2.5
-
-import "../helpers" 1.0
+import QtQuick
+import shared.Sizes
+import shared.Style
+import shared.utils
+import QtQuick.Shapes
+import QtQuick.Controls
+import QtStudio3D.OpenGL
+
+import "../helpers"
 
 /*
   \qmltype GaugesPanel
diff --git a/apps/com.theqtcompany.cluster/panels/SafeTelltalesPanel.qml b/apps/com.theqtcompany.cluster/panels/SafeTelltalesPanel.qml
index 49070570..75a71a84 100644
--- a/apps/com.theqtcompany.cluster/panels/SafeTelltalesPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/SafeTelltalesPanel.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import "../controls" 1.0
-import "../helpers" 1.0
-import shared.Sizes 1.0
-import Qt.SafeRenderer 1.1
+import QtQuick
+import QtQuick.Layouts
+import "../controls"
+import "../helpers"
+import shared.Sizes
+import Qt.SafeRenderer
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/TelltalesLeftPanel.qml b/apps/com.theqtcompany.cluster/panels/TelltalesLeftPanel.qml
index ade3e362..c56cffd1 100644
--- a/apps/com.theqtcompany.cluster/panels/TelltalesLeftPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/TelltalesLeftPanel.qml
@@ -31,11 +31,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import "../controls" 1.0
-import "../helpers" 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Layouts
+import "../controls"
+import "../helpers"
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/panels/TelltalesRightPanel.qml b/apps/com.theqtcompany.cluster/panels/TelltalesRightPanel.qml
index 12ec6db4..91cc9bf7 100644
--- a/apps/com.theqtcompany.cluster/panels/TelltalesRightPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/TelltalesRightPanel.qml
@@ -31,11 +31,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import "../controls" 1.0
-import "../helpers" 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Layouts
+import "../controls"
+import "../helpers"
+import shared.Sizes
 
 Item {
     id: root
diff --git a/apps/com.theqtcompany.cluster/stores/BehaviourInterface.qml b/apps/com.theqtcompany.cluster/stores/BehaviourInterface.qml
index 1ec57356..0e5534b2 100644
--- a/apps/com.theqtcompany.cluster/stores/BehaviourInterface.qml
+++ b/apps/com.theqtcompany.cluster/stores/BehaviourInterface.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.theqtcompany.cluster/stores/ExternalDataInterface.qml b/apps/com.theqtcompany.cluster/stores/ExternalDataInterface.qml
index 8ddde720..1a8d5ba0 100644
--- a/apps/com.theqtcompany.cluster/stores/ExternalDataInterface.qml
+++ b/apps/com.theqtcompany.cluster/stores/ExternalDataInterface.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.theqtcompany.cluster/stores/RootStore.qml b/apps/com.theqtcompany.cluster/stores/RootStore.qml
index b79886bb..02ce951f 100644
--- a/apps/com.theqtcompany.cluster/stores/RootStore.qml
+++ b/apps/com.theqtcompany.cluster/stores/RootStore.qml
@@ -29,11 +29,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.com.pelagicore.systeminfo 1.0
+import QtQuick
+import QtApplicationManager.Application
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.com.pelagicore.systeminfo
 
 /*!
     \qmltype ClusterStore
diff --git a/apps/com.theqtcompany.cluster/stores/RootStoreInterface.qml b/apps/com.theqtcompany.cluster/stores/RootStoreInterface.qml
index 4e070c40..a908e94b 100644
--- a/apps/com.theqtcompany.cluster/stores/RootStoreInterface.qml
+++ b/apps/com.theqtcompany.cluster/stores/RootStoreInterface.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.theqtcompany.cluster/stores/VehicleInterface.qml b/apps/com.theqtcompany.cluster/stores/VehicleInterface.qml
index 0338fe7c..265d4c2e 100644
--- a/apps/com.theqtcompany.cluster/stores/VehicleInterface.qml
+++ b/apps/com.theqtcompany.cluster/stores/VehicleInterface.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml b/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml
index b4be0281..99aa480d 100644
--- a/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml
+++ b/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml
@@ -29,18 +29,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
-
-import shared.com.pelagicore.remotesettings 1.0
-import shared.animations 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
-
-import "../stores" 1.0
-import "../panels" 1.0
-import "../helpers" 1.0
-import "../controls" 1.0
+import QtQuick
+import QtQuick.Window
+
+import shared.com.pelagicore.remotesettings
+import shared.animations
+import shared.Sizes
+import shared.Style
+
+import "../stores"
+import "../panels"
+import "../helpers"
+import "../controls"
 
 /*
     Lucee ClusterView
diff --git a/apps/com.theqtcompany.cluster/views/ClusterView.qml b/apps/com.theqtcompany.cluster/views/ClusterView.qml
index 958912d4..a4a43862 100644
--- a/apps/com.theqtcompany.cluster/views/ClusterView.qml
+++ b/apps/com.theqtcompany.cluster/views/ClusterView.qml
@@ -31,20 +31,20 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
-import shared.com.pelagicore.remotesettings 1.0
-//import application.windows 1.0
+import QtQuick
+import QtQuick.Window
+import shared.com.pelagicore.remotesettings
+//import application.windows
 
-import shared.Sizes 1.0
-import shared.Style 1.0
+import shared.Sizes
+import shared.Style
 
-import shared.animations 1.0
+import shared.animations
 
-import "../stores" 1.0
-import "../panels" 1.0
-import "../helpers" 1.0
-import "../controls" 1.0
+import "../stores"
+import "../panels"
+import "../helpers"
+import "../controls"
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/Main.qml b/dev/apps/com.pelagicore.sheets/Main.qml
index ed6cdf2e..f53a170f 100644
--- a/dev/apps/com.pelagicore.sheets/Main.qml
+++ b/dev/apps/com.pelagicore.sheets/Main.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import application.windows 1.0
-import shared.utils 1.0
+import QtQuick
+import application.windows
+import shared.utils
 
 ApplicationCCWindow {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/SheetsContent.qml b/dev/apps/com.pelagicore.sheets/SheetsContent.qml
index ba200b04..8c64fbd5 100644
--- a/dev/apps/com.pelagicore.sheets/SheetsContent.qml
+++ b/dev/apps/com.pelagicore.sheets/SheetsContent.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import Qt.labs.folderlistmodel 2.2
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.controls 1.0
-import shared.utils 1.0
+import QtQuick
+import Qt.labs.folderlistmodel
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/ButtonPanel.qml b/dev/apps/com.pelagicore.sheets/components/ButtonPanel.qml
index eab9f30e..cbcaf4fc 100644
--- a/dev/apps/com.pelagicore.sheets/components/ButtonPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/ButtonPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
index 44fb59a4..6214cae7 100644
--- a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.controls 1.0
-import shared.utils 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.controls
+import shared.utils
+
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/NotificationPanel.qml b/dev/apps/com.pelagicore.sheets/components/NotificationPanel.qml
index 5155df77..ac8d98c9 100644
--- a/dev/apps/com.pelagicore.sheets/components/NotificationPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/NotificationPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Sizes 1.0
-import QtApplicationManager.Application 2.0
-import QtApplicationManager 2.0
+import shared.Sizes
+import QtApplicationManager.Application
+import QtApplicationManager
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/PopupsPanel.qml b/dev/apps/com.pelagicore.sheets/components/PopupsPanel.qml
index 9cbd9711..43e85fdb 100644
--- a/dev/apps/com.pelagicore.sheets/components/PopupsPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/PopupsPanel.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.controls 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.controls
+import shared.utils
 
 import "../popups"
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/ProgressBarPanel.qml b/dev/apps/com.pelagicore.sheets/components/ProgressBarPanel.qml
index 7e7cb3d8..91856195 100644
--- a/dev/apps/com.pelagicore.sheets/components/ProgressBarPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/ProgressBarPanel.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/dev/apps/com.pelagicore.sheets/components/SliderPanel.qml b/dev/apps/com.pelagicore.sheets/components/SliderPanel.qml
index 5457898d..9e8b7f84 100644
--- a/dev/apps/com.pelagicore.sheets/components/SliderPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/SliderPanel.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     Column {
diff --git a/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml b/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml
index b815cce8..36c3a535 100644
--- a/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/ToolButtonPanel.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 GridLayout {
     anchors.leftMargin: Sizes.dp(100)
diff --git a/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml b/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml
index 7b23b3d3..aa6898ff 100644
--- a/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml
+++ b/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import application.windows 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import application.windows
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 PopupWindow {
     id: root
diff --git a/dummyimports/QtIvi/Media/MediaIndexerControl.qml b/dummyimports/QtIvi/Media/MediaIndexerControl.qml
index b1d78d7e..bfdfce27 100644
--- a/dummyimports/QtIvi/Media/MediaIndexerControl.qml
+++ b/dummyimports/QtIvi/Media/MediaIndexerControl.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
+import QtQuick
 
 QtObject {
     id: root
diff --git a/dummyimports/QtIvi/Media/MediaPlayer.qml b/dummyimports/QtIvi/Media/MediaPlayer.qml
index 3f8ce6b9..b765e395 100644
--- a/dummyimports/QtIvi/Media/MediaPlayer.qml
+++ b/dummyimports/QtIvi/Media/MediaPlayer.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
+import QtQuick
 
 QtObject {
 
diff --git a/dummyimports/QtIvi/SearchAndBrowseModel.qml b/dummyimports/QtIvi/SearchAndBrowseModel.qml
index 343e97cb..46abe48b 100644
--- a/dummyimports/QtIvi/SearchAndBrowseModel.qml
+++ b/dummyimports/QtIvi/SearchAndBrowseModel.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
+import QtQuick
 
 QtObject {
     id: root
diff --git a/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml b/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
index d36c9948..7aab38d0 100644
--- a/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
+++ b/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 QtObject {
     property int discoveryMode: 0 /* QIfAbstractFeature::NoAutoDiscovery */
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter1-basics/Main.qml b/examples/neptune3ui/parking-app-tutorial/chapter1-basics/Main.qml
index 9cfe48a2..734985c6 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter1-basics/Main.qml
+++ b/examples/neptune3ui/parking-app-tutorial/chapter1-basics/Main.qml
@@ -50,17 +50,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
-import QtApplicationManager 2.0
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
+import QtApplicationManager
 
 //! [implement app 1]
-import application.windows 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
-import shared.controls 1.0
+import application.windows
+import shared.Sizes
+import shared.Style
+import shared.controls
 
 ApplicationCCWindow {
     id: root
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter2-extend/Main.qml b/examples/neptune3ui/parking-app-tutorial/chapter2-extend/Main.qml
index 51f0de3d..a9a81d22 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter2-extend/Main.qml
+++ b/examples/neptune3ui/parking-app-tutorial/chapter2-extend/Main.qml
@@ -50,16 +50,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
-import QtApplicationManager 2.0
-
-import application.windows 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
-import shared.controls 1.0
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
+import QtApplicationManager
+
+import application.windows
+import shared.Sizes
+import shared.Style
+import shared.controls
 
 ApplicationCCWindow {
     id: root
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/app/Main.qml b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/app/Main.qml
index b1bb24e5..ac8105bc 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/app/Main.qml
+++ b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/app/Main.qml
@@ -50,18 +50,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.animations 1.0
-import QtQuick.Controls 2.2
-import QtApplicationManager 2.0
-
-import application.windows 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
-import shared.controls 1.0
-
-import Example.Parking 1.0
+import QtQuick
+import shared.utils
+import shared.animations
+import QtQuick.Controls
+import QtApplicationManager
+
+import application.windows
+import shared.Sizes
+import shared.Style
+import shared.controls
+
+import Example.Parking
 
 ApplicationCCWindow {
     id: root
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/simulation.qml b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/simulation.qml
index 78694192..d954cb6a 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/simulation.qml
+++ b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/simulation.qml
@@ -50,8 +50,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import Example.Parking.simulation 1.0
+import QtQuick
+import Example.Parking.simulation
 
 QtObject {
     property var settings : IfSimulator.findData(IfSimulator.simulationData, "ParkingInfo")
diff --git a/imports_shared/application/windows/ApplicationCCWindow.qml b/imports_shared/application/windows/ApplicationCCWindow.qml
index 25a4a0ab..e7774a3e 100644
--- a/imports_shared/application/windows/ApplicationCCWindow.qml
+++ b/imports_shared/application/windows/ApplicationCCWindow.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.controls
+import shared.utils
+import shared.animations
+import shared.Sizes
 
 /*!
     \qmltype ApplicationCCWindow
@@ -54,8 +54,8 @@ import shared.Sizes 1.0
     The following example uses \l{ApplicationCCWindow} as a root element:
 
     \qml
-    import QtQuick 2.10
-    import application.windows 1.0
+    import QtQuick
+    import application.windows
 
     ApplicationCCWindow {
         id: root
diff --git a/imports_shared/application/windows/ApplicationICWindow.qml b/imports_shared/application/windows/ApplicationICWindow.qml
index 10a433aa..b0fefd09 100644
--- a/imports_shared/application/windows/ApplicationICWindow.qml
+++ b/imports_shared/application/windows/ApplicationICWindow.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.Style 1.0
+import QtQuick
+import shared.utils
+import shared.Style
 
 /*!
     \qmltype ApplicationICWindow
@@ -53,8 +53,8 @@ import shared.Style 1.0
     The following example uses \l{ApplicationICWindow}:
 
     \qml
-    import QtQuick 2.10
-    import application.windows 1.0
+    import QtQuick
+    import application.windows
 
     QtObject {
         property var mainWindow: ApplicationCCWindow {
diff --git a/imports_shared/application/windows/NeptuneWindow.qml b/imports_shared/application/windows/NeptuneWindow.qml
index b7483d42..36fb5023 100644
--- a/imports_shared/application/windows/NeptuneWindow.qml
+++ b/imports_shared/application/windows/NeptuneWindow.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.Application 2.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtApplicationManager.Application
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 /*!
     \qmltype NeptuneWindow
@@ -52,8 +52,8 @@ import shared.Sizes 1.0
     The following example uses \l{NeptuneWindow}:
 
     \qml
-    import QtQuick 2.10
-    import application.windows 1.0
+    import QtQuick
+    import application.windows
 
     NeptuneWindow {
         id: root
diff --git a/imports_shared/application/windows/PopupWindow.qml b/imports_shared/application/windows/PopupWindow.qml
index dee96541..ccdb4b24 100644
--- a/imports_shared/application/windows/PopupWindow.qml
+++ b/imports_shared/application/windows/PopupWindow.qml
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 
-import QtQuick 2.6
-import shared.Style 1.0
+import QtQuick
+import shared.Style
 
 /*!
     \qmltype PopupWindow
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
index 8fd15e04..52c496ec 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
-import QtQuick.VirtualKeyboard.Styles 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Styles
 
-import shared.utils 1.0 as Utils
+import shared.utils as Utils
 
 KeyboardStyle {
     id: currentStyle
diff --git a/imports_shared/shared/animations/DefaultNumberAnimation.qml b/imports_shared/shared/animations/DefaultNumberAnimation.qml
index 6204f189..5aa5a3c1 100644
--- a/imports_shared/shared/animations/DefaultNumberAnimation.qml
+++ b/imports_shared/shared/animations/DefaultNumberAnimation.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 /*!
     \qmltype DefaultNumberAnimation
@@ -48,8 +48,8 @@ import QtQuick 2.6
     The following example shows how to use \l{DefaultNumberAnimation}:
 
     \qml
-    import QtQuick 2.10
-    import shared.animations 1.0
+    import QtQuick
+    import shared.animations
 
     Rectangle {
         id: root
diff --git a/imports_shared/shared/animations/DefaultSmoothedAnimation.qml b/imports_shared/shared/animations/DefaultSmoothedAnimation.qml
index 94a14259..9931a867 100644
--- a/imports_shared/shared/animations/DefaultSmoothedAnimation.qml
+++ b/imports_shared/shared/animations/DefaultSmoothedAnimation.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 /*!
     \qmltype DefaultSmoothedAnimation
@@ -48,8 +48,8 @@ import QtQuick 2.6
     The following example shows how to use \l{DefaultSmoothedAnimation}:
 
     \qml
-    import QtQuick 2.10
-    import shared.animations 1.0
+    import QtQuick
+    import shared.animations
 
     Rectangle {
         id: root
diff --git a/imports_shared/shared/effects/ScalableColorOverlay.qml b/imports_shared/shared/effects/ScalableColorOverlay.qml
index 907948db..162a5765 100644
--- a/imports_shared/shared/effects/ScalableColorOverlay.qml
+++ b/imports_shared/shared/effects/ScalableColorOverlay.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
+import QtQuick
 
 /*!
     \qmltype ScalableColorOverlay
@@ -46,8 +46,8 @@ import QtQuick 2.12
     The following example uses \l{ScalableColorOverlay}:
 
     \qml
-    import QtQuick 2.10
-    import shared.effects 1.0
+    import QtQuick
+    import shared.effects
 
     Item {
         id: root
diff --git a/imports_shared/shared/service/notification/NotificationInterface.qml b/imports_shared/shared/service/notification/NotificationInterface.qml
index 05f3d1c5..7ea2570e 100644
--- a/imports_shared/shared/service/notification/NotificationInterface.qml
+++ b/imports_shared/shared/service/notification/NotificationInterface.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtApplicationManager.Application 2.0
+import QtQuick
+import QtApplicationManager.Application
 
 /*!
     \qmltype NotificationInterface
diff --git a/imports_shared/shared/utils/Config.qml b/imports_shared/shared/utils/Config.qml
index a7d44340..8b0f8fe0 100644
--- a/imports_shared/shared/utils/Config.qml
+++ b/imports_shared/shared/utils/Config.qml
@@ -31,10 +31,10 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQuick 2.6
+import QtQuick
 
-import shared.Style 1.0
-import shared.com.pelagicore.translation 1.0
+import shared.Style
+import shared.com.pelagicore.translation
 
 QtObject {
     id: root
diff --git a/imports_shared/shared/utils/Cursor.qml b/imports_shared/shared/utils/Cursor.qml
index 0ebdd397..ad5fb243 100644
--- a/imports_shared/shared/utils/Cursor.qml
+++ b/imports_shared/shared/utils/Cursor.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQml 2.14
-import shared.utils 1.0
+import QtQuick
+import QtQml
+import shared.utils
 
 Loader {
     id: root
diff --git a/imports_shared/shared/utils/CursorIndicator.qml b/imports_shared/shared/utils/CursorIndicator.qml
index 84abb33e..eb43deed 100644
--- a/imports_shared/shared/utils/CursorIndicator.qml
+++ b/imports_shared/shared/utils/CursorIndicator.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 Rectangle {
     id: root
diff --git a/imports_shared/shared/utils/CursorManagement.qml b/imports_shared/shared/utils/CursorManagement.qml
index ea0a2b01..b29c3379 100644
--- a/imports_shared/shared/utils/CursorManagement.qml
+++ b/imports_shared/shared/utils/CursorManagement.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import CursorNavigation 1.0
+import QtQuick
+import CursorNavigation
 
 //all-input wrapper
 Item {
diff --git a/imports_shared/shared/utils/CursorManagementDummy.qml b/imports_shared/shared/utils/CursorManagementDummy.qml
index 361fa5cc..97be515f 100644
--- a/imports_shared/shared/utils/CursorManagementDummy.qml
+++ b/imports_shared/shared/utils/CursorManagementDummy.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
+import QtQuick
 
 //all-input wrapper dummy
 Item {
diff --git a/imports_shared/shared/utils/Logging.qml b/imports_shared/shared/utils/Logging.qml
index 62a1b28e..25aab620 100644
--- a/imports_shared/shared/utils/Logging.qml
+++ b/imports_shared/shared/utils/Logging.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQuick 2.8
+import QtQuick
 
 QtObject {
     readonly property var sysui: LoggingCategory {
diff --git a/imports_shared/shared/utils/MonitorOverlay.qml b/imports_shared/shared/utils/MonitorOverlay.qml
index a40a8507..40cce5cd 100644
--- a/imports_shared/shared/utils/MonitorOverlay.qml
+++ b/imports_shared/shared/utils/MonitorOverlay.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import QtApplicationManager 2.0
+import QtApplicationManager
 
 /*!
     \qmltype MonitorOverlay
diff --git a/imports_shared/shared/utils/StageLoader.qml b/imports_shared/shared/utils/StageLoader.qml
index 7ba104b4..0e560b48 100644
--- a/imports_shared/shared/utils/StageLoader.qml
+++ b/imports_shared/shared/utils/StageLoader.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
 Loader {
     id: root
diff --git a/imports_shared/shared/utils/Store.qml b/imports_shared/shared/utils/Store.qml
index c2aa0742..0843ab52 100644
--- a/imports_shared/shared/utils/Store.qml
+++ b/imports_shared/shared/utils/Store.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQml 2.2
+import QtQml
 
 /*
   Store.qml
diff --git a/imports_shared/shared/utils/TouchPointsTracer.qml b/imports_shared/shared/utils/TouchPointsTracer.qml
index 5f83305c..f4670f5b 100644
--- a/imports_shared/shared/utils/TouchPointsTracer.qml
+++ b/imports_shared/shared/utils/TouchPointsTracer.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.com.luxoft.eventslisteners 1.0
+import shared.Style
+import shared.Sizes
+import shared.com.luxoft.eventslisteners
 
 
 /*!
@@ -51,8 +51,8 @@ import shared.com.luxoft.eventslisteners 1.0
     The code snippet below shows how to use \l{TouchPointsTracer}:
 
     \qml
-    import QtQuick 2.10
-    import shared.utils 1.0
+    import QtQuick
+    import shared.utils
 
     Window {
         id: root
diff --git a/imports_shared/shared/utils/Tracer.qml b/imports_shared/shared/utils/Tracer.qml
index 73f4b90e..32041a35 100644
--- a/imports_shared/shared/utils/Tracer.qml
+++ b/imports_shared/shared/utils/Tracer.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
 /*!
     \qmltype Tracer
@@ -48,8 +48,8 @@ import shared.utils 1.0
     The following example shows how to use \l{Tracer}:
 
     \qml
-    import QtQuick 2.10
-    import shared.utils 1.0
+    import QtQuick
+    import shared.utils
 
     Rectangle {
         id: root
diff --git a/imports_system/system/controls/+lucee/PopupItem.qml b/imports_system/system/controls/+lucee/PopupItem.qml
index 41de7eb5..25123434 100644
--- a/imports_system/system/controls/+lucee/PopupItem.qml
+++ b/imports_system/system/controls/+lucee/PopupItem.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.controls 1.0
+import shared.Style
+import shared.Sizes
+import shared.controls
 
 AbstractPopupItem {
     id: root
diff --git a/imports_system/system/controls/AbstractPopupItem.qml b/imports_system/system/controls/AbstractPopupItem.qml
index 3927456e..d940dbef 100644
--- a/imports_system/system/controls/AbstractPopupItem.qml
+++ b/imports_system/system/controls/AbstractPopupItem.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.animations
 
 // NB: We can't use Popup from QtQuick.Controls as it doesn't support a rotated scene
 Control {
diff --git a/imports_system/system/controls/ApplicationCCWindowItem.qml b/imports_system/system/controls/ApplicationCCWindowItem.qml
index 4b9f0e1c..d18acdfd 100644
--- a/imports_system/system/controls/ApplicationCCWindowItem.qml
+++ b/imports_system/system/controls/ApplicationCCWindowItem.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import QtQuick.Controls 2.2
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Style
 
 NeptuneWindowItem {
     id: root
diff --git a/imports_system/system/controls/ApplicationICWindowItem.qml b/imports_system/system/controls/ApplicationICWindowItem.qml
index 1abc5a11..515b476f 100644
--- a/imports_system/system/controls/ApplicationICWindowItem.qml
+++ b/imports_system/system/controls/ApplicationICWindowItem.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import QtQuick.Controls 2.2
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Style
 
 NeptuneWindowItem {
     id: root
diff --git a/imports_system/system/controls/NeptuneWindowItem.qml b/imports_system/system/controls/NeptuneWindowItem.qml
index 0eff3afc..2ddbe276 100644
--- a/imports_system/system/controls/NeptuneWindowItem.qml
+++ b/imports_system/system/controls/NeptuneWindowItem.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import QtQuick.Controls 2.2
-import QtApplicationManager.SystemUI 2.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtApplicationManager.SystemUI
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 WindowItem {
     id: root
diff --git a/imports_system/system/controls/PopupItem.qml b/imports_system/system/controls/PopupItem.qml
index f73c3b41..0c366922 100644
--- a/imports_system/system/controls/PopupItem.qml
+++ b/imports_system/system/controls/PopupItem.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.controls 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.controls
 
 AbstractPopupItem {
     id: root
diff --git a/imports_system/system/controls/PopupItemLoader.qml b/imports_system/system/controls/PopupItemLoader.qml
index 5c87b0e4..79ef96c5 100644
--- a/imports_system/system/controls/PopupItemLoader.qml
+++ b/imports_system/system/controls/PopupItemLoader.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQml 2.14
+import QtQuick
+import QtQml
 
 /*
     Loads a PopupItem on demand
diff --git a/imports_system/system/models/application/ApplicationInfo.qml b/imports_system/system/models/application/ApplicationInfo.qml
index 3c33cdcb..5c7397a9 100644
--- a/imports_system/system/models/application/ApplicationInfo.qml
+++ b/imports_system/system/models/application/ApplicationInfo.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtApplicationManager.SystemUI 2.0
+import QtQuick
+import QtApplicationManager.SystemUI
 
 /*
     Wraps QtAM::Application object adding some more properties and concepts specific to Neptune 3.
diff --git a/imports_system/system/models/application/ApplicationModel.qml b/imports_system/system/models/application/ApplicationModel.qml
index b28e4a23..2581daf3 100644
--- a/imports_system/system/models/application/ApplicationModel.qml
+++ b/imports_system/system/models/application/ApplicationModel.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.SystemUI 2.0
-import system.requests 1.0
+import QtQuick
+import QtApplicationManager.SystemUI
+import system.requests
 
 /*
   A list of ApplicationInfo objects.
@@ -389,7 +389,7 @@ ListModel {
         }
 
         function sendNotification(summary, body, icon) {
-            var notification = Qt.createQmlObject("import QtApplicationManager 2.0; Notification {}", root, "notification")
+            var notification = Qt.createQmlObject("import QtApplicationManager; Notification {}", root, "notification")
             notification.summary = summary;
             notification.body = body;
             notification.icon = icon;
diff --git a/imports_system/system/models/notification/NotificationModel.qml b/imports_system/system/models/notification/NotificationModel.qml
index ba2eca9c..8cf576a6 100644
--- a/imports_system/system/models/notification/NotificationModel.qml
+++ b/imports_system/system/models/notification/NotificationModel.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtApplicationManager.SystemUI 2.0
+import QtQuick
+import QtApplicationManager.SystemUI
 
 QtObject {
     id: root
diff --git a/imports_system/system/requests/ApplicationRequestHandler.qml b/imports_system/system/requests/ApplicationRequestHandler.qml
index 9ca8d73c..8f840ecb 100644
--- a/imports_system/system/requests/ApplicationRequestHandler.qml
+++ b/imports_system/system/requests/ApplicationRequestHandler.qml
@@ -29,8 +29,8 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.10
-import QtApplicationManager.SystemUI 2.0
+import QtQuick
+import QtApplicationManager.SystemUI
 
 /*!
     \qmltype ApplicationRequestHandler
diff --git a/plugins/controls/ButtonBackground.qml b/plugins/controls/ButtonBackground.qml
index 1c570da5..808aa842 100644
--- a/plugins/controls/ButtonBackground.qml
+++ b/plugins/controls/ButtonBackground.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Rectangle {
     border.width: !parent.enabled && !parent.checked ? Sizes.dp(2) : 0
diff --git a/plugins/controls/ListItem.qml b/plugins/controls/ListItem.qml
index 7f181f92..fbb64cbc 100644
--- a/plugins/controls/ListItem.qml
+++ b/plugins/controls/ListItem.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 /*!
     \qmltype ListItem
@@ -50,8 +50,8 @@ import shared.Sizes 1.0
     The code snippet below shows how to use \c ListItem:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ListItemBasic.qml b/plugins/controls/ListItemBasic.qml
index 283e6c9b..6a2a0c22 100644
--- a/plugins/controls/ListItemBasic.qml
+++ b/plugins/controls/ListItemBasic.qml
@@ -31,15 +31,15 @@
 ****************************************************************************/
 
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
+import shared.controls
 
 /*!
     \qmltype ListItemBasic
@@ -54,8 +54,8 @@ import shared.controls 1.0
     The code snippet below shows how to use \c ListItemBasic:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ListItemFlatButton.qml b/plugins/controls/ListItemFlatButton.qml
index 4e716227..18fc5680 100644
--- a/plugins/controls/ListItemFlatButton.qml
+++ b/plugins/controls/ListItemFlatButton.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Sizes
 
 /*!
     \qmltype
@@ -51,8 +51,8 @@ import shared.Sizes 1.0
     The code snippet below shows how to use \c ListItemFlatButton:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ListItemProgress.qml b/plugins/controls/ListItemProgress.qml
index e29b7a65..8616e4f8 100644
--- a/plugins/controls/ListItemProgress.qml
+++ b/plugins/controls/ListItemProgress.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 /*!
     \qmltype ListItemProgress
@@ -55,8 +55,8 @@ import shared.Sizes 1.0
     The code snippet below shows how to use \c ListItemProgress:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ListItemSwitch.qml b/plugins/controls/ListItemSwitch.qml
index 32b2dbb4..c4d7f89e 100644
--- a/plugins/controls/ListItemSwitch.qml
+++ b/plugins/controls/ListItemSwitch.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
+import shared.Style
 
 /*!
     \qmltype ListItemSwitch
@@ -52,8 +52,8 @@ import shared.Style 1.0
     The following example uses \l{ListItemSwitch}:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ListItemTwoButtons.qml b/plugins/controls/ListItemTwoButtons.qml
index 2d5d4dff..718a2e32 100644
--- a/plugins/controls/ListItemTwoButtons.qml
+++ b/plugins/controls/ListItemTwoButtons.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.utils
+import shared.Sizes
 
 /*!
     \qmltype ListItemTwoButtons
@@ -54,8 +54,8 @@ import shared.Sizes 1.0
     The following example uses \l{ListItemTwoButtons}:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ScalableBorderImage.qml b/plugins/controls/ScalableBorderImage.qml
index 9182d661..b246d043 100644
--- a/plugins/controls/ScalableBorderImage.qml
+++ b/plugins/controls/ScalableBorderImage.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 /*!
     \qmltype ScalableBorderImage
@@ -52,8 +52,8 @@ import shared.Sizes 1.0
     The following example uses \l{ScalableBorderImage}:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/plugins/controls/ToolsColumn.qml b/plugins/controls/ToolsColumn.qml
index 7b876272..ab93f4b1 100644
--- a/plugins/controls/ToolsColumn.qml
+++ b/plugins/controls/ToolsColumn.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Sizes
+import shared.utils
 
 /*!
     \qmltype ToolsColumn
@@ -64,8 +64,8 @@ import shared.utils 1.0
     The following example uses \l{ToolsColumn} with icons defined by theme:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
@@ -83,8 +83,8 @@ import shared.utils 1.0
     The following example uses \l{ToolsColumn} with icons defined by source URL:
 
     \qml
-    import QtQuick 2.10
-    import shared.controls 1.0
+    import QtQuick
+    import shared.controls
 
     Item {
         id: root
diff --git a/squishtests/suite_neptune3/extension/NeptuneWidgets.qml b/squishtests/suite_neptune3/extension/NeptuneWidgets.qml
index 97fd3c37..89011cc5 100644
--- a/squishtests/suite_neptune3/extension/NeptuneWidgets.qml
+++ b/squishtests/suite_neptune3/extension/NeptuneWidgets.qml
@@ -29,7 +29,7 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.0
+import QtQuick
 import com.froglogic.squish.qtquick 0.1
 
 
diff --git a/src/connectivity/wifi_simulation/simulation.qml b/src/connectivity/wifi_simulation/simulation.qml
index afd4152f..7478023b 100644
--- a/src/connectivity/wifi_simulation/simulation.qml
+++ b/src/connectivity/wifi_simulation/simulation.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import shared.Connectivity.simulation 1.0
+import QtQuick
+import shared.Connectivity.simulation
 
 Item {
     WiFiBackend {
diff --git a/src/drivedata/backend_simulation/simulation.qml b/src/drivedata/backend_simulation/simulation.qml
index 5ccb22af..98bd8033 100644
--- a/src/drivedata/backend_simulation/simulation.qml
+++ b/src/drivedata/backend_simulation/simulation.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import shared.com.pelagicore.drivedata.simulation 1.0
+import QtQuick
+import shared.com.pelagicore.drivedata.simulation
 
 Item {
     InstrumentClusterBackend {
diff --git a/src/drivedata/drivedata-simulation-server/simulation.qml b/src/drivedata/drivedata-simulation-server/simulation.qml
index 65c9dcfb..68eddf12 100644
--- a/src/drivedata/drivedata-simulation-server/simulation.qml
+++ b/src/drivedata/drivedata-simulation-server/simulation.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import shared.com.pelagicore.drivedata.simulation 1.0
+import QtQuick
+import shared.com.pelagicore.drivedata.simulation
 
 Item {
     InstrumentClusterBackend {
diff --git a/src/neptune-cluster-app/ClusterRootStore.qml b/src/neptune-cluster-app/ClusterRootStore.qml
index 5f5c5f94..6bc20d3e 100644
--- a/src/neptune-cluster-app/ClusterRootStore.qml
+++ b/src/neptune-cluster-app/ClusterRootStore.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.utils 1.0
+import QtQuick
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.utils
 
-import "../apps/com.theqtcompany.cluster/stores" 1.0
+import "../apps/com.theqtcompany.cluster/stores"
 
 RootStoreInterface {
     id: root
diff --git a/src/neptune-cluster-app/Launcher.qml b/src/neptune-cluster-app/Launcher.qml
index e31d3866..697a96c2 100644
--- a/src/neptune-cluster-app/Launcher.qml
+++ b/src/neptune-cluster-app/Launcher.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.5
-import Qt.labs.folderlistmodel 2.2
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.folderlistmodel
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../sysui/launcher" 1.0
+import "../sysui/launcher"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/MockedWindows.qml b/src/neptune-cluster-app/MockedWindows.qml
index 0ae38109..b2bd8800 100644
--- a/src/neptune-cluster-app/MockedWindows.qml
+++ b/src/neptune-cluster-app/MockedWindows.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/Main.qml b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/Main.qml
index 6fd94bf9..164863b5 100644
--- a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/Main.qml
+++ b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/Main.qml
@@ -29,11 +29,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import "views" 1.0
-import "stores" 1.0
+import "views"
+import "stores"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/panels/Vehicle2DPanel.qml b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/panels/Vehicle2DPanel.qml
index d8006155..cc8434a0 100644
--- a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/panels/Vehicle2DPanel.qml
+++ b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/panels/Vehicle2DPanel.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 
-import shared.animations 1.0
-import shared.Sizes 1.0
+import shared.animations
+import shared.Sizes
 
-import "../helpers" 1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/stores/VehicleStore.qml b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/stores/VehicleStore.qml
index b02850a2..5d4f1919 100644
--- a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/stores/VehicleStore.qml
+++ b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/stores/VehicleStore.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
+import QtQuick
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
 
 
 QtObject {
diff --git a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/views/VehicleICView.qml b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/views/VehicleICView.qml
index 0b58a503..1ee84835 100644
--- a/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/views/VehicleICView.qml
+++ b/src/neptune-cluster-app/apps/com.luxoft.vehicle-ic/views/VehicleICView.qml
@@ -29,12 +29,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "../panels" 1.0
-import "../stores" 1.0
+import "../panels"
+import "../stores"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/Main.qml b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/Main.qml
index ac56bd47..f46dd280 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/Main.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/Main.qml
@@ -29,18 +29,18 @@
 **
 ****************************************************************************/
 
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 
-import QtQuick 2.9
-import QtPositioning 5.9
+import QtQuick
+import QtPositioning
 
-import shared.com.pelagicore.map 1.0
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.com.pelagicore.map
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import "views" 1.0
-import "stores" 1.0
+import "views"
+import "stores"
 
 Item {
     MapStore {
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/stores/MapStore.qml b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/stores/MapStore.qml
index 54659583..da5062c0 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/stores/MapStore.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/stores/MapStore.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtPositioning 5.9
-import QtLocation 5.9
-import Qt.labs.platform 1.0
-import shared.utils 1.0
-
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
+import QtQuick
+import QtPositioning
+import QtLocation
+import Qt.labs.platform
+import shared.utils
+
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
 
 QtObject {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/views/ICMapView.qml b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/views/ICMapView.qml
index 111259aa..2bfe39df 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.map-ic/views/ICMapView.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.map-ic/views/ICMapView.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtLocation 5.9
-import QtPositioning 5.14
-import QtQuick.Controls 2.13
+import QtQuick
+import QtLocation
+import QtPositioning
+import QtQuick.Controls
 
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.animations
+import shared.Style
+import shared.Sizes
 
-import "../helpers" 1.0
+import "../helpers"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/Main.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/Main.qml
index 89acf5d7..59305019 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/Main.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/Main.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import "stores" 1.0
-import "views" 1.0
+import "stores"
+import "views"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/+lucee/TitleColumn.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/+lucee/TitleColumn.qml
index 6a177dfc..11782e3c 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/+lucee/TitleColumn.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/+lucee/TitleColumn.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 ColumnLayout {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/MusicProgress.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/MusicProgress.qml
index 93f4f4ea..23358d21 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/MusicProgress.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/MusicProgress.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/TitleColumn.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/TitleColumn.qml
index d16602aa..643a328e 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/TitleColumn.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/controls/TitleColumn.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 ColumnLayout {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/panels/ICAlbumArtPanel.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/panels/ICAlbumArtPanel.qml
index f525bd9a..012494b3 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/panels/ICAlbumArtPanel.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/panels/ICAlbumArtPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import "../controls" 1.0
+import "../controls"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/stores/MusicStore.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/stores/MusicStore.qml
index 03b72c18..80c817f2 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/stores/MusicStore.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/stores/MusicStore.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtInterfaceFramework
 import QtInterfaceFramework.Media
 
-import shared.utils 1.0
+import shared.utils
 
 Store {
     id: root
diff --git a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/views/ICMusicView.qml b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/views/ICMusicView.qml
index 11dafa03..cd2d9af5 100644
--- a/src/neptune-cluster-app/apps/com.pelagicore.music-ic/views/ICMusicView.qml
+++ b/src/neptune-cluster-app/apps/com.pelagicore.music-ic/views/ICMusicView.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import "../stores" 1.0
-import "../panels" 1.0
+import "../stores"
+import "../panels"
 
 Item {
     id: root
diff --git a/src/neptune-cluster-app/main.qml b/src/neptune-cluster-app/main.qml
index 51cfd694..11e656bd 100644
--- a/src/neptune-cluster-app/main.qml
+++ b/src/neptune-cluster-app/main.qml
@@ -29,13 +29,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
+import QtQuick
+import QtQuick.Window
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import "../apps/com.theqtcompany.cluster/stores" 1.0
-import "../apps/com.theqtcompany.cluster/views" 1.0
+import shared.Style
+import shared.Sizes
+import "../apps/com.theqtcompany.cluster/stores"
+import "../apps/com.theqtcompany.cluster/views"
 
 Window {
     id: root
diff --git a/src/remotesettings/app/ConnectionDialog.qml b/src/remotesettings/app/ConnectionDialog.qml
index 652ce3ae..31406de9 100644
--- a/src/remotesettings/app/ConnectionDialog.qml
+++ b/src/remotesettings/app/ConnectionDialog.qml
@@ -29,9 +29,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Dialog {
     id: connectionDialog
diff --git a/src/remotesettings/app/DefaultNumberAnimation.qml b/src/remotesettings/app/DefaultNumberAnimation.qml
index 6204f189..5aa5a3c1 100644
--- a/src/remotesettings/app/DefaultNumberAnimation.qml
+++ b/src/remotesettings/app/DefaultNumberAnimation.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 /*!
     \qmltype DefaultNumberAnimation
@@ -48,8 +48,8 @@ import QtQuick 2.6
     The following example shows how to use \l{DefaultNumberAnimation}:
 
     \qml
-    import QtQuick 2.10
-    import shared.animations 1.0
+    import QtQuick
+    import shared.animations
 
     Rectangle {
         id: root
diff --git a/src/remotesettings/app/DevelopmentPage.qml b/src/remotesettings/app/DevelopmentPage.qml
index 191b3dca..79632585 100644
--- a/src/remotesettings/app/DevelopmentPage.qml
+++ b/src/remotesettings/app/DevelopmentPage.qml
@@ -28,9 +28,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 
 Flickable {
diff --git a/src/remotesettings/app/MapsPage.qml b/src/remotesettings/app/MapsPage.qml
index 00a4340f..dcae7c82 100644
--- a/src/remotesettings/app/MapsPage.qml
+++ b/src/remotesettings/app/MapsPage.qml
@@ -28,9 +28,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 
 Flickable {
diff --git a/src/remotesettings/app/MediaPage.qml b/src/remotesettings/app/MediaPage.qml
index c36f55f3..8bf20c49 100644
--- a/src/remotesettings/app/MediaPage.qml
+++ b/src/remotesettings/app/MediaPage.qml
@@ -28,9 +28,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 import QtInterfaceFramework.Media
 
diff --git a/src/remotesettings/app/SettingsPage.qml b/src/remotesettings/app/SettingsPage.qml
index 0e370dfb..95ece985 100644
--- a/src/remotesettings/app/SettingsPage.qml
+++ b/src/remotesettings/app/SettingsPage.qml
@@ -29,9 +29,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 
 Flickable {
diff --git a/src/remotesettings/app/Vehicle2DPanel.qml b/src/remotesettings/app/Vehicle2DPanel.qml
index aa19c93e..32d90612 100644
--- a/src/remotesettings/app/Vehicle2DPanel.qml
+++ b/src/remotesettings/app/Vehicle2DPanel.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
+import QtQuick
 import Qt5Compat.GraphicalEffects
 
 
diff --git a/src/remotesettings/app/VehiclePage.qml b/src/remotesettings/app/VehiclePage.qml
index 57c0855c..fcf83077 100644
--- a/src/remotesettings/app/VehiclePage.qml
+++ b/src/remotesettings/app/VehiclePage.qml
@@ -28,9 +28,9 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Flickable {
     id: root
diff --git a/src/remotesettings/app/main.qml b/src/remotesettings/app/main.qml
index aca9e857..1d0aff8f 100644
--- a/src/remotesettings/app/main.qml
+++ b/src/remotesettings/app/main.qml
@@ -29,15 +29,15 @@
 ** SPDX-License-Identifier: GPL-3.0
 **
 ****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import QtInterfaceFramework
 import QtInterfaceFramework.Media
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
 
-import QtQuick.Window 2.13
+import QtQuick.Window
 
 ApplicationWindow {
     id: root
diff --git a/styles/LuceeStyle/Button.qml b/styles/LuceeStyle/Button.qml
index 18c8676b..9be5b766 100644
--- a/styles/LuceeStyle/Button.qml
+++ b/styles/LuceeStyle/Button.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Layouts 1.3
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.Button {
     id: control
diff --git a/styles/LuceeStyle/ComboBox.qml b/styles/LuceeStyle/ComboBox.qml
index 5bf320de..efdcc75c 100644
--- a/styles/LuceeStyle/ComboBox.qml
+++ b/styles/LuceeStyle/ComboBox.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Window 2.3
-import QtQuick.Controls 2.2
-import QtQuick.Controls.impl 2.2
-import QtQuick.Templates 2.2 as T
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 T.ComboBox {
     id: control
diff --git a/styles/LuceeStyle/Control.qml b/styles/LuceeStyle/Control.qml
index 94a58481..176737df 100644
--- a/styles/LuceeStyle/Control.qml
+++ b/styles/LuceeStyle/Control.qml
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.Control {
     font.family: Style.fontFamily
diff --git a/styles/LuceeStyle/Dialog.qml b/styles/LuceeStyle/Dialog.qml
index cb279989..7ea972ea 100644
--- a/styles/LuceeStyle/Dialog.qml
+++ b/styles/LuceeStyle/Dialog.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Templates 2.2 as T
-import QtQuick.Controls 2.2
-import QtQuick.Controls.impl 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import shared.Style
+import shared.Sizes
+import shared.utils
 
 T.Dialog {
     id: control
diff --git a/styles/LuceeStyle/Frame.qml b/styles/LuceeStyle/Frame.qml
index a9ab74cb..d0c75369 100644
--- a/styles/LuceeStyle/Frame.qml
+++ b/styles/LuceeStyle/Frame.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Frame {
     id: control
diff --git a/styles/LuceeStyle/ItemDelegate.qml b/styles/LuceeStyle/ItemDelegate.qml
index f2a550db..64c828ca 100644
--- a/styles/LuceeStyle/ItemDelegate.qml
+++ b/styles/LuceeStyle/ItemDelegate.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ItemDelegate {
     id: control
diff --git a/styles/LuceeStyle/Label.qml b/styles/LuceeStyle/Label.qml
index ca0675dc..c8576639 100644
--- a/styles/LuceeStyle/Label.qml
+++ b/styles/LuceeStyle/Label.qml
@@ -32,8 +32,8 @@
 
 import QtQuick
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.Label {
     id: control
diff --git a/styles/LuceeStyle/Page.qml b/styles/LuceeStyle/Page.qml
index d8ddb751..90f8f36e 100644
--- a/styles/LuceeStyle/Page.qml
+++ b/styles/LuceeStyle/Page.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Page {
     id: control
diff --git a/styles/LuceeStyle/PageIndicator.qml b/styles/LuceeStyle/PageIndicator.qml
index 7859bf86..ce2f338a 100644
--- a/styles/LuceeStyle/PageIndicator.qml
+++ b/styles/LuceeStyle/PageIndicator.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.PageIndicator {
     id: control
diff --git a/styles/LuceeStyle/Pane.qml b/styles/LuceeStyle/Pane.qml
index aa56a550..af663fe5 100644
--- a/styles/LuceeStyle/Pane.qml
+++ b/styles/LuceeStyle/Pane.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Pane {
     id: control
diff --git a/styles/LuceeStyle/ProgressBar.qml b/styles/LuceeStyle/ProgressBar.qml
index 3597f009..82e195cf 100644
--- a/styles/LuceeStyle/ProgressBar.qml
+++ b/styles/LuceeStyle/ProgressBar.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ProgressBar {
     id: control
diff --git a/styles/LuceeStyle/RadioButton.qml b/styles/LuceeStyle/RadioButton.qml
index b24f8f9c..501dd5ad 100644
--- a/styles/LuceeStyle/RadioButton.qml
+++ b/styles/LuceeStyle/RadioButton.qml
@@ -31,12 +31,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 T.RadioButton {
     id: control
diff --git a/styles/LuceeStyle/ScrollIndicator.qml b/styles/LuceeStyle/ScrollIndicator.qml
index 6e98d9bc..3b7d15cd 100644
--- a/styles/LuceeStyle/ScrollIndicator.qml
+++ b/styles/LuceeStyle/ScrollIndicator.qml
@@ -35,13 +35,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 T.ScrollIndicator {
     id: control
diff --git a/styles/LuceeStyle/Slider.qml b/styles/LuceeStyle/Slider.qml
index f833e740..a782bc59 100644
--- a/styles/LuceeStyle/Slider.qml
+++ b/styles/LuceeStyle/Slider.qml
@@ -36,12 +36,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 T.Slider {
     id: control
diff --git a/styles/LuceeStyle/Switch.qml b/styles/LuceeStyle/Switch.qml
index 6bdaff47..550c07e9 100644
--- a/styles/LuceeStyle/Switch.qml
+++ b/styles/LuceeStyle/Switch.qml
@@ -36,15 +36,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 T.Switch {
     id: control
diff --git a/styles/LuceeStyle/SwitchDelegate.qml b/styles/LuceeStyle/SwitchDelegate.qml
index d8321ca9..07f6f9ec 100644
--- a/styles/LuceeStyle/SwitchDelegate.qml
+++ b/styles/LuceeStyle/SwitchDelegate.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+
+import shared.utils
+import shared.animations
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 // TODO: Fix the height and width more according to UI spec and based on external variables
 // TODO: Provide a better way to develop these UI controls in a more controlable fashion
diff --git a/styles/LuceeStyle/TabBar.qml b/styles/LuceeStyle/TabBar.qml
index d49ad854..f70cc5fc 100644
--- a/styles/LuceeStyle/TabBar.qml
+++ b/styles/LuceeStyle/TabBar.qml
@@ -32,8 +32,8 @@
 
 import QtQuick
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.TabBar {
     id: control
diff --git a/styles/LuceeStyle/TabButton.qml b/styles/LuceeStyle/TabButton.qml
index a4aa7589..f503439d 100644
--- a/styles/LuceeStyle/TabButton.qml
+++ b/styles/LuceeStyle/TabButton.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import QtQuick.Templates 2.3 as T
-
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.controls 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+import shared.utils
+import shared.Style
+import shared.Sizes
+import shared.controls
+import shared.utils
 
 T.TabButton {
     id: control
diff --git a/styles/LuceeStyle/ToolBar.qml b/styles/LuceeStyle/ToolBar.qml
index 8e8e9bc0..5d40d459 100644
--- a/styles/LuceeStyle/ToolBar.qml
+++ b/styles/LuceeStyle/ToolBar.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.ToolBar {
     id: control
diff --git a/styles/LuceeStyle/ToolButton.qml b/styles/LuceeStyle/ToolButton.qml
index 55efd6c6..170bf74b 100644
--- a/styles/LuceeStyle/ToolButton.qml
+++ b/styles/LuceeStyle/ToolButton.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ToolButton {
     id: control
diff --git a/styles/NeptuneStyle/Button.qml b/styles/NeptuneStyle/Button.qml
index 18c8676b..9be5b766 100644
--- a/styles/NeptuneStyle/Button.qml
+++ b/styles/NeptuneStyle/Button.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Layouts 1.3
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.Button {
     id: control
diff --git a/styles/NeptuneStyle/ComboBox.qml b/styles/NeptuneStyle/ComboBox.qml
index c4848b8f..97f0ac50 100644
--- a/styles/NeptuneStyle/ComboBox.qml
+++ b/styles/NeptuneStyle/ComboBox.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Window 2.3
-import QtQuick.Controls 2.2
-import QtQuick.Controls.impl 2.2
-import QtQuick.Templates 2.2 as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import shared.Style
+import shared.Sizes
 
 T.ComboBox {
     id: control
diff --git a/styles/NeptuneStyle/Control.qml b/styles/NeptuneStyle/Control.qml
index 94a58481..176737df 100644
--- a/styles/NeptuneStyle/Control.qml
+++ b/styles/NeptuneStyle/Control.qml
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.Control {
     font.family: Style.fontFamily
diff --git a/styles/NeptuneStyle/Dialog.qml b/styles/NeptuneStyle/Dialog.qml
index cb279989..7ea972ea 100644
--- a/styles/NeptuneStyle/Dialog.qml
+++ b/styles/NeptuneStyle/Dialog.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Templates 2.2 as T
-import QtQuick.Controls 2.2
-import QtQuick.Controls.impl 2.2
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import shared.Style
+import shared.Sizes
+import shared.utils
 
 T.Dialog {
     id: control
diff --git a/styles/NeptuneStyle/Frame.qml b/styles/NeptuneStyle/Frame.qml
index a9ab74cb..d0c75369 100644
--- a/styles/NeptuneStyle/Frame.qml
+++ b/styles/NeptuneStyle/Frame.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Frame {
     id: control
diff --git a/styles/NeptuneStyle/ItemDelegate.qml b/styles/NeptuneStyle/ItemDelegate.qml
index abc101ee..44a5bb0e 100644
--- a/styles/NeptuneStyle/ItemDelegate.qml
+++ b/styles/NeptuneStyle/ItemDelegate.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ItemDelegate {
     id: control
diff --git a/styles/NeptuneStyle/Label.qml b/styles/NeptuneStyle/Label.qml
index ca0675dc..c8576639 100644
--- a/styles/NeptuneStyle/Label.qml
+++ b/styles/NeptuneStyle/Label.qml
@@ -32,8 +32,8 @@
 
 import QtQuick
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.Label {
     id: control
diff --git a/styles/NeptuneStyle/Page.qml b/styles/NeptuneStyle/Page.qml
index d8ddb751..90f8f36e 100644
--- a/styles/NeptuneStyle/Page.qml
+++ b/styles/NeptuneStyle/Page.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Page {
     id: control
diff --git a/styles/NeptuneStyle/PageIndicator.qml b/styles/NeptuneStyle/PageIndicator.qml
index 7859bf86..ce2f338a 100644
--- a/styles/NeptuneStyle/PageIndicator.qml
+++ b/styles/NeptuneStyle/PageIndicator.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.PageIndicator {
     id: control
diff --git a/styles/NeptuneStyle/Pane.qml b/styles/NeptuneStyle/Pane.qml
index aa56a550..af663fe5 100644
--- a/styles/NeptuneStyle/Pane.qml
+++ b/styles/NeptuneStyle/Pane.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.Pane {
     id: control
diff --git a/styles/NeptuneStyle/ProgressBar.qml b/styles/NeptuneStyle/ProgressBar.qml
index 36b135c9..95d93dcb 100644
--- a/styles/NeptuneStyle/ProgressBar.qml
+++ b/styles/NeptuneStyle/ProgressBar.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ProgressBar {
     id: control
diff --git a/styles/NeptuneStyle/RadioButton.qml b/styles/NeptuneStyle/RadioButton.qml
index da3775be..5e502568 100644
--- a/styles/NeptuneStyle/RadioButton.qml
+++ b/styles/NeptuneStyle/RadioButton.qml
@@ -35,9 +35,9 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 T.RadioButton {
     id: control
diff --git a/styles/NeptuneStyle/ScrollIndicator.qml b/styles/NeptuneStyle/ScrollIndicator.qml
index 6e98d9bc..3b7d15cd 100644
--- a/styles/NeptuneStyle/ScrollIndicator.qml
+++ b/styles/NeptuneStyle/ScrollIndicator.qml
@@ -35,13 +35,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 T.ScrollIndicator {
     id: control
diff --git a/styles/NeptuneStyle/Slider.qml b/styles/NeptuneStyle/Slider.qml
index 313cc68a..c68d044d 100644
--- a/styles/NeptuneStyle/Slider.qml
+++ b/styles/NeptuneStyle/Slider.qml
@@ -36,12 +36,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.Style
+import shared.Sizes
 
 T.Slider {
     id: control
diff --git a/styles/NeptuneStyle/Switch.qml b/styles/NeptuneStyle/Switch.qml
index 2a906fc0..cacf2dd3 100644
--- a/styles/NeptuneStyle/Switch.qml
+++ b/styles/NeptuneStyle/Switch.qml
@@ -36,15 +36,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 T.Switch {
     id: control
diff --git a/styles/NeptuneStyle/SwitchDelegate.qml b/styles/NeptuneStyle/SwitchDelegate.qml
index 563a8e51..56f84dbb 100644
--- a/styles/NeptuneStyle/SwitchDelegate.qml
+++ b/styles/NeptuneStyle/SwitchDelegate.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+
+import shared.utils
+import shared.animations
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 // TODO: Fix the height and width more according to UI spec and based on external variables
 // TODO: Provide a better way to develop these UI controls in a more controlable fashion
diff --git a/styles/NeptuneStyle/TabBar.qml b/styles/NeptuneStyle/TabBar.qml
index bbed8875..bb11b8cb 100644
--- a/styles/NeptuneStyle/TabBar.qml
+++ b/styles/NeptuneStyle/TabBar.qml
@@ -32,8 +32,8 @@
 
 import QtQuick
 import QtQuick.Templates as T
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 T.TabBar {
     id: control
diff --git a/styles/NeptuneStyle/TabButton.qml b/styles/NeptuneStyle/TabButton.qml
index 7b0b5d05..b6d053b1 100644
--- a/styles/NeptuneStyle/TabButton.qml
+++ b/styles/NeptuneStyle/TabButton.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.Style
+import shared.Sizes
+import shared.controls
+import shared.utils
 
 T.TabButton {
     id: control
diff --git a/styles/NeptuneStyle/ToolBar.qml b/styles/NeptuneStyle/ToolBar.qml
index 8e8e9bc0..5d40d459 100644
--- a/styles/NeptuneStyle/ToolBar.qml
+++ b/styles/NeptuneStyle/ToolBar.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Templates as T
+import shared.Style
 
 T.ToolBar {
     id: control
diff --git a/styles/NeptuneStyle/ToolButton.qml b/styles/NeptuneStyle/ToolButton.qml
index 55efd6c6..170bf74b 100644
--- a/styles/NeptuneStyle/ToolButton.qml
+++ b/styles/NeptuneStyle/ToolButton.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.utils
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 T.ToolButton {
     id: control
diff --git a/sysui/about/About.qml b/sysui/about/About.qml
index 1258e852..7b5f79ea 100644
--- a/sysui/about/About.qml
+++ b/sysui/about/About.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQml 2.14
+import QtQuick
+import QtQml
 
-import system.controls 1.0
+import system.controls
 
 /*
     A seamless wrapper for AboutPopup that loads it on demand
diff --git a/sysui/about/AboutApps.qml b/sysui/about/AboutApps.qml
index 56adfee5..6a436248 100644
--- a/sysui/about/AboutApps.qml
+++ b/sysui/about/AboutApps.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.14
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtApplicationManager.SystemUI 2.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.controls 1.0
+import QtQuick
+import QtQml
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtApplicationManager.SystemUI
+
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.controls
 
 Item {
     id: root
diff --git a/sysui/about/AboutDiagnostics.qml b/sysui/about/AboutDiagnostics.qml
index 0fd0dc28..3635f90a 100644
--- a/sysui/about/AboutDiagnostics.qml
+++ b/sysui/about/AboutDiagnostics.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 ColumnLayout {
     property var sysinfo
diff --git a/sysui/about/AboutPerformance.qml b/sysui/about/AboutPerformance.qml
index f3d8cfb6..20cc420d 100644
--- a/sysui/about/AboutPerformance.qml
+++ b/sysui/about/AboutPerformance.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Flickable {
     id: root
diff --git a/sysui/about/AboutPopup.qml b/sysui/about/AboutPopup.qml
index b8b711d2..569e15f1 100644
--- a/sysui/about/AboutPopup.qml
+++ b/sysui/about/AboutPopup.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import system.controls 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
+import shared.controls
+import system.controls
 
 import "../procmon"
 
diff --git a/sysui/centerconsole/+lucee/CenterConsole.qml b/sysui/centerconsole/+lucee/CenterConsole.qml
index 3735cd99..3a61a437 100644
--- a/sysui/centerconsole/+lucee/CenterConsole.qml
+++ b/sysui/centerconsole/+lucee/CenterConsole.qml
@@ -30,20 +30,20 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import about 1.0
-import centerconsole 1.0
-import statusbar 1.0
-import stores 1.0
-import system.controls 1.0
+import shared.controls
+import shared.utils
+import shared.animations
+import about
+import centerconsole
+import statusbar
+import stores
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 AbstractCenterConsole {
     id: root
diff --git a/sysui/centerconsole/AbstractCenterConsole.qml b/sysui/centerconsole/AbstractCenterConsole.qml
index d4c6cb7a..57ed1f9d 100644
--- a/sysui/centerconsole/AbstractCenterConsole.qml
+++ b/sysui/centerconsole/AbstractCenterConsole.qml
@@ -30,21 +30,21 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQml 2.14
-import QtQuick.Controls 2.2
-
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import centerconsole 1.0
-import volume 1.0
-import statusbar 1.0
-import stores 1.0
-import system.controls 1.0
-
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQml
+import QtQuick.Controls
+
+import shared.controls
+import shared.utils
+import shared.animations
+import centerconsole
+import volume
+import statusbar
+import stores
+import system.controls
+
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/centerconsole/ApplicationFrame.qml b/sysui/centerconsole/ApplicationFrame.qml
index 48a25d90..d35d84d5 100644
--- a/sysui/centerconsole/ApplicationFrame.qml
+++ b/sysui/centerconsole/ApplicationFrame.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
+import QtQuick
 
-import shared.animations 1.0
-import system.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.animations
+import system.controls
+import shared.Style
+import shared.Sizes
 
 /*
     Displays the main window of a given application using in and out transition animations
diff --git a/sysui/centerconsole/ApplicationPopup.qml b/sysui/centerconsole/ApplicationPopup.qml
index 45c082f4..5d4d067a 100644
--- a/sysui/centerconsole/ApplicationPopup.qml
+++ b/sysui/centerconsole/ApplicationPopup.qml
@@ -37,10 +37,10 @@
     \brief Displays the content of an application's PopupWindow inside a PopupItem in System-UI
 */
 
-import QtQuick 2.7
-import system.controls 1.0
+import QtQuick
+import system.controls
 
-import shared.Style 1.0
+import shared.Style
 
 PopupItem {
     id: root
diff --git a/sysui/centerconsole/ApplicationPopups.qml b/sysui/centerconsole/ApplicationPopups.qml
index 5df2a2d4..fa160de8 100644
--- a/sysui/centerconsole/ApplicationPopups.qml
+++ b/sysui/centerconsole/ApplicationPopups.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import stores 1.0
-import QtApplicationManager.SystemUI 2.0
-import shared.Style 1.0
+import QtQuick
+import stores
+import QtApplicationManager.SystemUI
+import shared.Style
 
 /*
     Instantiates PopupItems for displaying PopupWindows created from the client side.
diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml
index 13c6c277..eacec20a 100644
--- a/sysui/centerconsole/CenterConsole.qml
+++ b/sysui/centerconsole/CenterConsole.qml
@@ -30,22 +30,22 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQml 2.14
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQml
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import about 1.0
-import centerconsole 1.0
-import volume 1.0
-import statusbar 1.0
-import stores 1.0
-import system.controls 1.0
+import shared.controls
+import shared.utils
+import shared.animations
+import about
+import centerconsole
+import volume
+import statusbar
+import stores
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 AbstractCenterConsole {
     id: root
diff --git a/sysui/centerconsole/CenterConsoleMonitorOverlay.qml b/sysui/centerconsole/CenterConsoleMonitorOverlay.qml
index 61f6d156..a3849db8 100644
--- a/sysui/centerconsole/CenterConsoleMonitorOverlay.qml
+++ b/sysui/centerconsole/CenterConsoleMonitorOverlay.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Sizes
+import shared.utils
 
 MonitorOverlay {
     id: root
diff --git a/sysui/centerconsole/CenterConsoleWindow.qml b/sysui/centerconsole/CenterConsoleWindow.qml
index 15f76cd5..37c1ad93 100644
--- a/sysui/centerconsole/CenterConsoleWindow.qml
+++ b/sysui/centerconsole/CenterConsoleWindow.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQml 2.14
-import shared.utils 1.0
-import stores 1.0
-import QtQuick.Window 2.3
+import QtQuick
+import QtQml
+import shared.utils
+import stores
+import QtQuick.Window
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Window {
     id: root
diff --git a/sysui/centerconsole/GamePadController.qml b/sysui/centerconsole/GamePadController.qml
index 9be31f9c..4bb2d2bc 100644
--- a/sysui/centerconsole/GamePadController.qml
+++ b/sysui/centerconsole/GamePadController.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
-import QtGamepad 1.0
+import QtQuick
+import QtGamepad
 
 Item {
     id: root
diff --git a/sysui/centerconsole/MainContentArea.qml b/sysui/centerconsole/MainContentArea.qml
index f4f152cc..342731a3 100644
--- a/sysui/centerconsole/MainContentArea.qml
+++ b/sysui/centerconsole/MainContentArea.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import Qt5Compat.GraphicalEffects
-import shared.animations 1.0
-import home 1.0
-import launcher 1.0
-import shared.utils 1.0
+import shared.animations
+import home
+import launcher
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/centerconsole/ModalOverlay.qml b/sysui/centerconsole/ModalOverlay.qml
index f0c04c02..9d5247c9 100644
--- a/sysui/centerconsole/ModalOverlay.qml
+++ b/sysui/centerconsole/ModalOverlay.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
+import QtQuick
 import Qt5Compat.GraphicalEffects
 
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.Sizes 1.0
+import shared.animations
+import shared.utils
+import shared.Sizes
 
 // We can't use Popup from QtQuick.Controls as it doesn't support a rotated scene,
 // hence the implementation of our own modal overlay scheme
diff --git a/sysui/centerconsole/UIShortcuts.qml b/sysui/centerconsole/UIShortcuts.qml
index d2d2eb9f..19b31ed1 100644
--- a/sysui/centerconsole/UIShortcuts.qml
+++ b/sysui/centerconsole/UIShortcuts.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 
 /*
     Keyboard shortcuts to simulate specific UI events when triggered.
diff --git a/sysui/centerconsole/VirtualKeyboard.qml b/sysui/centerconsole/VirtualKeyboard.qml
index a201317d..44bd0076 100644
--- a/sysui/centerconsole/VirtualKeyboard.qml
+++ b/sysui/centerconsole/VirtualKeyboard.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.VirtualKeyboard 2.1
-import QtQuick.VirtualKeyboard.Settings 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Settings
 
-import shared.animations 1.0
+import shared.animations
 
 Item {
     id: root
diff --git a/sysui/centerconsole/WidgetDrawer.qml b/sysui/centerconsole/WidgetDrawer.qml
index 41b5f385..5b44c3cb 100644
--- a/sysui/centerconsole/WidgetDrawer.qml
+++ b/sysui/centerconsole/WidgetDrawer.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import shared.utils 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Sizes
 
 /*
   Displays a child item on the screen which can be dismissed by swiping it to the right.
diff --git a/sysui/home/+lucee/ApplicationWidget.qml b/sysui/home/+lucee/ApplicationWidget.qml
index 49f1c6a0..da30cf5a 100644
--- a/sysui/home/+lucee/ApplicationWidget.qml
+++ b/sysui/home/+lucee/ApplicationWidget.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import system.controls 1.0
+import shared.animations
+import shared.utils
+import shared.controls
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import home 1.0
+import shared.Style
+import shared.Sizes
+import home
 
 AbstractApplicationWidget {
     id: root
diff --git a/sysui/home/+lucee/HomePage.qml b/sysui/home/+lucee/HomePage.qml
index c40b1ac6..889dd24b 100644
--- a/sysui/home/+lucee/HomePage.qml
+++ b/sysui/home/+lucee/HomePage.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
+import shared.Sizes
 
-import home 1.0
+import home
 
 AbstractHomePage {
     id: root
diff --git a/sysui/home/+lucee/ResizeHandle.qml b/sysui/home/+lucee/ResizeHandle.qml
index 296d946a..de70dd0d 100644
--- a/sysui/home/+lucee/ResizeHandle.qml
+++ b/sysui/home/+lucee/ResizeHandle.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import shared.Sizes 1.0
+import QtQuick
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/home/AbstractApplicationWidget.qml b/sysui/home/AbstractApplicationWidget.qml
index b2341c58..df9ddf51 100644
--- a/sysui/home/AbstractApplicationWidget.qml
+++ b/sysui/home/AbstractApplicationWidget.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import system.controls 1.0
+import shared.animations
+import shared.utils
+import shared.controls
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/home/AbstractHomePage.qml b/sysui/home/AbstractHomePage.qml
index f422482b..f118dd6e 100644
--- a/sysui/home/AbstractHomePage.qml
+++ b/sysui/home/AbstractHomePage.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.controls
+import shared.utils
+import shared.animations
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/home/AddWidgetPopup.qml b/sysui/home/AddWidgetPopup.qml
index 203378af..2f01660a 100644
--- a/sysui/home/AddWidgetPopup.qml
+++ b/sysui/home/AddWidgetPopup.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQml.Models 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQml.Models
 
-import shared.controls 1.0
-import system.controls 1.0
+import shared.controls
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 PopupItem {
     id: root
diff --git a/sysui/home/AddWidgetPopupLoader.qml b/sysui/home/AddWidgetPopupLoader.qml
index 7aac2f23..80cf26be 100644
--- a/sysui/home/AddWidgetPopupLoader.qml
+++ b/sysui/home/AddWidgetPopupLoader.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQml 2.14
+import QtQuick
+import QtQml
 
 /*
     A seamless wrapper for AddWidgetPopup that loads it on demand
diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml
index b24bd7c4..8ac0c3c5 100644
--- a/sysui/home/ApplicationWidget.qml
+++ b/sysui/home/ApplicationWidget.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
-import shared.animations 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import system.controls 1.0
+import shared.animations
+import shared.utils
+import shared.controls
+import system.controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 AbstractApplicationWidget {
     id: root
diff --git a/sysui/home/HomePage.qml b/sysui/home/HomePage.qml
index a023b286..0eefd491 100644
--- a/sysui/home/HomePage.qml
+++ b/sysui/home/HomePage.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Sizes
 
 AbstractHomePage {
     id: root
diff --git a/sysui/home/ResizeHandle.qml b/sysui/home/ResizeHandle.qml
index 74bfc5e3..6b15cf24 100644
--- a/sysui/home/ResizeHandle.qml
+++ b/sysui/home/ResizeHandle.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import shared.Sizes 1.0
+import QtQuick
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/home/WidgetGrid.qml b/sysui/home/WidgetGrid.qml
index 123cd226..6e631599 100644
--- a/sysui/home/WidgetGrid.qml
+++ b/sysui/home/WidgetGrid.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick
+import QtQuick.Controls
 
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
+import shared.controls
+import shared.utils
+import shared.animations
 
-import shared.NeptuneWidgetGrid 1.0
+import shared.NeptuneWidgetGrid
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/hud/HUDWindow.qml b/sysui/hud/HUDWindow.qml
index af290a8f..c74db078 100644
--- a/sysui/hud/HUDWindow.qml
+++ b/sysui/hud/HUDWindow.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.2
-import shared.utils 1.0
-import system.controls 1.0
-import QtQuick.Window 2.3
-import shared.Sizes 1.0
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.utils
+import system.controls
+import QtQuick.Window
+import shared.Sizes
+import shared.Style
 
 Window {
     id: root
diff --git a/sysui/instrumentcluster/ApplicationICWindows.qml b/sysui/instrumentcluster/ApplicationICWindows.qml
index ca1bcb47..60a4ce6a 100644
--- a/sysui/instrumentcluster/ApplicationICWindows.qml
+++ b/sysui/instrumentcluster/ApplicationICWindows.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQml.Models 2.2
-import system.controls 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQml.Models
+import system.controls
+import shared.animations
+import shared.Style
+import shared.utils
 
 Item {
     id: root
diff --git a/sysui/instrumentcluster/InstrumentClusterWindow.qml b/sysui/instrumentcluster/InstrumentClusterWindow.qml
index 8a883117..6857654e 100644
--- a/sysui/instrumentcluster/InstrumentClusterWindow.qml
+++ b/sysui/instrumentcluster/InstrumentClusterWindow.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQml 2.14
-import shared.utils 1.0
-import QtQuick.Window 2.3
-import system.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQml
+import shared.utils
+import QtQuick.Window
+import system.controls
+import shared.Style
+import shared.Sizes
 
 Window {
     id: root
@@ -60,7 +60,7 @@ Window {
     function sendWindowStateToSafeUI() {
         if (root.clusterStore.runningOnDesktop) {
             var sendMessageObject = Qt.createQmlObject(
-                    "import QtQuick 2.0;  import Qt.SafeRenderer 1.1;
+                    "import QtQuick 2.0;  import Qt.SafeRenderer;
                      QtObject {
                          function sendClusterWindowState(x,y, dx, dy, width, height) {
                              SafeMessage.moveItem(\"mainWindowPos\", Qt.point(x, y))
diff --git a/sysui/launcher/+lucee/AppButton.qml b/sysui/launcher/+lucee/AppButton.qml
index a91094f0..4f885389 100644
--- a/sysui/launcher/+lucee/AppButton.qml
+++ b/sysui/launcher/+lucee/AppButton.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/sysui/launcher/+lucee/AppIcon.qml b/sysui/launcher/+lucee/AppIcon.qml
index c3225faf..95e6eae0 100644
--- a/sysui/launcher/+lucee/AppIcon.qml
+++ b/sysui/launcher/+lucee/AppIcon.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import shared.controls 1.0
-import shared.Style 1.0
+import QtQuick
+import shared.controls
+import shared.Style
 
 NeptuneIconLabel {
     property bool checked: false
diff --git a/sysui/launcher/AppButton.qml b/sysui/launcher/AppButton.qml
index b7574b49..19fbe988 100644
--- a/sysui/launcher/AppButton.qml
+++ b/sysui/launcher/AppButton.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.Sizes
 
 ToolButton {
     id: root
diff --git a/sysui/launcher/AppIcon.qml b/sysui/launcher/AppIcon.qml
index 41521996..b81ac834 100644
--- a/sysui/launcher/AppIcon.qml
+++ b/sysui/launcher/AppIcon.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 Image {
     property bool checked: false
diff --git a/sysui/launcher/EditableGridView.qml b/sysui/launcher/EditableGridView.qml
index caa3e444..dfba58b0 100644
--- a/sysui/launcher/EditableGridView.qml
+++ b/sysui/launcher/EditableGridView.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQuick.Controls 2.2
-import QtQml.Models 2.1
-import QtQuick.Layouts 1.0
-import shared.controls 1.0
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml.Models
+import QtQuick.Layouts
+import shared.controls
+import shared.utils
+import shared.animations
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/launcher/Launcher.qml b/sysui/launcher/Launcher.qml
index 8bddacce..a4801a2e 100644
--- a/sysui/launcher/Launcher.qml
+++ b/sysui/launcher/Launcher.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQml.Models 2.1
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml.Models
+import QtQuick.Layouts
 
-import shared.animations 1.0
-import shared.controls 1.0
-import shared.utils 1.0
+import shared.animations
+import shared.controls
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/notification/NotificationCenter.qml b/sysui/notification/NotificationCenter.qml
index a62c4151..d4d9b23d 100644
--- a/sysui/notification/NotificationCenter.qml
+++ b/sysui/notification/NotificationCenter.qml
@@ -30,14 +30,14 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.0
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.controls 1.0
-import shared.animations 1.0
-import system.models.notification 1.0
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.Sizes
+import shared.utils
+import shared.controls
+import shared.animations
+import system.models.notification
+import shared.Style
 
 Item {
     id: root
diff --git a/sysui/notification/NotificationContent.qml b/sysui/notification/NotificationContent.qml
index 62100f68..ec02c8ea 100644
--- a/sysui/notification/NotificationContent.qml
+++ b/sysui/notification/NotificationContent.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import centerconsole 1.0
-import shared.animations 1.0
-import system.models.notification 1.0
-import shared.Sizes 1.0
+import QtQuick
+import centerconsole
+import shared.animations
+import system.models.notification
+import shared.Sizes
 
 ModalOverlay {
     id: root
diff --git a/sysui/notification/NotificationHandle.qml b/sysui/notification/NotificationHandle.qml
index 25fcb875..978a5dec 100644
--- a/sysui/notification/NotificationHandle.qml
+++ b/sysui/notification/NotificationHandle.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.13
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
-import shared.utils 1.0
-import shared.Style 1.0
+import shared.Sizes
+import shared.utils
+import shared.Style
 
 ToolButton {
     id: root
diff --git a/sysui/notification/NotificationItem.qml b/sysui/notification/NotificationItem.qml
index ef71e5c6..2e8f77f8 100644
--- a/sysui/notification/NotificationItem.qml
+++ b/sysui/notification/NotificationItem.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.0
-import shared.controls 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/sysui/notification/NotificationToast.qml b/sysui/notification/NotificationToast.qml
index 142a352c..88eba106 100644
--- a/sysui/notification/NotificationToast.qml
+++ b/sysui/notification/NotificationToast.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.0
-import shared.controls 1.0
-import shared.animations 1.0
-import system.models.notification 1.0
-import shared.Style 1.0
+import QtQuick
+import QtQuick.Controls
+import shared.controls
+import shared.animations
+import system.models.notification
+import shared.Style
 
 NotificationItem {
     id: root
diff --git a/sysui/procmon/CpuMonitor.qml b/sysui/procmon/CpuMonitor.qml
index 37f6a0d6..5dd77e2d 100644
--- a/sysui/procmon/CpuMonitor.qml
+++ b/sysui/procmon/CpuMonitor.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import shared.utils 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Sizes
 
 MonitorPanel {
     id: root
diff --git a/sysui/procmon/MonitorListItem.qml b/sysui/procmon/MonitorListItem.qml
index ccb09eb9..db78559c 100644
--- a/sysui/procmon/MonitorListItem.qml
+++ b/sysui/procmon/MonitorListItem.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/procmon/MonitorPanel.qml b/sysui/procmon/MonitorPanel.qml
index addf0f7c..bb1de940 100644
--- a/sysui/procmon/MonitorPanel.qml
+++ b/sysui/procmon/MonitorPanel.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Style
+import shared.Sizes
+import shared.utils
 
 Item {
     id: root
diff --git a/sysui/procmon/MonitorView.qml b/sysui/procmon/MonitorView.qml
index fd2f1839..83bd9eb8 100644
--- a/sysui/procmon/MonitorView.qml
+++ b/sysui/procmon/MonitorView.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Sizes
+import shared.utils
 
 ColumnLayout {
     id: root
diff --git a/sysui/procmon/RamMonitor.qml b/sysui/procmon/RamMonitor.qml
index e79149a8..71dc87bc 100644
--- a/sysui/procmon/RamMonitor.qml
+++ b/sysui/procmon/RamMonitor.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import shared.Sizes 1.0
-import shared.utils 1.0
+import QtQuick
+import shared.Sizes
+import shared.utils
 
 MonitorPanel {
     id: root
diff --git a/sysui/statusbar/+lucee/DateAndTime.qml b/sysui/statusbar/+lucee/DateAndTime.qml
index 9238c028..31f25bc8 100644
--- a/sysui/statusbar/+lucee/DateAndTime.qml
+++ b/sysui/statusbar/+lucee/DateAndTime.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Label {
     id: root
diff --git a/sysui/statusbar/+lucee/IndicatorTray.qml b/sysui/statusbar/+lucee/IndicatorTray.qml
index ce4e7bc7..c3a43b18 100644
--- a/sysui/statusbar/+lucee/IndicatorTray.qml
+++ b/sysui/statusbar/+lucee/IndicatorTray.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/sysui/statusbar/+lucee/StatusBar.qml b/sysui/statusbar/+lucee/StatusBar.qml
index bab1efbf..368a19cd 100644
--- a/sysui/statusbar/+lucee/StatusBar.qml
+++ b/sysui/statusbar/+lucee/StatusBar.qml
@@ -30,17 +30,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQml 2.14
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQml
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.controls 1.0
-import volume 1.0
+import shared.utils
+import shared.controls
+import volume
 
-import shared.Sizes 1.0
-import system.controls 1.0
+import shared.Sizes
+import system.controls
 
 Item {
     id: root
diff --git a/sysui/statusbar/CellularReception.qml b/sysui/statusbar/CellularReception.qml
index a799171d..520d0b71 100644
--- a/sysui/statusbar/CellularReception.qml
+++ b/sysui/statusbar/CellularReception.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Item {
     id: root
diff --git a/sysui/statusbar/DateAndTime.qml b/sysui/statusbar/DateAndTime.qml
index ce8071ec..5b47e0be 100644
--- a/sysui/statusbar/DateAndTime.qml
+++ b/sysui/statusbar/DateAndTime.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Sizes 1.0
+import shared.Sizes
 
 Label {
     id: root
diff --git a/sysui/statusbar/IndicatorTray.qml b/sysui/statusbar/IndicatorTray.qml
index 078e28ec..165c6992 100644
--- a/sysui/statusbar/IndicatorTray.qml
+++ b/sysui/statusbar/IndicatorTray.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
 Control {
     id: root
diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml
index 74c78d85..2c3fd544 100644
--- a/sysui/statusbar/StatusBar.qml
+++ b/sysui/statusbar/StatusBar.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.controls 1.0
+import shared.utils
+import shared.controls
 
-import shared.Sizes 1.0
-import system.controls 1.0
+import shared.Sizes
+import system.controls
 
 Item {
     id: root
diff --git a/sysui/stores/ApplicationPopupsStore.qml b/sysui/stores/ApplicationPopupsStore.qml
index def83379..5d678001 100644
--- a/sysui/stores/ApplicationPopupsStore.qml
+++ b/sysui/stores/ApplicationPopupsStore.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
 Store {
     id: root
diff --git a/sysui/stores/CenterConsoleStore.qml b/sysui/stores/CenterConsoleStore.qml
index 8e741200..8599eefb 100644
--- a/sysui/stores/CenterConsoleStore.qml
+++ b/sysui/stores/CenterConsoleStore.qml
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 import QtQuick
-import QtApplicationManager.SystemUI 2.0
-import shared.utils 1.0
+import QtApplicationManager.SystemUI
+import shared.utils
 
 import "../helper/utils.js" as Utils
 
diff --git a/sysui/stores/ClusterStore.qml b/sysui/stores/ClusterStore.qml
index c5266cf3..7d939407 100644
--- a/sysui/stores/ClusterStore.qml
+++ b/sysui/stores/ClusterStore.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQml 2.14
-import QtApplicationManager.SystemUI 2.0
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.drivedata 1.0
-import shared.utils 1.0
+import QtQuick
+import QtQml
+import QtApplicationManager.SystemUI
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.drivedata
+import shared.utils
 
 QtObject {
     id: root
diff --git a/sysui/stores/HUDStore.qml b/sysui/stores/HUDStore.qml
index 8663c23a..b6a86de1 100644
--- a/sysui/stores/HUDStore.qml
+++ b/sysui/stores/HUDStore.qml
@@ -30,9 +30,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager.SystemUI 2.0
-import shared.com.pelagicore.drivedata 1.0
+import QtQuick
+import QtApplicationManager.SystemUI
+import shared.com.pelagicore.drivedata
 
 QtObject {
     id: root
diff --git a/sysui/stores/MusicAppRequestsIPCStore.qml b/sysui/stores/MusicAppRequestsIPCStore.qml
index 4e54d234..c32c8c64 100644
--- a/sysui/stores/MusicAppRequestsIPCStore.qml
+++ b/sysui/stores/MusicAppRequestsIPCStore.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtApplicationManager.SystemUI 2.0
+import QtQuick
+import QtApplicationManager.SystemUI
 
 /*!
     \qmltype MusicAppRequestsIPCStore
diff --git a/sysui/stores/MusicStore.qml b/sysui/stores/MusicStore.qml
index 204f4f09..6bbca3ab 100644
--- a/sysui/stores/MusicStore.qml
+++ b/sysui/stores/MusicStore.qml
@@ -29,8 +29,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtApplicationManager 2.0
+import QtQuick
+import QtApplicationManager
 
 QtObject {
     id: root
diff --git a/sysui/stores/RootStore.qml b/sysui/stores/RootStore.qml
index a3ca2965..694da9f4 100644
--- a/sysui/stores/RootStore.qml
+++ b/sysui/stores/RootStore.qml
@@ -30,18 +30,18 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import Qt.labs.platform 1.0
-import QtApplicationManager 2.0
-import QtApplicationManager.Application 2.0
-import QtApplicationManager.SystemUI 2.0
-import shared.utils 1.0
-import shared.Style 1.0
+import QtQuick
+import Qt.labs.platform
+import QtApplicationManager
+import QtApplicationManager.Application
+import QtApplicationManager.SystemUI
+import shared.utils
+import shared.Style
 
-import system.models.application 1.0
+import system.models.application
 
-import shared.com.pelagicore.remotesettings 1.0
-import shared.com.pelagicore.systeminfo 1.0
+import shared.com.pelagicore.remotesettings
+import shared.com.pelagicore.systeminfo
 
 Store {
     id: root
@@ -84,7 +84,7 @@ Store {
             settingsStore.setValue("widgetStates", applicationModel.serializeWidgetStates());
             if (clusterStore.qsrEnabled) {
                 //not to have direct dependency on QtSafeRenderer
-                var sendMessageObject = Qt.createQmlObject("import QtQuick 2.0;  import Qt.SafeRenderer 1.1;
+                var sendMessageObject = Qt.createQmlObject("import QtQuick;  import Qt.SafeRenderer;
                         QtObject {
                             function sendShuttingDown() {
                                 SafeMessage.sendHeartBeat(1) //sends one message with 1 ms expire timeout
diff --git a/sysui/stores/SettingsStore.qml b/sysui/stores/SettingsStore.qml
index dc51d29d..69e686fb 100644
--- a/sysui/stores/SettingsStore.qml
+++ b/sysui/stores/SettingsStore.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import Qt.labs.settings 1.0
+import QtQuick
+import Qt.labs.settings
 
 Settings {
     id: root
diff --git a/sysui/stores/StatusBarStore.qml b/sysui/stores/StatusBarStore.qml
index b046ef42..5ee76aa8 100644
--- a/sysui/stores/StatusBarStore.qml
+++ b/sysui/stores/StatusBarStore.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 QtObject {
     id: root
diff --git a/sysui/stores/SystemStore.qml b/sysui/stores/SystemStore.qml
index 67cf05f6..3a1e4adc 100644
--- a/sysui/stores/SystemStore.qml
+++ b/sysui/stores/SystemStore.qml
@@ -30,10 +30,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtApplicationManager 2.0
-import QtApplicationManager.SystemUI 2.0
-import shared.utils 1.0
+import QtQuick
+import QtApplicationManager
+import QtApplicationManager.SystemUI
+import shared.utils
 
 Store {
     id: root
diff --git a/sysui/stores/VolumeStore.qml b/sysui/stores/VolumeStore.qml
index 4f2dea80..64e06487 100644
--- a/sysui/stores/VolumeStore.qml
+++ b/sysui/stores/VolumeStore.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtInterfaceFramework.Media 1.0
+import QtQuick
+import QtInterfaceFramework.Media
 
 QtObject {
     id: root
diff --git a/sysui/volume/VolumePopup.qml b/sysui/volume/VolumePopup.qml
index 126ef8d9..92b3bc78 100644
--- a/sysui/volume/VolumePopup.qml
+++ b/sysui/volume/VolumePopup.qml
@@ -30,16 +30,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import shared.utils 1.0
-import shared.animations 1.0
-import shared.Style 1.0
-import shared.controls 1.0
-import shared.Sizes 1.0
-import system.controls 1.0
+import shared.utils
+import shared.animations
+import shared.Style
+import shared.controls
+import shared.Sizes
+import system.controls
 
 PopupItem {
     id: root
diff --git a/sysui/volume/VolumeSlider.qml b/sysui/volume/VolumeSlider.qml
index 11b598c2..9b1edcf5 100644
--- a/sysui/volume/VolumeSlider.qml
+++ b/sysui/volume/VolumeSlider.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
-import shared.Sizes 1.0
-import shared.utils 1.0
+import shared.Sizes
+import shared.utils
 
 Slider {
     id: root
diff --git a/tests/apps/com.luxoft.vehicle/vehicleharness/VehicleViewHarness.qml b/tests/apps/com.luxoft.vehicle/vehicleharness/VehicleViewHarness.qml
index 4cdf45b5..8912fea1 100644
--- a/tests/apps/com.luxoft.vehicle/vehicleharness/VehicleViewHarness.qml
+++ b/tests/apps/com.luxoft.vehicle/vehicleharness/VehicleViewHarness.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import views 1.0
-import stores 1.0
+import views
+import stores
 
 Item {
     id: root
diff --git a/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml b/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml
index 70ace6c1..48c482f2 100644
--- a/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml
+++ b/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.Style 1.0
-import shared.Sizes 1.0
+import QtQuick
+import shared.utils
+import shared.Style
+import shared.Sizes
 
-import views 1.0
-import stores 1.0
+import views
+import stores
 
 Item {
     id: root
diff --git a/tests/apps/com.theqtcompany.cluster/clusterharness/ClusterViewHarness.qml b/tests/apps/com.theqtcompany.cluster/clusterharness/ClusterViewHarness.qml
index 1b14512e..ae9d658c 100644
--- a/tests/apps/com.theqtcompany.cluster/clusterharness/ClusterViewHarness.qml
+++ b/tests/apps/com.theqtcompany.cluster/clusterharness/ClusterViewHarness.qml
@@ -30,15 +30,15 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Window 2.2
-import shared.utils 1.0
+import QtQuick
+import QtQuick.Window
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
+import shared.Style
+import shared.Sizes
 
-import views 1.0
-import stores 1.0
+import views
+import stores
 
 Item {
     id: root
diff --git a/tests/apps/com.theqtcompany.cluster/clusterharness/DialPowerHarness.qml b/tests/apps/com.theqtcompany.cluster/clusterharness/DialPowerHarness.qml
index 10e659fd..ad8508ab 100644
--- a/tests/apps/com.theqtcompany.cluster/clusterharness/DialPowerHarness.qml
+++ b/tests/apps/com.theqtcompany.cluster/clusterharness/DialPowerHarness.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
+import QtQuick
+import shared.utils
 
-import shared.Style 1.0
-import shared.Sizes 1.0
-import panels 1.0
+import shared.Style
+import shared.Sizes
+import panels
 
 Item {
     id: root
diff --git a/tests/apps/com.theqtcompany.cluster/clusterharness/DialSpeedHarness.qml b/tests/apps/com.theqtcompany.cluster/clusterharness/DialSpeedHarness.qml
index 4b979d6d..b674e779 100644
--- a/tests/apps/com.theqtcompany.cluster/clusterharness/DialSpeedHarness.qml
+++ b/tests/apps/com.theqtcompany.cluster/clusterharness/DialSpeedHarness.qml
@@ -30,12 +30,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import shared.utils 1.0
-import shared.Sizes 1.0
-import shared.Style 1.0
+import QtQuick
+import shared.utils
+import shared.Sizes
+import shared.Style
 
-import panels 1.0
+import panels
 
 Item {
     id: root
diff --git a/tests/dummyimports/QtApplicationManager/Application/ApplicationManagerWindow.qml b/tests/dummyimports/QtApplicationManager/Application/ApplicationManagerWindow.qml
index 289fe951..53b514c9 100644
--- a/tests/dummyimports/QtApplicationManager/Application/ApplicationManagerWindow.qml
+++ b/tests/dummyimports/QtApplicationManager/Application/ApplicationManagerWindow.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtApplicationManager 2.0
+import QtQuick
+import QtApplicationManager
 
 Item {
     id: root
diff --git a/tests/dummyimports/QtApplicationManager/Notification.qml b/tests/dummyimports/QtApplicationManager/Notification.qml
index 44e904ea..c4aea06f 100644
--- a/tests/dummyimports/QtApplicationManager/Notification.qml
+++ b/tests/dummyimports/QtApplicationManager/Notification.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtQml 2.0
+import QtQml
 
 QtObject {
     property string summary
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationIPCInterface.qml b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationIPCInterface.qml
index baf16553..66a2f7a4 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationIPCInterface.qml
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationIPCInterface.qml
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-import QtQml 2.0
+import QtQml
 
 QtObject {
 }
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationManager.qml b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationManager.qml
index 6e378a78..b46cc78b 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationManager.qml
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationManager.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick
 
 ListModel {
     id: root
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/SystemMonitor.qml b/tests/dummyimports/QtApplicationManager/SystemUI/SystemMonitor.qml
index 84dca296..8b4a3495 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/SystemMonitor.qml
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/SystemMonitor.qml
@@ -33,7 +33,7 @@
 
 pragma Singleton
 
-import QtQml 2.0
+import QtQml
 
 QtObject {
     property int reportingInterval
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/WindowItem.qml b/tests/dummyimports/QtApplicationManager/SystemUI/WindowItem.qml
index a2872c6b..663d0f13 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/WindowItem.qml
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/WindowItem.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 Item {
     id: root
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/WindowManager.qml b/tests/dummyimports/QtApplicationManager/SystemUI/WindowManager.qml
index 983f64c5..fd84d63b 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/WindowManager.qml
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/WindowManager.qml
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQuick 2.2
-import QtApplicationManager 2.0
+import QtQuick
+import QtApplicationManager
 
 QtObject {
     id: root
diff --git a/tests/qmltests/FakeAppInfo.qml b/tests/qmltests/FakeAppInfo.qml
index a69a9807..8f2eb193 100644
--- a/tests/qmltests/FakeAppInfo.qml
+++ b/tests/qmltests/FakeAppInfo.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick
 
 QtObject {
     id: root
diff --git a/tests/qmltests/NeptuneTestCase.qml b/tests/qmltests/NeptuneTestCase.qml
index d6fc3b51..9eb5382d 100644
--- a/tests/qmltests/NeptuneTestCase.qml
+++ b/tests/qmltests/NeptuneTestCase.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtTest 1.1
+import QtTest
 
 /*
     Collects some generally useful functions for test cases.
diff --git a/tests/qmltests/tst_ApplicationWidget.qml b/tests/qmltests/tst_ApplicationWidget.qml
index 78adb862..af6c7246 100644
--- a/tests/qmltests/tst_ApplicationWidget.qml
+++ b/tests/qmltests/tst_ApplicationWidget.qml
@@ -30,11 +30,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtTest 1.1
+import QtQuick
+import QtTest
 
 // sysui, for getting ApplicationWidget
-import home 1.0
+import home
 
 Item {
     width: 600
diff --git a/tests/qmltests/tst_WidgetDrawer.qml b/tests/qmltests/tst_WidgetDrawer.qml
index f7866a75..35fac0af 100644
--- a/tests/qmltests/tst_WidgetDrawer.qml
+++ b/tests/qmltests/tst_WidgetDrawer.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtTest 1.1
+import QtQuick
+import QtTest
 
 // sysui, for getting WidgetDrawer
-import centerconsole 1.0
+import centerconsole
 
-import shared.utils 1.0
+import shared.utils
 
 Item {
     id: root
diff --git a/tests/qmltests/tst_WidgetGrid.qml b/tests/qmltests/tst_WidgetGrid.qml
index 6abbefbb..59837069 100644
--- a/tests/qmltests/tst_WidgetGrid.qml
+++ b/tests/qmltests/tst_WidgetGrid.qml
@@ -30,13 +30,13 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtTest 1.1
+import QtQuick
+import QtTest
 
 // sysui, for getting WidgetGrid
-import home 1.0
+import home
 
-import shared.utils 1.0
+import shared.utils
 
 Item {
     id: root