Port to Qt 6.2

 - Build is warning free on Linux
 - Still using qmake
 - Custom fragmenShaders in the cluster are not ported yet
 - Qt 3D models are rendered, but the Studio 3D integration is untested

Change-Id: I0e410a932d6461ba29e7c945cb5e9750d6df8964
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Bramastyo Harimukti Santoso <bram.harimukti@gmail.com>

472 files changed, 679 insertions, 1199 deletions

diff --git a/Main.qml b/Main.qml
index 8d507c7f..77bfa501 100644
--- a/Main.qml
+++ b/Main.qml
@@ -49,7 +49,7 @@ QtObject {
     readonly property RootStore store: RootStore {
         clusterAvailable: instrumentClusterWindowLoader.item && instrumentClusterWindowLoader.item.visible
 
-        onAccentColorChanged: {
+        onAccentColorChanged: function(newAccentColor) {
             centerConsoleWindow.contentItem.Style.accentColor = newAccentColor;
             if (instrumentClusterWindowLoader.item) {
                 instrumentClusterWindowLoader.item.contentItem.Style.accentColor = newAccentColor;
@@ -59,7 +59,7 @@ QtObject {
             }
         }
 
-        onGrabImageRequested: {
+        onGrabImageRequested: function(screenshotCCPath, screenshotICPath) {
             centerConsoleWindow.mainCenterConsole.grabToImage(function(result) {
                 var ret = result.saveToFile(screenshotCCPath);
                 console.info("Screenshot was", ret ? "" : "NOT", "saved to file", screenshotCCPath);
@@ -73,7 +73,7 @@ QtObject {
             }
         }
 
-        onUpdateThemeRequested: {
+        onUpdateThemeRequested: function(currentTheme) {
             var chosenTheme = currentTheme === 0 ? Style.Light : Style.Dark;
             if (centerConsoleWindow.popupParent.visible) {
                 centerConsoleWindow.popupParent.updateOverlay();
diff --git a/README.md b/README.md
index 13eea259..a0f055ab 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,9 @@ System UI acts as a Wayland server, compositing the application windows in its o
 regular QML items.
 
 * a Linux installation
-* Qt5 (branch 5.15) with qtwayland submodule and built with Open GL ES (-opengl es2 -opengles3)
-* QtIvi (git://code.qt.io/qt/qtivi.git, branch 5.15)
-* Qt Application Manager (git://code.qt.io/qt/qtapplicationmanager.git, branch 5.15)
+* Qt6 (6.2.5+) with qtwayland submodule and built with Open GL ES (-opengl es2 -opengles3)
+* Qt InterfaceFramework (git://code.qt.io/qt/qtinterfaceframework.git, 6.2.5+)
+* Qt Application Manager (git://code.qt.io/qt/qtapplicationmanager.git, 6.2.5+)
 
 ### Single-process UI (fallback option)
 
@@ -48,6 +48,6 @@ In single-process mode, all application code run in one process, which is the sa
 process as the System UI itself.
 
 * a Linux, Windows, or macOS installation
-* Qt5 (branch 5.15)
-* QtIvi (git://code.qt.io/qt/qtivi.git, branch 5.15)
-* Qt Application Manager (git://code.qt.io/qt/qtapplicationmanager.git, branch 5.15)
+* Qt6 (6.2.5+)
+* Qt InterfaceFramework (git://code.qt.io/qt/qtinterfaceframework.git, 6.2.5+)
+* Qt Application Manager (git://code.qt.io/qt/qtapplicationmanager.git, 6.2.5+)
diff --git a/am-config-lucee.yaml b/am-config-lucee.yaml
index 747d5116..a06d3bab 100644
--- a/am-config-lucee.yaml
+++ b/am-config-lucee.yaml
@@ -15,13 +15,13 @@ applications:
 
 runtimes:
   qml:
-    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ]
     environmentVariables:
        QT_PLUGIN_PATH: "${CONFIG_PWD}"
        SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
        QT_FILE_SELECTORS: lucee
   native:
-    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ]
     environmentVariables:
       QT_PLUGIN_PATH: "${CONFIG_PWD}"
       SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
@@ -31,11 +31,11 @@ runtimes:
 
 ui:
   fullscreen: no
-  style: "${CONFIG_PWD}/styles/lucee"
+  style: "LuceeStyle"
   iconThemeName: "lucee"
   iconThemeSearchPaths: [ "${CONFIG_PWD}/imports_shared/assets/icons" ]
   mainQml: "${CONFIG_PWD}/Main.qml"
-  importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui" ]
+  importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui", "${CONFIG_PWD}/styles" ]
   windowIcon: "${CONFIG_PWD}/imports_shared/assets/icons/lucee/sysui/ic-menu-home.png"
   enableTouchEmulation: yes
 
diff --git a/am-config-neptune.yaml b/am-config-neptune.yaml
index cc17eb7b..d173756c 100644
--- a/am-config-neptune.yaml
+++ b/am-config-neptune.yaml
@@ -15,12 +15,12 @@ applications:
 
 runtimes:
   qml:
-    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ]
     environmentVariables:
        QT_PLUGIN_PATH: "${CONFIG_PWD}"
        SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
   native:
-    importPaths: [ "${CONFIG_PWD}/imports_shared" ]
+    importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ]
     environmentVariables:
       QT_PLUGIN_PATH: "${CONFIG_PWD}"
       SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
@@ -29,11 +29,11 @@ runtimes:
 
 ui:
   fullscreen: no
-  style: "${CONFIG_PWD}/styles/neptune"
+  style: "NeptuneStyle"
   iconThemeName: "neptune"
   iconThemeSearchPaths: [ "${CONFIG_PWD}/imports_shared/assets/icons" ]
   mainQml: "${CONFIG_PWD}/Main.qml"
-  importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui" ]
+  importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui", "${CONFIG_PWD}/styles" ]
   windowIcon: "${CONFIG_PWD}/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png"
   enableTouchEmulation: yes
 
@@ -75,5 +75,6 @@ logging:
     - "cursor.navigation=false"
     - "qt3ds.*=false"
     - "shared.com.pelagicore.map.info=false"
-    - "*.warning=false"
+    - "*.info=true"
+    - "*.warning=true"
     - "*.critical=true"
diff --git a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
index 8b870dd1..4aee6fd2 100644
--- a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
@@ -92,7 +92,7 @@ Item {
             rightDoorOpened: root.rightDoorOpened
             trunkOpened: root.trunkOpened
 
-            onNewRoofOpenProgressRequested: root.newRoofOpenProgressRequested(progress)
+            onNewRoofOpenProgressRequested: function(progress) { root.newRoofOpenProgressRequested(progress) }
         }
 
         FrontDoorsPanel {
diff --git a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
index eb67fd94..bcf55926 100644
--- a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.9
 import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.Sizes 1.0
 
diff --git a/apps/com.luxoft.vehicle/panels/RoofPanel.qml b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
index 0c3918a3..29ac8b5e 100644
--- a/apps/com.luxoft.vehicle/panels/RoofPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Layouts 1.3
 
 import shared.Sizes 1.0
diff --git a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
index b2460d12..6e9832f9 100644
--- a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects 1.0
 
 import shared.animations 1.0
 
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
index 26f221d9..2fcc661a 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
@@ -30,8 +30,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.12
-
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.Sizes 1.0
 
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
index a8b84056..215317e8 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
@@ -32,7 +32,6 @@
 
 import QtQuick 2.9
 import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
 
 import shared.controls 1.0
@@ -84,7 +83,7 @@ Item {
         SupportPanel { id: supportPanel; objectName: "vehicleSupportPanel" }
         EnergyPanel {
             objectName: "vehicleEnergyPanel"
-            onIntentToMapRequested: root.intentToMapRequested(intentId, params)
+            onIntentToMapRequested: function(intentId) { root.intentToMapRequested(intentId, params) }
         }
         DoorsPanel {
             id: doorsPanel
@@ -92,7 +91,7 @@ Item {
             onLeftDoorClicked: root.leftDoorClicked()
             onRightDoorClicked: root.rightDoorClicked()
             onTrunkClicked: root.trunkClicked()
-            onNewRoofOpenProgressRequested: root.newRoofOpenProgressRequested(progress)
+            onNewRoofOpenProgressRequested: function(progress) { root.newRoofOpenProgressRequested(progress) }
         }
         TiresPanel { objectName: "vehicleTiresPanel" }
         Settings3DPanel {
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
index 1c0068ff..2cb1202c 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
@@ -146,7 +146,7 @@ Item {
             FrameAction {
                 id: frameCounter
                 property real dtime: 0.0
-                onTriggered: {
+                onTriggered: function(dt) {
                     if (renderSettings.renderPolicy === RenderSettings.Always) {
                         dtime += dt;
                         if (dtime > 5.0) {
diff --git a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
index 6a2b02e4..06f1141e 100644
--- a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
@@ -31,7 +31,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.5
-import QtGraphicalEffects 1.12
 
 import shared.Sizes 1.0
 import shared.Style 1.0
diff --git a/apps/com.luxoft.vehicle/views/VehicleView.qml b/apps/com.luxoft.vehicle/views/VehicleView.qml
index 04f857ee..bffae32b 100644
--- a/apps/com.luxoft.vehicle/views/VehicleView.qml
+++ b/apps/com.luxoft.vehicle/views/VehicleView.qml
@@ -195,11 +195,11 @@ Item {
         onLeftDoorClicked: root.store.setLeftDoor()
         onRightDoorClicked: root.store.setRightDoor()
         onTrunkClicked: root.store.setTrunk()
-        onNewRoofOpenProgressRequested: root.store.setRoofOpenProgress(progress)
+        onNewRoofOpenProgressRequested: function(progress) { root.store.setRoofOpenProgress(progress) } 
 
-        onRuntimeChanged: { root.store.setRuntime(runtime); }
+        onRuntimeChanged: function(runtime) { root.store.setRuntime(runtime) }
 
-        onQualityChanged: {
+        onQualityChanged: function(quality) {
             if (root.store.model3DVersion !== quality) {
                 root.store.model3DVersion = quality;
                 root.store.setModelQuality(quality);
@@ -207,6 +207,6 @@ Item {
         }
 
         onShowNotificationAboutChange: store.showNotificationAboutChange()
-        onIntentToMapRequested: { root.store.createIntentToMap(intentId, params) }
+        onIntentToMapRequested: function(intentId, params) { root.store.createIntentToMap(intentId, params) }
     }
 }
diff --git a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
index 213debd1..f08f2ea7 100644
--- a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
+++ b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
@@ -46,14 +46,15 @@ Control {
 
     background: Image {
         width: Sizes.dp(sourceSize.width)
-        height: width
+        height: Sizes.dp(sourceSize.height)
         source: Style.image("colorSelector/color-wheel")
+        fillMode: Image.PreserveAspectFit 
 
         Image {
             //selected color overlay
-            height: Sizes.dp(sourceSize.width)
-            width: Sizes.dp(sourceSize.height)
+	    anchors.fill: parent
             source: Style.image("colorSelector/"+Style.accentColor)
+            fillMode: parent.fillMode
         }
 
         MouseArea {
diff --git a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
index 22db493d..3a3c0247 100644
--- a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
@@ -46,7 +46,7 @@ Control {
         id: colorsChart
         width: root.availableWidth
         height: root.availableHeight
-        onAccentColorRequested: {
+        onAccentColorRequested: function(accentColor) {
             root.accentColorRequested(accentColor);
         }
     }
diff --git a/apps/com.pelagicore.apps.settings/store/RootStore.qml b/apps/com.pelagicore.apps.settings/store/RootStore.qml
index 8abbdb6d..84c5a519 100644
--- a/apps/com.pelagicore.apps.settings/store/RootStore.qml
+++ b/apps/com.pelagicore.apps.settings/store/RootStore.qml
@@ -99,7 +99,7 @@ QtObject {
     }
 
     readonly property UISettings uiSettings: UISettings {
-        onAccentColorChanged: {
+        onAccentColorChanged: function(accentColor) {
             root.accentColorsModel.forEach(function(element) {
                 element.selected = Qt.colorEqual(element.color, accentColor);
             });
diff --git a/apps/com.pelagicore.apps.settings/views/SettingsView.qml b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
index c19f44fa..c49b8a57 100644
--- a/apps/com.pelagicore.apps.settings/views/SettingsView.qml
+++ b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
@@ -240,7 +240,7 @@ Control {
                 anchors.fill: parent
                 visible: toolsColumn.currentIcon === 'ic-color'
                 model: store.accentColorsModel
-                onAccentColorRequested: store.updateAccentColor(accentColor)
+                onAccentColorRequested: function(accentColor) { store.updateAccentColor(accentColor) }
             }
         }
     }
diff --git a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
index cb7f351c..6a440633 100644
--- a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
@@ -32,9 +32,8 @@
 
 import QtQuick 2.8
 import QtQml 2.2
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
 import shared.utils 1.0
 import shared.animations 1.0
 import "../controls" 1.0
diff --git a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
index 0686cfc4..ee5e2f15 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
 import shared.utils 1.0
 import shared.Style 1.0
 import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
index 6eee833c..1144db11 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
 import shared.animations 1.0
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
index a37b078c..79228288 100644
--- a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
 import shared.utils 1.0
 import shared.controls 1.0
 import shared.Style 1.0
diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
index 740824cb..35944401 100644
--- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick.Controls
 import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
 import shared.utils 1.0
 import shared.controls 1.0
 import shared.Style 1.0
diff --git a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
index a61ea82e..be4ece49 100644
--- a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
 import shared.animations 1.0
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/apps/com.pelagicore.calendar/views/CalendarView.qml b/apps/com.pelagicore.calendar/views/CalendarView.qml
index d2ba3328..1c729191 100644
--- a/apps/com.pelagicore.calendar/views/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/CalendarView.qml
@@ -31,9 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
 import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
 import shared.animations 1.0
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/apps/com.pelagicore.climate/Main.qml b/apps/com.pelagicore.climate/Main.qml
index a2d9a761..fab1958d 100644
--- a/apps/com.pelagicore.climate/Main.qml
+++ b/apps/com.pelagicore.climate/Main.qml
@@ -59,7 +59,7 @@ NeptuneWindow {
         }
     }
 
-    onWindowPropertyChanged: {
+    onWindowPropertyChanged: function(name, value) {
         if (name === "neptuneLanguageLocale") {
             climateStore.measurementSystem = Qt.locale().measurementSystem
         }
diff --git a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
index 912737a3..e406e3a2 100644
--- a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
@@ -33,7 +33,7 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import "../helpers" 1.0
 import shared.animations 1.0
diff --git a/apps/com.pelagicore.climate/stores/ClimateStore.qml b/apps/com.pelagicore.climate/stores/ClimateStore.qml
index 7948a391..d8025f95 100644
--- a/apps/com.pelagicore.climate/stores/ClimateStore.qml
+++ b/apps/com.pelagicore.climate/stores/ClimateStore.qml
@@ -31,14 +31,14 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtIvi.VehicleFunctions 1.0
+import QtInterfaceFramework.VehicleFunctions 1.0
 
 QtObject {
     id: root
 
     property ClimateControl climateControl: ClimateControl {
         discoveryMode: ClimateControl.AutoDiscovery
-        onIsInitializedChanged: {
+        onIsInitializedChanged: function() {
             if (isInitialized) {
                 leftSeat.setValue(21.5)
                 rightSeat.setValue(21.5)
@@ -173,7 +173,7 @@ QtObject {
 
     // ClimateControl.airfloDirections is a bitfield. Manipulating bitfields is a PITA.
     // Convert it into a nice set of booleans instead.
-    // TODO: Change the QtIVI interface from bitfield to booleans so that this wrapping is no longer needed
+    // TODO: Change the QtInterfaceFramework interface from bitfield to booleans so that this wrapping is no longer needed
     property QtObject airflow: QtObject {
         id: airflow
         property bool _lock: false
diff --git a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
index 6b558aab..78b27e8f 100644
--- a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
+++ b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
@@ -106,7 +106,7 @@ DSM.StateMachine {
             }
             DSM.SignalTransition {
                 targetState: serverOnMaintanceState
-                signal: appStoreConfig.serverOnMaintanceState
+                signal: appStoreConfig.serverOnMaintance
             }
         }
 
diff --git a/apps/com.pelagicore.hud/panels/NaviPanel.qml b/apps/com.pelagicore.hud/panels/NaviPanel.qml
index 9581c30e..6c8e5b3d 100644
--- a/apps/com.pelagicore.hud/panels/NaviPanel.qml
+++ b/apps/com.pelagicore.hud/panels/NaviPanel.qml
@@ -30,8 +30,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls
 import shared.Style 1.0
 import shared.Sizes 1.0
 import shared.animations 1.0
@@ -57,7 +56,8 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         height: Sizes.dp(120)
         width: Sizes.dp(20)
-        orientation: Qt.Vertical
+        transformOrigin: Item.Center
+        rotation: 270
         visible: opacity > 0.0
         opacity: root.nextTurnDistance <= 300 && root.nextTurnDistanceMeasuredIn === "m" ? 1 : 0
         Behavior on opacity { DefaultNumberAnimation {} }
@@ -65,19 +65,17 @@ Item {
         value: root.nextTurnDistance <= 300 && root.nextTurnDistanceMeasuredIn === "m"
                ? root.nextTurnDistance / 300 : 0.0
 
-        style: ProgressBarStyle {
-            background: Rectangle {
-                radius: 2
-                color: "transparent"
-                border.color: "gray"
-                border.width: Sizes.dp(1)
-                implicitHeight: Sizes.dp(200)
-                implicitWidth: Sizes.dp(20)
-            }
-            progress: Rectangle {
-                color: "lightsteelblue"
-                border.color: "steelblue"
-            }
+        background: Rectangle {
+            radius: 2
+            color: "transparent"
+            border.color: "gray"
+            border.width: Sizes.dp(1)
+            implicitHeight: Sizes.dp(200)
+            implicitWidth: Sizes.dp(20)
+        }
+        contentItem: Rectangle {
+            color: "lightsteelblue"
+            border.color: "steelblue"
         }
     }
 }
diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml
index 2fee8c35..6d34bc3c 100644
--- a/apps/com.pelagicore.map/views/MapView.qml
+++ b/apps/com.pelagicore.map/views/MapView.qml
@@ -35,7 +35,7 @@ import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import QtPositioning 5.9
 import QtLocation 5.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import Qt.labs.platform 1.0
 
diff --git a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
index 217e32f2..361524d9 100644
--- a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
@@ -31,6 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
 import shared.utils 1.0
 import shared.controls 1.0
 import QtQuick.Controls 2.3
@@ -55,16 +56,19 @@ Row {
         icon.color: "white"
         onClicked: root.playClicked()
 
-        background: Image {
-            id: playButtonBackground
+        background: Item {
             anchors.centerIn: parent
-            width: Sizes.dp(sourceSize.width)
-            height: Sizes.dp(sourceSize.height)
-            source: Style.image("ic_button-bg")
-            fillMode: Image.PreserveAspectFit
-
-            ScalableColorOverlay {
-                anchors.fill: parent
+            width: playButtonBackground.width
+            height: playButtonBackground.height
+            Image {
+                id: playButtonBackground
+                width: Sizes.dp(sourceSize.width)
+                height: Sizes.dp(sourceSize.height)
+                source: Style.image("ic_button-bg")
+                fillMode: Image.PreserveAspectFit
+            }
+            ColorOverlay {
+                anchors.fill: playButtonBackground
                 source: playButtonBackground
                 color: Style.accentColor
             }
diff --git a/apps/com.pelagicore.music/controls/MusicControls.qml b/apps/com.pelagicore.music/controls/MusicControls.qml
index c06ed2d7..02837107 100644
--- a/apps/com.pelagicore.music/controls/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/MusicControls.qml
@@ -31,6 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
 import shared.utils 1.0
 import shared.controls 1.0
 import QtQuick.Controls 2.3
@@ -66,16 +67,19 @@ Row {
         icon.color: "white"
         onClicked: root.playClicked()
 
-        background: Image {
-            id: playButtonBackground
+        background: Item {
             anchors.centerIn: parent
-            width: Sizes.dp(sourceSize.width)
-            height: Sizes.dp(sourceSize.height)
-            source: Style.image("ic_button-bg")
-            fillMode: Image.PreserveAspectFit
-
-            ScalableColorOverlay {
-                anchors.fill: parent
+            width: playButtonBackground.width
+            height: playButtonBackground.height
+            Image {
+                id: playButtonBackground
+                width: Sizes.dp(sourceSize.width)
+                height: Sizes.dp(sourceSize.height)
+                source: Style.image("ic_button-bg")
+                fillMode: Image.PreserveAspectFit
+            }
+            ColorOverlay {
+                anchors.fill: playButtonBackground
                 source: playButtonBackground
                 color: Style.accentColor
             }
diff --git a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
index 34e15cd6..dff6fc04 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.11
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
 import QtQuick.Controls 2.2
 import shared.utils 1.0
 import shared.animations 1.0
@@ -109,12 +109,11 @@ Item {
                 fillMode: Image.PreserveAspectCrop
             }
 
-            GaussianBlur {
+            FastBlur {
                 id: undefinedBlur
                 anchors.fill: albumArtUndefined
                 source: albumArtUndefined
                 radius: 8
-                samples: 16
                 visible: false
             }
 
@@ -139,12 +138,11 @@ Item {
                 fillMode: Image.PreserveAspectCrop
             }
 
-            GaussianBlur {
+            FastBlur {
                 id: albumArtBlur
                 anchors.fill: albumArt
                 source: albumArt
                 radius: 8
-                samples: 16
                 visible: false
             }
 
@@ -310,16 +308,19 @@ Item {
         icon.color: "white"
         onClicked: root.playClicked();
 
-        background: Image {
-            id: playButtonBackground
+        background: Item {
             anchors.centerIn: parent
-            width: Sizes.dp(sourceSize.width)
-            height: Sizes.dp(sourceSize.height)
-            source: Style.image("ic_button-bg")
-            fillMode: Image.PreserveAspectFit
-
-            ScalableColorOverlay {
-                anchors.fill: parent
+            width: playButtonBackground.width
+            height: playButtonBackground.height
+            Image {
+                id: playButtonBackground
+                width: Sizes.dp(sourceSize.width)
+                height: Sizes.dp(sourceSize.height)
+                source: Style.image("ic_button-bg")
+                fillMode: Image.PreserveAspectFit
+            }
+            ColorOverlay {
+                anchors.fill: playButtonBackground
                 source: playButtonBackground
                 color: Style.accentColor
             }
diff --git a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
index b1a9cd87..6a014911 100644
--- a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
+++ b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
@@ -31,7 +31,6 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtGraphicalEffects 1.13
 import shared.utils 1.0
 import shared.controls 1.0
 import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.music/stores/MusicStore.qml b/apps/com.pelagicore.music/stores/MusicStore.qml
index a69ef5e3..d7895880 100644
--- a/apps/com.pelagicore.music/stores/MusicStore.qml
+++ b/apps/com.pelagicore.music/stores/MusicStore.qml
@@ -33,8 +33,8 @@
 import QtQuick 2.8
 import QtApplicationManager.Application 2.0
 import QtApplicationManager 2.0
-import QtIvi 1.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework
+import QtInterfaceFramework.Media
 import shared.utils 1.0
 
 Store {
@@ -77,10 +77,12 @@ Store {
     property string headerTextInArtistsView: ""
     property string headerTextInAlbumsView: ""
 
-    property SearchAndBrowseModel searchAndBrowseModel: SearchAndBrowseModel {
+    property FilterAndBrowseModel searchAndBrowseModel: FilterAndBrowseModel {
         id: searchBrowseModel
         contentType: ""
-        onContentTypeChanged: console.log(Logging.apps, "Music App::Content Type Change: ", contentType)
+        onContentTypeChanged: function(contentType) {
+            console.log(Logging.apps, "Music App::Content Type Change: ", contentType)
+        }
         serviceObject: root.player.serviceObject
 
         onCountChanged: {
@@ -107,7 +109,7 @@ Store {
     readonly property MediaIndexerControl indexerControl: MediaIndexerControl {
         property bool databaseReloaded: false
         property bool modelPopulated: false
-        onProgressChanged: {
+        onProgressChanged: function(progress) {
             // SearchAndBrowseModel need to be reloaded when indexing process reach 20 %
             // to get the music data and after indexing process is done.
             // Without reloading the model, Neptune 3 won't see any music during the first
diff --git a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
index cd824bb9..2ef9095c 100644
--- a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml
index c1ab5c80..f2a051ff 100644
--- a/apps/com.pelagicore.music/views/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/WidgetContentView.qml
@@ -85,7 +85,7 @@ Item {
                     listView.model: store.musicPlaylist
                     listView.interactive: false
                     musicPlaying: root.store.playing
-                    onItemClicked: {
+                    onItemClicked: function(index) {
                         store.musicPlaylist.currentIndex = index;
                         store.player.play();
                     }
@@ -145,7 +145,7 @@ Item {
         visible: opacity > 0
         value: store.currentTrackPosition
         progressText: store.elapsedTime + " / " + store.totalTime
-        onUpdatePosition: store.updatePosition(value)
+        onUpdatePosition: function(value) { store.updatePosition(value) }
     }
 
     MusicTools {
diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml
index 2fda4a84..37a1e780 100644
--- a/apps/com.pelagicore.phone/Main.qml
+++ b/apps/com.pelagicore.phone/Main.qml
@@ -35,7 +35,6 @@ import application.windows 1.0
 import shared.utils 1.0
 import shared.animations 1.0
 import shared.controls 1.0
-import QtGraphicalEffects 1.0
 
 import shared.Style 1.0
 import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
index a4b5a3aa..ffc89d3a 100644
--- a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
+++ b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.Sizes 1.0
 
diff --git a/apps/com.pelagicore.phone/controls/RoundImage.qml b/apps/com.pelagicore.phone/controls/RoundImage.qml
index f11486a2..bf7157ea 100644
--- a/apps/com.pelagicore.phone/controls/RoundImage.qml
+++ b/apps/com.pelagicore.phone/controls/RoundImage.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.8
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.Sizes 1.0
 
diff --git a/apps/com.pelagicore.phone/controls/WidgetContact.qml b/apps/com.pelagicore.phone/controls/WidgetContact.qml
index 9f0a6cf7..d188276c 100644
--- a/apps/com.pelagicore.phone/controls/WidgetContact.qml
+++ b/apps/com.pelagicore.phone/controls/WidgetContact.qml
@@ -33,7 +33,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.effects 1.0
 import shared.animations 1.0
@@ -121,16 +121,20 @@ Control {
             icon.name: "ic-call-contrast"
             icon.color: "white"
 
-            background: Image {
-                id: callButtonBackground
+            background: Item {
                 anchors.centerIn: parent
-                width: Sizes.dp(sourceSize.width)
-                height: Sizes.dp(sourceSize.height)
-                source: Style.image("ic_button-bg")
-                fillMode: Image.PreserveAspectFit
+                width: callButtonBackground.width
+                height: callButtonBackground.height
+                Image {
+                    id: callButtonBackground
+                    width: Sizes.dp(sourceSize.width)
+                    height: Sizes.dp(sourceSize.height)
+                    source: Style.image("ic_button-bg")
+                    fillMode: Image.PreserveAspectFit
 
-                ScalableColorOverlay {
-                    anchors.fill: parent
+                }
+                ColorOverlay {
+                    anchors.fill: callButtonBackground
                     source: callButtonBackground
                     color: Style.accentColor
                 }
diff --git a/apps/com.pelagicore.phone/stores/PhoneStore.qml b/apps/com.pelagicore.phone/stores/PhoneStore.qml
index da305fe2..ae3b28fe 100644
--- a/apps/com.pelagicore.phone/stores/PhoneStore.qml
+++ b/apps/com.pelagicore.phone/stores/PhoneStore.qml
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
index d4ab3ee4..e67bb021 100644
--- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
@@ -124,7 +124,7 @@ Item {
             source: "../assets/profile_photos/%1.png".arg(model.handle)
             lastItem: (index === (favorites1Row.model.count - 1))
             maximized: (root.state === "Maximized")
-            onCallWidgetClicked: { root.store.startCall(handle); }
+            onCallWidgetClicked: function(handle) { root.store.startCall(handle); }
             enableOpacityMasks: store.allowOpenGLContent
         }
         PageIndicator {
diff --git a/apps/com.pelagicore.phone/views/PhoneView.qml b/apps/com.pelagicore.phone/views/PhoneView.qml
index 0198c5c8..2b457ea9 100644
--- a/apps/com.pelagicore.phone/views/PhoneView.qml
+++ b/apps/com.pelagicore.phone/views/PhoneView.qml
@@ -97,7 +97,7 @@ Item {
         state: root.state
         store: root.store
         ongoingCall: root.store.ongoingCall
-        onCallEndRequested: root.store.endCall(handle)
+        onCallEndRequested: function(handle) { root.store.endCall(handle) }
         onKeypadRequested: {
             toolsColumn.currentIndex = 3; // keypad
             root.activateApp();
diff --git a/apps/com.pelagicore.tuner/controls/MusicControls.qml b/apps/com.pelagicore.tuner/controls/MusicControls.qml
index e0e25197..5d6758d5 100644
--- a/apps/com.pelagicore.tuner/controls/MusicControls.qml
+++ b/apps/com.pelagicore.tuner/controls/MusicControls.qml
@@ -31,6 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
 import shared.utils 1.0
 import shared.controls 1.0
 import QtQuick.Controls 2.3
@@ -64,16 +65,19 @@ Row {
         icon.color: "white"
         onClicked: root.playClicked()
 
-        background: Image {
-            id: playButtonBackground
+        background: Item {
             anchors.centerIn: parent
-            width: Sizes.dp(sourceSize.width)
-            height: Sizes.dp(sourceSize.height)
-            source: Style.image("ic_button-bg")
-            fillMode: Image.PreserveAspectFit
-
-            ScalableColorOverlay {
-                anchors.fill: parent
+            width: playButtonBackground.width
+            height: playButtonBackground.height
+            Image {
+                id: playButtonBackground
+                width: Sizes.dp(sourceSize.width)
+                height: Sizes.dp(sourceSize.height)
+                source: Style.image("ic_button-bg")
+                fillMode: Image.PreserveAspectFit
+            }
+            ColorOverlay {
+                anchors.fill: playButtonBackground
                 source: playButtonBackground
                 color: Style.accentColor
             }
diff --git a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
index 8bfaddfb..6dc0bd33 100644
--- a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
+++ b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
@@ -33,7 +33,6 @@
 import QtQuick 2.8
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/apps/com.pelagicore.tuner/controls/TunerSlider.qml b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
index b10f2113..2bda18a1 100644
--- a/apps/com.pelagicore.tuner/controls/TunerSlider.qml
+++ b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
@@ -33,7 +33,7 @@
 import QtQuick 2.8
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/apps/com.pelagicore.tuner/stores/TunerStore.qml b/apps/com.pelagicore.tuner/stores/TunerStore.qml
index f05892e7..52da18cf 100644
--- a/apps/com.pelagicore.tuner/stores/TunerStore.qml
+++ b/apps/com.pelagicore.tuner/stores/TunerStore.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtMultimedia 5.9
+import QtMultimedia
 import QtApplicationManager.Application 2.0
 import QtApplicationManager 2.0
 import shared.utils 1.0
@@ -114,7 +114,7 @@ Store {
         }
     }
 
-    // TODO: Simulation models. QtIVI models are not updated yet and only have two available stations.
+    // TODO: Simulation models. QtInterfaceFramework models are not updated yet and only have two available stations.
     readonly property ListModel fm1Stations: ListModel {
         ListElement {
             freq: 87.5
diff --git a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
index 348ad3dd..940c0428 100644
--- a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
+++ b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
@@ -106,7 +106,7 @@ Item {
         anchors.top: parent.top
         height: parent.height
         listView.model: root.store.currentPresetModel
-        onItemClicked: {
+        onItemClicked: function(index) {
             root.store.setFrequency(root.store.currentPresetModel.get(index).freq);
         }
     }
diff --git a/apps/com.theqtcompany.cluster/Main.qml b/apps/com.theqtcompany.cluster/Main.qml
index 2f9db8c3..f347134a 100644
--- a/apps/com.theqtcompany.cluster/Main.qml
+++ b/apps/com.theqtcompany.cluster/Main.qml
@@ -84,7 +84,7 @@ NeptuneWindow {
         }
     }
 
-    onWindowPropertyChanged: {
+    onWindowPropertyChanged: function(name, value) {
         if (name === "clusterUIMode") {
             //set UI mode for cluster: no app or some app running under cluster view
             clusterView.store.behaviourInterface.clusterUIMode = value
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
index 2c0493b1..05dc0c36 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
@@ -31,7 +31,6 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 import QtQuick.Shapes 1.12
 import shared.controls 1.0
 import "../helpers" 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
index 93ca9790..266f8d19 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
@@ -31,7 +31,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Shapes 1.12
 import shared.controls 1.0
 import "../helpers" 1.0
@@ -96,7 +96,6 @@ Item {
         horizontalOffset: 0
         verticalOffset: 0
         radius: Sizes.dp(10)
-        samples: 10
         color: "gray"
         source: speedRectangle
         opacity: 0.7
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
index 05c6966b..abf9aebf 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
@@ -32,7 +32,6 @@
 import QtQuick 2.9
 import shared.Sizes 1.0
 import QtQuick.Shapes 1.12
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
 
 /*
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
index db3b2444..9936ce63 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
@@ -32,7 +32,7 @@
 import QtQuick 2.12
 import QtQuick.Shapes 1.12
 import shared.Sizes 1.0
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Controls 2.2
 
 /*
diff --git a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
index d50bd5f8..36a68024 100644
--- a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Shapes 1.0
 import "../helpers" 1.0
 import shared.Style 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
index 73e452d8..aee69173 100644
--- a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
@@ -32,6 +32,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
+import Qt5Compat.GraphicalEffects
 import QtQuick.Controls 2.3
 import "../helpers" 1.0
 import shared.Style 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
index f81d13ab..299040cb 100644
--- a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
@@ -33,7 +33,7 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Shapes 1.0
 import shared.controls 1.0
 import "../helpers" 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
index b765f62e..5d39f06a 100644
--- a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
+++ b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
@@ -31,7 +31,6 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 import QtQuick.Shapes 1.12
 
 import shared.Sizes 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
index 2d4b6e1b..29d420be 100644
--- a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
+++ b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
@@ -32,7 +32,6 @@
 import QtQuick 2.12
 import QtQuick.Shapes 1.12
 import shared.Sizes 1.0
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
 
 /*!
diff --git a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
index 849a64c2..22882880 100644
--- a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
+++ b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
@@ -34,7 +34,6 @@ import shared.Sizes 1.0
 import shared.Style 1.0
 import shared.utils 1.0
 import QtQuick.Shapes 1.12
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
 import QtStudio3D.OpenGL 2.5
 
diff --git a/doc/doc.pri b/doc/doc.pri
index a1708b71..8e4e7f10 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,5 +1,5 @@
 CONFIG += force_qt
-QT *= quick ivicore
+QT *= quick interfaceframework
 
 INCLUDEPATH += $$OUT_PWD/../src/remotesettings/frontend \
                $$OUT_PWD/../src/drivedata/frontend \
diff --git a/doc/neptune3ui-project.qdocconf b/doc/neptune3ui-project.qdocconf
index 53f19f0e..b118e0e4 100644
--- a/doc/neptune3ui-project.qdocconf
+++ b/doc/neptune3ui-project.qdocconf
@@ -24,7 +24,7 @@ depends += qtcore \
            qtquick \
            qtqml \
            qtgui \
-           qtivi \
+           interfaceframework \
            applicationmanager \
            qt3d \
            qt3dstudio \
diff --git a/doc/src/examples-parking-app-tutorial.qdoc b/doc/src/examples-parking-app-tutorial.qdoc
index 71a64273..c2d6ef44 100644
--- a/doc/src/examples-parking-app-tutorial.qdoc
+++ b/doc/src/examples-parking-app-tutorial.qdoc
@@ -256,19 +256,19 @@ simulation which shows the number of parking lots currently available.
 
 While this chapter does introduce the Middleware integration, how it works, and what needs to be
 done to package it correctly, a full deep dive is out of scope. For more in-depth details on
-how to develop Middleware APIs, refer to the \l{Qt IVI Generator Tutorial}.
+how to develop Middleware APIs, refer to the \l{Qt Interface Framework Generator Tutorial}.
 
 \note This application requires a multi-process environment.
 
 \section2 Define the Middleware API
 
-To define our Middleware API, we use the IVI Generator from the QtIvi module. This generator uses
+To define our Middleware API, we use the generator from the QtInterfaceFramework module. This generator uses
 an Interface Definition Language (IDL) to generate code, significantly reducing the amount of code
 we need to write.
 
 \section3 QFace
 
-QtIvi uses the QFace IDL to describe what needs to be generated. For this example, we define a
+QtInterfaceFramework uses the QFace IDL to describe what needs to be generated. For this example, we define a
 simple interface, \c ParkingInfo, that provides a \c readonly property called \c freeLots, inside
 a \c Parking module.
 
@@ -277,27 +277,27 @@ a \c Parking module.
 \section2 Autogeneration
 
 Now that the first version of our IDL file is ready, it's time to autogenerate API from it with
-the \l{IVI Generator} tool. Similar to \l moc, this autogeneration process is integrated into the
+the \l{Qt Interface Framework Generator} tool. Similar to \l moc, this autogeneration process is integrated into the
 \l qmake Build System and is done at compile time.
 
 In the following \c{.pro} file, we build a C++ library based on our IDL file:
 
 \quotefile ../examples/neptune3ui/parking-app-tutorial/chapter3-middleware/frontend/frontend.pro
 
-By adding \c ivigenerator to the \c CONFIG variable, qmake's IVI Generator integration is loaded
-and it expects a QFace IDL file in the \C QFACE_SOURCES variable. The set \c DEFINE makes sure
+By adding \c ifcodegen to the \c CONFIG variable, qmake's Interface Framework Generator integration is loaded
+and it expects a QFace IDL file in the \C IFCODEGEN_SOURCES variable. The set \c DEFINE makes sure
 that the library exports its symbols, which is necessary for Windows systems.
 
 \section2 Which Files are Autogenerated
 
-The IVI Generator works based on generation templates -- these define what content should be
-generated from a QFace file. If no \c QFACE_FORMAT is defined, then the default template,
+The Interface Framework Generator works based on generation templates -- these define what content should be
+generated from a QFace file. If no \c IFCODEGEN_TEMPLATE is defined, then the default template,
 \c frontend is used. For more details on these templates, see \l{Use the Generator}.
 
 This \c frontend template generates:
 
 \list
-    \li a C++ class derived from QIviAbstractFeature for every interface in the QFace file
+    \li a C++ class derived from QIfAbstractFeature for every interface in the QFace file
     \li one module class that helps to register all interfaces to QML and stores global types
         and functions
 \endlist
@@ -309,14 +309,14 @@ These files are available in your library's build folder, should you wish to ins
 In addition to the library that contains our Middleware API, we also need a QML plugin to be able
 to use the API from within QML.
 
-The IVI Generator can help us generate such a plugin with a different generation template. The
+The Interface Framework Generator can help us generate such a plugin with a different generation template. The
 following \c{.pro} file generates a QML plugin that exports the API to QML:
 
 \quotefile ../examples/neptune3ui/parking-app-tutorial/chapter3-middleware/imports/imports.pro
 
 We use \c CONFIG to build a plugin, then define the settings for the linker to link against our
-frontend library. Next, we use \c QFACE_FORMAT to choose \c qmlplugin as the generation template.
-Instead of adding \c ivigenerator to the \c CONFIG, this time we use \l{https://doc.qt.io/qt-5/qmake-test-function-reference.html#load-feature} {qmake's load() function} to explicitly load the
+frontend library. Next, we use \c IFCODEGEN_TEMPLATE to choose \c qmlplugin as the generation template.
+Instead of adding \c ifcodegen to the \c CONFIG, this time we use \l{https://doc.qt.io/qt-5/qmake-test-function-reference.html#load-feature} {qmake's load() function} to explicitly load the
 feature. This way, we can use the \c URI variable, that's part of the \c qmlplugin generation
 template. This variable can define a \c DESTDIR by repliacing all dots with slashes.
 
@@ -324,7 +324,7 @@ In addition to the folder structure, the QmlEngine also needs a \c qmldir file w
 what files are part of the plugin, and under which \c URI. For more information, see
 \l{https://doc.qt.io/qt-5/qtqml-modules-qmldir.html}{Module Definition qmldir Files}.
 
-Both -- the \c qmldir file and the \c plugins.qmltypes file -- are autogenerated by the IVI
+Both -- the \c qmldir file and the \c plugins.qmltypes file -- are autogenerated by the Interface Framework
 Generator and provide information about code-completion; but they need to be placed next to
 the library. To do so, we add these files to a scope similar to an \c INSTALL target, but add it
 to the \c COPIES variable instead. This makes sure that the files are copied when the plugin is
@@ -396,16 +396,16 @@ With those settings in place, the app can be deployed. It should show \c 0 free
 
 \section2 Define a Simulation Behavior
 
-To simulate some values for our Middleware API, first we need to understand QtIvi's architecture a
-little bit better. As we learned when generating the library, the IVI Generator used a template
+To simulate some values for our Middleware API, first we need to understand QtInterfaceFramework's architecture a
+little bit better. As we learned when generating the library, the Interface Framework Generator used a template
 called \c frontend. To define some simulation values or to connect to a real API, we also need
-corresponding \c backend. This \c backend is provided in the form of a plugin, and QtIvi takes care
+corresponding \c backend. This \c backend is provided in the form of a plugin, and QtInterfaceFramework takes care
 to load and connect the \c frontend to the \c backend. For more information on this concept, see
 \l{Dynamic Backend Architecture}.
 
 \section2 Backend Plugin with Static Values
 
-The next step is to generate such a backend using the IVI Generator and use \l{Annotations} to
+The next step is to generate such a backend using the Interface Framework Generator and use \l{Annotations} to
 define what the simulation should do.
 
 Let's start with the \c{.pro} to generate and build our backend:
@@ -413,10 +413,10 @@ Let's start with the \c{.pro} to generate and build our backend:
 \quotefile ../examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/backend_simulator.pro
 
 To build a plugin, we need to add \c plugin to the \c CONFIG variable as well as change the
-\c QFACE_FORMAT to use the \c backend_simulator generation template. Similar to the QML plugin,
+\c IFCODEGEN_TEMPLATE to use the \c backend_simulator generation template. Similar to the QML plugin,
 the backend also needs to link to our frontend library, since it uses the types defined there.
 
-TO ensure that QtIvi can find the backend, it needs to be placed in a \c qtivi folder. In turn,
+TO ensure that QtInterfaceFramework can find the backend, it needs to be placed in a \c interfaceframework folder. In turn,
 this folder needs to be part of the Qt plugin search path.
 
 Just like with the import path, the additional plugin path needs to be setup in the package
@@ -427,7 +427,7 @@ manifest:
         pluginPaths: [ '.' ]
 \endcode
 
-Now, we have created a simulation backend, but without additional information, the IVI Generator
+Now, we have created a simulation backend, but without additional information, the Interface Framework Generator
 can't create something really useful.
 
 First, we define a static default value which the simulation backend should provide. The easiest
@@ -440,7 +440,7 @@ a default value we change the IDL file like this:
 \printuntil }
 \printuntil }
 
-Because of the change to the IDL file, the IVI Generator now recreates the backend plugin. Now,
+Because of the change to the IDL file, the Interface Framework Generator now recreates the backend plugin. Now,
 when we run the updated application, we should see \c 42 free parking lots.
 
 \section2 Simulation QML
@@ -450,7 +450,7 @@ having a generated simulation backend can do more. It would also allow you to de
 behavior that's more dynamic.
 
 To achieve this, we add another annotation to our QFace IDL file and define a \c simulationFile.
-This file contains our simulation behavior and QIviSimulationEngine loads it. Similar to other QML
+This file contains our simulation behavior and QIfSimulationEngine loads it. Similar to other QML
 files, the best way to serve this file is to embed it inside a Qt resource.
 
 Our \c simulation.qml looks like this:
@@ -460,8 +460,8 @@ Our \c simulation.qml looks like this:
 \printuntil } } } }
 
 First, there's a \c settings property, that's initialized with the return value from the
-\l{IviSimulator::findData}{IviSimulator.findData} method, which takes the
-\l{IviSimulator::simulationData}{IviSimulator.simulationData} and a string as input. The
+\l{IfSimulator::findData}{IfSimulator.findData} method, which takes the
+\l{IfSimulator::simulationData}{IfSimulator.simulationData} and a string as input. The
 \c simulationData is the JSON file represented as a JavaScript object.
 
 The \c findData method helps us to extract only data that is of interest for this interface,
@@ -477,9 +477,9 @@ also writable to make it possible to change them to provide a useful simulation.
 Each time a frontend instance connects to a backend, the \c initialize() function is called.
 The same applies to the QML simulation: as the \c initialize() C++ function forwards this to the
 QML insitance. This behavior also applies to all other functions, like getters and setters.
-For more details, see \l{QIviSimulationEngine}.
+For more details, see \l{QIfSimulationEngine}.
 
-Inside the QML \c initialize() function, we call \c{IviSimulator.initializeDefault()}, to read
+Inside the QML \c initialize() function, we call \c{IfSimulator.initializeDefault()}, to read
 the default values from the \c simulationData object and iniitialize all properties. This is done
 only \b once, as we don't want the properties to be reset to default when the next frontend
 instance connects to the backend. Lastly, the base implementation is called to make sure that the
diff --git a/doc/src/neptune3ui-3d-integration.qdoc b/doc/src/neptune3ui-3d-integration.qdoc
index 997f387b..870e3878 100644
--- a/doc/src/neptune3ui-3d-integration.qdoc
+++ b/doc/src/neptune3ui-3d-integration.qdoc
@@ -191,7 +191,7 @@
         \li Clone the Qt 3D Studio runtime git repository from
         \l{https://code.qt.io/cgit/qt3dstudio/qt3d-runtime.git/}
         \li Next, build and install the Qt 3D Studio runtime from the branch 2.1.
-        \li Finally, build and install \l{Qt Application Manager}, \l{Qt IVI} and then
+        \li Finally, build and install \l{Qt Application Manager}, \l{Qt Interface Framework} and then
         \l{Neptune 3 UI} as explained in the Installation sections of those components.
    \endlist
 
diff --git a/doc/src/neptune3ui-companion-app.qdoc b/doc/src/neptune3ui-companion-app.qdoc
index 17051af5..9c8339f8 100644
--- a/doc/src/neptune3ui-companion-app.qdoc
+++ b/doc/src/neptune3ui-companion-app.qdoc
@@ -39,7 +39,7 @@
    changing the instrument cluster values, for demonstration or testing purposes.
 
    The app connects to the same remote middleware services and utilizes the same autogenerated
-   QtIVI interfaces and mechanisms; just like Neptune 3 UI. This solution simplifies the task of
+   QtInterfaceFramework interfaces and mechanisms; just like Neptune 3 UI. This solution simplifies the task of
    implementing this kind of app, without requiring separate APIs and a dedicated architecture to
    access vehicle function data.
 
diff --git a/doc/src/neptune3ui-configure.qdoc b/doc/src/neptune3ui-configure.qdoc
index ebdeda74..bfd38ea6 100644
--- a/doc/src/neptune3ui-configure.qdoc
+++ b/doc/src/neptune3ui-configure.qdoc
@@ -128,10 +128,6 @@
    in Neptune 3 UI. When enabled, the Sheets app is included in the Application Launcher and
    developers can see all of the components that Neptune 3 UI supports, to develop an app.
 
-   The \c enableCursorManagement option can be set to \c yes or \c no, to enable or disable the
-   Cursor Support in Neptune 3 UI's Center Console only. When enabled, it's possible to navigate
-   the Center Console with input methods other than touch, such as a keyboard or a gamepad.
-
    The \c hardwareVariant parameter can be used to specify the type of hardware used. According to
    the variant, features are enabled or disabled depending on whether the hardware supports them.
    Currently, this parameter accepts two values: \c high or \c low. If set to \c low, some
diff --git a/doc/src/neptune3ui-external-pages.qdoc b/doc/src/neptune3ui-external-pages.qdoc
index 1d8cf7dd..bf018955 100644
--- a/doc/src/neptune3ui-external-pages.qdoc
+++ b/doc/src/neptune3ui-external-pages.qdoc
@@ -27,12 +27,12 @@
 ****************************************************************************/
 
 /*!
-    \externalpage http://www.qt.io/qt-automotive-suite/
+    \externalpage https://www.qt.io/qt-automotive-suite/
     \title Qt Automotive Suite Product
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtAutomotiveSuite/
+    \externalpage https://doc.qt.io/QtAutomotiveSuite/
     \title Qt Automotive Suite
 */
 
@@ -52,18 +52,18 @@
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtApplicationManager/manifest.html
+    \externalpage https://doc.qt.io/QtApplicationManager/manifest.html
     \title Qt Application Manager Manifest File
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtApplicationManager/qml-qtapplicationmanager-notification.html
+    \externalpage https://doc.qt.io/QtApplicationManager/qml-qtapplicationmanager-notification.html
     \title Notification
 */
 
 /*!
-    \externalpage https://doc.qt.io/QtIVI/index.html
-    \title Qt IVI
+    \externalpage https://doc.qt.io/QtInterfaceFramework/index.html
+    \title Qt InterfaceFramework
 */
 
 /*!
@@ -72,52 +72,52 @@
  */
 
 /*!
-    \externalpage http://doc.qt.io/QtForDeviceCreation/qtee-custom-embedded-linux-image.html
+    \externalpage https://doc.qt.io/QtForDeviceCreation/qtee-custom-embedded-linux-image.html
     \title Building eLinux Image
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtForDeviceCreation/qtee-requirements-x11.html#requirements-for-boot-to-qt-emulator
+    \externalpage https://doc.qt.io/QtForDeviceCreation/qtee-requirements-x11.html#requirements-for-boot-to-qt-emulator
     \title Emulator Requirements for Linux/x11
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtForDeviceCreation/qtee-requirements-windows.html#requirements-for-boot-to-qt-emulator
+    \externalpage https://doc.qt.io/QtForDeviceCreation/qtee-requirements-windows.html#requirements-for-boot-to-qt-emulator
     \title Emulator Requirements for Windows
 */
 
 /*!
-    \externalpage http://doc.qt.io/qt-5/qtquickcontrols2-environment.html
+    \externalpage https://doc.qt.io/qt-5/qtquickcontrols2-environment.html
     \title Qt QuickControls 2 Environment Variables
 */
 
 /*!
-    \externalpage http://code.qt.io/cgit/qt/qtapplicationmanager.git/
+    \externalpage https://code.qt.io/cgit/qt/qtapplicationmanager.git/
     \title Qt Application Manager Git Repository
 */
 
 /*!
-    \externalpage http://code.qt.io/cgit/qt/qtivi.git/
-    \title Qt IVI Git Repository
+    \externalpage https://code.qt.io/cgit/qt/qtinterfaceframework.git/
+    \title Qt InterfaceFramework Git Repository
 */
 
 /*!
-    \externalpage http://code.qt.io/cgit/qt-apps/neptune3-ui.git/
+    \externalpage https://code.qt.io/cgit/qt-apps/neptune3-ui.git/
     \title Neptune3-UI Git Repository
 */
 
 /*!
-    \externalpage http://developer.gnome.org/notification-spec/
+    \externalpage https://developer.gnome.org/notification-spec/
     \title GNOME Desktop Notifications Specification
 */
 
 /*!
-    \externalpage http://doc.qt.io/qtcreator/creator-project-qmake.html
+    \externalpage https://doc.qt.io/qtcreator/creator-project-qmake.html
     \title Create Project Qmake
 */
 
 /*!
-    \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html#build-steps
+    \externalpage https://doc.qt.io/qtcreator/creator-build-settings.html#build-steps
     \title Build Steps
 */
 
@@ -142,13 +142,13 @@
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtIVI/ipc-integration.html
-    \title Qt IVI Inter-Process Communication Integration
+    \externalpage https://doc.qt.io/QtInterfaceFramework/ipc-integration.html
+    \title Qt InterfaceFramework Inter-Process Communication Integration
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtIVI/qtivi-ivicore-qface-ivi-remote-example.html
-    \title Qt IVI Generator Remote Objects Example
+    \externalpage https://doc.qt.io/QtInterfaceFramework/qtinterfaceframework-interfaceframework-qface-remote-example.html
+    \title Qt InterfaceFramework Generator Remote Objects Example
 */
 
 /*!
diff --git a/doc/src/neptune3ui-install.qdoc b/doc/src/neptune3ui-install.qdoc
index 515bc74d..23677632 100644
--- a/doc/src/neptune3ui-install.qdoc
+++ b/doc/src/neptune3ui-install.qdoc
@@ -43,9 +43,9 @@
 
     \section1 Run Neptune 3 UI from a Qt Automotive Suite Installation
 
-    Neptune 3 UI depends on \l{Qt Application Manager} and \l{Qt IVI} to provide support for both a
-    Center Console display and an Instrument Cluster. It also uses the Qt IVI plugins and its
-    \c ivigenerator to generate and access various services. Neptune 3 UI offers a multi-process
+    Neptune 3 UI depends on \l{Qt Application Manager} and \l{Qt InterfaceFramework} to provide support for both a
+    Center Console display and an Instrument Cluster. It also uses the Qt InterfaceFramework plugins and its
+    \c ifcodegen to generate and access various services. Neptune 3 UI offers a multi-process
     application model using a central System UI and various apps. The System UI provides an
     application launcher to start and stop apps; it also acts as a full-fledged compositor.
     Additionally, the \l{Qt Creator Plugin for Qt Application Manager} lets you develop and deploy
@@ -101,7 +101,7 @@
     \section2 Prerequisites
 
     \list
-        \li \b{Qt 5.12} or higher
+        \li \b{Qt 6.2.5} or higher
         \li To support multi-process mode, your Qt installation must include the \c qtwayland
             submodule, and be built with Open GL ES \c{(-opengl es2 -opengles3)}.
     \endlist
@@ -109,8 +109,8 @@
     \section2 Dependencies
 
     \list
-        \li \l{Qt Application Manager} 5.15
-        \li \l{Qt IVI} 5.15
+        \li \l{Qt Application Manager} 6.2.5+
+        \li \l{Qt InterfaceFramework} 6.2.5+
         \li \l{Qt Safe Renderer} 1.1 (optional)
         \li \l{Qt 3D Studio} (optional)
     \endlist
@@ -119,10 +119,10 @@
 
    \list 1
         \li Clone the repositories mentioned in \l{Install Qt Automotive Suite}.
-        \li Build \l{Qt Application Manager} against Qt 5.15. For more detailed build
+        \li Build \l{Qt Application Manager} against Qt 6.2.5. For more detailed build
             instructions, see \l{Qt Applicaton Manager Installation}.
-        \li Build \l{Qt IVI} against Qt 5.15. For more detailed build instructions, see
-            \l[QtIvi]{Installation}.
+        \li Build \l{Qt InterfaceFramework} against Qt 6.2.5. For more detailed build instructions, see
+            \l[QtInterfaceFramework]{Installation}.
         \li Run the following command in a terminal, to build Neptune 3 UI:
             \badcode
             qmake neptune3-ui.pro
diff --git a/doc/src/neptune3ui-middleware.qdoc b/doc/src/neptune3ui-middleware.qdoc
index 9f07afd3..1df2ac08 100644
--- a/doc/src/neptune3ui-middleware.qdoc
+++ b/doc/src/neptune3ui-middleware.qdoc
@@ -30,14 +30,14 @@
    \title Neptune 3 UI - Middleware
    \brief Describes Neptune 3 UI's middleware implementation.
 
-   Neptune 3 UI uses QtIvi, its autogenerator tools, QtIviVehicleFunctions, and QtIviMedia to
+   Neptune 3 UI uses QtInterfaceFramework, its autogenerator tools, QtIfVehicleFunctions, and QtIfMedia to
    implement Middleware APIs in an automotive UI context. There are two such APIs that Neptune 3 UI
    implements and utilizes: \c RemoteSettings and \c DriveData.
 
    Neptune 3 UI connects to their corresponding remote services: \c remotesettings-server and the
    \c drivedata-simulation-server. In this case, a remote service refers to an independent process,
-   possibly running on a different host. For an introduction to QtIvi's middleware services, see
-   \l {Qt IVI Inter-Process Communication Integration}.
+   possibly running on a different host. For an introduction to QtInterfaceFramework's middleware services, see
+   \l {Qt Interface Framework Inter-Process Communication Integration}.
 
    \section1 Why use Middleware
 
@@ -67,13 +67,13 @@
 
    \section1 Implementation
 
-   The middleware architecture is based on QtIVI and its \l {Qt IVI Autogenerator}{ivigenerator}
+   The middleware architecture is based on QtInterfaceFramework and its \l {Qt Interface Framework Generator}{ifcodegen}
    tool. Neptune 3 UI's built-in apps, the companion app, and System UI all connect to the remote
    services through auto-generated components. Communication between the middleware services and
    frontends is achieved with QtRemoteObjects. This is done transparently; you can replace this
    communication with other messaging mechanisms, without changing the APIs.
 
-   QtIvi-based middleware is described in \c{.qface} files; for each file, the QtIVI autogenerator
+   QtInterfaceFramework-based middleware is described in \c{.qface} files; for each file, the QtInterfaceFramework autogenerator
    generates these distinct components: frontend, backend plugin, and a separate service
    executable.
 
@@ -94,7 +94,7 @@
    \endlist
 
    As discussed above, the \b remotesettings.qface file is the interface description that the
-   \c ivigenerator takes as input. The \b frontend is a shared library containing a C++
+   \c ifcodegen takes as input. The \b frontend is a shared library containing a C++
    implementation of our middleware and the interface to implement a backend for it. Whether the
    middleware service is remote or not, is hidden from the code that uses the frontend (opaque).
    For example, all methods in the frontend's interface are asynchronous. For convenience, the
@@ -126,10 +126,10 @@
 
    \section2 Related Information
    \list
-      \li See \l{Qt IVI Inter-Process Communication Integration} and
-         \l {Generate QtRemoteObjects based backends with the Qt IVI Generator} for a more
+      \li See \l{Qt Interface Framework Inter-Process Communication Integration} and
+         \l {Generate QtRemoteObjects based backends with the Qt Interface Framework Generator} for a more
          detailed explanation and a walkthrough on generating middleware services.
-      \li See \l{Qt IVI Simulation System} for more info about simulations.
+      \li See \l{Qt Interface Framework Simulation System} for more info about simulations.
       \li See \l{Develop a Parking App}
    \endlist
 
diff --git a/doc/src/neptune3ui-overview.qdoc b/doc/src/neptune3ui-overview.qdoc
index 1045bc03..5508b10f 100644
--- a/doc/src/neptune3ui-overview.qdoc
+++ b/doc/src/neptune3ui-overview.qdoc
@@ -43,7 +43,7 @@
    \li Provide UI designers with methods to control the look-and-feel.
    \li Improve flexibility by enabling
        \l{Qt Automotive Suite Product} {Qt Automotive Suite} to integrate with
-       external tools, such as 3D tools, Maps, Qt IVI, and more.
+       external tools, such as 3D tools, Maps, Qt Interface Framework, and more.
    \li Provide a multi-process UI that forms a base for an IVI system.
    \endlist
 
@@ -56,7 +56,7 @@
        takes care of the application and window management.
    \li Can be integrated with various car 3D model technologies.
    \li Can be integrated with various navigation solutions.
-   \li Utilizes the \l{Qt IVI} module, that provides C++ classes and QML types
+   \li Utilizes the \l{Qt Interface Framework} module, that provides C++ classes and QML types
        to access vehicle features, as well as a core API to implement new IVI
        features.
    \li Supports \l{Neptune 3 UI Cursor Management Support}{cursor management}
@@ -110,7 +110,7 @@
    \row
        \li Music App (\c musicapp)
        \li A Media app that can play music that was previously indexed by
-           \l{Qt IVI} using the Qt Multimedia backend.
+           \l{Qt Interface Framework} using the Qt Multimedia backend.
    \row
        \li \l{Neptune 3 UI - Maps App}{Maps App} (\c mapapp)
        \li A Maps app that is created using the MapBoxGL plugin from Qt
@@ -131,7 +131,7 @@
    \row
        \li Tuner App (\c tunerapp)
        \li A media app that has a pre-set station list, provided by the
-           simulation backend from \l{Qt IVI}.
+           simulation backend from \l{Qt Interface Framework}.
    \row
        \li Downloads App (\c downloadsapp)
        \li Allows the user to install apps from the Neptune Deployment Store
@@ -391,7 +391,7 @@
 
    The Climate Bar is located at the bottom of the \l{Center Console Display}.
    Tapping on it displays a climate panel with some simulation data interface
-   to \l{Qt IVI} as shown in the following image:
+   to \l{Qt Interface Framework} as shown in the following image:
 
    \image center-stack-climate.png
 
diff --git a/doc/src/neptune3ui-qt-safe-renderer-integration.qdoc b/doc/src/neptune3ui-qt-safe-renderer-integration.qdoc
index 2e1b4b89..49884dbe 100644
--- a/doc/src/neptune3ui-qt-safe-renderer-integration.qdoc
+++ b/doc/src/neptune3ui-qt-safe-renderer-integration.qdoc
@@ -62,7 +62,7 @@
 
     The Client to Neptune's \l{Neptune 3 UI - Middleware}{Middleware} provides the value sources
     for Safe UI: telltales state, speed, and so on. The \c neptune3-ui-qsr-cluster app connects to
-    the same remote middleware services and utilizes the same autogenerated QtIVI interfaces and
+    the same remote middleware services and utilizes the same autogenerated QtInterfaceFramework interfaces and
     mechanisms as Neptune 3 UI. The \c neptune3-ui-qsr-cluster app expects to find  both services
     running at the same address. By default, it assumes the \c {tcp://127.0.0.1} address, ports 9998
     for the drivedata-simulation-server and 9999 for the remotesettings-server. To override these
@@ -199,7 +199,7 @@
         and receiving notification that \c {Main UI} is about to shutdown. We use the simple Qt TCP
         Server (\c TcpMsgHandler) for this.
     \li Communicating with Neptune's \l {Neptune 3 UI - Middleware}
-        {Middleware} to get values of Safe UI elements states. The same \l{Qt IVI} auto
+        {Middleware} to get values of Safe UI elements states. The same \l{Qt InterfaceFramework} auto
         generated client is used as with Neptune's \l {Neptune 3 UI - Companion App}.
     \endlist
 
diff --git a/doc/src/neptune3ui-system-dialog.qdoc b/doc/src/neptune3ui-system-dialog.qdoc
index 2a5ce418..fe70b990 100644
--- a/doc/src/neptune3ui-system-dialog.qdoc
+++ b/doc/src/neptune3ui-system-dialog.qdoc
@@ -47,7 +47,7 @@
    resources as well)
    \li Network (Internet Connection) Status
    \li Connected Network Devices with all their address information
-   \li Version: shows which Neptune 3 UI, Application Manager and Qt IVI versions are being
+   \li Version: shows which Neptune 3 UI, Application Manager and Qt Interface Framework versions are being
        used
    \li Platform: shows which operating system, Qt version, and OpenGL are being used.
    \endlist
diff --git a/doc/src/neptune3ui-toc.qdoc b/doc/src/neptune3ui-toc.qdoc
index eb5d36a5..17866273 100644
--- a/doc/src/neptune3ui-toc.qdoc
+++ b/doc/src/neptune3ui-toc.qdoc
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
diff --git a/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml b/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
index 372ac421..d36c9948 100644
--- a/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
+++ b/dummyimports/QtIvi/VehicleFunctions/DummyClimateControl.qml
@@ -33,10 +33,10 @@
 import QtQuick 2.0
 
 QtObject {
-    property int discoveryMode: 0 /* QIviAbstractFeature::NoAutoDiscovery */
+    property int discoveryMode: 0 /* QIfAbstractFeature::NoAutoDiscovery */
     property int steeringWheelHeater: 0
     property bool recirculationEnabled: false
-    property int recirculationMode: 0 /* QtIviVehicleFunctionsModule::RecirculationOff */
+    property int recirculationMode: 0 /* QtIfVehicleFunctionsModule::RecirculationOff */
     property bool airConditioningEnabled: true
     property bool defrostEnabled: false
     property bool heaterEnabled: true
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/backend_simulator.pro b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/backend_simulator.pro
index d3ce4870..aa1bac3e 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/backend_simulator.pro
+++ b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/backend_simulator/backend_simulator.pro
@@ -1,22 +1,22 @@
 TEMPLATE = lib
 TARGET = $$qtLibraryTarget(parking_simulation)
-DESTDIR = ../qtivi
+DESTDIR = ../interfaceframework
 
-QT += core ivicore
-CONFIG += ivigenerator plugin
+QT += core interfaceframework
+CONFIG += ifcodegen plugin
 
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(Parking)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../parking.qface
-PLUGIN_TYPE = qtivi
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../parking.qface
+PLUGIN_TYPE = interfaceframework
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = $$OUT_PWD/../frontend/qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/neptune3-ui/chapter3-middleware/qtivi
+target.path = $$[QT_INSTALL_EXAMPLES]/neptune3-ui/chapter3-middleware/interfaceframework
 INSTALLS += target
 
 RESOURCES += \
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 9b172008..78694192 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
@@ -54,7 +54,7 @@ import QtQuick 2.10
 import Example.Parking.simulation 1.0
 
 QtObject {
-    property var settings : IviSimulator.findData(IviSimulator.simulationData, "ParkingInfo")
+    property var settings : IfSimulator.findData(IfSimulator.simulationData, "ParkingInfo")
     property bool defaultInitialized: false
     property LoggingCategory qLcParkingInfo: LoggingCategory {
         name: "example.parking.simulation.parkinginfobackend"
@@ -64,7 +64,7 @@ QtObject {
         function initialize() {
             console.log(qLcParkingInfo, "INITIALIZE")
             if (!defaultInitialized) {
-                IviSimulator.initializeDefault(settings, backend)
+                IfSimulator.initializeDefault(settings, backend)
                 defaultInitialized = true
             }
             Base.initialize()
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/frontend/frontend.pro b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/frontend/frontend.pro
index 62f2d4e7..d4191a8d 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/frontend/frontend.pro
+++ b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/frontend/frontend.pro
@@ -2,12 +2,12 @@ TARGET = $$qtLibraryTarget(Parking)
 TEMPLATE = lib
 DESTDIR = ..
 
-QT += ivicore ivicore-private qml quick
+QT += interfaceframework interfaceframework-private qml quick
 CONFIG += unversioned_libname unversioned_soname
 
 DEFINES += QT_BUILD_EXAMPLE_PARKING_LIB
-CONFIG += ivigenerator
-QFACE_SOURCES = ../parking.qface
+CONFIG += ifcodegen
+IFCODEGEN_SOURCES = ../parking.qface
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
diff --git a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/imports/imports.pro b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/imports/imports.pro
index a45d8982..2e94fa34 100644
--- a/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/imports/imports.pro
+++ b/examples/neptune3ui/parking-app-tutorial/chapter3-middleware/imports/imports.pro
@@ -1,15 +1,15 @@
 TEMPLATE = lib
 CONFIG += plugin
-QT += ivicore
+QT += interfaceframework
 
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(Parking)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../../../
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../parking.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../parking.qface
 
-load(ivigenerator)
+load(ifcodegen)
 
 DESTDIR = $$OUT_PWD/$$replace(URI, \\., /)
 
diff --git a/header.FDL-QTAS b/header.FDL-QTAS
index 0c1e0bd8..ff713eda 100644
--- a/header.FDL-QTAS
+++ b/header.FDL-QTAS
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
diff --git a/imports_shared/application/windows/ApplicationCCWindow.qml b/imports_shared/application/windows/ApplicationCCWindow.qml
index ef604620..25a4a0ab 100644
--- a/imports_shared/application/windows/ApplicationCCWindow.qml
+++ b/imports_shared/application/windows/ApplicationCCWindow.qml
@@ -132,7 +132,7 @@ NeptuneWindow {
         root.setWindowProperty("activationCount", d.activationCount++)
     }
 
-    onWindowPropertyChanged: {
+    onWindowPropertyChanged: function(name, value) {
         switch (name) {
         case "exposedRectBottomMargin":
             d.exposedRectBottomMargin = value;
diff --git a/imports_shared/application/windows/ApplicationICWindow.qml b/imports_shared/application/windows/ApplicationICWindow.qml
index b9729630..10a433aa 100644
--- a/imports_shared/application/windows/ApplicationICWindow.qml
+++ b/imports_shared/application/windows/ApplicationICWindow.qml
@@ -89,7 +89,7 @@ NeptuneWindow {
         visible = true;
     }
 
-    onWindowPropertyChanged: {
+    onWindowPropertyChanged: function(name, value) {
         switch (name) {
         case "performanceMonitorEnabled":
             performanceOverlay.fpsVisible = value;
diff --git a/imports_shared/application/windows/NeptuneWindow.qml b/imports_shared/application/windows/NeptuneWindow.qml
index ae3f39e0..b7483d42 100644
--- a/imports_shared/application/windows/NeptuneWindow.qml
+++ b/imports_shared/application/windows/NeptuneWindow.qml
@@ -82,7 +82,7 @@ ApplicationManagerWindow {
     */
     readonly property bool isRightToLeft: Config.rtlMode
 
-    onWindowPropertyChanged: {
+    onWindowPropertyChanged: function(name, value) {
         switch (name) {
         case "neptuneScale":
             root.Sizes.scale = value;
diff --git a/imports_shared/assets/translations/ar_MA.ts b/imports_shared/assets/translations/ar_MA.ts
index b66893f3..2455a11a 100644
--- a/imports_shared/assets/translations/ar_MA.ts
+++ b/imports_shared/assets/translations/ar_MA.ts
@@ -824,7 +824,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/cs_CZ.ts b/imports_shared/assets/translations/cs_CZ.ts
index fbff46dc..e87e498e 100644
--- a/imports_shared/assets/translations/cs_CZ.ts
+++ b/imports_shared/assets/translations/cs_CZ.ts
@@ -1409,8 +1409,8 @@ Parking Olympia</source>
         <translation>Qt Application Manager: %1</translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
-        <translation>Qt IVI: %1</translation>
+        <source>Qt IF: %1</source>
+        <translation>Qt IF: %1</translation>
     </message>
     <message>
         <source>Neptune 3: %1 %2</source>
diff --git a/imports_shared/assets/translations/de_DE.ts b/imports_shared/assets/translations/de_DE.ts
index 55b22edf..fc058d4a 100644
--- a/imports_shared/assets/translations/de_DE.ts
+++ b/imports_shared/assets/translations/de_DE.ts
@@ -1045,8 +1045,8 @@ Parking Olympia</source>
         <translation>Plattform</translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
-        <translation>Qt IVI: %1</translation>
+        <source>Qt IF: %1</source>
+        <translation>Qt IF: %1</translation>
     </message>
     <message>
         <source>Neptune 3: %1 %2</source>
diff --git a/imports_shared/assets/translations/en_GB.ts b/imports_shared/assets/translations/en_GB.ts
index f99618fa..834ff266 100644
--- a/imports_shared/assets/translations/en_GB.ts
+++ b/imports_shared/assets/translations/en_GB.ts
@@ -808,7 +808,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/en_US.ts b/imports_shared/assets/translations/en_US.ts
index 1d4d440e..f8801a36 100644
--- a/imports_shared/assets/translations/en_US.ts
+++ b/imports_shared/assets/translations/en_US.ts
@@ -808,7 +808,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/he_IL.ts b/imports_shared/assets/translations/he_IL.ts
index 3222bb62..560ad404 100644
--- a/imports_shared/assets/translations/he_IL.ts
+++ b/imports_shared/assets/translations/he_IL.ts
@@ -486,7 +486,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/ja_JP.ts b/imports_shared/assets/translations/ja_JP.ts
index 41157eb4..753ed0b8 100644
--- a/imports_shared/assets/translations/ja_JP.ts
+++ b/imports_shared/assets/translations/ja_JP.ts
@@ -1087,7 +1087,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/ko_KR.ts b/imports_shared/assets/translations/ko_KR.ts
index 60ca0103..a9fc9419 100644
--- a/imports_shared/assets/translations/ko_KR.ts
+++ b/imports_shared/assets/translations/ko_KR.ts
@@ -1094,7 +1094,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/assets/translations/zh_CN.ts b/imports_shared/assets/translations/zh_CN.ts
index 409979df..82e42c19 100644
--- a/imports_shared/assets/translations/zh_CN.ts
+++ b/imports_shared/assets/translations/zh_CN.ts
@@ -1115,7 +1115,7 @@ Parking Olympia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt IVI: %1</source>
+        <source>Qt IF: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
index d96d56ca..431558ce 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/backspace-868482.svg
@@ -1,75 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="-420 107 159 88"
-   enable-background="new -420 107 159 88"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="backspace-868482.svg"><metadata
-     id="metadata3483"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3481" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1136"
-     id="namedview3479"
-     showgrid="false"
-     inkscape:zoom="4.327044"
-     inkscape:cx="109.27575"
-     inkscape:cy="20.181193"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3463" /><g
-     id="g3459"><rect
-       x="-420"
-       y="107"
-       fill="none"
-       width="159"
-       height="88"
-       id="rect3461" /><g
-       id="g3463"><g
-         id="g3465"><path
-           d="m -261.2,195 -114.8,0 -44,-44 44,-44 114.8,0 z m -112.17994,-3.67355 107.81308,-0.2311 0,-79.72849 -108.27529,0 -39.40204,39.40204 z"
-           id="path3467"
-           inkscape:connector-curvature="0"
-           style="fill:#868482"
-           sodipodi:nodetypes="cccccccccccc" /></g><g
-         id="g3469"
-         transform="translate(5.315407,3.0043605)"><g
-           id="g3471"><rect
-             x="-327.47067"
-             y="128.42934"
-             transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,-665.0558,26.5252)"
-             width="6.0706396"
-             height="50.470654"
-             id="rect3473"
-             style="fill:#868482" /></g><g
-           id="g3475"><rect
-             x="-351.79507"
-             y="151.44643"
-             transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,-665.0499,26.5255)"
-             width="52.595058"
-             height="5.2535815"
-             id="rect3477"
-             style="fill:#868482" /></g></g></g></g></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:327fe8a0130d1ff0db433f7e250034f9e8aabef54f3a9ca0e8ca71fd622b85ac
+size 2727
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
index 82db68a4..da6940d0 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/check-868482.svg
@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-414 91 170 119" enable-background="new -414 91 170 119" xml:space="preserve">
-<g>
-    <polygon fill="#868482" points="-351.7,210 -414,147.7 -402.7,136.3 -351.7,187.3 -255.3,91 -244,102.3 "/>
-</g>
-</svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:e31973295667b8f5ac2f42473da399f80f8ce86af687323ce5b5728d2eb72657
+size 473
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
index fce3431a..94acc9f7 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/enter-868482.svg
@@ -1,13 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-    viewBox="-394 111 211 80" enable-background="new -394 111 211 80" xml:space="preserve">
-<g>
-    <rect x="-394" y="111" fill="none" width="211" height="80"/>
-    <g>
-        <rect x="-384.8" y="144.8" fill="#868482" width="201.8" height="12.3"/>
-        <rect x="-195.3" y="121.7" fill="#868482" width="12.3" height="35.3"/>
-        <polygon fill="#868482" points="-349.5,111 -349.5,190.8 -394,151.7 "/>
-    </g>
-</g>
-</svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:383122ad204f677ce7bd240ebb036aa97ae2c63fc988511c9642ef43416f3bf8
+size 688
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
index 2da3a1e7..81441ba9 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/globe-868482.svg
@@ -1,56 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="-427 79 144 144"
-   enable-background="new -427 79 144 144"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="globe-868482.svg"><metadata
-     id="metadata3793"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3791" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1136"
-     id="namedview3789"
-     showgrid="false"
-     inkscape:zoom="4.6354778"
-     inkscape:cx="15.443116"
-     inkscape:cy="49.492945"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
-     id="g3781"><rect
-       x="-427"
-       y="79"
-       fill="none"
-       width="144"
-       height="144"
-       id="rect3783" /><g
-       id="g3785"><path
-         d="m -355,223 c -39.5,0 -71.8,-32.1 -72,-71.6 -0.2,-39.7 31.9,-72.2 71.6,-72.4 l 0.7,0 c 19.1,0.1 37.1,7.6 50.6,21.1 13.5,13.5 21,31.5 21.1,50.5 0.1,19.2 -7.3,37.4 -20.8,51 -13.5,13.7 -31.6,21.3 -50.8,21.4 z m 3.22136,-42.7 0,35.96737 c 9,-8.1 18.80446,-20.05728 23.40446,-30.85728 -6.7,-2 -16.40446,-4.71009 -23.40446,-5.11009 z M -380,183.9 c 3.2,7.4 9.01009,18.18309 14.31009,24.48309 2.4,2.9 5.74718,4.95282 8.54718,7.45282 L -357.57418,180.3 c -7,0.4 -15.62582,1.6 -22.42582,3.6 z m 58.2,3 c -3.9,9.1 -15.88755,21.48309 -22.58755,28.98309 10.4,-2.9 26.58755,-12.38309 34.48755,-20.28309 0.5,-0.5 1,-1.1 1.6,-1.6 -4.4,-2.9 -8.9,-5.2 -13.5,-7.1 z m -82.073,8.72582 c 7.8,8.5 28.47064,18.03591 39.87064,21.23591 -0.5,-0.6 -4.98309,-5.51455 -5.48309,-6.11455 -6,-7.1 -11.01573,-15.54718 -14.51573,-23.94718 -4.7,2 -15.57182,6.02582 -19.87182,8.82582 z m 83.03145,-13.68991 c 5.5,2.3 12.95728,7.04155 18.05728,10.34155 6.5,-9.4 12.773,-28.06619 13.573,-39.56619 l -25.48873,0 c -0.1,1.2 -0.1,4.98873 -0.2,6.28873 -0.7,6.8 -3.94155,16.63591 -5.94155,22.93591 z m -100.59436,-27.93027 c 0.8,11.8 7.60446,27.13027 14.00446,36.33027 5.1,-3.3 15.36173,-6.96291 20.76173,-9.26291 -2.4,-7.5 -8.23028,-19.71455 -8.63028,-27.71455 z m 31.16854,-0.64719 c 0.3,7 6.03028,19.84037 8.13028,26.44037 7.7,-2.4 16.56291,-3.36854 24.56291,-3.66854 l 0.21573,-23.20328 z m 38.48873,22.34037 c 8,0.4 16.97864,2.77864 24.67864,5.17864 1.7,-5.6 5.70446,-15.59882 6.20446,-21.59882 0.1,-1 0.53145,-6.53028 0.63145,-7.43028 l -31.51455,0.64718 z M -314.8,146.7 l 25.58873,0 c -0.8,-11.5 -6.973,-24.55727 -13.573,-33.95727 -5.1,3.4 -11.79437,5.76854 -17.39437,8.06854 2.5,7.5 4.97864,17.88873 5.37864,25.88873 z m -37.19436,0.86291 31.73027,-1.07864 c -0.4,-7 -3.32582,-17.46736 -5.42582,-24.06736 -7.7,2.4 -18.95164,4.34718 -26.95164,4.74718 z m -37.95728,0.43145 32.16173,0 0,-20.83027 c -7.9,-0.4 -20.97746,-0.83709 -28.57746,-3.23709 -1.8,5.8 -3.21572,13.41009 -3.81572,19.61009 -0.1,0.8 0.23145,3.65727 0.23145,4.45727 z m -31.69999,0.86292 26.45163,-0.64719 c 0.1,-1 0.1,-3.51009 0.2,-4.51009 0.6,-7 2,-13.8 4,-20.3 -5.5,-2.3 -13.92018,-6.39436 -19.02018,-9.79436 -6.4,9.1 -10.83145,23.45164 -11.63145,35.25164 z m 68.57863,-63.07183 0.21573,35.69882 c 6.9,-0.3 18.23027,-1.5 24.93027,-3.5 -1.37418,-7.31572 -7.3,-14.54718 -12.5,-20.64718 -2.4,-2.9 -9.846,-9.05164 -12.646,-11.55164 z m -30.94155,33.27746 c 6.7,2 18.89319,2.33709 25.79319,2.63709 l 0.64718,-35.698822 c -8.9,7.9 -21.84037,22.461732 -26.44037,33.061732 z m 38.29554,-34.224642 c 0.8,0.9 7.42465,6.977459 8.22465,7.977459 5.9,6.9 11.89436,14.384273 15.39436,22.484273 4.7,-2 12.96737,-4.73145 17.36737,-7.63145 -0.6,-0.6 -1.63146,-1.84719 -2.23146,-2.54719 -9.29436,-11.451637 -28.15492,-17.483092 -38.75492,-20.283092 z M -406.246,107.88427 c 4.4,2.8 12.78309,7.78873 17.48309,9.68873 4,-9.3 17.48192,-24.803277 24.48192,-32.303277 -11.8,3.2 -33.96501,13.91455 -41.96501,22.614547 z"
-         id="path3787"
-         inkscape:connector-curvature="0"
-         style="fill:#868482"
-         sodipodi:nodetypes="scccscccscccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /></g></g></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:86bb11e65450e4c9c0766154da8c68891526c5af915268fd953fb8bfa2b0f61d
+size 4890
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
index f128b3d4..e385f8c4 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/handwriting-868482.svg
@@ -1,54 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 156 104"
-   enable-background="new 0 0 156 104"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="handwriting-868482.svg"><metadata
-     id="metadata3399"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3397" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1136"
-     id="namedview3395"
-     showgrid="false"
-     inkscape:zoom="9.2948718"
-     inkscape:cx="83.191118"
-     inkscape:cy="52"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
-     id="g3387"><g
-       id="g3389"><path
-         d="m 37.922759,97.167586 c -10.1,0 -11.046207,-1.342069 -16.967587,-8.651034 -8.271034,-21 1.526897,-31.697931 17.826897,-48.997931 1.2,-1.2 7.241379,-9.493104 8.441379,-10.793104 5.3,-5.7 1.111724,-14.727586 -0.588276,-18.027586 -1.8,-3.4 -11.309655,-4.0393103 -16.009655,-3.3393103 -16.5,2.6 -24.7503446,30.7034483 -24.7503446,30.9034483 L 0,36.6 C 0.3,35.3 6.4,4.3 31.2,0.3 41,-1.3 49.7,2.7 53.9,10.7 c 4.7,8.9 2.6,20.1 -5.3,28.6 -1.2,1.3 -2.4,2.6 -3.6,3.8 -16.7,17.8 -25.9,28.5 -19.6,41.4 3.3,6.8 11.1,7.6 16.9,6.3 C 51.5,88.7 62.1,79.7 62,61.3 61.8,33.2 78.2,19.5 92.2,16.4 c 14.5,-3.2 26.67862,3.922759 32.97862,17.322759 1.3,2.8 2.83793,5.077241 3.63793,7.777241 13.3,0.7 25.82276,5.375862 26.32276,5.475862 l -2.32414,5.044828 c -0.1,0 -12.71241,-4.306207 -23.61241,-5.306207 2.11379,17.360689 -3.65104,36.323448 -15.68897,41.155172 C 101.61379,93.869655 87.9,92.1 83,83.1 79.9,77.5 81.1,68.4 85.9,60.6 c 7.9,-13 25.71103,-17.615172 35.91103,-19.015172 -0.4,-1.2 -3.26689,-7.456552 -3.76689,-8.456552 -3.9,-8.3 -16.07311,-13.368276 -24.973106,-11.368276 -9.7,2.2 -26.056551,18.017241 -25.856551,39.017241 0.2,25.5 -9.682759,32.613104 -23.082759,35.813104 -2.6,0.6 -3.808965,0.577241 -6.208965,0.577241 z M 123.02759,47.137241 c -14,1.5 -27.377935,6.671035 -32.222073,16.235173 -4.569547,5.48009 -6.825089,15.074863 -1.501379,19.937241 10.744832,7.956552 19.564832,1.708966 24.404142,-1.198621 10.58482,-6.253103 9.81931,-26.073793 9.31931,-34.973793 z"
-         id="path3391"
-         inkscape:connector-curvature="0"
-         style="fill:#868482"
-         sodipodi:nodetypes="sccccccccccccccccccccccccccccsccccc" /></g><rect
-       fill="none"
-       width="156"
-       height="104"
-       id="rect3393" /></g></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:df12eac0c504ff5dedb725fc66d59631e06af6a1b63be0a21078f2b473c3116e
+size 3323
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
index 694bcc12..14758170 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/hidekeyboard-868482.svg
@@ -1,281 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="-427 87 144 127"
-   enable-background="new -427 87 144 127"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="hidekeyboard-868482.svg"><metadata
-     id="metadata3534"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3532" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1136"
-     id="namedview3530"
-     showgrid="false"
-     inkscape:zoom="3.8188977"
-     inkscape:cx="57.633466"
-     inkscape:cy="81.826203"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3468" /><g
-     id="g3464"><rect
-       x="-427"
-       y="87"
-       fill="none"
-       width="144"
-       height="127"
-       id="rect3466" /><g
-       id="g3468"><g
-         id="g3470" /><g
-         id="g3498"
-         transform="matrix(0.6642876,0,0,0.60833553,-135.10074,52.111516)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500"
-           style="fill:#868482" /></g><g
-         id="g3522"
-         transform="matrix(1,0,0,0.53000264,-0.26185567,72.641448)"><rect
-           x="-388.89999"
-           y="146.2"
-           width="67.699997"
-           height="11.7"
-           id="rect3524"
-           style="fill:#868482" /></g><polygon
-         style="fill:#868482"
-         id="polygon3528"
-         points="-381.1,195.2 -355,213.9 -328.9,195.2 -345.2,195.2 -355,202.2 -364.8,195.2 " /><g
-         id="g3498-5"
-         transform="matrix(0.6642876,0,0,0.60833553,-116.19714,52.058942)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7"
-           style="fill:#868482" /></g><g
-         id="g3498-5-4"
-         transform="matrix(0.6642876,0,0,0.60833553,-78.8827,51.666158)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-0"
-           style="fill:#868482" /></g><g
-         id="g3498-5-43"
-         transform="matrix(0.6642876,0,0,0.60833553,-97.474452,51.928014)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-4"
-           style="fill:#868482" /></g><g
-         id="g3498-5-2"
-         transform="matrix(0.6642876,0,0,0.60833553,-60.16002,51.666158)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-6"
-           style="fill:#868482" /></g><g
-         id="g3498-5-3"
-         transform="matrix(0.6642876,0,0,0.60833553,-41.568267,51.797086)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-64"
-           style="fill:#868482" /></g><g
-         id="g3498-5-0"
-         transform="matrix(0.6642876,0,0,0.60833553,-41.306411,32.419767)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-60"
-           style="fill:#868482" /></g><g
-         id="g3498-5-5"
-         transform="matrix(0.6642876,0,0,0.60833553,-60.290947,32.419767)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-1"
-           style="fill:#868482" /></g><g
-         id="g3498-5-34"
-         transform="matrix(0.6642876,0,0,0.60833553,-78.751772,32.288839)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-8"
-           style="fill:#868482" /></g><g
-         id="g3498-5-28"
-         transform="matrix(0.6642876,0,0,0.60833553,-97.60538,32.419766)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-08"
-           style="fill:#868482" /></g><g
-         id="g3498-5-8"
-         transform="matrix(0.6642876,0,0,0.60833553,-116.45899,32.288839)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-66"
-           style="fill:#868482" /></g><g
-         id="g3498-5-6"
-         transform="matrix(0.6642876,0,0,0.60833553,-134.91981,32.550694)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-7-85"
-           style="fill:#868482" /></g><g
-         id="g3498-2"
-         transform="matrix(0.56357388,0,0,7.7030576,-197.43282,-888.87016)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-3"
-           style="fill:#868482" /></g><g
-         id="g3498-2-4"
-         transform="matrix(0.56357388,0,0,7.7030576,-59.762201,-888.87016)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-3-6"
-           style="fill:#868482" /></g><g
-         id="g3498-50"
-         transform="matrix(11.474227,0,0,0.60833553,4253.5026,93.039354)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-1"
-           style="fill:#868482" /></g><g
-         id="g3498-50-9"
-         transform="matrix(11.474227,0,0,0.60833553,4252.9789,9.9001791)"><rect
-           x="-407.5"
-           y="126.7"
-           width="11.7"
-           height="11.7"
-           id="rect3500-1-4"
-           style="fill:#868482" /></g><path
-         style="fill:#999999;fill-opacity:1"
-         d="m -0.0757732,45.191067 0,-45.0182098 3.2404639,-0.08614494 C 7.3998563,-0.02587596 134.35087,-0.02575465 139.85335,0.08684287 l 4.22242,0.08640373 0,45.0180154 0,45.018016 -72.07577,0 -72.0757732,0 0,-45.018211 z m 137.7360832,-0.08643 0,-38.0345359 -65.594846,0 -65.5948454,0 0,38.0345359 0,38.034536 65.5948454,0 65.594846,0 0,-38.034536 z"
-         id="path3720"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#ffffff"
-         d="m 21.265464,45.759278 0,-3.469587 3.796907,0 3.796907,0 0,3.469587 0,3.469588 -3.796907,0 -3.796907,0 0,-3.469588 z"
-         id="path3722"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 21.396392,26.185567 0,-3.535052 3.862371,0 3.862371,0 0,3.535052 0,3.535052 -3.862371,0 -3.862371,0 0,-3.535052 z"
-         id="path3724"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 39.857216,25.923711 0,-3.535051 3.862372,0 3.862371,0 0,3.535051 0,3.535052 -3.862371,0 -3.862372,0 0,-3.535052 z"
-         id="path3726"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#ffffff"
-         d="m 40.119072,45.693814 0,-3.535051 3.862371,0 3.862371,0 0,3.535051 0,3.535052 -3.862371,0 -3.862371,0 0,-3.535052 z"
-         id="path3728"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 58.841753,45.562887 0,-3.535052 3.862371,0 3.862371,0 0,3.535052 0,3.535051 -3.862371,0 -3.862371,0 0,-3.535051 z"
-         id="path3730"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#ffffff"
-         d="m 58.710825,26.054639 0,-3.535051 3.862371,0 3.862371,0 0,3.535051 0,3.535052 -3.862371,0 -3.862371,0 0,-3.535052 z"
-         id="path3732"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 77.564433,25.923711 0,-3.535051 3.862371,0 3.862371,0 0,3.535051 0,3.535052 -3.862371,0 -3.862371,0 0,-3.535052 z"
-         id="path3734"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 77.433505,45.301031 0,-3.535052 3.862371,0 3.862371,0 0,3.535052 0,3.535051 -3.862371,0 -3.862371,0 0,-3.535051 z"
-         id="path3736"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 96.156186,45.301031 0,-3.535052 3.862374,0 3.86237,0 0,3.535052 0,3.535051 -3.86237,0 -3.862374,0 0,-3.535051 z"
-         id="path3738"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 96.025258,26.054639 0,-3.535051 3.862371,0 3.862371,0 0,3.535051 0,3.535052 -3.862371,0 -3.862371,0 0,-3.535052 z"
-         id="path3740"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 115.00979,26.054639 0,-3.535051 3.86237,0 3.86238,0 0,3.535051 0,3.535052 -3.86238,0 -3.86237,0 0,-3.535052 z"
-         id="path3742"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 114.74794,45.431959 0,-3.535052 3.86237,0 3.86237,0 0,3.535052 0,3.535051 -3.86237,0 -3.86237,0 0,-3.535051 z"
-         id="path3744"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 37.893299,66.249485 0,-3.011341 33.779381,0 33.77938,0 0,3.011341 0,3.01134 -33.77938,0 -33.779381,0 0,-3.01134 z"
-         id="path3746"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1"
-         d="m 64.14433,121.20799 c -4.320619,-3.09875 -10.146368,-7.27582 -12.94611,-9.28238 l -5.090439,-3.64829 8.049329,0 8.04933,0 4.883685,3.48882 c 3.894822,2.78239 4.926318,3.46219 5.094241,3.35732 0.115806,-0.0723 2.325191,-1.64229 4.909744,-3.48882 l 4.699189,-3.35732 8.052119,0 8.052118,0 -0.510624,0.36756 c -0.280842,0.20216 -5.931036,4.24862 -12.555984,8.99213 -6.624949,4.7435 -12.222114,8.75517 -12.438144,8.91481 L 72,126.84208 64.14433,121.20799 Z"
-         id="path3748"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 58.890373,26.058333 0,-3.404124 3.665979,0 3.66598,0 0,3.404124 0,3.404124 -3.66598,0 -3.665979,0 0,-3.404124 z"
-         id="path5455"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 21.445012,45.697508 0,-3.404124 3.66598,0 3.665979,0 0,3.404124 0,3.404124 -3.665979,0 -3.66598,0 0,-3.404124 z"
-         id="path5482"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /><path
-         style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 40.29862,45.697508 0,-3.404124 3.66598,0 3.665979,0 0,3.404124 0,3.404124 -3.665979,0 -3.66598,0 0,-3.404124 z"
-         id="path5484"
-         inkscape:connector-curvature="0"
-         transform="translate(-427,87)" /></g></g></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e822e5c5d6604b3138015c39cb88a0cf4ac5cbef0fe81496298a436c1f4c5c4
+size 12358
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
index 6ee0ba97..0ef76627 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/search-868482.svg
@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-425 77 148 148" enable-background="new -425 77 148 148" xml:space="preserve">
-<g>
-	<rect x="-425" y="77" fill="none" width="148" height="148"/>
-	<g>
-		<path fill="#868482" d="M-278.2,209.7c1.6,1.6,1.6,4.1,0,5.7l-8.5,8.5c-1.6,1.6-4.1,1.6-5.7,0l-44.6-44.6c-1.6-1.6-1.6-4.1,0-5.7
-			l8.5-8.5c1.6-1.6,4.1-1.6,5.7,0L-278.2,209.7z"/>
-		<path fill="#868482" d="M-367,89c25.4,0,46,20.6,46,46s-20.6,46-46,46c-25.4,0-46-20.6-46-46S-392.4,89-367,89 M-367,77
-			c-32,0-58,26-58,58s26,58,58,58c32,0,58-26,58-58S-335,77-367,77L-367,77z"/>
-	</g>
-</g>
-</svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:15153af2cae501c63677fa9ba51935dee03f97e9c2e69bcd4a391e0910f914d9
+size 815
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
index 709cd284..963d9c43 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/images/textmode-868482.svg
@@ -1,87 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="124px"
-   height="96px"
-   viewBox="0 0 124 96"
-   enable-background="new 0 0 124 96"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="textmode-868482.svg"><metadata
-     id="metadata3875"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3873" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1136"
-     id="namedview3871"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="-2.4745771"
-     inkscape:cy="47.999999"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
-     id="g3853"
-     style="fill:#999999;fill-opacity:1"><g
-       id="g3855"
-       style="fill:#999999;fill-opacity:1"><g
-         id="g3857"
-         style="fill:#999999;fill-opacity:1"><path
-           fill="#868482"
-           d="M55.4,70.8L46.9,49H19.4L11,70.8H2.9L30,2h6.7l27,68.8H55.4z M44.4,41.8l-8-21.2c-1-2.7-2.1-6-3.2-9.9     c-0.7,3-1.7,6.3-3,9.9l-8.1,21.2H44.4z"
-           id="path3859"
-           style="fill:#999999;fill-opacity:1" /><path
-           fill="#868482"
-           d="M66.6,72.8H54.1L45.5,51H20.8l-8.4,21.8H0L28.7,0h9.4L66.6,72.8z M56.8,68.8h4L35.4,4h-1.9l1.7,6.2     c1.1,3.8,2.1,7.1,3.1,9.7l9,24h-28l9.1-23.9c1.2-3.5,2.2-6.7,2.9-9.6L32.8,4h-1.4L5.9,68.8h3.8L18.1,47h30.2L56.8,68.8z      M25.1,39.8h16.4l-7-18.5c-0.4-1.1-0.8-2.2-1.2-3.4c-0.4,1.1-0.7,2.2-1.2,3.4L25.1,39.8z"
-           id="path3861"
-           style="fill:#999999;fill-opacity:1" /></g><g
-         id="g3863"
-         style="fill:#999999;fill-opacity:1"><path
-           fill="#868482"
-           d="M116.2,70.8l-1.5-7.3h-0.4c-2.6,3.2-5.1,5.4-7.7,6.5s-5.7,1.7-9.5,1.7c-5.1,0-9.1-1.3-12-3.9     s-4.3-6.4-4.3-11.2c0-10.4,8.3-15.8,24.9-16.3l8.7-0.3v-3.2c0-4-0.9-7-2.6-8.9s-4.5-2.9-8.3-2.9c-4.3,0-9.1,1.3-14.5,3.9l-2.4-6     c2.5-1.4,5.3-2.5,8.3-3.2s6-1.2,9.1-1.2c6.1,0,10.7,1.4,13.6,4.1s4.4,7.1,4.4,13.1v35.1H116.2z M98.7,65.3c4.8,0,8.6-1.3,11.4-4     s4.1-6.4,4.1-11.2v-4.6l-7.8,0.3c-6.2,0.2-10.6,1.2-13.4,2.9S89,53.1,89,56.7c0,2.8,0.9,5,2.6,6.4S95.6,65.3,98.7,65.3z"
-           id="path3865"
-           style="fill:#999999;fill-opacity:1" /><path
-           fill="#868482"
-           d="M97.1,73.8c-5.6,0-10.1-1.5-13.3-4.5c-3.3-3-5-7.3-5-12.7c0-11.6,9-17.8,26.8-18.3l6.8-0.2v-1.3     c0-3.5-0.7-6.1-2.1-7.6c-1.3-1.5-3.6-2.2-6.8-2.2c-4,0-8.6,1.3-13.7,3.7l-1.9,0.9L84,22.1l1.6-0.8c2.7-1.4,5.6-2.6,8.8-3.4     c3.2-0.8,6.4-1.2,9.6-1.2c6.6,0,11.7,1.6,15,4.6c3.4,3.1,5.1,8,5.1,14.5v37.1h-9.4l-1.1-5.3c-2,2-4,3.5-6,4.4     C104.7,73.1,101.2,73.8,97.1,73.8z M103.5,23c4.4,0,7.7,1.2,9.8,3.5c2.1,2.3,3.1,5.7,3.1,10.3V42l-10.7,0.3     c-23,0.7-23,10.9-23,14.3c0,4.3,1.2,7.5,3.7,9.7c2.5,2.3,6.1,3.4,10.6,3.4c3.5,0,6.4-0.5,8.7-1.5c2.2-1,4.6-3,6.9-6l0.6-0.8h2.6     l0.7,1.6l1.2,5.7h2.1V35.8c0-5.4-1.3-9.3-3.8-11.6c-2.6-2.4-6.7-3.5-12.3-3.5c-2.8,0-5.7,0.4-8.6,1.1c-2.2,0.6-4.3,1.3-6.3,2.3     l0.9,2.3C94.9,24.1,99.4,23,103.5,23z M98.7,67.3c-3.5,0-6.4-0.9-8.5-2.7C88,62.8,87,60.1,87,56.7c0-4.3,1.7-7.6,5-9.6     c3.1-1.9,7.8-3,14.4-3.2l9.9-0.4v6.7c0,5.3-1.6,9.6-4.8,12.6C108.3,65.8,104,67.3,98.7,67.3z M112.2,47.6l-5.7,0.2     c-5.8,0.2-10,1.1-12.4,2.6C92,51.8,91,53.8,91,56.7c0,2.2,0.6,3.8,1.9,4.9c1.3,1.1,3.3,1.7,5.8,1.7c4.3,0,7.6-1.1,10-3.4     c2.4-2.3,3.5-5.5,3.5-9.7V47.6z"
-           id="path3867"
-           style="fill:#999999;fill-opacity:1" /></g></g><rect
-       y="88"
-       fill="#868482"
-       width="124"
-       height="8"
-       id="rect3869"
-       style="fill:#999999;fill-opacity:1" /></g><path
-     style="fill:#999999;fill-opacity:1"
-     d="m 0.33220339,72.63421 c 0,-0.155512 11.21134461,-28.667467 28.36096261,-72.12573542 0.143964,-0.36481583 1.481288,-0.50697527 4.733406,-0.50316785 L 37.959322,0.01061345 51.99322,35.862443 c 7.718644,19.718506 14.093085,36.099169 14.165419,36.401472 0.105888,0.442511 -1.021912,0.549644 -5.786164,0.549644 l -5.917684,0 -0.546838,-1.118644 C 53.607192,71.079661 51.634697,66.138911 49.524625,60.715473 l -3.836489,-9.860803 -12.536913,0.09809 -12.536911,0.09809 -4.160608,10.779661 -4.160608,10.779661 -5.9804461,0.112569 c -3.2892456,0.06192 -5.98044651,0.02208 -5.98044651,-0.08853 z M 41.423311,39.559322 c 0.0112,-0.536844 -7.930409,-21.643254 -8.141955,-21.638878 -0.210051,0.0043 -8.141912,21.095451 -8.137865,21.638878 0.003,0.398954 16.271502,0.398954 16.27982,0 z"
-     id="path3877"
-     inkscape:connector-curvature="0" /><path
-     style="fill:#999999;fill-opacity:1"
-     d="m 92.065151,73.149063 c -3.134892,-0.597811 -6.806633,-2.545615 -8.728039,-4.630092 -3.392162,-3.680063 -4.988275,-9.313558 -4.123086,-14.552476 0.655241,-3.967636 1.662266,-6.021269 4.194145,-8.553147 4.290577,-4.290579 10.117905,-6.121781 21.824109,-6.858095 l 7.47634,-0.470258 -0.23843,-2.843927 c -0.31037,-3.702079 -1.57377,-6.208129 -3.6811,-7.301736 -3.65637,-1.897491 -10.292169,-1.160169 -17.463875,1.940458 -1.80721,0.781333 -3.322385,1.379711 -3.367056,1.329729 -0.04467,-0.04998 -0.915507,-2.104434 -1.935193,-4.565451 l -1.853974,-4.474576 2.725673,-1.292565 c 3.14265,-1.490302 7.040665,-2.780454 10.251098,-3.392873 3.029187,-0.577844 10.434727,-0.568505 13.314347,0.01679 7.53165,1.530841 11.84608,6.107198 13.11198,13.90799 0.24028,1.480703 0.41628,10.734302 0.41806,21.980995 l 0.003,19.423728 -4.60617,0 -4.60616,0 -0.46374,-2.493636 c -0.25506,-1.371499 -0.554,-2.583889 -0.6643,-2.694191 -0.11031,-0.110307 -1.04828,0.545637 -2.08439,1.457658 -1.03611,0.91202 -2.66587,2.03679 -3.62169,2.499498 -3.64892,1.766412 -11.019819,2.493295 -15.881619,1.566175 z M 106.05095,61.766929 c 4.32066,-2.196863 6.139,-5.519149 6.14339,-11.224556 l 0.002,-2.949153 -3.76271,0.0081 c -2.06949,0.0044 -5.04407,0.190591 -6.61017,0.413687 -8.020819,1.142591 -10.808919,3.331507 -10.833665,8.505426 -0.02458,5.139533 2.569947,7.10421 8.959187,6.784237 2.870148,-0.143735 3.841638,-0.388564 6.101698,-1.5377 z"
-     id="path3879"
-     inkscape:connector-curvature="0" /><path
-     style="fill:#999999;fill-opacity:1"
-     d="m 0.33220339,92.135593 0,-3.864407 61.83050861,0 61.830508,0 0,3.864407 0,3.864407 -61.830508,0 -61.83050861,0 0,-3.864407 z"
-     id="path3881"
-     inkscape:connector-curvature="0" /></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:971806b2ba57cb1a5bbc2e361b5174246ac30723d2dd558b62c17430968b0d34
+size 7137
diff --git a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
index a9c6c0cb..8fd15e04 100644
--- a/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
+++ b/imports_shared/shared/QtQuick/VirtualKeyboard/Styles/neptune/style.qml
@@ -33,7 +33,6 @@
 import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 import QtQuick.VirtualKeyboard.Styles 2.1
-import QtGraphicalEffects 1.0
 
 import shared.utils 1.0 as Utils
 
diff --git a/imports_shared/shared/utils/TouchPointsTracer.qml b/imports_shared/shared/utils/TouchPointsTracer.qml
index 23af2d04..5f83305c 100644
--- a/imports_shared/shared/utils/TouchPointsTracer.qml
+++ b/imports_shared/shared/utils/TouchPointsTracer.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/imports_system/system/controls/PopupItem.qml b/imports_system/system/controls/PopupItem.qml
index babf0774..f73c3b41 100644
--- a/imports_system/system/controls/PopupItem.qml
+++ b/imports_system/system/controls/PopupItem.qml
@@ -87,7 +87,7 @@ AbstractPopupItem {
         MouseArea {
             anchors.fill: parent
             acceptedButtons: Qt.AllButtons
-            onWheel: wheel.accepted = true;
+            onWheel: function(wheel) { wheel.accepted = true }
         }
     }
 
diff --git a/imports_system/system/models/application/ApplicationInfo.qml b/imports_system/system/models/application/ApplicationInfo.qml
index a925fc71..3c33cdcb 100644
--- a/imports_system/system/models/application/ApplicationInfo.qml
+++ b/imports_system/system/models/application/ApplicationInfo.qml
@@ -78,8 +78,8 @@ QtObject {
     readonly property var categories: application ? application.categories : []
     readonly property string name: {
         if (application) {
-            var result = application.name(d.languageCode);
-            return result ? result : application.name("en");
+            var result = application.names[d.languageCode];
+            return result ? result : application.names["en"];
         } else {
             return "???";
         }
diff --git a/neptune3-ui.pro b/neptune3-ui.pro
index 9a6974be..12cebc29 100644
--- a/neptune3-ui.pro
+++ b/neptune3-ui.pro
@@ -1,12 +1,12 @@
 requires(linux|android|macos|win32:!winrt)
 
-QT_FOR_CONFIG += ivicore
+QT_FOR_CONFIG += interfaceframework
 
-!qtHaveModule(ivicore)|!qtConfig(ivigenerator) {
-    log("$$escape_expand(\\n\\n) *** No ivigenerator available: Make sure QtIvi is installed and configured correctly ***$$escape_expand(\\n\\n)")
-    CONFIG += no_ivigenerator_available
+!qtHaveModule(interfaceframework)|!qtConfig(ifcodegen) {
+    log("$$escape_expand(\\n\\n) *** No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly ***$$escape_expand(\\n\\n)")
+    CONFIG += no_ifgenerator_available
 }
-requires(!no_ivigenerator_available)
+requires(!no_ifgenerator_available)
 requires(qtHaveModule(appman_main-private))
 
 !qtHaveModule(qtsaferenderer)|load(qtsaferenderer-tools):!qtsaferenderer-tools-available {
diff --git a/plugins/controls/ListItemBasic.qml b/plugins/controls/ListItemBasic.qml
index 3ea7538b..283e6c9b 100644
--- a/plugins/controls/ListItemBasic.qml
+++ b/plugins/controls/ListItemBasic.qml
@@ -35,7 +35,6 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls.impl 2.3
 import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
 
 import shared.utils 1.0
 import shared.Style 1.0
diff --git a/plugins/controls/controls.pro b/plugins/controls/controls.pro
index a4868533..cdbdb98b 100644
--- a/plugins/controls/controls.pro
+++ b/plugins/controls/controls.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += qt plugin c++11 no_private_qt_headers_warning
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private quicktemplates2-private
+QT += core-private gui-private qml-private quick-private quickcontrols2-private quickcontrols2impl-private quicktemplates2-private
 
 uri = controls
 EXTRA_FILES += $$files($$PWD/*.qml, true)
diff --git a/plugins/controls/neptuneiconlabel.cpp b/plugins/controls/neptuneiconlabel.cpp
index 0f0c5503..572cad06 100644
--- a/plugins/controls/neptuneiconlabel.cpp
+++ b/plugins/controls/neptuneiconlabel.cpp
@@ -31,8 +31,8 @@
 
 #include "neptuneiconlabel.h"
 #include "neptuneiconlabel_p.h"
-#include <QtQuickControls2/private/qquickiconimage_p.h>
-#include <QtQuickControls2/private/qquickmnemoniclabel_p.h>
+#include <QtQuickControls2Impl/private/qquickiconimage_p.h>
+#include <QtQuickControls2Impl/private/qquickmnemoniclabel_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQuick/private/qquickitem_p.h>
@@ -759,10 +759,10 @@ void NeptuneIconLabel::componentComplete()
     d->layout();
 }
 
-void NeptuneIconLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void NeptuneIconLabel::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(NeptuneIconLabel);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 
     //layout operates only by width and height, skip layout updates on rect x,y change
     if (newGeometry.size() != oldGeometry.size()) {
diff --git a/plugins/controls/neptuneiconlabel.h b/plugins/controls/neptuneiconlabel.h
index 18484bfe..e6cae5af 100644
--- a/plugins/controls/neptuneiconlabel.h
+++ b/plugins/controls/neptuneiconlabel.h
@@ -33,7 +33,6 @@
 #define NEPTUNEICONLABEL_H
 
 #include <QtQuick/qquickitem.h>
-#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 #include <QtQuickTemplates2/private/qquickicon_p.h>
 #include <QtQuick/private/qquickimagebase_p.h>
 #include <QtQuick/private/qquickimage_p.h>
@@ -134,7 +133,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 private Q_SLOTS:
     void onImageStatusChanged(QQuickImageBase::Status);
diff --git a/plugins/controls/neptuneiconlabel_p.h b/plugins/controls/neptuneiconlabel_p.h
index ddd5ef53..5ca1ca40 100644
--- a/plugins/controls/neptuneiconlabel_p.h
+++ b/plugins/controls/neptuneiconlabel_p.h
@@ -33,7 +33,6 @@
 #define NEPTUNEICONLABEL_P_H
 
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 #include <QtQuickTemplates2/private/qquickicon_p.h>
 #include <QtQuick/private/qquickimage_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
diff --git a/plugins/controls/qquickdefaultprogressbar.cpp b/plugins/controls/qquickdefaultprogressbar.cpp
index c7467311..865eee96 100644
--- a/plugins/controls/qquickdefaultprogressbar.cpp
+++ b/plugins/controls/qquickdefaultprogressbar.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qeasingcurve.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
-#include <QtQuickControls2/private/qquickanimatednode_p.h>
+#include <QtQuickControls2Impl/private/qquickanimatednode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/plugins/eventslisteners/eventsListenersPlugin.cpp b/plugins/eventslisteners/eventsListenersPlugin.cpp
index f7fc52fb..ed5a1b02 100644
--- a/plugins/eventslisteners/eventsListenersPlugin.cpp
+++ b/plugins/eventslisteners/eventsListenersPlugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/eventslisteners/touchPointsTracer.h b/plugins/eventslisteners/touchPointsTracer.h
index a92323ac..5ca3835e 100644
--- a/plugins/eventslisteners/touchPointsTracer.h
+++ b/plugins/eventslisteners/touchPointsTracer.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
@@ -72,11 +72,11 @@ public:
                     || event->type() == QEvent::TouchEnd
                     || event->type() == QEvent::TouchUpdate) {
                 auto tEvent = static_cast<QTouchEvent *>(event);
-                const QList<QTouchEvent::TouchPoint> touchPoints = tEvent->touchPoints();
+                const QList<QTouchEvent::TouchPoint> touchPoints = tEvent->points();
                 QVector<int> points;
                 points.reserve(touchPoints.size() * 2); // 2 int = point
                 for (auto && tp : touchPoints) {
-                    QPoint point = tp.pos().toPoint();
+                    QPoint point = tp.position().toPoint();
                     points << point.x() << point.y();
                 }
 
diff --git a/plugins/fileutils/fileUtils.cpp b/plugins/fileutils/fileUtils.cpp
index 204946a7..93185c6f 100644
--- a/plugins/fileutils/fileUtils.cpp
+++ b/plugins/fileutils/fileUtils.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2020 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/fileutils/fileUtils.h b/plugins/fileutils/fileUtils.h
index 0134abe8..ae37af34 100644
--- a/plugins/fileutils/fileUtils.h
+++ b/plugins/fileutils/fileUtils.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2020 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/scripts/scanmusic.py b/plugins/scripts/scanmusic.py
index 53fe674e..b441b5e9 100644
--- a/plugins/scripts/scanmusic.py
+++ b/plugins/scripts/scanmusic.py
@@ -7,7 +7,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/sizes/Sizes.h b/plugins/sizes/Sizes.h
index fd1545e4..bc8af3c9 100644
--- a/plugins/sizes/Sizes.h
+++ b/plugins/sizes/Sizes.h
@@ -36,7 +36,7 @@
 #include <QtCore/QScopedPointer>
 #include <QJSValue>
 
-#include <QtQuickControls2/private/qquickattachedobject_p.h>
+#include <QtQuickControls2Impl/private/qquickattachedobject_p.h>
 
 class StyleData;
 
diff --git a/plugins/sizes/sizes.pro b/plugins/sizes/sizes.pro
index b9ba4e6a..95a6dfe7 100644
--- a/plugins/sizes/sizes.pro
+++ b/plugins/sizes/sizes.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += qt plugin c++11 no_private_qt_headers_warning
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quickcontrols2-private quickcontrols2impl-private
 
 SOURCES += SizesPlugin.cpp Sizes.cpp
 HEADERS += Sizes.h
diff --git a/plugins/squishhook/appmanhook_global.h b/plugins/squishhook/appmanhook_global.h
index 448726d4..03322514 100644
--- a/plugins/squishhook/appmanhook_global.h
+++ b/plugins/squishhook/appmanhook_global.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 froglogic GmbH
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/squishhook/appmansquishhook.cpp b/plugins/squishhook/appmansquishhook.cpp
index 20600072..e70c169d 100644
--- a/plugins/squishhook/appmansquishhook.cpp
+++ b/plugins/squishhook/appmansquishhook.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 froglogic GmbH
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/squishhook/appmansquishhook.h b/plugins/squishhook/appmansquishhook.h
index edd2f117..7e27b5e3 100644
--- a/plugins/squishhook/appmansquishhook.h
+++ b/plugins/squishhook/appmansquishhook.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 froglogic GmbH
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/style/Style.cpp b/plugins/style/Style.cpp
index 4a6d44a1..c5c4f937 100644
--- a/plugins/style/Style.cpp
+++ b/plugins/style/Style.cpp
@@ -51,6 +51,7 @@ Style::~Style()
 
 Style *Style::qmlAttachedProperties(QObject *object)
 {
+    StyleDefaults::setEngine(qmlEngine(object));
     return new Style(object);
 }
 
diff --git a/plugins/style/Style.h b/plugins/style/Style.h
index 32ed108c..c3f5ca55 100644
--- a/plugins/style/Style.h
+++ b/plugins/style/Style.h
@@ -33,7 +33,7 @@
 
 #include "StyleData.h"
 
-#include <QtQuickControls2/private/qquickattachedobject_p.h>
+#include <QtQuickControls2Impl/private/qquickattachedobject_p.h>
 #include <QJSValue>
 
 class Style : public QQuickAttachedObject
diff --git a/plugins/style/StyleData.h b/plugins/style/StyleData.h
index 177a67a3..db0f3de5 100644
--- a/plugins/style/StyleData.h
+++ b/plugins/style/StyleData.h
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/style/StyleDefaults.cpp b/plugins/style/StyleDefaults.cpp
index 3370d3c2..8385eca5 100644
--- a/plugins/style/StyleDefaults.cpp
+++ b/plugins/style/StyleDefaults.cpp
@@ -33,6 +33,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QQuickStyle>
+#include <QQmlEngine>
 
 #define CHECK_KEY(key) \
     if (!settings.contains(key)) { \
@@ -49,6 +50,13 @@
     variable = settings.value(key).toReal();
 
 StyleDefaults *StyleDefaults::m_instance = nullptr;
+QQmlEngine *StyleDefaults::m_engine = nullptr;
+
+void StyleDefaults::setEngine(QQmlEngine *e)
+{
+    if (!m_engine && e)
+        m_engine = e;
+}
 
 StyleDefaults *StyleDefaults::instance()
 {
@@ -62,7 +70,19 @@ StyleDefaults::StyleDefaults()
 {
     const char *confFileName = "style.conf";
 
-    QDir chosenStyleDir(QDir(QQuickStyle::path()).absoluteFilePath(QQuickStyle::name()));
+    QDir chosenStyleDir = QStringLiteral("/does-not-exist0000000000000000");
+
+    Q_ASSERT(m_engine);
+    const QString name = QQuickStyle::name();
+    const auto paths = m_engine->importPathList();
+
+    for (const auto &path : paths) {
+        QDir d(path);
+        if (d.cd(name)) {
+            chosenStyleDir = d;
+            break;
+        }
+    }
 
     if (!chosenStyleDir.exists()) {
         qCritical() << "Style: directory for the chosen style does not exist:" << chosenStyleDir.absolutePath();
diff --git a/plugins/style/StyleDefaults.h b/plugins/style/StyleDefaults.h
index c14972d9..3c922944 100644
--- a/plugins/style/StyleDefaults.h
+++ b/plugins/style/StyleDefaults.h
@@ -35,9 +35,12 @@
 
 #include <QSettings>
 
+QT_FORWARD_DECLARE_CLASS(QQmlEngine)
+
 class StyleDefaults
 {
 public:
+    static void setEngine(QQmlEngine *e);
     static StyleDefaults *instance();
 
     const StyleData &data() const { return m_data; }
@@ -56,4 +59,5 @@ private:
     QString m_imagePath;
 
     static StyleDefaults *m_instance;
+    static QQmlEngine *m_engine;
 };
diff --git a/plugins/style/style.pro b/plugins/style/style.pro
index ef2c04ce..5ac94e0f 100644
--- a/plugins/style/style.pro
+++ b/plugins/style/style.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += qt plugin c++11 no_private_qt_headers_warning
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quickcontrols2-private quickcontrols2impl-private
 
 SOURCES += StylePlugin.cpp Style.cpp StyleDefaults.cpp
 HEADERS += Style.h StyleDefaults.h
diff --git a/plugins/systeminfo/plugin.cpp b/plugins/systeminfo/plugin.cpp
index c27ef160..6ae33879 100644
--- a/plugins/systeminfo/plugin.cpp
+++ b/plugins/systeminfo/plugin.cpp
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/plugins/systeminfo/systeminfo.cpp b/plugins/systeminfo/systeminfo.cpp
index 249fea9f..8f0330c1 100644
--- a/plugins/systeminfo/systeminfo.cpp
+++ b/plugins/systeminfo/systeminfo.cpp
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
@@ -118,7 +118,7 @@ void SystemInfo::getQtDiagInfo()
 {
     m_qtDiagContents.clear();
     // first try in the current Qt dir
-    QString qtdiagExe = QStandardPaths::findExecutable(QStringLiteral("qtdiag"), {QLibraryInfo::location(QLibraryInfo::BinariesPath)});
+    QString qtdiagExe = QStandardPaths::findExecutable(QStringLiteral("qtdiag"), {QLibraryInfo::path(QLibraryInfo::BinariesPath)});
     if (qtdiagExe.isEmpty()) {
         // try in $PATH
         qtdiagExe = QStandardPaths::findExecutable(QStringLiteral("qtdiag"));
@@ -142,7 +142,7 @@ void SystemInfo::getQtDiagInfo()
         m_qtDiagContents.prepend(QObject::tr("Output from %1:").arg(qtdiagExe) + QStringLiteral("\n\n"));
         emit qtDiagChanged();
     });
-    m_diagProc->start(qtdiagExe, QProcess::ReadOnly);
+    m_diagProc->start(qtdiagExe, { }, QProcess::ReadOnly);
 #endif
 }
 
@@ -174,10 +174,11 @@ bool SystemInfo::allowOpenGLContent()
 
 void SystemInfo::timerEvent(QTimerEvent *event)
 {
+return;
     Q_UNUSED(event);
     getAddress();
     auto reply = m_networkManager->get(QNetworkRequest(QUrl("https://www.google.com")));
-    connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error),
+    connect(reply, &QNetworkReply::errorOccurred,
         [=](QNetworkReply::NetworkError code) {
             updateInternetAccessStatus(code == QNetworkReply::NetworkError::NoError);
         }
diff --git a/plugins/systeminfo/systeminfo.h b/plugins/systeminfo/systeminfo.h
index 8d2506b2..c464fdc7 100644
--- a/plugins/systeminfo/systeminfo.h
+++ b/plugins/systeminfo/systeminfo.h
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/server.conf b/server.conf
index 1a7360b8..6b0a7af0 100644
--- a/server.conf
+++ b/server.conf
@@ -4,5 +4,5 @@ Registry=tcp://0.0.0.0:9999
 [drivedata]
 Registry=tcp://0.0.0.0:9998
 
-[qtivimedia]
+[qtifmedia]
 Registry=tcp://0.0.0.0:9997
diff --git a/src/connectivity/connectivity/connectivity.pro b/src/connectivity/connectivity/connectivity.pro
index fd4d607f..901dbf9d 100644
--- a/src/connectivity/connectivity/connectivity.pro
+++ b/src/connectivity/connectivity/connectivity.pro
@@ -1,12 +1,12 @@
 TARGET = $$qtLibraryTarget(Connectivity)
 TEMPLATE = lib
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 
-QT += ivicore ivicore-private qml quick
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT += interfaceframework interfaceframework-private qml quick
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
-QFACE_SOURCES = ../connectivity.qface
+IFCODEGEN_SOURCES = ../connectivity.qface
 
 DESTDIR = $$LIB_DESTDIR
 DEFINES += QT_BUILD_CONNECTIVITY_LIB
diff --git a/src/connectivity/connectivity_plugin/connectivity_plugin.pro b/src/connectivity/connectivity_plugin/connectivity_plugin.pro
index c2fc9d1b..189d2605 100644
--- a/src/connectivity/connectivity_plugin/connectivity_plugin.pro
+++ b/src/connectivity/connectivity_plugin/connectivity_plugin.pro
@@ -1,19 +1,19 @@
 TEMPLATE = lib
 CONFIG += plugin
-QT += ivicore qml
+QT += interfaceframework qml
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(Connectivity)
 INCLUDEPATH += $$OUT_PWD/../connectivity
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../connectivity.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../connectivity.qface
 
-load(ivigenerator)
+load(ifcodegen)
 
 uri = Connectivity
 EXTRA_FILES += $$OUT_PWD/qmldir \
diff --git a/src/connectivity/wifi_simulation/simulation.qml b/src/connectivity/wifi_simulation/simulation.qml
index 39f1da75..afd4152f 100644
--- a/src/connectivity/wifi_simulation/simulation.qml
+++ b/src/connectivity/wifi_simulation/simulation.qml
@@ -35,10 +35,10 @@ import shared.Connectivity.simulation 1.0
 Item {
     WiFiBackend {
         id: backend
-        property var settings : IviSimulator.findData(IviSimulator.simulationData, "WiFi")
+        property var settings : IfSimulator.findData(IfSimulator.simulationData, "WiFi")
 
         function initialize() {
-            IviSimulator.initializeDefault(settings, backend)
+            IfSimulator.initializeDefault(settings, backend)
             Base.initialize()
 
             for (var i = 0; i < 7; i++) {
@@ -127,7 +127,7 @@ Item {
             }
         }
 
-        function connectToAccessPoint(qtIviReply, ssid) {
+        function connectToAccessPoint(qtIfReply, ssid) {
             for (var j = 0; j < backend.allAccessPoints.length; j++) {
                 if (backend.accessPoints[j].ssid == ssid) {
                     var security = backend.allAccessPoints[j].security
@@ -143,12 +143,12 @@ Item {
                 }
             }
 
-            qtIviReply.setSuccess(0)
-            return qtIviReply
+            qtIfReply.setSuccess(0)
+            return qtIfReply
         }
 
 
-        function sendCredentials(qtIviReply, ssid, password) {
+        function sendCredentials(qtIfReply, ssid, password) {
             var success = false;
             for (var j = 0; j < backend.allAccessPoints.length; j++) {
                 if ( backend.activeAccessPoint.ssid == backend.allAccessPoints[j].ssid ) {
@@ -160,24 +160,24 @@ Item {
             }
 
             if (success) {
-                qtIviReply.setSuccess(0)
+                qtIfReply.setSuccess(0)
             } else {
-                qtIviReply.setFailed()
+                qtIfReply.setFailed()
             }
-            return qtIviReply
+            return qtIfReply
         }
 
-        function disconnectFromAccessPoint(qtIviReply, ssid) {
+        function disconnectFromAccessPoint(qtIfReply, ssid) {
             backend.connectionStatus = WiFi.Disconnecting
             timerDisconnecting.start()
-            qtIviReply.setSuccess(0)
-            return qtIviReply
+            qtIfReply.setSuccess(0)
+            return qtIfReply
         }
 
         readonly property Connections backendSignals: Connections {
             target: backend
-            onEnabledChanged: {
-                if (!backend.enabled) {
+            function onEnabledChanged(enabled) {
+                if (!enabled) {
                     for (var j = 0; j < backend.allAccessPoints.length; j++) {
                         backend.allAccessPoints[j].connected = false
                     }
diff --git a/src/connectivity/wifi_simulation/wifi_simulation.pro b/src/connectivity/wifi_simulation/wifi_simulation.pro
index 5546c090..231916d7 100644
--- a/src/connectivity/wifi_simulation/wifi_simulation.pro
+++ b/src/connectivity/wifi_simulation/wifi_simulation.pro
@@ -1,28 +1,28 @@
 TEMPLATE = lib
 TARGET = $$qtLibraryTarget(wifi_simulation)
-CONFIG += ivigenerator plugin
+CONFIG += ifcodegen plugin
 
-QT += core ivicore
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT += core interfaceframework
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(Connectivity)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../connectivity.qface
-PLUGIN_TYPE = qtivi
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../connectivity.qface
+PLUGIN_TYPE = interfaceframework
 
 INCLUDEPATH += $$OUT_PWD/../connectivity
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = $$OUT_PWD/../connectivity/qml
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
 
 RESOURCES += plugin_resource.qrc
diff --git a/src/drivedata/backend/backend.pro b/src/drivedata/backend/backend.pro
index 7aa90cf2..31d6e650 100644
--- a/src/drivedata/backend/backend.pro
+++ b/src/drivedata/backend/backend.pro
@@ -1,32 +1,32 @@
 TEMPLATE=lib
-TARGET = $$qt5LibraryTarget(drivedata_backend_qtro, "plugins/qtivi/")
-CONFIG += ivigenerator plugin
+TARGET = $$qt5LibraryTarget(drivedata_backend_qtro, "plugins/interfaceframework/")
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(drivedata)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
+PLUGIN_TYPE = interfaceframework
+PLUGIN_EXTENDS = interfaceframework
 PLUGIN_CLASS_NAME = IviSettingsBackendInterface
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../drivedata.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../drivedata.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
diff --git a/src/drivedata/backend_simulation/backend_simulation.pro b/src/drivedata/backend_simulation/backend_simulation.pro
index 29a4b767..4290d209 100644
--- a/src/drivedata/backend_simulation/backend_simulation.pro
+++ b/src/drivedata/backend_simulation/backend_simulation.pro
@@ -1,33 +1,33 @@
 TEMPLATE=lib
 TARGET = $$qtLibraryTarget(drivedata_backend_simulation)
-CONFIG += ivigenerator plugin
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(drivedata)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
+PLUGIN_TYPE = interfaceframework
 PLUGIN_CLASS_NAME = DriveDataPlugin
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../drivedata.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../drivedata.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
 
 #! [0]
diff --git a/src/drivedata/backend_simulation/simulation.qml b/src/drivedata/backend_simulation/simulation.qml
index 4a50b57b..5ccb22af 100644
--- a/src/drivedata/backend_simulation/simulation.qml
+++ b/src/drivedata/backend_simulation/simulation.qml
@@ -35,10 +35,10 @@ import shared.com.pelagicore.drivedata.simulation 1.0
 Item {
     InstrumentClusterBackend {
         id: backend
-        property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster")
+        property var settings : IfSimulator.findData(IfSimulator.simulationData, "InstrumentCluster")
 
         function initialize() {
-            IviSimulator.initializeDefault(settings, backend)
+            IfSimulator.initializeDefault(settings, backend)
             Base.initialize()
         }
 
diff --git a/src/drivedata/drivedata-simulation-server/drivedata-simulation-server.pro b/src/drivedata/drivedata-simulation-server/drivedata-simulation-server.pro
index cd895f9e..88d7f35d 100644
--- a/src/drivedata/drivedata-simulation-server/drivedata-simulation-server.pro
+++ b/src/drivedata/drivedata-simulation-server/drivedata-simulation-server.pro
@@ -1,19 +1,19 @@
 QT -= gui
 
 macos: CONFIG -= app_bundle
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 
 include($$SOURCE_DIR/config.pri)
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available")
 
 TEMPLATE = app
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = server_qtro_simulator
-QFACE_SOURCES = ../drivedata.qface
+IFCODEGEN_TEMPLATE = server_qtro_simulator
+IFCODEGEN_SOURCES = ../drivedata.qface
 
 RESOURCES += plugin_resource.qrc
 QML_IMPORT_PATH = $$OUT_PWD/qml
diff --git a/src/drivedata/drivedata-simulation-server/simulation.qml b/src/drivedata/drivedata-simulation-server/simulation.qml
index 2371a16c..65c9dcfb 100644
--- a/src/drivedata/drivedata-simulation-server/simulation.qml
+++ b/src/drivedata/drivedata-simulation-server/simulation.qml
@@ -35,10 +35,10 @@ import shared.com.pelagicore.drivedata.simulation 1.0
 Item {
     InstrumentClusterBackend {
         id: backend
-        property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster")
+        property var settings : IfSimulator.findData(IfSimulator.simulationData, "InstrumentCluster")
 
         function initialize() {
-            IviSimulator.initializeDefault(settings, backend)
+            IfSimulator.initializeDefault(settings, backend)
             Base.initialize()
         }
 
diff --git a/src/drivedata/frontend/frontend.pro b/src/drivedata/frontend/frontend.pro
index 88067ec4..9864f582 100644
--- a/src/drivedata/frontend/frontend.pro
+++ b/src/drivedata/frontend/frontend.pro
@@ -1,19 +1,19 @@
 TARGET = $$qtLibraryTarget(drivedata)
 TEMPLATE = lib
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 DESTDIR = $$LIB_DESTDIR
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
 include($$SOURCE_DIR/config.pri)
 
 DEFINES += QT_BUILD_DRIVEDATA_LIB
-QT += ivicore ivicore-private qml
+QT += interfaceframework interfaceframework-private qml
 
-QFACE_SOURCES = ../drivedata.qface
+IFCODEGEN_SOURCES = ../drivedata.qface
 
 target.path = $$INSTALL_PREFIX/neptune3/lib
 win32:target.path = $$INSTALL_PREFIX/neptune3/
diff --git a/src/drivedata/qml_plugin/qml_plugin.pro b/src/drivedata/qml_plugin/qml_plugin.pro
index 87ec318e..dcbee375 100644
--- a/src/drivedata/qml_plugin/qml_plugin.pro
+++ b/src/drivedata/qml_plugin/qml_plugin.pro
@@ -4,15 +4,15 @@ QT += qml
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(drivedata)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../drivedata.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../drivedata.qface
 
-load(ivigenerator)
+load(ifcodegen)
 
 # the qmlplugin template provides the URI variable to read the uri from the qface files, but this
 # already contains the shared prefix, and the qmlplugin prf adds one as well
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 16c1ea27..d8006155 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
@@ -30,7 +30,6 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.12
 
 import shared.animations 1.0
 import shared.Sizes 1.0
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 50d0a64f..03b72c18 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
@@ -31,8 +31,8 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtIvi 1.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework
+import QtInterfaceFramework.Media
 
 import shared.utils 1.0
 
diff --git a/src/neptune-cluster-app/main.cpp b/src/neptune-cluster-app/main.cpp
index abc64db2..bdbf41e8 100644
--- a/src/neptune-cluster-app/main.cpp
+++ b/src/neptune-cluster-app/main.cpp
@@ -45,7 +45,6 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QCoreApplication::setApplicationName(QStringLiteral("Neptune Cluster"));
     QCoreApplication::setOrganizationName(QStringLiteral("Luxoft Sweden AB"));
     QCoreApplication::setOrganizationDomain(QStringLiteral("luxoft.com"));
diff --git a/src/neptune-cluster-app/neptune-cluster-app.pro b/src/neptune-cluster-app/neptune-cluster-app.pro
index 154c5fe4..5efe8590 100644
--- a/src/neptune-cluster-app/neptune-cluster-app.pro
+++ b/src/neptune-cluster-app/neptune-cluster-app.pro
@@ -2,7 +2,7 @@ requires(linux|macos) # @todo add win
 
 TEMPLATE = app
 TARGET = neptune-cluster-app
-QT *= quick gui core ivicore
+QT *= quick gui core interfaceframework
 
 isEmpty(INSTALL_PREFIX) {
     INSTALL_PREFIX=/opt
diff --git a/src/neptune3-ui-qsr-cluster/README.md b/src/neptune3-ui-qsr-cluster/README.md
index 26e2afbf..21eefc65 100644
--- a/src/neptune3-ui-qsr-cluster/README.md
+++ b/src/neptune3-ui-qsr-cluster/README.md
@@ -12,7 +12,7 @@ In this sample main aspects of work with QSR are presented:
 4. Communicating with `Non-Safe UI` with heartbeats and shut down processing
     Simple Qt TCP Sever (TcpMsgHandler) is used for this.
 5. Communicating with Neptune's `Remote Settings Server` to get values of Safe UI elements states.
-    Same QtIVI autogenerated client is used as in Neptune's `Remote Control Application`
+    Same QtIF autogenerated client is used as in Neptune's `Remote Control Application`
 
 Application main work logic is:
 
diff --git a/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster.pro b/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster.pro
index e67bfe3d..b5f2f663 100644
--- a/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster.pro
+++ b/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster.pro
@@ -22,7 +22,7 @@ win32 {
     LIBS += -lUser32
 }
 
-QT = core gui qtsaferenderer network ivicore
+QT = core gui qtsaferenderer network interfaceframework
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) -l$$qtLibraryTarget(drivedata)
 
diff --git a/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster_wrapper.bat b/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster_wrapper.bat
index 5e9f3211..b3d996cd 100644
--- a/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster_wrapper.bat
+++ b/src/neptune3-ui-qsr-cluster/neptune3-ui-qsr-cluster_wrapper.bat
@@ -4,7 +4,7 @@
 :: Copyright (C) 2020 Luxoft Sweden AB
 :: Contact: https://www.qt.io/licensing/
 ::
-:: This file is part of the Neptune IVI UI.
+:: This file is part of the Neptune 3 UI.
 ::
 :: $QT_BEGIN_LICENSE:GPL-QTAS$
 :: Commercial License Usage
diff --git a/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.cpp b/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.cpp
index 726b8746..b3ea9903 100644
--- a/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.cpp
+++ b/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.h b/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.h
index 0ce4dfd9..27118c2f 100644
--- a/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.h
+++ b/src/neptune3-ui-qsr-cluster/neptunesafestatemanager.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2019 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/src/neptune3-ui-qsr-cluster/remotesettings_client.cpp b/src/neptune3-ui-qsr-cluster/remotesettings_client.cpp
index c5aee089..f7c8b4fb 100644
--- a/src/neptune3-ui-qsr-cluster/remotesettings_client.cpp
+++ b/src/neptune3-ui-qsr-cluster/remotesettings_client.cpp
@@ -58,9 +58,9 @@ RemoteSettings_Client::RemoteSettings_Client(QObject *parent) : QObject(parent),
     connect(&m_connectionMonitoringTimer, &QTimer::timeout, this, &RemoteSettings_Client::onCMTimeout);
     connect(&m_connectionMonitoring, &ConnectionMonitoring::counterChanged,
             this, &RemoteSettings_Client::onCMCounterChanged);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::isInitializedChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::isInitializedChanged,
             this, &RemoteSettings_Client::updateConnectionStatus);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::errorChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::errorChanged,
             this, &RemoteSettings_Client::updateConnectionStatus);
     connect(&m_reconnectionTimer, &QTimer::timeout, this, &RemoteSettings_Client::onReconnectionTimeout);
     readSettings();
@@ -142,7 +142,7 @@ void RemoteSettings_Client::connectToServer(const QString &serverUrl)
 void RemoteSettings_Client::updateConnectionStatus()
 {
     bool c = m_connectionMonitoring.isInitialized() &&
-             m_connectionMonitoring.error()==QIviAbstractFeature::NoError &&
+             m_connectionMonitoring.error()==QIfAbstractFeature::NoError &&
              !m_timedOut;
     if (c == m_connected)
         return;
diff --git a/src/neptune3-ui/main.cpp b/src/neptune3-ui/main.cpp
index ff76f49d..e70c7882 100644
--- a/src/neptune3-ui/main.cpp
+++ b/src/neptune3-ui/main.cpp
@@ -32,13 +32,13 @@
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManCommon/logging.h>
+#include <QtAppManCommon/startuptimer.h>
 #include <QtAppManCommonVersion>
-#include <QtIviCore/QtIviCoreVersion>
+#include <QtInterfaceFramework/QtInterfaceFrameworkVersion>
 #include <QtAppManMain/main.h>
 #include <QtAppManMain/defaultconfiguration.h>
 #include <QtAppManPackage/packageutilities.h>
 #include <QtAppManManager/sudo.h>
-#include <QtAppManWindow/touchemulation.h>
 #include <QtGui/QFontDatabase>
 #include <QGuiApplication>
 #include <QTranslator>
@@ -46,7 +46,6 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QProcess>
-#include <QTouchDevice>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
@@ -74,12 +73,14 @@ void startExtraProcess(const QString &name) {
     QObject::connect(qApp, &QCoreApplication::aboutToQuit, [serverProcess] () {
         serverProcess->terminate();
     });
-    serverProcess->start(name, QProcess::ReadOnly);
+    serverProcess->start(name, {}, QProcess::ReadOnly);
 #endif
 }
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
+    StartupTimer::instance()->checkpoint("entered main");
+
 #ifdef Q_OS_ANDROID
     qputenv("QML_DISABLE_DISK_CACHE", "1");
 #endif
@@ -89,14 +90,14 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain(qSL("luxoft.com"));
     QCoreApplication::setApplicationVersion(STR(NEPTUNE_VERSION));
 
-    Logging::initialize();
-
-    PackageUtilities::ensureCorrectLocale();
+    Logging::initialize(argc, argv);
+    StartupTimer::instance()->checkpoint("after basic initialization");
 
     try {
         Sudo::forkServer(Sudo::DropPrivilegesPermanently);
+        StartupTimer::instance()->checkpoint("after sudo server fork");
 
-        qputenv("QTIVIMEDIA_SIMULATOR_DATABASE", QFile::encodeName(QDir::homePath() + "/media.db"));
+        qputenv("QTIFMEDIA_SIMULATOR_DATABASE", QFile::encodeName(QDir::homePath() + "/media.db"));
         qputenv("QT_IM_MODULE", "qtvirtualkeyboard");
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@@ -109,8 +110,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
         Main a(argc, argv);
 
         // start the server; the server itself will ensure one instance only
-        startExtraProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/ivivehiclefunctions-simulation-server");
-        startExtraProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/ivimedia-simulation-server");
+        startExtraProcess(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/ifvehiclefunctions-simulation-server");
+        startExtraProcess(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/ifmedia-simulation-server");
         startExtraProcess(QCoreApplication::applicationDirPath() + "/drivedata-simulation-server");
         startExtraProcess(QCoreApplication::applicationDirPath() + "/remotesettings-server");
 #endif
@@ -119,24 +120,25 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
         // load the Qt translations
         QTranslator qtTranslator;
-        if (qtTranslator.load(QLocale(), qSL("qt_"), QString(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+        if (qtTranslator.load(QLocale(), qSL("qt_"), QString(), QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
             a.installTranslator(&qtTranslator);
         }
 
 #ifdef Q_OS_ANDROID
-        DefaultConfiguration cfg(QStringList({ qSL("assets:/am-config-neptune.yaml"), qSL("assets:/am-config-android.yaml") }), QString());
+        Configuration cfg({ qSL("assets:/am-config-neptune.yaml"), qSL("assets:/am-config-android.yaml") }, { });
 #else
-        DefaultConfiguration cfg(QStringList(QCoreApplication::applicationDirPath() + qSL("/am-config-neptune.yaml")), QString());
+        Configuration cfg({ QCoreApplication::applicationDirPath() + qSL("/am-config-neptune.yaml") }, { });
 #endif
+        cfg.parseWithArguments(QCoreApplication::arguments());
+        StartupTimer::instance()->checkpoint("after command line parse");
 
-        cfg.parse();
         a.setup(&cfg);
 
 #ifdef USE_QT_SAFE_RENDERER
         //Set env variables for Qt Safe Renderer for sending heartbeats
         //env variables are used to start TCP client to connect to "safe ui" part
         //qsrEnabled also switches loading of Safe Telltales in Cluster View
-        bool    qsrEnabled = cfg.rawSystemProperties()["public"].toMap()["qsrEnabled"].toBool();
+        bool qsrEnabled = cfg.rawSystemProperties()["public"].toMap()["qsrEnabled"].toBool();
         if (qsrEnabled)
         {
             QString qsrIp   = cfg.rawSystemProperties()["public"].toMap()["qsrServerAddress"].toString();
@@ -152,14 +154,13 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #ifdef Q_OS_ANDROID
         a.qmlEngine()->setUrlInterceptor(new UrlInterceptor);
 #endif
-
         a.loadQml(cfg.loadDummyData());
         a.showWindow(cfg.fullscreen() && !cfg.noFullscreen());
 
         auto ctx = a.qmlEngine()->rootContext();
         ctx->setContextProperty("neptuneInfo", STR(NEPTUNE_INFO));
         ctx->setContextProperty("qtamVersion", QTAPPMANCOMMON_VERSION_STR);
-        ctx->setContextProperty("qtiviVersion", QTIVICORE_VERSION_STR);
+        ctx->setContextProperty("qtifVersion", QTINTERFACEFRAMEWORK_VERSION_STR);
 
         return MainBase::exec();
     } catch (const std::exception &e) {
diff --git a/src/neptune3-ui/neptune3-ui_wrapper.bat b/src/neptune3-ui/neptune3-ui_wrapper.bat
index 2ad4ec27..62657688 100644
--- a/src/neptune3-ui/neptune3-ui_wrapper.bat
+++ b/src/neptune3-ui/neptune3-ui_wrapper.bat
@@ -5,7 +5,7 @@
 :: Copyright (C) 2018 Pelagicore AG
 :: Contact: https://www.qt.io/licensing/
 ::
-:: This file is part of the Neptune IVI UI.
+:: This file is part of the Neptune 3 UI.
 ::
 :: $QT_BEGIN_LICENSE:GPL-QTAS$
 :: Commercial License Usage
diff --git a/src/remotesettings/app/DevelopmentPage.qml b/src/remotesettings/app/DevelopmentPage.qml
index d84f16fa..191b3dca 100644
--- a/src/remotesettings/app/DevelopmentPage.qml
+++ b/src/remotesettings/app/DevelopmentPage.qml
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2019-2020 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
@@ -401,7 +401,7 @@ Flickable {
             }
 
             Label {
-                text: qsTr("Qt IVI Version: ") + qtiviVersion
+                text: qsTr("Qt IF Version: ") + qtifVersion
                 Layout.alignment: Qt.AlignHCenter
             }
         }
diff --git a/src/remotesettings/app/MediaPage.qml b/src/remotesettings/app/MediaPage.qml
index 523aa7ac..c36f55f3 100644
--- a/src/remotesettings/app/MediaPage.qml
+++ b/src/remotesettings/app/MediaPage.qml
@@ -32,7 +32,7 @@ import QtQuick 2.8
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import QtIvi.Media 1.0
+import QtInterfaceFramework.Media
 
 Flickable {
     id: root
diff --git a/src/remotesettings/app/Vehicle2DPanel.qml b/src/remotesettings/app/Vehicle2DPanel.qml
index 870cd998..aa19c93e 100644
--- a/src/remotesettings/app/Vehicle2DPanel.qml
+++ b/src/remotesettings/app/Vehicle2DPanel.qml
@@ -30,7 +30,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
 
 
 Item {
diff --git a/src/remotesettings/app/app.pro b/src/remotesettings/app/app.pro
index e5fd7b68..cc175ccc 100644
--- a/src/remotesettings/app/app.pro
+++ b/src/remotesettings/app/app.pro
@@ -1,7 +1,7 @@
 VERSION  = 5.15.1
 TARGET = neptune-companion-app
 DESTDIR = $$BUILD_DIR
-QT += quick ivicore ivimedia
+QT += quick interfaceframework ifmedia
 CONFIG += c++11
 macos: CONFIG -= app_bundle
 
diff --git a/src/remotesettings/app/client.cpp b/src/remotesettings/app/client.cpp
index 48b500a2..06cb56c9 100644
--- a/src/remotesettings/app/client.cpp
+++ b/src/remotesettings/app/client.cpp
@@ -61,9 +61,9 @@ Client::Client(QObject *parent) : QObject(parent),
     connect(&m_connectionMonitoringTimer, &QTimer::timeout, this, &Client::onCMTimeout);
     connect(&m_connectionMonitoring, &ConnectionMonitoring::counterChanged,
             this, &Client::onCMCounterChanged);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::isInitializedChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::isInitializedChanged,
             this, &Client::updateConnectionStatus);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::errorChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::errorChanged,
             this, &Client::updateConnectionStatus);
     connect(&m_reconnectionTimer, &QTimer::timeout, this, &Client::onReconnectionTimeout);
     readSettings();
@@ -130,7 +130,7 @@ void Client::connectToServer(const QString &serverUrl)
     settings.setValue(QStringLiteral("Registry"), driveDataUrl.toString());
     settings.endGroup();
     settings.sync();
-    settings.beginGroup(QStringLiteral("qtivimedia"));
+    settings.beginGroup(QStringLiteral("qtifmedia"));
     settings.setValue(QStringLiteral("Registry"), iviMediaUrl.toString());
     settings.endGroup();
     settings.sync();
@@ -151,7 +151,7 @@ void Client::connectToServer(const QString &serverUrl)
 void Client::updateConnectionStatus()
 {
     bool c = m_connectionMonitoring.isInitialized() &&
-             m_connectionMonitoring.error()==QIviAbstractFeature::NoError &&
+             m_connectionMonitoring.error()==QIfAbstractFeature::NoError &&
              !m_timedOut;
     if (c == m_connected)
         return;
diff --git a/src/remotesettings/app/main.cpp b/src/remotesettings/app/main.cpp
index fdc99c88..a08815ad 100644
--- a/src/remotesettings/app/main.cpp
+++ b/src/remotesettings/app/main.cpp
@@ -34,7 +34,7 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QtCore/QCommandLineParser>
-#include <QtIviCore/QtIviCoreVersion>
+#include <QtInterfaceFramework/QtInterfaceFrameworkVersion>
 #include "client.h"
 
 // code to transform a macro into a string literal
@@ -43,7 +43,6 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QCoreApplication::setApplicationName(QStringLiteral("Neptune Companion"));
     QCoreApplication::setOrganizationName(QStringLiteral("Luxoft Sweden AB"));
     QCoreApplication::setOrganizationDomain(QStringLiteral("luxoft.com"));
@@ -71,7 +70,7 @@ int main(int argc, char *argv[])
     engine.addImportPath(QDir::currentPath()+QStringLiteral("/imports_shared/"));
     engine.rootContext()->setContextProperty(QStringLiteral("client"), &client);
     engine.rootContext()->setContextProperty("neptuneGitRevision", STR(NEPTUNE_GIT_REVISION));
-    engine.rootContext()->setContextProperty("qtiviVersion", QTIVICORE_VERSION_STR);
+    engine.rootContext()->setContextProperty("qtifVersion", QTINTERFACEFRAMEWORK_VERSION_STR);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;
diff --git a/src/remotesettings/app/main.qml b/src/remotesettings/app/main.qml
index d677b1e4..aca9e857 100644
--- a/src/remotesettings/app/main.qml
+++ b/src/remotesettings/app/main.qml
@@ -32,8 +32,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import QtIvi 1.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework
+import QtInterfaceFramework.Media
 import shared.com.pelagicore.remotesettings 1.0
 import shared.com.pelagicore.drivedata 1.0
 
@@ -93,11 +93,11 @@ ApplicationWindow {
 
         property bool isConnected: false
 
-        onIsInitializedChanged: {
+        onIsInitializedChanged: function(isInitialized) {
             isConnected = isInitialized;
         }
 
-        onErrorChanged: {
+        onErrorChanged: function(error) {
             if (error > 0) {
                 //Any other state then NoError=0
                 isConnected = false;
@@ -126,7 +126,7 @@ ApplicationWindow {
         lastUrls: client.lastUrls
         anchors.centerIn: parent
 
-        onAccepted: {
+        onAccepted: function(accepted) {
             if (accepted) {
                 client.connectToServer(url);
                 uiSettings.setServiceObject(null);
diff --git a/src/remotesettings/app/neptune-companion-app_wrapper.bat b/src/remotesettings/app/neptune-companion-app_wrapper.bat
index ef22de82..cee466e7 100644
--- a/src/remotesettings/app/neptune-companion-app_wrapper.bat
+++ b/src/remotesettings/app/neptune-companion-app_wrapper.bat
@@ -4,7 +4,7 @@
 :: Copyright (C) 2019 Luxoft Sweden AB
 :: Contact: https://www.qt.io/licensing/
 ::
-:: This file is part of the Neptune IVI UI.
+:: This file is part of the Neptune 3 UI.
 ::
 :: $QT_BEGIN_LICENSE:GPL-QTAS$
 :: Commercial License Usage
diff --git a/src/remotesettings/backend/backend.pro b/src/remotesettings/backend/backend.pro
index 689437fc..77141765 100644
--- a/src/remotesettings/backend/backend.pro
+++ b/src/remotesettings/backend/backend.pro
@@ -1,32 +1,32 @@
 TEMPLATE=lib
-TARGET = $$qt5LibraryTarget(remotesettings_backend_qtro, "plugins/qtivi/")
-CONFIG += ivigenerator plugin
+TARGET = $$qt5LibraryTarget(remotesettings_backend_qtro, "plugins/interfaceframework/")
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
+PLUGIN_TYPE = interfaceframework
+PLUGIN_EXTENDS = interfaceframework
 PLUGIN_CLASS_NAME = IviSettingsBackendInterface
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
diff --git a/src/remotesettings/backend_simulation/backend_simulation.pro b/src/remotesettings/backend_simulation/backend_simulation.pro
index b5ba75c7..78ca2cb6 100644
--- a/src/remotesettings/backend_simulation/backend_simulation.pro
+++ b/src/remotesettings/backend_simulation/backend_simulation.pro
@@ -1,32 +1,32 @@
 TEMPLATE=lib
 TARGET = $$qtLibraryTarget(remotesettings_backend_simulation)
-CONFIG += ivigenerator plugin
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
+PLUGIN_TYPE = interfaceframework
+PLUGIN_EXTENDS = interfaceframework
 PLUGIN_CLASS_NAME = IviSettingsBackendInterface
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
diff --git a/src/remotesettings/frontend/frontend.pro b/src/remotesettings/frontend/frontend.pro
index ef2f653c..e8b30a18 100644
--- a/src/remotesettings/frontend/frontend.pro
+++ b/src/remotesettings/frontend/frontend.pro
@@ -1,19 +1,19 @@
 TARGET = $$qtLibraryTarget(remotesettings)
 TEMPLATE = lib
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 DESTDIR = $$LIB_DESTDIR
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
 include($$SOURCE_DIR/config.pri)
 
 DEFINES += QT_BUILD_REMOTESETTINGS_LIB
-QT += ivicore ivicore-private qml
+QT += interfaceframework interfaceframework-private qml
 
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../frontend
 
diff --git a/src/remotesettings/qml_plugin/qml_plugin.pro b/src/remotesettings/qml_plugin/qml_plugin.pro
index 741a55ca..13c8a38e 100644
--- a/src/remotesettings/qml_plugin/qml_plugin.pro
+++ b/src/remotesettings/qml_plugin/qml_plugin.pro
@@ -4,15 +4,15 @@ QT += qml
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
-load(ivigenerator)
+load(ifcodegen)
 
 # the qmlplugin template provides the URI variable to read the uri from the qface files, but this
 # already contains the shared prefix, and the qmlplugin prf adds one as well
diff --git a/src/remotesettings/remotesettings-server/remotesettings-server.pro b/src/remotesettings/remotesettings-server/remotesettings-server.pro
index 9c0f6904..30c71238 100644
--- a/src/remotesettings/remotesettings-server/remotesettings-server.pro
+++ b/src/remotesettings/remotesettings-server/remotesettings-server.pro
@@ -2,15 +2,15 @@ QT -= gui
 
 CONFIG += c++11 console
 macos: CONFIG -= app_bundle
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = server_qtro
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = server_qtro
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 SOURCES += \
     main.cpp\
diff --git a/styles/lucee/Button.qml b/styles/LuceeStyle/Button.qml
index 18c8676b..18c8676b 100644
--- a/styles/lucee/Button.qml
+++ b/styles/LuceeStyle/Button.qml
diff --git a/styles/lucee/ComboBox.qml b/styles/LuceeStyle/ComboBox.qml
index 5bf320de..5bf320de 100644
--- a/styles/lucee/ComboBox.qml
+++ b/styles/LuceeStyle/ComboBox.qml
diff --git a/styles/neptune/Control.qml b/styles/LuceeStyle/Control.qml
index db705268..94a58481 100644
--- a/styles/neptune/Control.qml
+++ b/styles/LuceeStyle/Control.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Templates 2.3 as T
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/Dialog.qml b/styles/LuceeStyle/Dialog.qml
index cb279989..cb279989 100644
--- a/styles/lucee/Dialog.qml
+++ b/styles/LuceeStyle/Dialog.qml
diff --git a/styles/lucee/Frame.qml b/styles/LuceeStyle/Frame.qml
index a9ab74cb..a9ab74cb 100644
--- a/styles/lucee/Frame.qml
+++ b/styles/LuceeStyle/Frame.qml
diff --git a/styles/lucee/ItemDelegate.qml b/styles/LuceeStyle/ItemDelegate.qml
index f2a550db..f2a550db 100644
--- a/styles/lucee/ItemDelegate.qml
+++ b/styles/LuceeStyle/ItemDelegate.qml
diff --git a/styles/neptune/Label.qml b/styles/LuceeStyle/Label.qml
index cb9c731a..ca0675dc 100644
--- a/styles/neptune/Label.qml
+++ b/styles/LuceeStyle/Label.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/Page.qml b/styles/LuceeStyle/Page.qml
index d8ddb751..d8ddb751 100644
--- a/styles/lucee/Page.qml
+++ b/styles/LuceeStyle/Page.qml
diff --git a/styles/lucee/PageIndicator.qml b/styles/LuceeStyle/PageIndicator.qml
index 7859bf86..7859bf86 100644
--- a/styles/lucee/PageIndicator.qml
+++ b/styles/LuceeStyle/PageIndicator.qml
diff --git a/styles/lucee/Pane.qml b/styles/LuceeStyle/Pane.qml
index aa56a550..aa56a550 100644
--- a/styles/lucee/Pane.qml
+++ b/styles/LuceeStyle/Pane.qml
diff --git a/styles/lucee/ProgressBar.qml b/styles/LuceeStyle/ProgressBar.qml
index 3597f009..3597f009 100644
--- a/styles/lucee/ProgressBar.qml
+++ b/styles/LuceeStyle/ProgressBar.qml
diff --git a/styles/lucee/RadioButton.qml b/styles/LuceeStyle/RadioButton.qml
index b24f8f9c..b24f8f9c 100644
--- a/styles/lucee/RadioButton.qml
+++ b/styles/LuceeStyle/RadioButton.qml
diff --git a/styles/lucee/ScrollIndicator.qml b/styles/LuceeStyle/ScrollIndicator.qml
index 6e98d9bc..6e98d9bc 100644
--- a/styles/lucee/ScrollIndicator.qml
+++ b/styles/LuceeStyle/ScrollIndicator.qml
diff --git a/styles/lucee/Slider.qml b/styles/LuceeStyle/Slider.qml
index f833e740..f833e740 100644
--- a/styles/lucee/Slider.qml
+++ b/styles/LuceeStyle/Slider.qml
diff --git a/styles/lucee/Switch.qml b/styles/LuceeStyle/Switch.qml
index 6bdaff47..6bdaff47 100644
--- a/styles/lucee/Switch.qml
+++ b/styles/LuceeStyle/Switch.qml
diff --git a/styles/lucee/SwitchDelegate.qml b/styles/LuceeStyle/SwitchDelegate.qml
index d8321ca9..d8321ca9 100644
--- a/styles/lucee/SwitchDelegate.qml
+++ b/styles/LuceeStyle/SwitchDelegate.qml
diff --git a/styles/lucee/TabBar.qml b/styles/LuceeStyle/TabBar.qml
index 4ad06691..d49ad854 100644
--- a/styles/lucee/TabBar.qml
+++ b/styles/LuceeStyle/TabBar.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/lucee/TabButton.qml b/styles/LuceeStyle/TabButton.qml
index a4aa7589..a4aa7589 100644
--- a/styles/lucee/TabButton.qml
+++ b/styles/LuceeStyle/TabButton.qml
diff --git a/styles/lucee/ToolBar.qml b/styles/LuceeStyle/ToolBar.qml
index 8e8e9bc0..8e8e9bc0 100644
--- a/styles/lucee/ToolBar.qml
+++ b/styles/LuceeStyle/ToolBar.qml
diff --git a/styles/lucee/ToolButton.qml b/styles/LuceeStyle/ToolButton.qml
index 55efd6c6..55efd6c6 100644
--- a/styles/lucee/ToolButton.qml
+++ b/styles/LuceeStyle/ToolButton.qml
diff --git a/styles/lucee/images/album-art-mask.png b/styles/LuceeStyle/images/album-art-mask.png
index fc6cf82d..fc6cf82d 100644
--- a/styles/lucee/images/album-art-mask.png
+++ b/styles/LuceeStyle/images/album-art-mask.png
diff --git a/styles/lucee/images/album-art-placeholder.png b/styles/LuceeStyle/images/album-art-placeholder.png
index 2d08913d..2d08913d 100644
--- a/styles/lucee/images/album-art-placeholder.png
+++ b/styles/LuceeStyle/images/album-art-placeholder.png
diff --git a/styles/lucee/images/album-art-shadow-widget.png b/styles/LuceeStyle/images/album-art-shadow-widget.png
index c365a642..c365a642 100644
--- a/styles/lucee/images/album-art-shadow-widget.png
+++ b/styles/LuceeStyle/images/album-art-shadow-widget.png
diff --git a/styles/lucee/images/album-art-shadow.png b/styles/LuceeStyle/images/album-art-shadow.png
index e7ba6682..e7ba6682 100644
--- a/styles/lucee/images/album-art-shadow.png
+++ b/styles/LuceeStyle/images/album-art-shadow.png
diff --git a/styles/lucee/images/app-fullscreen-top-bg-dark.png b/styles/LuceeStyle/images/app-fullscreen-top-bg-dark.png
index 9fe3f124..9fe3f124 100644
--- a/styles/lucee/images/app-fullscreen-top-bg-dark.png
+++ b/styles/LuceeStyle/images/app-fullscreen-top-bg-dark.png
diff --git a/styles/lucee/images/app-fullscreen-top-bg.png b/styles/LuceeStyle/images/app-fullscreen-top-bg.png
index 9fe3f124..9fe3f124 100644
--- a/styles/lucee/images/app-fullscreen-top-bg.png
+++ b/styles/LuceeStyle/images/app-fullscreen-top-bg.png
diff --git a/styles/lucee/images/bg-home-dark.png b/styles/LuceeStyle/images/bg-home-dark.png
index 10ed8c10..10ed8c10 100644
--- a/styles/lucee/images/bg-home-dark.png
+++ b/styles/LuceeStyle/images/bg-home-dark.png
diff --git a/styles/lucee/images/bg-home.png b/styles/LuceeStyle/images/bg-home.png
index 31a47804..31a47804 100644
--- a/styles/lucee/images/bg-home.png
+++ b/styles/LuceeStyle/images/bg-home.png
diff --git a/styles/LuceeStyle/images/colorSelector/#51a7f4.png b/styles/LuceeStyle/images/colorSelector/#51a7f4.png
new file mode 100644
index 00000000..bd254df3
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#51a7f4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f95d42c7b69c1498b22f74acded592bdc655043f41857f9cbab4ce7fd0dcbf6
+size 23598
diff --git a/styles/LuceeStyle/images/colorSelector/#535258.png b/styles/LuceeStyle/images/colorSelector/#535258.png
new file mode 100644
index 00000000..de45c6ab
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#535258.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f253cb692517e06c5feac2dcf5217c6411fdc984d858a059b0915093325c330
+size 22841
diff --git a/styles/LuceeStyle/images/colorSelector/#78887b.png b/styles/LuceeStyle/images/colorSelector/#78887b.png
new file mode 100644
index 00000000..b7bc4bbe
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#78887b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46da0efd2c5311d3af54b3352d6143ce596c5663289fb9b2ea176e5fe0bedfdd
+size 22275
diff --git a/styles/LuceeStyle/images/colorSelector/#7ba2a5.png b/styles/LuceeStyle/images/colorSelector/#7ba2a5.png
new file mode 100644
index 00000000..3004fb92
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#7ba2a5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46b3ce57f1894c44cab5344f8b230576c5025804acdb18bf3c002249fc49c4af
+size 24955
diff --git a/styles/LuceeStyle/images/colorSelector/#9eae83.png b/styles/LuceeStyle/images/colorSelector/#9eae83.png
new file mode 100644
index 00000000..add478cf
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#9eae83.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddb2570d34d386e2b574e0ec63204ad81118b1c695fb5eacfe00b5d943c65045
+size 26422
diff --git a/styles/LuceeStyle/images/colorSelector/#d35756.png b/styles/LuceeStyle/images/colorSelector/#d35756.png
new file mode 100644
index 00000000..91803177
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#d35756.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2603b3d079d038761a4b7c62f323996498350831cef28db58b33d7e8fc40480
+size 23173
diff --git a/styles/LuceeStyle/images/colorSelector/#db3b9f.png b/styles/LuceeStyle/images/colorSelector/#db3b9f.png
new file mode 100644
index 00000000..79c5b540
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#db3b9f.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d60a33f8b16c55887a5983cfdd4615a161d237d3d24db4de1df2d5f78c54dc
+size 23879
diff --git a/styles/LuceeStyle/images/colorSelector/#fba054.png b/styles/LuceeStyle/images/colorSelector/#fba054.png
new file mode 100644
index 00000000..aff2e969
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/#fba054.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84c345395a7de785552ef58e231ce0a0fc34c5c38eff4ba1edce3d0d13e672ec
+size 25211
diff --git a/styles/LuceeStyle/images/colorSelector/color-wheel.png b/styles/LuceeStyle/images/colorSelector/color-wheel.png
new file mode 100644
index 00000000..79466fae
--- /dev/null
+++ b/styles/LuceeStyle/images/colorSelector/color-wheel.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4a31577e3ea41b34cf619e60e199cd529da2dcb2611211487fb2986004f3377
+size 38001
diff --git a/styles/lucee/images/divider-dark.png b/styles/LuceeStyle/images/divider-dark.png
index b4ff3ba0..b4ff3ba0 100644
--- a/styles/lucee/images/divider-dark.png
+++ b/styles/LuceeStyle/images/divider-dark.png
diff --git a/styles/lucee/images/divider.png b/styles/LuceeStyle/images/divider.png
index c944b8a4..c944b8a4 100644
--- a/styles/lucee/images/divider.png
+++ b/styles/LuceeStyle/images/divider.png
diff --git a/styles/lucee/images/fan-speed-5.png b/styles/LuceeStyle/images/fan-speed-5.png
index d199e72c..d199e72c 100644
--- a/styles/lucee/images/fan-speed-5.png
+++ b/styles/LuceeStyle/images/fan-speed-5.png
diff --git a/styles/lucee/images/floating-panel-top-bg.png b/styles/LuceeStyle/images/floating-panel-top-bg.png
index de009b70..de009b70 100644
--- a/styles/lucee/images/floating-panel-top-bg.png
+++ b/styles/LuceeStyle/images/floating-panel-top-bg.png
diff --git a/styles/lucee/images/home-widget-bg.png b/styles/LuceeStyle/images/home-widget-bg.png
index d5361540..d5361540 100644
--- a/styles/lucee/images/home-widget-bg.png
+++ b/styles/LuceeStyle/images/home-widget-bg.png
diff --git a/styles/lucee/images/ic-app-active-bg.png b/styles/LuceeStyle/images/ic-app-active-bg.png
index 5a794c81..5a794c81 100644
--- a/styles/lucee/images/ic-app-active-bg.png
+++ b/styles/LuceeStyle/images/ic-app-active-bg.png
diff --git a/styles/lucee/images/ic-calculator-dark.png b/styles/LuceeStyle/images/ic-calculator-dark.png
index c38d1400..c38d1400 100644
--- a/styles/lucee/images/ic-calculator-dark.png
+++ b/styles/LuceeStyle/images/ic-calculator-dark.png
diff --git a/styles/lucee/images/ic-call.png b/styles/LuceeStyle/images/ic-call.png
index 0454eaed..0454eaed 100644
--- a/styles/lucee/images/ic-call.png
+++ b/styles/LuceeStyle/images/ic-call.png
diff --git a/styles/lucee/images/ic-expand-dark.png b/styles/LuceeStyle/images/ic-expand-dark.png
index 19548ae6..19548ae6 100644
--- a/styles/lucee/images/ic-expand-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-dark.png
diff --git a/styles/lucee/images/ic-expand-to-fullscreen-dark.png b/styles/LuceeStyle/images/ic-expand-to-fullscreen-dark.png
index 81bcc768..81bcc768 100644
--- a/styles/lucee/images/ic-expand-to-fullscreen-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-to-fullscreen-dark.png
diff --git a/styles/lucee/images/ic-expand-to-fullscreen.png b/styles/LuceeStyle/images/ic-expand-to-fullscreen.png
index 30b610b2..30b610b2 100644
--- a/styles/lucee/images/ic-expand-to-fullscreen.png
+++ b/styles/LuceeStyle/images/ic-expand-to-fullscreen.png
diff --git a/styles/lucee/images/ic-expand-up-dark.png b/styles/LuceeStyle/images/ic-expand-up-dark.png
index 0346da66..0346da66 100644
--- a/styles/lucee/images/ic-expand-up-dark.png
+++ b/styles/LuceeStyle/images/ic-expand-up-dark.png
diff --git a/styles/lucee/images/ic-expand-up.png b/styles/LuceeStyle/images/ic-expand-up.png
index 82562f01..82562f01 100644
--- a/styles/lucee/images/ic-expand-up.png
+++ b/styles/LuceeStyle/images/ic-expand-up.png
diff --git a/styles/lucee/images/ic-expand.png b/styles/LuceeStyle/images/ic-expand.png
index 3f05e117..3f05e117 100644
--- a/styles/lucee/images/ic-expand.png
+++ b/styles/LuceeStyle/images/ic-expand.png
diff --git a/styles/lucee/images/ic-favorite-dark.png b/styles/LuceeStyle/images/ic-favorite-dark.png
index 93ab4bb6..93ab4bb6 100644
--- a/styles/lucee/images/ic-favorite-dark.png
+++ b/styles/LuceeStyle/images/ic-favorite-dark.png
diff --git a/styles/lucee/images/ic-favorite.png b/styles/LuceeStyle/images/ic-favorite.png
index 075df9cd..075df9cd 100644
--- a/styles/lucee/images/ic-favorite.png
+++ b/styles/LuceeStyle/images/ic-favorite.png
diff --git a/styles/lucee/images/ic-music-dark.png b/styles/LuceeStyle/images/ic-music-dark.png
index 8e1302c1..8e1302c1 100644
--- a/styles/lucee/images/ic-music-dark.png
+++ b/styles/LuceeStyle/images/ic-music-dark.png
diff --git a/styles/lucee/images/ic-navigation-dark.png b/styles/LuceeStyle/images/ic-navigation-dark.png
index 6e48a601..6e48a601 100644
--- a/styles/lucee/images/ic-navigation-dark.png
+++ b/styles/LuceeStyle/images/ic-navigation-dark.png
diff --git a/styles/lucee/images/ic-next-level-dark.png b/styles/LuceeStyle/images/ic-next-level-dark.png
index 700fb96c..700fb96c 100644
--- a/styles/lucee/images/ic-next-level-dark.png
+++ b/styles/LuceeStyle/images/ic-next-level-dark.png
diff --git a/styles/lucee/images/ic-next-level.png b/styles/LuceeStyle/images/ic-next-level.png
index 5fc33846..5fc33846 100644
--- a/styles/lucee/images/ic-next-level.png
+++ b/styles/LuceeStyle/images/ic-next-level.png
diff --git a/styles/lucee/images/ic-rain-amount.png b/styles/LuceeStyle/images/ic-rain-amount.png
index 823d430b..823d430b 100644
--- a/styles/lucee/images/ic-rain-amount.png
+++ b/styles/LuceeStyle/images/ic-rain-amount.png
diff --git a/styles/lucee/images/ic-search_OFF-dark.png b/styles/LuceeStyle/images/ic-search_OFF-dark.png
index 7d96e114..7d96e114 100644
--- a/styles/lucee/images/ic-search_OFF-dark.png
+++ b/styles/LuceeStyle/images/ic-search_OFF-dark.png
diff --git a/styles/lucee/images/ic-search_OFF.png b/styles/LuceeStyle/images/ic-search_OFF.png
index 0e2ca5df..0e2ca5df 100644
--- a/styles/lucee/images/ic-search_OFF.png
+++ b/styles/LuceeStyle/images/ic-search_OFF.png
diff --git a/styles/lucee/images/ic-search_ON-dark.png b/styles/LuceeStyle/images/ic-search_ON-dark.png
index 8e2814bc..8e2814bc 100644
--- a/styles/lucee/images/ic-search_ON-dark.png
+++ b/styles/LuceeStyle/images/ic-search_ON-dark.png
diff --git a/styles/lucee/images/ic-search_ON.png b/styles/LuceeStyle/images/ic-search_ON.png
index 8e2814bc..8e2814bc 100644
--- a/styles/lucee/images/ic-search_ON.png
+++ b/styles/LuceeStyle/images/ic-search_ON.png
diff --git a/styles/lucee/images/ic-statusbar-battery-dark.png b/styles/LuceeStyle/images/ic-statusbar-battery-dark.png
index 851d64a2..851d64a2 100644
--- a/styles/lucee/images/ic-statusbar-battery-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-battery-dark.png
diff --git a/styles/lucee/images/ic-statusbar-battery.png b/styles/LuceeStyle/images/ic-statusbar-battery.png
index 59031feb..59031feb 100644
--- a/styles/lucee/images/ic-statusbar-battery.png
+++ b/styles/LuceeStyle/images/ic-statusbar-battery.png
diff --git a/styles/lucee/images/ic-statusbar-bluetooth-dark.png b/styles/LuceeStyle/images/ic-statusbar-bluetooth-dark.png
index 71a11f3e..71a11f3e 100644
--- a/styles/lucee/images/ic-statusbar-bluetooth-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-bluetooth-dark.png
diff --git a/styles/lucee/images/ic-statusbar-bluetooth.png b/styles/LuceeStyle/images/ic-statusbar-bluetooth.png
index 20ec6a11..20ec6a11 100644
--- a/styles/lucee/images/ic-statusbar-bluetooth.png
+++ b/styles/LuceeStyle/images/ic-statusbar-bluetooth.png
diff --git a/styles/lucee/images/ic-statusbar-reception-dark.png b/styles/LuceeStyle/images/ic-statusbar-reception-dark.png
index 640223be..640223be 100644
--- a/styles/lucee/images/ic-statusbar-reception-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception-dark.png
diff --git a/styles/lucee/images/ic-statusbar-reception.png b/styles/LuceeStyle/images/ic-statusbar-reception.png
index e8b0f2b8..e8b0f2b8 100644
--- a/styles/lucee/images/ic-statusbar-reception.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception.png
diff --git a/styles/lucee/images/ic-statusbar-reception_OFF.png b/styles/LuceeStyle/images/ic-statusbar-reception_OFF.png
index 5190ad83..5190ad83 100644
--- a/styles/lucee/images/ic-statusbar-reception_OFF.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception_OFF.png
diff --git a/styles/lucee/images/ic-statusbar-reception_ON.png b/styles/LuceeStyle/images/ic-statusbar-reception_ON.png
index e969c768..e969c768 100644
--- a/styles/lucee/images/ic-statusbar-reception_ON.png
+++ b/styles/LuceeStyle/images/ic-statusbar-reception_ON.png
diff --git a/styles/lucee/images/ic-statusbar-wifi-dark.png b/styles/LuceeStyle/images/ic-statusbar-wifi-dark.png
index 11b6c15b..11b6c15b 100644
--- a/styles/lucee/images/ic-statusbar-wifi-dark.png
+++ b/styles/LuceeStyle/images/ic-statusbar-wifi-dark.png
diff --git a/styles/lucee/images/ic-statusbar-wifi.png b/styles/LuceeStyle/images/ic-statusbar-wifi.png
index e12dbc98..e12dbc98 100644
--- a/styles/lucee/images/ic-statusbar-wifi.png
+++ b/styles/LuceeStyle/images/ic-statusbar-wifi.png
diff --git a/styles/lucee/images/ic-weather-partly-rain-dark.png b/styles/LuceeStyle/images/ic-weather-partly-rain-dark.png
index e8ca6be6..e8ca6be6 100644
--- a/styles/lucee/images/ic-weather-partly-rain-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-partly-rain-dark.png
diff --git a/styles/lucee/images/ic-weather-partly-rain.png b/styles/LuceeStyle/images/ic-weather-partly-rain.png
index 69bb6701..69bb6701 100644
--- a/styles/lucee/images/ic-weather-partly-rain.png
+++ b/styles/LuceeStyle/images/ic-weather-partly-rain.png
diff --git a/styles/lucee/images/ic-weather-rain-dark.png b/styles/LuceeStyle/images/ic-weather-rain-dark.png
index 82a1dacd..82a1dacd 100644
--- a/styles/lucee/images/ic-weather-rain-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-rain-dark.png
diff --git a/styles/lucee/images/ic-weather-rain.png b/styles/LuceeStyle/images/ic-weather-rain.png
index c96d9602..c96d9602 100644
--- a/styles/lucee/images/ic-weather-rain.png
+++ b/styles/LuceeStyle/images/ic-weather-rain.png
diff --git a/styles/lucee/images/ic-weather-snow-dark.png b/styles/LuceeStyle/images/ic-weather-snow-dark.png
index 51512d26..51512d26 100644
--- a/styles/lucee/images/ic-weather-snow-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-snow-dark.png
diff --git a/styles/lucee/images/ic-weather-snow.png b/styles/LuceeStyle/images/ic-weather-snow.png
index a2ef5405..a2ef5405 100644
--- a/styles/lucee/images/ic-weather-snow.png
+++ b/styles/LuceeStyle/images/ic-weather-snow.png
diff --git a/styles/lucee/images/ic-weather-sun-dark.png b/styles/LuceeStyle/images/ic-weather-sun-dark.png
index 30acedf1..30acedf1 100644
--- a/styles/lucee/images/ic-weather-sun-dark.png
+++ b/styles/LuceeStyle/images/ic-weather-sun-dark.png
diff --git a/styles/lucee/images/ic-weather-sun.png b/styles/LuceeStyle/images/ic-weather-sun.png
index 593035ff..593035ff 100644
--- a/styles/lucee/images/ic-weather-sun.png
+++ b/styles/LuceeStyle/images/ic-weather-sun.png
diff --git a/styles/lucee/images/ic-widget-close.png b/styles/LuceeStyle/images/ic-widget-close.png
index e5e65832..e5e65832 100644
--- a/styles/lucee/images/ic-widget-close.png
+++ b/styles/LuceeStyle/images/ic-widget-close.png
diff --git a/styles/lucee/images/ic-widget-move.png b/styles/LuceeStyle/images/ic-widget-move.png
index 36a267d9..36a267d9 100644
--- a/styles/lucee/images/ic-widget-move.png
+++ b/styles/LuceeStyle/images/ic-widget-move.png
diff --git a/styles/lucee/images/ic-widget-music.png b/styles/LuceeStyle/images/ic-widget-music.png
index b2a4958a..b2a4958a 100644
--- a/styles/lucee/images/ic-widget-music.png
+++ b/styles/LuceeStyle/images/ic-widget-music.png
diff --git a/styles/lucee/images/ic-widget-navigation.png b/styles/LuceeStyle/images/ic-widget-navigation.png
index dca356a3..dca356a3 100644
--- a/styles/lucee/images/ic-widget-navigation.png
+++ b/styles/LuceeStyle/images/ic-widget-navigation.png
diff --git a/styles/lucee/images/ic-widget-tuner.png b/styles/LuceeStyle/images/ic-widget-tuner.png
index 13dace7b..13dace7b 100644
--- a/styles/lucee/images/ic-widget-tuner.png
+++ b/styles/LuceeStyle/images/ic-widget-tuner.png
diff --git a/styles/lucee/images/ic-widget-weather.png b/styles/LuceeStyle/images/ic-widget-weather.png
index ffe5c0ec..ffe5c0ec 100644
--- a/styles/lucee/images/ic-widget-weather.png
+++ b/styles/LuceeStyle/images/ic-widget-weather.png
diff --git a/styles/lucee/images/ic_button-bg-red.png b/styles/LuceeStyle/images/ic_button-bg-red.png
index 0d30973d..0d30973d 100644
--- a/styles/lucee/images/ic_button-bg-red.png
+++ b/styles/LuceeStyle/images/ic_button-bg-red.png
diff --git a/styles/lucee/images/ic_button-bg.png b/styles/LuceeStyle/images/ic_button-bg.png
index 941fd420..941fd420 100644
--- a/styles/lucee/images/ic_button-bg.png
+++ b/styles/LuceeStyle/images/ic_button-bg.png
diff --git a/styles/lucee/images/input-overlay.png b/styles/LuceeStyle/images/input-overlay.png
index bbc1d17c..bbc1d17c 100644
--- a/styles/lucee/images/input-overlay.png
+++ b/styles/LuceeStyle/images/input-overlay.png
diff --git a/styles/lucee/images/instrument-cluster-bg-dark.png b/styles/LuceeStyle/images/instrument-cluster-bg-dark.png
index 455e3f19..455e3f19 100644
--- a/styles/lucee/images/instrument-cluster-bg-dark.png
+++ b/styles/LuceeStyle/images/instrument-cluster-bg-dark.png
diff --git a/styles/lucee/images/instrument-cluster-bg.png b/styles/LuceeStyle/images/instrument-cluster-bg.png
index 8cd4c905..8cd4c905 100644
--- a/styles/lucee/images/instrument-cluster-bg.png
+++ b/styles/LuceeStyle/images/instrument-cluster-bg.png
diff --git a/styles/lucee/images/list-divider-dark.png b/styles/LuceeStyle/images/list-divider-dark.png
index 78ae5372..78ae5372 100644
--- a/styles/lucee/images/list-divider-dark.png
+++ b/styles/LuceeStyle/images/list-divider-dark.png
diff --git a/styles/lucee/images/list-divider.png b/styles/LuceeStyle/images/list-divider.png
index 1db5ec08..1db5ec08 100644
--- a/styles/lucee/images/list-divider.png
+++ b/styles/LuceeStyle/images/list-divider.png
diff --git a/styles/lucee/images/logo-kdab.png b/styles/LuceeStyle/images/logo-kdab.png
index 99e67295..99e67295 100644
--- a/styles/lucee/images/logo-kdab.png
+++ b/styles/LuceeStyle/images/logo-kdab.png
diff --git a/styles/lucee/images/logo-luxoft.png b/styles/LuceeStyle/images/logo-luxoft.png
index 285be51f..285be51f 100644
--- a/styles/lucee/images/logo-luxoft.png
+++ b/styles/LuceeStyle/images/logo-luxoft.png
diff --git a/styles/lucee/images/logo-theqtcompany.png b/styles/LuceeStyle/images/logo-theqtcompany.png
index d36228b3..d36228b3 100644
--- a/styles/lucee/images/logo-theqtcompany.png
+++ b/styles/LuceeStyle/images/logo-theqtcompany.png
diff --git a/styles/lucee/images/luxoft-footer.png b/styles/LuceeStyle/images/luxoft-footer.png
index 285be51f..285be51f 100644
--- a/styles/lucee/images/luxoft-footer.png
+++ b/styles/LuceeStyle/images/luxoft-footer.png
diff --git a/styles/lucee/images/panel-inner-shadow-dark.png b/styles/LuceeStyle/images/panel-inner-shadow-dark.png
index 5533d7eb..5533d7eb 100644
--- a/styles/lucee/images/panel-inner-shadow-dark.png
+++ b/styles/LuceeStyle/images/panel-inner-shadow-dark.png
diff --git a/styles/lucee/images/panel-inner-shadow.png b/styles/LuceeStyle/images/panel-inner-shadow.png
index a52e197b..a52e197b 100644
--- a/styles/lucee/images/panel-inner-shadow.png
+++ b/styles/LuceeStyle/images/panel-inner-shadow.png
diff --git a/styles/lucee/images/popup-background-9patch.png b/styles/LuceeStyle/images/popup-background-9patch.png
index 69906137..69906137 100644
--- a/styles/lucee/images/popup-background-9patch.png
+++ b/styles/LuceeStyle/images/popup-background-9patch.png
diff --git a/styles/lucee/images/popup-title-shadow.png b/styles/LuceeStyle/images/popup-title-shadow.png
index b75e399a..b75e399a 100644
--- a/styles/lucee/images/popup-title-shadow.png
+++ b/styles/LuceeStyle/images/popup-title-shadow.png
diff --git a/styles/lucee/images/tabbar-bg-left-dark.png b/styles/LuceeStyle/images/tabbar-bg-left-dark.png
index baa75f07..baa75f07 100644
--- a/styles/lucee/images/tabbar-bg-left-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-left-dark.png
diff --git a/styles/lucee/images/tabbar-bg-left.png b/styles/LuceeStyle/images/tabbar-bg-left.png
index ddc91d26..ddc91d26 100644
--- a/styles/lucee/images/tabbar-bg-left.png
+++ b/styles/LuceeStyle/images/tabbar-bg-left.png
diff --git a/styles/lucee/images/tabbar-bg-middle-dark.png b/styles/LuceeStyle/images/tabbar-bg-middle-dark.png
index aad5677f..aad5677f 100644
--- a/styles/lucee/images/tabbar-bg-middle-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-middle-dark.png
diff --git a/styles/lucee/images/tabbar-bg-middle.png b/styles/LuceeStyle/images/tabbar-bg-middle.png
index 84b2a6fb..84b2a6fb 100644
--- a/styles/lucee/images/tabbar-bg-middle.png
+++ b/styles/LuceeStyle/images/tabbar-bg-middle.png
diff --git a/styles/lucee/images/tabbar-bg-right-dark.png b/styles/LuceeStyle/images/tabbar-bg-right-dark.png
index 7e54bea8..7e54bea8 100644
--- a/styles/lucee/images/tabbar-bg-right-dark.png
+++ b/styles/LuceeStyle/images/tabbar-bg-right-dark.png
diff --git a/styles/lucee/images/tabbar-bg-right.png b/styles/LuceeStyle/images/tabbar-bg-right.png
index d9332858..d9332858 100644
--- a/styles/lucee/images/tabbar-bg-right.png
+++ b/styles/LuceeStyle/images/tabbar-bg-right.png
diff --git a/styles/lucee/images/temperature-slider-bg.png b/styles/LuceeStyle/images/temperature-slider-bg.png
index 77fc3ca9..77fc3ca9 100644
--- a/styles/lucee/images/temperature-slider-bg.png
+++ b/styles/LuceeStyle/images/temperature-slider-bg.png
diff --git a/styles/lucee/images/vertical-slider-handle-dark.png b/styles/LuceeStyle/images/vertical-slider-handle-dark.png
index c13a6135..c13a6135 100644
--- a/styles/lucee/images/vertical-slider-handle-dark.png
+++ b/styles/LuceeStyle/images/vertical-slider-handle-dark.png
diff --git a/styles/lucee/images/vertical-slider-handle.png b/styles/LuceeStyle/images/vertical-slider-handle.png
index ab19782b..ab19782b 100644
--- a/styles/lucee/images/vertical-slider-handle.png
+++ b/styles/LuceeStyle/images/vertical-slider-handle.png
diff --git a/styles/lucee/images/weather-cloudy.png b/styles/LuceeStyle/images/weather-cloudy.png
index bfb9bbc7..bfb9bbc7 100644
--- a/styles/lucee/images/weather-cloudy.png
+++ b/styles/LuceeStyle/images/weather-cloudy.png
diff --git a/styles/lucee/images/widget-bg-dark.png b/styles/LuceeStyle/images/widget-bg-dark.png
index 9990505a..9990505a 100644
--- a/styles/lucee/images/widget-bg-dark.png
+++ b/styles/LuceeStyle/images/widget-bg-dark.png
diff --git a/styles/lucee/images/widget-bg.png b/styles/LuceeStyle/images/widget-bg.png
index 43d0ae50..43d0ae50 100644
--- a/styles/lucee/images/widget-bg.png
+++ b/styles/LuceeStyle/images/widget-bg.png
diff --git a/styles/lucee/images/widget-corner-dark.png b/styles/LuceeStyle/images/widget-corner-dark.png
index aace3ab6..aace3ab6 100644
--- a/styles/lucee/images/widget-corner-dark.png
+++ b/styles/LuceeStyle/images/widget-corner-dark.png
diff --git a/styles/lucee/images/widget-corner.png b/styles/LuceeStyle/images/widget-corner.png
index 99068874..99068874 100644
--- a/styles/lucee/images/widget-corner.png
+++ b/styles/LuceeStyle/images/widget-corner.png
diff --git a/styles/lucee/images/widget-dragged-bg.png b/styles/LuceeStyle/images/widget-dragged-bg.png
index f46ba822..f46ba822 100644
--- a/styles/lucee/images/widget-dragged-bg.png
+++ b/styles/LuceeStyle/images/widget-dragged-bg.png
diff --git a/styles/lucee/images/widget-left-section-bg-dark.png b/styles/LuceeStyle/images/widget-left-section-bg-dark.png
index e95928c8..e95928c8 100644
--- a/styles/lucee/images/widget-left-section-bg-dark.png
+++ b/styles/LuceeStyle/images/widget-left-section-bg-dark.png
diff --git a/styles/lucee/images/widget-left-section-bg.png b/styles/LuceeStyle/images/widget-left-section-bg.png
index eabb8767..eabb8767 100644
--- a/styles/lucee/images/widget-left-section-bg.png
+++ b/styles/LuceeStyle/images/widget-left-section-bg.png
diff --git a/styles/lucee/images/widget-resize-bottom.png b/styles/LuceeStyle/images/widget-resize-bottom.png
index f315d153..f315d153 100644
--- a/styles/lucee/images/widget-resize-bottom.png
+++ b/styles/LuceeStyle/images/widget-resize-bottom.png
diff --git a/styles/lucee/images/widget-resize-top.png b/styles/LuceeStyle/images/widget-resize-top.png
index fb43cc99..fb43cc99 100644
--- a/styles/lucee/images/widget-resize-top.png
+++ b/styles/LuceeStyle/images/widget-resize-top.png
diff --git a/styles/lucee/images/widget-stripe.png b/styles/LuceeStyle/images/widget-stripe.png
index c9ed373e..c9ed373e 100644
--- a/styles/lucee/images/widget-stripe.png
+++ b/styles/LuceeStyle/images/widget-stripe.png
diff --git a/styles/lucee/images/widget-window-mask.png b/styles/LuceeStyle/images/widget-window-mask.png
index 82d8990e..82d8990e 100644
--- a/styles/lucee/images/widget-window-mask.png
+++ b/styles/LuceeStyle/images/widget-window-mask.png
diff --git a/styles/LuceeStyle/qmldir b/styles/LuceeStyle/qmldir
new file mode 100644
index 00000000..3baa4da2
--- /dev/null
+++ b/styles/LuceeStyle/qmldir
@@ -0,0 +1,21 @@
+module LuceeStyle
+Button 1.0 Button.qml
+ComboBox 1.0 ComboBox.qml
+Control 1.0 Control.qml
+Dialog 1.0 Dialog.qml
+Frame 1.0 Frame.qml
+ItemDelegate 1.0 ItemDelegate.qml
+Label 1.0 Label.qml
+Page 1.0 Page.qml
+PageIndicator 1.0 PageIndicator.qml
+Pane 1.0 Pane.qml
+ProgressBar 1.0 ProgressBar.qml
+RadioButton 1.0 RadioButton.qml
+ScrollIndicator 1.0 ScrollIndicator.qml
+Slider 1.0 Slider.qml
+Switch 1.0 Switch.qml
+SwitchDelegate 1.0 SwitchDelegate.qml
+TabBar 1.0 TabBar.qml
+TabButton 1.0 TabButton.qml
+ToolBar 1.0 ToolBar.qml
+ToolButton 1.0 ToolButton.qml
diff --git a/styles/lucee/style.conf b/styles/LuceeStyle/style.conf
index b5d943eb..b5d943eb 100644
--- a/styles/lucee/style.conf
+++ b/styles/LuceeStyle/style.conf
diff --git a/styles/neptune/Button.qml b/styles/NeptuneStyle/Button.qml
index 18c8676b..18c8676b 100644
--- a/styles/neptune/Button.qml
+++ b/styles/NeptuneStyle/Button.qml
diff --git a/styles/neptune/ComboBox.qml b/styles/NeptuneStyle/ComboBox.qml
index c4848b8f..c4848b8f 100644
--- a/styles/neptune/ComboBox.qml
+++ b/styles/NeptuneStyle/ComboBox.qml
diff --git a/styles/lucee/Control.qml b/styles/NeptuneStyle/Control.qml
index db705268..94a58481 100644
--- a/styles/lucee/Control.qml
+++ b/styles/NeptuneStyle/Control.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Templates 2.3 as T
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/Dialog.qml b/styles/NeptuneStyle/Dialog.qml
index cb279989..cb279989 100644
--- a/styles/neptune/Dialog.qml
+++ b/styles/NeptuneStyle/Dialog.qml
diff --git a/styles/neptune/Frame.qml b/styles/NeptuneStyle/Frame.qml
index a9ab74cb..a9ab74cb 100644
--- a/styles/neptune/Frame.qml
+++ b/styles/NeptuneStyle/Frame.qml
diff --git a/styles/neptune/ItemDelegate.qml b/styles/NeptuneStyle/ItemDelegate.qml
index abc101ee..abc101ee 100644
--- a/styles/neptune/ItemDelegate.qml
+++ b/styles/NeptuneStyle/ItemDelegate.qml
diff --git a/styles/lucee/Label.qml b/styles/NeptuneStyle/Label.qml
index cb9c731a..ca0675dc 100644
--- a/styles/lucee/Label.qml
+++ b/styles/NeptuneStyle/Label.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/Page.qml b/styles/NeptuneStyle/Page.qml
index d8ddb751..d8ddb751 100644
--- a/styles/neptune/Page.qml
+++ b/styles/NeptuneStyle/Page.qml
diff --git a/styles/neptune/PageIndicator.qml b/styles/NeptuneStyle/PageIndicator.qml
index 7859bf86..7859bf86 100644
--- a/styles/neptune/PageIndicator.qml
+++ b/styles/NeptuneStyle/PageIndicator.qml
diff --git a/styles/neptune/Pane.qml b/styles/NeptuneStyle/Pane.qml
index aa56a550..aa56a550 100644
--- a/styles/neptune/Pane.qml
+++ b/styles/NeptuneStyle/Pane.qml
diff --git a/styles/neptune/ProgressBar.qml b/styles/NeptuneStyle/ProgressBar.qml
index 36b135c9..36b135c9 100644
--- a/styles/neptune/ProgressBar.qml
+++ b/styles/NeptuneStyle/ProgressBar.qml
diff --git a/styles/neptune/RadioButton.qml b/styles/NeptuneStyle/RadioButton.qml
index 466a791b..da3775be 100644
--- a/styles/neptune/RadioButton.qml
+++ b/styles/NeptuneStyle/RadioButton.qml
@@ -31,8 +31,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
 
 import shared.utils 1.0
 import shared.Style 1.0
diff --git a/styles/neptune/ScrollIndicator.qml b/styles/NeptuneStyle/ScrollIndicator.qml
index 6e98d9bc..6e98d9bc 100644
--- a/styles/neptune/ScrollIndicator.qml
+++ b/styles/NeptuneStyle/ScrollIndicator.qml
diff --git a/styles/neptune/Slider.qml b/styles/NeptuneStyle/Slider.qml
index 313cc68a..313cc68a 100644
--- a/styles/neptune/Slider.qml
+++ b/styles/NeptuneStyle/Slider.qml
diff --git a/styles/neptune/Switch.qml b/styles/NeptuneStyle/Switch.qml
index 2a906fc0..2a906fc0 100644
--- a/styles/neptune/Switch.qml
+++ b/styles/NeptuneStyle/Switch.qml
diff --git a/styles/neptune/SwitchDelegate.qml b/styles/NeptuneStyle/SwitchDelegate.qml
index 563a8e51..563a8e51 100644
--- a/styles/neptune/SwitchDelegate.qml
+++ b/styles/NeptuneStyle/SwitchDelegate.qml
diff --git a/styles/neptune/TabBar.qml b/styles/NeptuneStyle/TabBar.qml
index 1d7f8d73..bbed8875 100644
--- a/styles/neptune/TabBar.qml
+++ b/styles/NeptuneStyle/TabBar.qml
@@ -30,8 +30,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick
+import QtQuick.Templates as T
 import shared.Style 1.0
 import shared.Sizes 1.0
 
diff --git a/styles/neptune/TabButton.qml b/styles/NeptuneStyle/TabButton.qml
index 7b0b5d05..7b0b5d05 100644
--- a/styles/neptune/TabButton.qml
+++ b/styles/NeptuneStyle/TabButton.qml
diff --git a/styles/neptune/ToolBar.qml b/styles/NeptuneStyle/ToolBar.qml
index 8e8e9bc0..8e8e9bc0 100644
--- a/styles/neptune/ToolBar.qml
+++ b/styles/NeptuneStyle/ToolBar.qml
diff --git a/styles/neptune/ToolButton.qml b/styles/NeptuneStyle/ToolButton.qml
index 55efd6c6..55efd6c6 100644
--- a/styles/neptune/ToolButton.qml
+++ b/styles/NeptuneStyle/ToolButton.qml
diff --git a/styles/neptune/images/album-art-placeholder-dark.png b/styles/NeptuneStyle/images/album-art-placeholder-dark.png
index fc7b3726..fc7b3726 100644
--- a/styles/neptune/images/album-art-placeholder-dark.png
+++ b/styles/NeptuneStyle/images/album-art-placeholder-dark.png
diff --git a/styles/neptune/images/album-art-placeholder.png b/styles/NeptuneStyle/images/album-art-placeholder.png
index 03c265f1..03c265f1 100644
--- a/styles/neptune/images/album-art-placeholder.png
+++ b/styles/NeptuneStyle/images/album-art-placeholder.png
diff --git a/styles/neptune/images/album-art-shadow-dark.png b/styles/NeptuneStyle/images/album-art-shadow-dark.png
index acc15650..acc15650 100644
--- a/styles/neptune/images/album-art-shadow-dark.png
+++ b/styles/NeptuneStyle/images/album-art-shadow-dark.png
diff --git a/styles/neptune/images/album-art-shadow-widget.png b/styles/NeptuneStyle/images/album-art-shadow-widget.png
index c365a642..c365a642 100644
--- a/styles/neptune/images/album-art-shadow-widget.png
+++ b/styles/NeptuneStyle/images/album-art-shadow-widget.png
diff --git a/styles/neptune/images/album-art-shadow.png b/styles/NeptuneStyle/images/album-art-shadow.png
index e7ba6682..e7ba6682 100644
--- a/styles/neptune/images/album-art-shadow.png
+++ b/styles/NeptuneStyle/images/album-art-shadow.png
diff --git a/styles/neptune/images/app-fullscreen-top-bg-dark.png b/styles/NeptuneStyle/images/app-fullscreen-top-bg-dark.png
index 9fe3f124..9fe3f124 100644
--- a/styles/neptune/images/app-fullscreen-top-bg-dark.png
+++ b/styles/NeptuneStyle/images/app-fullscreen-top-bg-dark.png
diff --git a/styles/neptune/images/app-fullscreen-top-bg.png b/styles/NeptuneStyle/images/app-fullscreen-top-bg.png
index 9fe3f124..9fe3f124 100644
--- a/styles/neptune/images/app-fullscreen-top-bg.png
+++ b/styles/NeptuneStyle/images/app-fullscreen-top-bg.png
diff --git a/styles/neptune/images/bg-home-dark.png b/styles/NeptuneStyle/images/bg-home-dark.png
index a2f4663d..a2f4663d 100644
--- a/styles/neptune/images/bg-home-dark.png
+++ b/styles/NeptuneStyle/images/bg-home-dark.png
diff --git a/styles/neptune/images/bg-home.png b/styles/NeptuneStyle/images/bg-home.png
index 98e38db2..98e38db2 100644
--- a/styles/neptune/images/bg-home.png
+++ b/styles/NeptuneStyle/images/bg-home.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#087559.png b/styles/NeptuneStyle/images/colorSelector/#087559.png
new file mode 100644
index 00000000..56bd7f7e
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#087559.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df8d330c009d9dc856f5a2788dfbb440fa38ce629c923a72c20aba3eb37c6a61
+size 24723
diff --git a/styles/NeptuneStyle/images/colorSelector/#417eb6.png b/styles/NeptuneStyle/images/colorSelector/#417eb6.png
new file mode 100644
index 00000000..97c81993
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#417eb6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:702ae95c5cfedac4ac5b645d05ba568ec6d5e52efbdb5caed294ff659b9a4c46
+size 22717
diff --git a/styles/NeptuneStyle/images/colorSelector/#4c878b.png b/styles/NeptuneStyle/images/colorSelector/#4c878b.png
new file mode 100644
index 00000000..d6b8c344
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#4c878b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da884caaafd87eb28abd3c91274c5440bd2b412cc1a0d0b642cad2a3cc7ac460
+size 23564
diff --git a/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png b/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png
new file mode 100644
index 00000000..dff6cd1b
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#4f4c4a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70792aeda8b02ad491fa354f483d3de6920b4b105cbc1ba2b8c132c856cd2213
+size 23689
diff --git a/styles/lucee/images/colorSelector/#51a7f4.png b/styles/NeptuneStyle/images/colorSelector/#51a7f4.png
index ac8ef8ac..ac8ef8ac 100644
--- a/styles/lucee/images/colorSelector/#51a7f4.png
+++ b/styles/NeptuneStyle/images/colorSelector/#51a7f4.png
diff --git a/styles/lucee/images/colorSelector/#535258.png b/styles/NeptuneStyle/images/colorSelector/#535258.png
index 3463d5d8..3463d5d8 100644
--- a/styles/lucee/images/colorSelector/#535258.png
+++ b/styles/NeptuneStyle/images/colorSelector/#535258.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#698563.png b/styles/NeptuneStyle/images/colorSelector/#698563.png
new file mode 100644
index 00000000..7330e8a0
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#698563.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93d3259208844487996c405454f1036057ba7b4eb384e14d00252a6455727040
+size 22297
diff --git a/styles/lucee/images/colorSelector/#78887b.png b/styles/NeptuneStyle/images/colorSelector/#78887b.png
index f6401303..f6401303 100644
--- a/styles/lucee/images/colorSelector/#78887b.png
+++ b/styles/NeptuneStyle/images/colorSelector/#78887b.png
diff --git a/styles/lucee/images/colorSelector/#7ba2a5.png b/styles/NeptuneStyle/images/colorSelector/#7ba2a5.png
index 6f3efb46..6f3efb46 100644
--- a/styles/lucee/images/colorSelector/#7ba2a5.png
+++ b/styles/NeptuneStyle/images/colorSelector/#7ba2a5.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#916755.png b/styles/NeptuneStyle/images/colorSelector/#916755.png
new file mode 100644
index 00000000..6d59f111
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#916755.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6131ff97e05f0b98e922a8e9c8520ffe68bc906bba2d1c5961071e5cdb414dc1
+size 25333
diff --git a/styles/NeptuneStyle/images/colorSelector/#977b35.png b/styles/NeptuneStyle/images/colorSelector/#977b35.png
new file mode 100644
index 00000000..81c03b86
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#977b35.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a6e442e6796b81df21b26186c6324f6db860bd26a4ada30ca669a66ab07e8db
+size 26211
diff --git a/styles/lucee/images/colorSelector/#9eae83.png b/styles/NeptuneStyle/images/colorSelector/#9eae83.png
index c902d564..c902d564 100644
--- a/styles/lucee/images/colorSelector/#9eae83.png
+++ b/styles/NeptuneStyle/images/colorSelector/#9eae83.png
diff --git a/styles/NeptuneStyle/images/colorSelector/#b75034.png b/styles/NeptuneStyle/images/colorSelector/#b75034.png
new file mode 100644
index 00000000..a221521a
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/#b75034.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:752f5d753f198e0dc35d7a6edcf988663bd4b89f4d5f2c75525165e754060830
+size 23277
diff --git a/styles/lucee/images/colorSelector/#d35756.png b/styles/NeptuneStyle/images/colorSelector/#d35756.png
index 5bb7f192..5bb7f192 100644
--- a/styles/lucee/images/colorSelector/#d35756.png
+++ b/styles/NeptuneStyle/images/colorSelector/#d35756.png
diff --git a/styles/lucee/images/colorSelector/#db3b9f.png b/styles/NeptuneStyle/images/colorSelector/#db3b9f.png
index ec052635..ec052635 100644
--- a/styles/lucee/images/colorSelector/#db3b9f.png
+++ b/styles/NeptuneStyle/images/colorSelector/#db3b9f.png
diff --git a/styles/lucee/images/colorSelector/#fba054.png b/styles/NeptuneStyle/images/colorSelector/#fba054.png
index b46f6d2b..b46f6d2b 100644
--- a/styles/lucee/images/colorSelector/#fba054.png
+++ b/styles/NeptuneStyle/images/colorSelector/#fba054.png
diff --git a/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png b/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png
new file mode 100644
index 00000000..890a0b48
--- /dev/null
+++ b/styles/NeptuneStyle/images/colorSelector/color-wheel-dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:711921573018521d44f694c3652930e9ceac7588f202ef4e0a92b590c5e45348
+size 38216
diff --git a/styles/lucee/images/colorSelector/color-wheel.png b/styles/NeptuneStyle/images/colorSelector/color-wheel.png
index 923de750..923de750 100644
--- a/styles/lucee/images/colorSelector/color-wheel.png
+++ b/styles/NeptuneStyle/images/colorSelector/color-wheel.png
diff --git a/styles/neptune/images/divider-dark.png b/styles/NeptuneStyle/images/divider-dark.png
index b4ff3ba0..b4ff3ba0 100644
--- a/styles/neptune/images/divider-dark.png
+++ b/styles/NeptuneStyle/images/divider-dark.png
diff --git a/styles/neptune/images/divider.png b/styles/NeptuneStyle/images/divider.png
index c944b8a4..c944b8a4 100644
--- a/styles/neptune/images/divider.png
+++ b/styles/NeptuneStyle/images/divider.png
diff --git a/styles/neptune/images/fan-speed-5.png b/styles/NeptuneStyle/images/fan-speed-5.png
index d199e72c..d199e72c 100644
--- a/styles/neptune/images/fan-speed-5.png
+++ b/styles/NeptuneStyle/images/fan-speed-5.png
diff --git a/styles/neptune/images/floating-panel-top-bg.png b/styles/NeptuneStyle/images/floating-panel-top-bg.png
index aa06e90e..aa06e90e 100644
--- a/styles/neptune/images/floating-panel-top-bg.png
+++ b/styles/NeptuneStyle/images/floating-panel-top-bg.png
diff --git a/styles/neptune/images/highlighted-button-shadow.png b/styles/NeptuneStyle/images/highlighted-button-shadow.png
index d274654d..d274654d 100644
--- a/styles/neptune/images/highlighted-button-shadow.png
+++ b/styles/NeptuneStyle/images/highlighted-button-shadow.png
diff --git a/styles/neptune/images/home-widget-bg.png b/styles/NeptuneStyle/images/home-widget-bg.png
index d5361540..d5361540 100644
--- a/styles/neptune/images/home-widget-bg.png
+++ b/styles/NeptuneStyle/images/home-widget-bg.png
diff --git a/styles/neptune/images/ic-app-active-bg.png b/styles/NeptuneStyle/images/ic-app-active-bg.png
index e9c9f5b6..e9c9f5b6 100644
--- a/styles/neptune/images/ic-app-active-bg.png
+++ b/styles/NeptuneStyle/images/ic-app-active-bg.png
diff --git a/styles/neptune/images/ic-calculator-dark.png b/styles/NeptuneStyle/images/ic-calculator-dark.png
index c38d1400..c38d1400 100644
--- a/styles/neptune/images/ic-calculator-dark.png
+++ b/styles/NeptuneStyle/images/ic-calculator-dark.png
diff --git a/styles/neptune/images/ic-call.png b/styles/NeptuneStyle/images/ic-call.png
index 0454eaed..0454eaed 100644
--- a/styles/neptune/images/ic-call.png
+++ b/styles/NeptuneStyle/images/ic-call.png
diff --git a/styles/neptune/images/ic-expand-down-dark.png b/styles/NeptuneStyle/images/ic-expand-down-dark.png
index 3ce57ca3..3ce57ca3 100644
--- a/styles/neptune/images/ic-expand-down-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-down-dark.png
diff --git a/styles/neptune/images/ic-expand-down.png b/styles/NeptuneStyle/images/ic-expand-down.png
index 7b2b2102..7b2b2102 100644
--- a/styles/neptune/images/ic-expand-down.png
+++ b/styles/NeptuneStyle/images/ic-expand-down.png
diff --git a/styles/neptune/images/ic-expand-to-fullscreen-dark.png b/styles/NeptuneStyle/images/ic-expand-to-fullscreen-dark.png
index 81bcc768..81bcc768 100644
--- a/styles/neptune/images/ic-expand-to-fullscreen-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-to-fullscreen-dark.png
diff --git a/styles/neptune/images/ic-expand-to-fullscreen.png b/styles/NeptuneStyle/images/ic-expand-to-fullscreen.png
index 30b610b2..30b610b2 100644
--- a/styles/neptune/images/ic-expand-to-fullscreen.png
+++ b/styles/NeptuneStyle/images/ic-expand-to-fullscreen.png
diff --git a/styles/neptune/images/ic-expand-up-dark.png b/styles/NeptuneStyle/images/ic-expand-up-dark.png
index c2396bec..c2396bec 100644
--- a/styles/neptune/images/ic-expand-up-dark.png
+++ b/styles/NeptuneStyle/images/ic-expand-up-dark.png
diff --git a/styles/neptune/images/ic-expand-up.png b/styles/NeptuneStyle/images/ic-expand-up.png
index 57a81a3a..57a81a3a 100644
--- a/styles/neptune/images/ic-expand-up.png
+++ b/styles/NeptuneStyle/images/ic-expand-up.png
diff --git a/styles/neptune/images/ic-favorite-dark.png b/styles/NeptuneStyle/images/ic-favorite-dark.png
index 93ab4bb6..93ab4bb6 100644
--- a/styles/neptune/images/ic-favorite-dark.png
+++ b/styles/NeptuneStyle/images/ic-favorite-dark.png
diff --git a/styles/neptune/images/ic-favorite.png b/styles/NeptuneStyle/images/ic-favorite.png
index 075df9cd..075df9cd 100644
--- a/styles/neptune/images/ic-favorite.png
+++ b/styles/NeptuneStyle/images/ic-favorite.png
diff --git a/styles/neptune/images/ic-music-dark.png b/styles/NeptuneStyle/images/ic-music-dark.png
index 8e1302c1..8e1302c1 100644
--- a/styles/neptune/images/ic-music-dark.png
+++ b/styles/NeptuneStyle/images/ic-music-dark.png
diff --git a/styles/neptune/images/ic-navigation-dark.png b/styles/NeptuneStyle/images/ic-navigation-dark.png
index 6e48a601..6e48a601 100644
--- a/styles/neptune/images/ic-navigation-dark.png
+++ b/styles/NeptuneStyle/images/ic-navigation-dark.png
diff --git a/styles/neptune/images/ic-next-level-dark.png b/styles/NeptuneStyle/images/ic-next-level-dark.png
index 700fb96c..700fb96c 100644
--- a/styles/neptune/images/ic-next-level-dark.png
+++ b/styles/NeptuneStyle/images/ic-next-level-dark.png
diff --git a/styles/neptune/images/ic-next-level.png b/styles/NeptuneStyle/images/ic-next-level.png
index 5fc33846..5fc33846 100644
--- a/styles/neptune/images/ic-next-level.png
+++ b/styles/NeptuneStyle/images/ic-next-level.png
diff --git a/styles/neptune/images/ic-rain-amount.png b/styles/NeptuneStyle/images/ic-rain-amount.png
index 823d430b..823d430b 100644
--- a/styles/neptune/images/ic-rain-amount.png
+++ b/styles/NeptuneStyle/images/ic-rain-amount.png
diff --git a/styles/neptune/images/ic-search_OFF-dark.png b/styles/NeptuneStyle/images/ic-search_OFF-dark.png
index 7d96e114..7d96e114 100644
--- a/styles/neptune/images/ic-search_OFF-dark.png
+++ b/styles/NeptuneStyle/images/ic-search_OFF-dark.png
diff --git a/styles/neptune/images/ic-search_OFF.png b/styles/NeptuneStyle/images/ic-search_OFF.png
index 0e2ca5df..0e2ca5df 100644
--- a/styles/neptune/images/ic-search_OFF.png
+++ b/styles/NeptuneStyle/images/ic-search_OFF.png
diff --git a/styles/neptune/images/ic-search_ON-dark.png b/styles/NeptuneStyle/images/ic-search_ON-dark.png
index 8e2814bc..8e2814bc 100644
--- a/styles/neptune/images/ic-search_ON-dark.png
+++ b/styles/NeptuneStyle/images/ic-search_ON-dark.png
diff --git a/styles/neptune/images/ic-search_ON.png b/styles/NeptuneStyle/images/ic-search_ON.png
index 8e2814bc..8e2814bc 100644
--- a/styles/neptune/images/ic-search_ON.png
+++ b/styles/NeptuneStyle/images/ic-search_ON.png
diff --git a/styles/neptune/images/ic-statusbar-battery-dark.png b/styles/NeptuneStyle/images/ic-statusbar-battery-dark.png
index 851d64a2..851d64a2 100644
--- a/styles/neptune/images/ic-statusbar-battery-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-battery-dark.png
diff --git a/styles/neptune/images/ic-statusbar-battery.png b/styles/NeptuneStyle/images/ic-statusbar-battery.png
index 59031feb..59031feb 100644
--- a/styles/neptune/images/ic-statusbar-battery.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-battery.png
diff --git a/styles/neptune/images/ic-statusbar-bluetooth-dark.png b/styles/NeptuneStyle/images/ic-statusbar-bluetooth-dark.png
index 71a11f3e..71a11f3e 100644
--- a/styles/neptune/images/ic-statusbar-bluetooth-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-bluetooth-dark.png
diff --git a/styles/neptune/images/ic-statusbar-bluetooth.png b/styles/NeptuneStyle/images/ic-statusbar-bluetooth.png
index 20ec6a11..20ec6a11 100644
--- a/styles/neptune/images/ic-statusbar-bluetooth.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-bluetooth.png
diff --git a/styles/neptune/images/ic-statusbar-reception-dark.png b/styles/NeptuneStyle/images/ic-statusbar-reception-dark.png
index 640223be..640223be 100644
--- a/styles/neptune/images/ic-statusbar-reception-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-reception-dark.png
diff --git a/styles/neptune/images/ic-statusbar-reception.png b/styles/NeptuneStyle/images/ic-statusbar-reception.png
index e8b0f2b8..e8b0f2b8 100644
--- a/styles/neptune/images/ic-statusbar-reception.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-reception.png
diff --git a/styles/neptune/images/ic-statusbar-wifi-dark.png b/styles/NeptuneStyle/images/ic-statusbar-wifi-dark.png
index 11b6c15b..11b6c15b 100644
--- a/styles/neptune/images/ic-statusbar-wifi-dark.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-wifi-dark.png
diff --git a/styles/neptune/images/ic-statusbar-wifi.png b/styles/NeptuneStyle/images/ic-statusbar-wifi.png
index e12dbc98..e12dbc98 100644
--- a/styles/neptune/images/ic-statusbar-wifi.png
+++ b/styles/NeptuneStyle/images/ic-statusbar-wifi.png
diff --git a/styles/neptune/images/ic-weather-partly-rain-dark.png b/styles/NeptuneStyle/images/ic-weather-partly-rain-dark.png
index e8ca6be6..e8ca6be6 100644
--- a/styles/neptune/images/ic-weather-partly-rain-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-partly-rain-dark.png
diff --git a/styles/neptune/images/ic-weather-partly-rain.png b/styles/NeptuneStyle/images/ic-weather-partly-rain.png
index 69bb6701..69bb6701 100644
--- a/styles/neptune/images/ic-weather-partly-rain.png
+++ b/styles/NeptuneStyle/images/ic-weather-partly-rain.png
diff --git a/styles/neptune/images/ic-weather-rain-dark.png b/styles/NeptuneStyle/images/ic-weather-rain-dark.png
index 82a1dacd..82a1dacd 100644
--- a/styles/neptune/images/ic-weather-rain-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-rain-dark.png
diff --git a/styles/neptune/images/ic-weather-rain.png b/styles/NeptuneStyle/images/ic-weather-rain.png
index c96d9602..c96d9602 100644
--- a/styles/neptune/images/ic-weather-rain.png
+++ b/styles/NeptuneStyle/images/ic-weather-rain.png
diff --git a/styles/neptune/images/ic-weather-snow-dark.png b/styles/NeptuneStyle/images/ic-weather-snow-dark.png
index 51512d26..51512d26 100644
--- a/styles/neptune/images/ic-weather-snow-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-snow-dark.png
diff --git a/styles/neptune/images/ic-weather-snow.png b/styles/NeptuneStyle/images/ic-weather-snow.png
index a2ef5405..a2ef5405 100644
--- a/styles/neptune/images/ic-weather-snow.png
+++ b/styles/NeptuneStyle/images/ic-weather-snow.png
diff --git a/styles/neptune/images/ic-weather-sun-dark.png b/styles/NeptuneStyle/images/ic-weather-sun-dark.png
index 30acedf1..30acedf1 100644
--- a/styles/neptune/images/ic-weather-sun-dark.png
+++ b/styles/NeptuneStyle/images/ic-weather-sun-dark.png
diff --git a/styles/neptune/images/ic-weather-sun.png b/styles/NeptuneStyle/images/ic-weather-sun.png
index 593035ff..593035ff 100644
--- a/styles/neptune/images/ic-weather-sun.png
+++ b/styles/NeptuneStyle/images/ic-weather-sun.png
diff --git a/styles/neptune/images/ic-widget-close.png b/styles/NeptuneStyle/images/ic-widget-close.png
index eb18b529..eb18b529 100644
--- a/styles/neptune/images/ic-widget-close.png
+++ b/styles/NeptuneStyle/images/ic-widget-close.png
diff --git a/styles/neptune/images/ic-widget-move.png b/styles/NeptuneStyle/images/ic-widget-move.png
index 36a267d9..36a267d9 100644
--- a/styles/neptune/images/ic-widget-move.png
+++ b/styles/NeptuneStyle/images/ic-widget-move.png
diff --git a/styles/neptune/images/ic-widget-music.png b/styles/NeptuneStyle/images/ic-widget-music.png
index b2a4958a..b2a4958a 100644
--- a/styles/neptune/images/ic-widget-music.png
+++ b/styles/NeptuneStyle/images/ic-widget-music.png
diff --git a/styles/neptune/images/ic-widget-navigation.png b/styles/NeptuneStyle/images/ic-widget-navigation.png
index dca356a3..dca356a3 100644
--- a/styles/neptune/images/ic-widget-navigation.png
+++ b/styles/NeptuneStyle/images/ic-widget-navigation.png
diff --git a/styles/neptune/images/ic-widget-tuner.png b/styles/NeptuneStyle/images/ic-widget-tuner.png
index 13dace7b..13dace7b 100644
--- a/styles/neptune/images/ic-widget-tuner.png
+++ b/styles/NeptuneStyle/images/ic-widget-tuner.png
diff --git a/styles/neptune/images/ic-widget-weather.png b/styles/NeptuneStyle/images/ic-widget-weather.png
index ffe5c0ec..ffe5c0ec 100644
--- a/styles/neptune/images/ic-widget-weather.png
+++ b/styles/NeptuneStyle/images/ic-widget-weather.png
diff --git a/styles/neptune/images/ic_button-bg-red.png b/styles/NeptuneStyle/images/ic_button-bg-red.png
index 0d30973d..0d30973d 100644
--- a/styles/neptune/images/ic_button-bg-red.png
+++ b/styles/NeptuneStyle/images/ic_button-bg-red.png
diff --git a/styles/neptune/images/ic_button-bg.png b/styles/NeptuneStyle/images/ic_button-bg.png
index 941fd420..941fd420 100644
--- a/styles/neptune/images/ic_button-bg.png
+++ b/styles/NeptuneStyle/images/ic_button-bg.png
diff --git a/styles/neptune/images/input-overlay.png b/styles/NeptuneStyle/images/input-overlay.png
index bbc1d17c..bbc1d17c 100644
--- a/styles/neptune/images/input-overlay.png
+++ b/styles/NeptuneStyle/images/input-overlay.png
diff --git a/styles/neptune/images/instrument-cluster-bg-dark.png b/styles/NeptuneStyle/images/instrument-cluster-bg-dark.png
index 1a89136b..1a89136b 100644
--- a/styles/neptune/images/instrument-cluster-bg-dark.png
+++ b/styles/NeptuneStyle/images/instrument-cluster-bg-dark.png
diff --git a/styles/neptune/images/instrument-cluster-bg.png b/styles/NeptuneStyle/images/instrument-cluster-bg.png
index 8cd4c905..8cd4c905 100644
--- a/styles/neptune/images/instrument-cluster-bg.png
+++ b/styles/NeptuneStyle/images/instrument-cluster-bg.png
diff --git a/styles/neptune/images/list-divider-dark.png b/styles/NeptuneStyle/images/list-divider-dark.png
index 78ae5372..78ae5372 100644
--- a/styles/neptune/images/list-divider-dark.png
+++ b/styles/NeptuneStyle/images/list-divider-dark.png
diff --git a/styles/neptune/images/list-divider.png b/styles/NeptuneStyle/images/list-divider.png
index 1db5ec08..1db5ec08 100644
--- a/styles/neptune/images/list-divider.png
+++ b/styles/NeptuneStyle/images/list-divider.png
diff --git a/styles/neptune/images/logo-kdab-dark.png b/styles/NeptuneStyle/images/logo-kdab-dark.png
index 1f440c21..1f440c21 100644
--- a/styles/neptune/images/logo-kdab-dark.png
+++ b/styles/NeptuneStyle/images/logo-kdab-dark.png
diff --git a/styles/neptune/images/logo-kdab.png b/styles/NeptuneStyle/images/logo-kdab.png
index 99e67295..99e67295 100644
--- a/styles/neptune/images/logo-kdab.png
+++ b/styles/NeptuneStyle/images/logo-kdab.png
diff --git a/styles/neptune/images/logo-luxoft-dark.png b/styles/NeptuneStyle/images/logo-luxoft-dark.png
index 792f1114..792f1114 100644
--- a/styles/neptune/images/logo-luxoft-dark.png
+++ b/styles/NeptuneStyle/images/logo-luxoft-dark.png
diff --git a/styles/neptune/images/logo-luxoft.png b/styles/NeptuneStyle/images/logo-luxoft.png
index 285be51f..285be51f 100644
--- a/styles/neptune/images/logo-luxoft.png
+++ b/styles/NeptuneStyle/images/logo-luxoft.png
diff --git a/styles/neptune/images/logo-theqtcompany-dark.png b/styles/NeptuneStyle/images/logo-theqtcompany-dark.png
index 276617b6..276617b6 100644
--- a/styles/neptune/images/logo-theqtcompany-dark.png
+++ b/styles/NeptuneStyle/images/logo-theqtcompany-dark.png
diff --git a/styles/neptune/images/logo-theqtcompany.png b/styles/NeptuneStyle/images/logo-theqtcompany.png
index d36228b3..d36228b3 100644
--- a/styles/neptune/images/logo-theqtcompany.png
+++ b/styles/NeptuneStyle/images/logo-theqtcompany.png
diff --git a/styles/neptune/images/panel-inner-shadow-dark.png b/styles/NeptuneStyle/images/panel-inner-shadow-dark.png
index 5533d7eb..5533d7eb 100644
--- a/styles/neptune/images/panel-inner-shadow-dark.png
+++ b/styles/NeptuneStyle/images/panel-inner-shadow-dark.png
diff --git a/styles/neptune/images/panel-inner-shadow.png b/styles/NeptuneStyle/images/panel-inner-shadow.png
index a52e197b..a52e197b 100644
--- a/styles/neptune/images/panel-inner-shadow.png
+++ b/styles/NeptuneStyle/images/panel-inner-shadow.png
diff --git a/styles/neptune/images/phone-widget-section-gradient-dark.png b/styles/NeptuneStyle/images/phone-widget-section-gradient-dark.png
index 29a9e9fb..29a9e9fb 100644
--- a/styles/neptune/images/phone-widget-section-gradient-dark.png
+++ b/styles/NeptuneStyle/images/phone-widget-section-gradient-dark.png
diff --git a/styles/neptune/images/phone-widget-section-gradient.png b/styles/NeptuneStyle/images/phone-widget-section-gradient.png
index a6f5fde5..a6f5fde5 100644
--- a/styles/neptune/images/phone-widget-section-gradient.png
+++ b/styles/NeptuneStyle/images/phone-widget-section-gradient.png
diff --git a/styles/neptune/images/playing-dark.gif b/styles/NeptuneStyle/images/playing-dark.gif
index 01c23b2e..01c23b2e 100644
--- a/styles/neptune/images/playing-dark.gif
+++ b/styles/NeptuneStyle/images/playing-dark.gif
diff --git a/styles/neptune/images/playing.gif b/styles/NeptuneStyle/images/playing.gif
index 3c9e15a6..3c9e15a6 100644
--- a/styles/neptune/images/playing.gif
+++ b/styles/NeptuneStyle/images/playing.gif
diff --git a/styles/neptune/images/popup-background-9patch-dark.png b/styles/NeptuneStyle/images/popup-background-9patch-dark.png
index 617f585e..617f585e 100644
--- a/styles/neptune/images/popup-background-9patch-dark.png
+++ b/styles/NeptuneStyle/images/popup-background-9patch-dark.png
diff --git a/styles/neptune/images/popup-background-9patch.png b/styles/NeptuneStyle/images/popup-background-9patch.png
index e5239de5..e5239de5 100644
--- a/styles/neptune/images/popup-background-9patch.png
+++ b/styles/NeptuneStyle/images/popup-background-9patch.png
diff --git a/styles/neptune/images/popup-close-button-bg-dark.png b/styles/NeptuneStyle/images/popup-close-button-bg-dark.png
index f3782193..f3782193 100644
--- a/styles/neptune/images/popup-close-button-bg-dark.png
+++ b/styles/NeptuneStyle/images/popup-close-button-bg-dark.png
diff --git a/styles/neptune/images/popup-close-button-bg.png b/styles/NeptuneStyle/images/popup-close-button-bg.png
index 571d7336..571d7336 100644
--- a/styles/neptune/images/popup-close-button-bg.png
+++ b/styles/NeptuneStyle/images/popup-close-button-bg.png
diff --git a/styles/neptune/images/popup-title-shadow.png b/styles/NeptuneStyle/images/popup-title-shadow.png
index b75e399a..b75e399a 100644
--- a/styles/neptune/images/popup-title-shadow.png
+++ b/styles/NeptuneStyle/images/popup-title-shadow.png
diff --git a/styles/neptune/images/slider-handle-horizontal-dark.png b/styles/NeptuneStyle/images/slider-handle-horizontal-dark.png
index 07215da8..07215da8 100644
--- a/styles/neptune/images/slider-handle-horizontal-dark.png
+++ b/styles/NeptuneStyle/images/slider-handle-horizontal-dark.png
diff --git a/styles/neptune/images/slider-handle-horizontal.png b/styles/NeptuneStyle/images/slider-handle-horizontal.png
index b11c62a8..b11c62a8 100644
--- a/styles/neptune/images/slider-handle-horizontal.png
+++ b/styles/NeptuneStyle/images/slider-handle-horizontal.png
diff --git a/styles/neptune/images/slider-handle-vertical-dark.png b/styles/NeptuneStyle/images/slider-handle-vertical-dark.png
index 7bc964cd..7bc964cd 100644
--- a/styles/neptune/images/slider-handle-vertical-dark.png
+++ b/styles/NeptuneStyle/images/slider-handle-vertical-dark.png
diff --git a/styles/neptune/images/slider-handle-vertical.png b/styles/NeptuneStyle/images/slider-handle-vertical.png
index 2974afba..2974afba 100644
--- a/styles/neptune/images/slider-handle-vertical.png
+++ b/styles/NeptuneStyle/images/slider-handle-vertical.png
diff --git a/styles/neptune/images/tabbar-bg-left-dark.png b/styles/NeptuneStyle/images/tabbar-bg-left-dark.png
index baa75f07..baa75f07 100644
--- a/styles/neptune/images/tabbar-bg-left-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-left-dark.png
diff --git a/styles/neptune/images/tabbar-bg-left.png b/styles/NeptuneStyle/images/tabbar-bg-left.png
index ddc91d26..ddc91d26 100644
--- a/styles/neptune/images/tabbar-bg-left.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-left.png
diff --git a/styles/neptune/images/tabbar-bg-middle-dark.png b/styles/NeptuneStyle/images/tabbar-bg-middle-dark.png
index aad5677f..aad5677f 100644
--- a/styles/neptune/images/tabbar-bg-middle-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-middle-dark.png
diff --git a/styles/neptune/images/tabbar-bg-middle.png b/styles/NeptuneStyle/images/tabbar-bg-middle.png
index 84b2a6fb..84b2a6fb 100644
--- a/styles/neptune/images/tabbar-bg-middle.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-middle.png
diff --git a/styles/neptune/images/tabbar-bg-right-dark.png b/styles/NeptuneStyle/images/tabbar-bg-right-dark.png
index 7e54bea8..7e54bea8 100644
--- a/styles/neptune/images/tabbar-bg-right-dark.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-right-dark.png
diff --git a/styles/neptune/images/tabbar-bg-right.png b/styles/NeptuneStyle/images/tabbar-bg-right.png
index d9332858..d9332858 100644
--- a/styles/neptune/images/tabbar-bg-right.png
+++ b/styles/NeptuneStyle/images/tabbar-bg-right.png
diff --git a/styles/neptune/images/temperature-slider-bg.png b/styles/NeptuneStyle/images/temperature-slider-bg.png
index 77fc3ca9..77fc3ca9 100644
--- a/styles/neptune/images/temperature-slider-bg.png
+++ b/styles/NeptuneStyle/images/temperature-slider-bg.png
diff --git a/styles/neptune/images/vertical-slider-handle-dark.png b/styles/NeptuneStyle/images/vertical-slider-handle-dark.png
index c13a6135..c13a6135 100644
--- a/styles/neptune/images/vertical-slider-handle-dark.png
+++ b/styles/NeptuneStyle/images/vertical-slider-handle-dark.png
diff --git a/styles/neptune/images/vertical-slider-handle.png b/styles/NeptuneStyle/images/vertical-slider-handle.png
index ab19782b..ab19782b 100644
--- a/styles/neptune/images/vertical-slider-handle.png
+++ b/styles/NeptuneStyle/images/vertical-slider-handle.png
diff --git a/styles/neptune/images/weather-cloudy.png b/styles/NeptuneStyle/images/weather-cloudy.png
index bfb9bbc7..bfb9bbc7 100644
--- a/styles/neptune/images/weather-cloudy.png
+++ b/styles/NeptuneStyle/images/weather-cloudy.png
diff --git a/styles/neptune/images/widget-bg-dark.png b/styles/NeptuneStyle/images/widget-bg-dark.png
index 1c2c85d7..1c2c85d7 100644
--- a/styles/neptune/images/widget-bg-dark.png
+++ b/styles/NeptuneStyle/images/widget-bg-dark.png
diff --git a/styles/neptune/images/widget-bg.png b/styles/NeptuneStyle/images/widget-bg.png
index 060845bf..060845bf 100644
--- a/styles/neptune/images/widget-bg.png
+++ b/styles/NeptuneStyle/images/widget-bg.png
diff --git a/styles/neptune/images/widget-corner-dark.png b/styles/NeptuneStyle/images/widget-corner-dark.png
index 4ae8be69..4ae8be69 100644
--- a/styles/neptune/images/widget-corner-dark.png
+++ b/styles/NeptuneStyle/images/widget-corner-dark.png
diff --git a/styles/neptune/images/widget-corner.png b/styles/NeptuneStyle/images/widget-corner.png
index 99068874..99068874 100644
--- a/styles/neptune/images/widget-corner.png
+++ b/styles/NeptuneStyle/images/widget-corner.png
diff --git a/styles/neptune/images/widget-dragged-bg.png b/styles/NeptuneStyle/images/widget-dragged-bg.png
index 9990505a..9990505a 100644
--- a/styles/neptune/images/widget-dragged-bg.png
+++ b/styles/NeptuneStyle/images/widget-dragged-bg.png
diff --git a/styles/neptune/images/widget-left-section-bg-dark.png b/styles/NeptuneStyle/images/widget-left-section-bg-dark.png
index db985c5b..db985c5b 100644
--- a/styles/neptune/images/widget-left-section-bg-dark.png
+++ b/styles/NeptuneStyle/images/widget-left-section-bg-dark.png
diff --git a/styles/neptune/images/widget-left-section-bg.png b/styles/NeptuneStyle/images/widget-left-section-bg.png
index eabb8767..eabb8767 100644
--- a/styles/neptune/images/widget-left-section-bg.png
+++ b/styles/NeptuneStyle/images/widget-left-section-bg.png
diff --git a/styles/neptune/images/widget-stripe.png b/styles/NeptuneStyle/images/widget-stripe.png
index a81387bc..a81387bc 100644
--- a/styles/neptune/images/widget-stripe.png
+++ b/styles/NeptuneStyle/images/widget-stripe.png
diff --git a/styles/neptune/images/widget-window-mask.png b/styles/NeptuneStyle/images/widget-window-mask.png
index f2f506a8..f2f506a8 100644
--- a/styles/neptune/images/widget-window-mask.png
+++ b/styles/NeptuneStyle/images/widget-window-mask.png
diff --git a/styles/NeptuneStyle/qmldir b/styles/NeptuneStyle/qmldir
new file mode 100644
index 00000000..770623f0
--- /dev/null
+++ b/styles/NeptuneStyle/qmldir
@@ -0,0 +1,21 @@
+module NeptuneStyle
+Button 1.0 Button.qml
+ComboBox 1.0 ComboBox.qml
+Control 1.0 Control.qml
+Dialog 1.0 Dialog.qml
+Frame 1.0 Frame.qml
+ItemDelegate 1.0 ItemDelegate.qml
+Label 1.0 Label.qml
+Page 1.0 Page.qml
+PageIndicator 1.0 PageIndicator.qml
+Pane 1.0 Pane.qml
+ProgressBar 1.0 ProgressBar.qml
+RadioButton 1.0 RadioButton.qml
+ScrollIndicator 1.0 ScrollIndicator.qml
+Slider 1.0 Slider.qml
+Switch 1.0 Switch.qml
+SwitchDelegate 1.0 SwitchDelegate.qml
+TabBar 1.0 TabBar.qml
+TabButton 1.0 TabButton.qml
+ToolBar 1.0 ToolBar.qml
+ToolButton 1.0 ToolButton.qml
diff --git a/styles/neptune/style.conf b/styles/NeptuneStyle/style.conf
index 88283ef2..88283ef2 100644
--- a/styles/neptune/style.conf
+++ b/styles/NeptuneStyle/style.conf
diff --git a/styles/neptune/images/colorSelector/#087559.png b/styles/neptune/images/colorSelector/#087559.png
deleted file mode 100644
index a162669e..00000000
--- a/styles/neptune/images/colorSelector/#087559.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2b2845d2df523b2bb92b32e62719ef598c616e94b4109f3376064e2b68a617b
-size 257
diff --git a/styles/neptune/images/colorSelector/#417eb6.png b/styles/neptune/images/colorSelector/#417eb6.png
deleted file mode 100644
index 055d1b84..00000000
--- a/styles/neptune/images/colorSelector/#417eb6.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1f853cab7785eb257c9c27487c03d8036d7ea52a4b7dec656070fb7e7943d51
-size 257
diff --git a/styles/neptune/images/colorSelector/#4c878b.png b/styles/neptune/images/colorSelector/#4c878b.png
deleted file mode 100644
index ec5cecac..00000000
--- a/styles/neptune/images/colorSelector/#4c878b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78ae36465a08af2da7cd60d44f30ffda00a6c5a0cc98e53e6775c7d189a7288e
-size 257
diff --git a/styles/neptune/images/colorSelector/#4f4c4a.png b/styles/neptune/images/colorSelector/#4f4c4a.png
deleted file mode 100644
index 03ef8162..00000000
--- a/styles/neptune/images/colorSelector/#4f4c4a.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f577d358ad8313348c3de119fc8227d2a3f86acf20091bd53f9fa1b05c1912a
-size 257
diff --git a/styles/neptune/images/colorSelector/#51a7f4.png b/styles/neptune/images/colorSelector/#51a7f4.png
deleted file mode 100644
index 766d3a77..00000000
--- a/styles/neptune/images/colorSelector/#51a7f4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbb1f7335b488867dad05bf7ebe65738254d05c1c20581fc79cafaee047a75ff
-size 257
diff --git a/styles/neptune/images/colorSelector/#535258.png b/styles/neptune/images/colorSelector/#535258.png
deleted file mode 100644
index 338c6700..00000000
--- a/styles/neptune/images/colorSelector/#535258.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8f4460625f2e473f58f2f70509c2478318652b5ee5b58692290b5a40a176b2d
-size 257
diff --git a/styles/neptune/images/colorSelector/#698563.png b/styles/neptune/images/colorSelector/#698563.png
deleted file mode 100644
index bc9e9536..00000000
--- a/styles/neptune/images/colorSelector/#698563.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:714b46f826ca46fe894192e67cbc94ea953c2cf421aca34b8d64150e91b2d8f0
-size 257
diff --git a/styles/neptune/images/colorSelector/#78887b.png b/styles/neptune/images/colorSelector/#78887b.png
deleted file mode 100644
index fa9e13cf..00000000
--- a/styles/neptune/images/colorSelector/#78887b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1de8160b624bb282f65c023c22ec5e5be7c486d37acae4b2a37efc3fcbc83a4d
-size 257
diff --git a/styles/neptune/images/colorSelector/#7ba2a5.png b/styles/neptune/images/colorSelector/#7ba2a5.png
deleted file mode 100644
index a35edff0..00000000
--- a/styles/neptune/images/colorSelector/#7ba2a5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9a9c77660e1420b6bb7f7eb3e18c9c58aada5802cf0e91f651933ddcd8bb018
-size 257
diff --git a/styles/neptune/images/colorSelector/#916755.png b/styles/neptune/images/colorSelector/#916755.png
deleted file mode 100644
index d0445cfd..00000000
--- a/styles/neptune/images/colorSelector/#916755.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46cc000a9702709887891e8dc4bf36d3f5656d7129858e29cc0fa5e61c98ec79
-size 257
diff --git a/styles/neptune/images/colorSelector/#977b35.png b/styles/neptune/images/colorSelector/#977b35.png
deleted file mode 100644
index 53dd3955..00000000
--- a/styles/neptune/images/colorSelector/#977b35.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d1c4e82c69d82ab7c1280cd2745d8b95d87192102d129d0e2038ba94f4f05cb
-size 257
diff --git a/styles/neptune/images/colorSelector/#9eae83.png b/styles/neptune/images/colorSelector/#9eae83.png
deleted file mode 100644
index 1ebe4288..00000000
--- a/styles/neptune/images/colorSelector/#9eae83.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a56f5ff39d4560c4cc9554faedd395ed04603752aeb9f5806a25b2ba7b31ae01
-size 257
diff --git a/styles/neptune/images/colorSelector/#b75034.png b/styles/neptune/images/colorSelector/#b75034.png
deleted file mode 100644
index 0e7033e3..00000000
--- a/styles/neptune/images/colorSelector/#b75034.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93f93260d8b4247910c43c1fa5f22dbeb5097d8c1d55927c99be54e856861a27
-size 257
diff --git a/styles/neptune/images/colorSelector/#d35756.png b/styles/neptune/images/colorSelector/#d35756.png
deleted file mode 100644
index 1b975cc7..00000000
--- a/styles/neptune/images/colorSelector/#d35756.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a295f43cf45825668316420df405889ccc11e82d899668929168c20682d3fb4
-size 257
diff --git a/styles/neptune/images/colorSelector/#db3b9f.png b/styles/neptune/images/colorSelector/#db3b9f.png
deleted file mode 100644
index deb90d1a..00000000
--- a/styles/neptune/images/colorSelector/#db3b9f.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22a777d0160ac99fa023b0d6df32b9ea05ea7db41205a914f48262e1b10d4ba8
-size 257
diff --git a/styles/neptune/images/colorSelector/#fba054.png b/styles/neptune/images/colorSelector/#fba054.png
deleted file mode 100644
index f983197d..00000000
--- a/styles/neptune/images/colorSelector/#fba054.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c90e840bb1c129f8a8990e3523a4ff680ec8100bfac6bf3e50d77ac2e1f7a4f
-size 257
diff --git a/styles/neptune/images/colorSelector/color-wheel-dark.png b/styles/neptune/images/colorSelector/color-wheel-dark.png
deleted file mode 100644
index 2cf92998..00000000
--- a/styles/neptune/images/colorSelector/color-wheel-dark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf54abd7224bbca7061a2cfe83a467e6ea88766f42a0eaab016f8d2fc002b0b3
-size 258
diff --git a/styles/neptune/images/colorSelector/color-wheel.png b/styles/neptune/images/colorSelector/color-wheel.png
deleted file mode 100644
index 5838acc8..00000000
--- a/styles/neptune/images/colorSelector/color-wheel.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f77a9fb5275e2c7d7a35e4584cca714f458d34b42f1177d09685fea5ff13b35f
-size 258
diff --git a/sysui/about/About.qml b/sysui/about/About.qml
index b47f7274..1258e852 100644
--- a/sysui/about/About.qml
+++ b/sysui/about/About.qml
@@ -41,7 +41,7 @@ import system.controls 1.0
 PopupItemLoader {
     id: root
 
-    source: "AboutPopup.qml"
+    source: Qt.resolvedUrl("./AboutPopup.qml")
 
     // to be set/called from outside
     property var applicationModel
diff --git a/sysui/about/AboutApps.qml b/sysui/about/AboutApps.qml
index efaa7d61..56adfee5 100644
--- a/sysui/about/AboutApps.qml
+++ b/sysui/about/AboutApps.qml
@@ -174,7 +174,7 @@ Item {
         Item {
             id: delegateRoot
 
-            width: parent.width
+            width: ListView.view.width
             implicitHeight: Sizes.dp(265)
 
             function getWindowTypeName(window) {
diff --git a/sysui/centerconsole/+lucee/CenterConsole.qml b/sysui/centerconsole/+lucee/CenterConsole.qml
index 7c943bc6..3735cd99 100644
--- a/sysui/centerconsole/+lucee/CenterConsole.qml
+++ b/sysui/centerconsole/+lucee/CenterConsole.qml
@@ -31,9 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/AbstractCenterConsole.qml b/sysui/centerconsole/AbstractCenterConsole.qml
index 203c5532..d4c6cb7a 100644
--- a/sysui/centerconsole/AbstractCenterConsole.qml
+++ b/sysui/centerconsole/AbstractCenterConsole.qml
@@ -32,9 +32,7 @@
 
 import QtQuick 2.7
 import QtQml 2.14
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml
index 26cdb915..13c6c277 100644
--- a/sysui/centerconsole/CenterConsole.qml
+++ b/sysui/centerconsole/CenterConsole.qml
@@ -32,9 +32,7 @@
 
 import QtQuick 2.7
 import QtQml 2.14
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/CenterConsoleWindow.qml b/sysui/centerconsole/CenterConsoleWindow.qml
index b2d42505..15f76cd5 100644
--- a/sysui/centerconsole/CenterConsoleWindow.qml
+++ b/sysui/centerconsole/CenterConsoleWindow.qml
@@ -128,17 +128,6 @@ Window {
         id: mainCenterConsole
         anchors.fill: parent
 
-        Loader {
-            sourceComponent: Component {
-                GamePadController {
-                    onButtonBPressed: root.nextICAppIsRequested();
-                    onButtonR1Pressed: root.store.musicStore.sendIntent("next");
-                    onButtonL1Pressed: root.store.musicStore.sendIntent("prev");
-                }
-            }
-            active: root.store.enableCursorManagement
-        }
-
         CenterConsole {
             id: centerConsole
             anchors.centerIn: parent
diff --git a/sysui/centerconsole/MainContentArea.qml b/sysui/centerconsole/MainContentArea.qml
index b664243c..f4f152cc 100644
--- a/sysui/centerconsole/MainContentArea.qml
+++ b/sysui/centerconsole/MainContentArea.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import home 1.0
 import launcher 1.0
diff --git a/sysui/centerconsole/ModalOverlay.qml b/sysui/centerconsole/ModalOverlay.qml
index 7180d003..f0c04c02 100644
--- a/sysui/centerconsole/ModalOverlay.qml
+++ b/sysui/centerconsole/ModalOverlay.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.animations 1.0
 import shared.utils 1.0
diff --git a/sysui/helper/utils.js b/sysui/helper/utils.js
index 3d57dc28..603932bb 100644
--- a/sysui/helper/utils.js
+++ b/sysui/helper/utils.js
@@ -31,34 +31,35 @@
 ****************************************************************************/
 
 .pragma library
+.import QtQml as Qml
 
 function orientationFromString(str) {
     str = str.trim().toLowerCase().replace('-','').replace('_','').replace('orientation','')
 
     if (str === "portrait") {
-        return Qt.PortraitOrientation;
-    } else if (str === "invertedportrait") {
-        return Qt.InvertedPortraitOrientation;
-    } else if (str === "landscape") {
-        return Qt.LandscapeOrientation;
+        return Qml.Qt.PortraitOrientation;
+   } else if (str === "invertedportrait") {
+       return Qml.Qt.InvertedPortraitOrientation;
+   } else if (str === "landscape") {
+        return Qml.Qt.LandscapeOrientation;
     } else if (str === "invertedlandscape") {
-        return Qt.InvertedLandscapeOrientation;
+        return Qml.Qt.InvertedLandscapeOrientation;
     } else {
         // default to portrait
-        return Qt.PortraitOrientation;
+        return Qml.Qt.PortraitOrientation;
     }
 }
 
 function invertOrientation(orientation) {
     switch (orientation) {
-        case Qt.PortraitOrientation:
-            return Qt.InvertedPortraitOrientation;
-        case Qt.InvertedPortraitOrientation:
-            return Qt.PortraitOrientation;
-        case Qt.LandscapeOrientation:
-            return Qt.InvertedLandscapeOrientation;
-        case Qt.InvertedLandscapeOrientation:
-            return Qt.LandscapeOrientation;
+        case Qml.Qt.PortraitOrientation:
+            return Qml.Qt.InvertedPortraitOrientation;
+        case Qml.Qt.InvertedPortraitOrientation:
+            return Qml.Qt.PortraitOrientation;
+        case Qml.Qt.LandscapeOrientation:
+            return Qml.Qt.InvertedLandscapeOrientation;
+        case Qml.Qt.InvertedLandscapeOrientation:
+            return Qml.Qt.LandscapeOrientation;
         default:
             return orientation;
     }
@@ -67,26 +68,26 @@ function invertOrientation(orientation) {
 function rotateDisplay(orientation, isLandscape) {
     if (isLandscape) {
         switch (orientation) {
-            case Qt.PortraitOrientation:
+            case Qml.Qt.PortraitOrientation:
                 return 90;
-            case Qt.LandscapeOrientation:
+            case Qml.Qt.LandscapeOrientation:
                 return 0;
-            case Qt.InvertedPortraitOrientation:
+            case Qml.Qt.InvertedPortraitOrientation:
                 return -90;
-            case Qt.InvertedLandscapeOrientation:
+            case Qml.Qt.InvertedLandscapeOrientation:
                 return 180;
             default:
                 return 0;
         }
     } else {
         switch (orientation) {
-            case Qt.PortraitOrientation:
+            case Qml.Qt.PortraitOrientation:
                 return 0;
-            case Qt.LandscapeOrientation:
+            case Qml.Qt.LandscapeOrientation:
                 return -90;
-            case Qt.InvertedPortraitOrientation:
+            case Qml.Qt.InvertedPortraitOrientation:
                 return 180;
-            case Qt.InvertedLandscapeOrientation:
+            case Qml.Qt.InvertedLandscapeOrientation:
                 return 90;
             default:
                 return 0;
diff --git a/sysui/home/+lucee/ApplicationWidget.qml b/sysui/home/+lucee/ApplicationWidget.qml
index 3705168e..49f1c6a0 100644
--- a/sysui/home/+lucee/ApplicationWidget.qml
+++ b/sysui/home/+lucee/ApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/AbstractApplicationWidget.qml b/sysui/home/AbstractApplicationWidget.qml
index bc6ddee3..b2341c58 100644
--- a/sysui/home/AbstractApplicationWidget.qml
+++ b/sysui/home/AbstractApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml
index 7d70ce7f..b24bd7c4 100644
--- a/sysui/home/ApplicationWidget.qml
+++ b/sysui/home/ApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/WidgetGrid.qml b/sysui/home/WidgetGrid.qml
index 00757f01..123cd226 100644
--- a/sysui/home/WidgetGrid.qml
+++ b/sysui/home/WidgetGrid.qml
@@ -448,11 +448,11 @@ Item {
                         property real dragStartTouchPosY
                         property real dragTouchPosY
 
-                        onDraggedOntoPos: {
+                        onDraggedOntoPos: function(pos) {
                             dragTouchPosY = appWidget.mapToItem(root, pos.x, pos.y).y;
                             widgetColumn.onWidgetMoved(repeaterDelegate);
                         }
-                        onDragStarted: {
+                        onDragStarted: function(pos) {
                             dragStartPosY = appWidget.mapToItem(root, 0, 0).y
                             dragTouchPosY = dragStartTouchPosY = appWidget.mapToItem(root, pos.x, pos.y).y
                             beingDragged = true;
diff --git a/sysui/procmon/MonitorView.qml b/sysui/procmon/MonitorView.qml
index 29e0de28..fd2f1839 100644
--- a/sysui/procmon/MonitorView.qml
+++ b/sysui/procmon/MonitorView.qml
@@ -127,7 +127,7 @@ ColumnLayout {
                 title: qsTr("Version")
                 subtitle: qsTr("Neptune 3: %1 %2").arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                           qsTr("Qt Application Manager: %1").arg(qtamVersion) + "\n" +
-                          qsTr("Qt IVI: %1").arg(qtiviVersion)
+                          qsTr("Qt IF: %1").arg(qtifVersion)
             }
 
             MonitorListItem {
diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml
index 6c03c302..74c78d85 100644
--- a/sysui/statusbar/StatusBar.qml
+++ b/sysui/statusbar/StatusBar.qml
@@ -78,7 +78,7 @@ Item {
 
             MouseArea {
                 anchors.fill: parent
-                onPressAndHold: {
+                onPressAndHold: function(mouse) {
                     root.screenshotRequested();
                     mouse.accepted = true;
                 }
diff --git a/sysui/stores/CenterConsoleStore.qml b/sysui/stores/CenterConsoleStore.qml
index eecc6732..8e741200 100644
--- a/sysui/stores/CenterConsoleStore.qml
+++ b/sysui/stores/CenterConsoleStore.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtApplicationManager.SystemUI 2.0
 import shared.utils 1.0
 
diff --git a/sysui/stores/RootStore.qml b/sysui/stores/RootStore.qml
index 0e574fb8..a3ca2965 100644
--- a/sysui/stores/RootStore.qml
+++ b/sysui/stores/RootStore.qml
@@ -47,7 +47,6 @@ Store {
     id: root
 
     readonly property SystemStore systemStore: SystemStore {}
-    readonly property var musicAppRequestsIPC: MusicAppRequestsIPCStore  {}
     readonly property SettingsStore settingsStore: SettingsStore {}
     readonly property ClusterStore clusterStore: ClusterStore { id: clusterStore }
     readonly property HUDStore hudStore: HUDStore {}
@@ -98,7 +97,7 @@ Store {
         }
         onAutostartAppsListChanged: { settingsStore.setValue("autostartApps", applicationModel.serializeAutostart()); }
         onAutorecoverAppsListChanged: { settingsStore.setValue("autorecoverApps", applicationModel.serializeAutorecover()); }
-        onApplicationPopupAdded: applicationPopupsStore.appPopupsModel.append({"window":window});
+        onApplicationPopupAdded: function(window) { applicationPopupsStore.appPopupsModel.append({"window":window}) }
         onWidgetStatesChanged: {
             settingsStore.setValue("widgetStates", applicationModel.serializeWidgetStates());
         }
@@ -122,7 +121,7 @@ Store {
     property string lighThemeLastAccColor: "#d35756"
     property string darkThemeLastAccColor: "#b75034"
     readonly property UISettings uiSettings: UISettings {
-        onLanguageChanged: {
+        onLanguageChanged: function(language) {
             if (language !== Config.languageLocale) {
                 Config.languageLocale = language;
                 uiSettings.setRtlMode(Qt.locale(language).textDirection === Qt.RightToLeft)
@@ -137,7 +136,7 @@ Store {
             }
         }
 
-        onAccentColorChanged: {
+        onAccentColorChanged: function(accentColor) {
             if (isInitialized) {
                 if (Config._initAccentColors(uiSettings.theme)
                         .some(data => data.color === uiSettings.accentColor)) {
@@ -156,7 +155,7 @@ Store {
                 }
             });
         }
-        onIsInitializedChanged: {
+        onIsInitializedChanged: function(isInitialized) {
             if (isInitialized) {
                 theme = root.initialTheme;
 
@@ -175,11 +174,11 @@ Store {
             }
         }
 
-        onVolumeChanged: {
+        onVolumeChanged: function(volume) {
             volumeStore.player.volume = volume * 100;
         }
 
-        onMutedChanged: {
+        onMutedChanged: function(muted) {
             volumeStore.player.muted = muted;
         }
     }
@@ -253,7 +252,7 @@ Store {
         request.open("PUT", fileUrl);
         request.send("Neptune 3: %1 %2".arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                      "Qt Application Manager: %1".arg(qtamVersion) + "\n" +
-                     "Qt IVI: %1".arg(qtiviVersion) + "\n\n" +
+                     "Qt IF: %1".arg(qtifVersion) + "\n\n" +
                      text);
     }
 
diff --git a/sysui/stores/VolumeStore.qml b/sysui/stores/VolumeStore.qml
index 0ea33884..4f2dea80 100644
--- a/sysui/stores/VolumeStore.qml
+++ b/sysui/stores/VolumeStore.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework.Media 1.0
 
 QtObject {
     id: root
diff --git a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationInstaller.js b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationInstaller.js
index 3ac7427c..256d0008 100644
--- a/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationInstaller.js
+++ b/tests/dummyimports/QtApplicationManager/SystemUI/ApplicationInstaller.js
@@ -4,7 +4,7 @@
 ** Copyright (C) 2018 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Neptune 3 IVI UI.
+** This file is part of the Neptune 3 UI.
 **
 ** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
diff --git a/win32/server.conf b/win32/server.conf
index 8a73dbd7..7549e0ed 100644
--- a/win32/server.conf
+++ b/win32/server.conf
@@ -4,5 +4,5 @@ Registry=tcp://127.0.0.1:9999
 [drivedata]
 Registry=tcp://127.0.0.1:9998
 
-[qtivimedia]
+[qtifmedia]
 Registry=tcp://127.0.0.1:9997