diff --git a/src/qml/About.qml b/src/qml/About.qml
index 570c707ff2..605fe001b4 100644
--- a/src/qml/About.qml
+++ b/src/qml/About.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   id: aboutPanel
diff --git a/src/qml/BadLayerItem.qml b/src/qml/BadLayerItem.qml
index 93ee0310bd..62dcd3cd4f 100644
--- a/src/qml/BadLayerItem.qml
+++ b/src/qml/BadLayerItem.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Page {
   id: badLayerPage
diff --git a/src/qml/BluetoothDeviceChooser.qml b/src/qml/BluetoothDeviceChooser.qml
index 944a0db628..5b720ea21b 100644
--- a/src/qml/BluetoothDeviceChooser.qml
+++ b/src/qml/BluetoothDeviceChooser.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   width: parent.width
diff --git a/src/qml/BookmarkHighlight.qml b/src/qml/BookmarkHighlight.qml
index ed49b28a8a..8cf5b28f79 100644
--- a/src/qml/BookmarkHighlight.qml
+++ b/src/qml/BookmarkHighlight.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 
 Repeater {
   id: bookmarkHighlight
diff --git a/src/qml/BookmarkProperties.qml b/src/qml/BookmarkProperties.qml
index 0a96bd5cd6..97dc44fcac 100644
--- a/src/qml/BookmarkProperties.qml
+++ b/src/qml/BookmarkProperties.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: bookmarkProperties
diff --git a/src/qml/BookmarkRenderer.qml b/src/qml/BookmarkRenderer.qml
index 5a2d2110ba..6662957287 100644
--- a/src/qml/BookmarkRenderer.qml
+++ b/src/qml/BookmarkRenderer.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: bookmarkRenderer
diff --git a/src/qml/BrowserPanel.qml b/src/qml/BrowserPanel.qml
index fa29ed3978..5b76da36f3 100644
--- a/src/qml/BrowserPanel.qml
+++ b/src/qml/BrowserPanel.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtWebView 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtWebView
+import org.qfield
+import Theme
 
 Popup {
   id: browserPanel
@@ -66,36 +66,22 @@ Popup {
     if (url != '') {
       if (browserView === undefined) {
         // avoid cost of WevView creation until needed
-        if (qVersion >= '6.0.0') {
-          browserView = Qt.createQmlObject('import QtWebView
-            WebView {
-              id: browserView
-              anchors { top: parent.top; left: parent.left; right: parent.right; }
-              onLoadingChanged: {
-                if ( !loading ) {
-                  anchors.fill = parent; width = parent.width
-                  height = parent.height; opacity = 1
-                }
+        browserView = Qt.createQmlObject('import QtWebView
+          WebView {
+            id: browserView
+            anchors { top: parent.top; left: parent.left; right: parent.right; }
+            onLoadingChanged: {
+              if ( !loading ) {
+                anchors.fill = parent; width = parent.width
+                height = parent.height; opacity = 1
               }
-              onCookieAdded: (domain, name) => {
-                browserPanel.browserCookies.push([domain, name])
-              }
-            }', browserContent);
-          if (clearCookiesOnOpen) {
-            browserView.deleteAllCookies();
-          }
-        } else {
-          browserView = Qt.createQmlObject('import QtWebView 1.14
-            WebView {
-              id: browserView
-              anchors { top: parent.top; left: parent.left; right: parent.right; }
-              onLoadingChanged: {
-                if ( !loading ) {
-                  anchors.fill = parent; width = parent.width
-                  height = parent.height; opacity = 1
-                }
-              }
-            }', browserContent);
+            }
+            onCookieAdded: (domain, name) => {
+              browserPanel.browserCookies.push([domain, name])
+            }
+          }', browserContent);
+        if (clearCookiesOnOpen) {
+          browserView.deleteAllCookies();
         }
       }
       browserView.anchors.fill = undefined;
diff --git a/src/qml/BusyOverlay.qml b/src/qml/BusyOverlay.qml
index c71f407b16..b48914382b 100644
--- a/src/qml/BusyOverlay.qml
+++ b/src/qml/BusyOverlay.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Rectangle {
   id: busyOverlay
diff --git a/src/qml/Changelog.qml b/src/qml/Changelog.qml
index 817cb6a96f..668b9f5794 100644
--- a/src/qml/Changelog.qml
+++ b/src/qml/Changelog.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Popup {
   id: changelogPopup
diff --git a/src/qml/CodeReader.qml b/src/qml/CodeReader.qml
index 02aae8b035..cfcfa61e6f 100644
--- a/src/qml/CodeReader.qml
+++ b/src/qml/CodeReader.qml
@@ -4,8 +4,8 @@ import QtQuick.Layouts
 import QtQuick.Shapes
 import QtMultimedia
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Popup {
   id: codeReader
diff --git a/src/qml/ConfirmationToolbar.qml b/src/qml/ConfirmationToolbar.qml
index f463cd02c2..162ff4791b 100644
--- a/src/qml/ConfirmationToolbar.qml
+++ b/src/qml/ConfirmationToolbar.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: confirmationToolbar
 
   spacing: 4
diff --git a/src/qml/CoordinateLocator.qml b/src/qml/CoordinateLocator.qml
index 74ea8787d4..cba0aeec0d 100644
--- a/src/qml/CoordinateLocator.qml
+++ b/src/qml/CoordinateLocator.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: locator
diff --git a/src/qml/DashBoard.qml b/src/qml/DashBoard.qml
index 15fff9086d..00e43e4cb8 100644
--- a/src/qml/DashBoard.qml
+++ b/src/qml/DashBoard.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Drawer {
   id: dashBoard
diff --git a/src/qml/DigitizingToolbar.qml b/src/qml/DigitizingToolbar.qml
index ee8fd37da9..9ad1e0a075 100644
--- a/src/qml/DigitizingToolbar.qml
+++ b/src/qml/DigitizingToolbar.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: digitizingToolbar
 
   property RubberbandModel rubberbandModel
diff --git a/src/qml/ElevationProfile.qml b/src/qml/ElevationProfile.qml
index 60f8c68813..6b7bbc565e 100644
--- a/src/qml/ElevationProfile.qml
+++ b/src/qml/ElevationProfile.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQml 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: elevationProfile
diff --git a/src/qml/EmbeddedFeatureForm.qml b/src/qml/EmbeddedFeatureForm.qml
index aebe4a166d..2acb8e3734 100644
--- a/src/qml/EmbeddedFeatureForm.qml
+++ b/src/qml/EmbeddedFeatureForm.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 Popup {
   id: formPopup
diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
index eb6f7569c5..1a1d4c54cb 100644
--- a/src/qml/FeatureForm.qml
+++ b/src/qml/FeatureForm.qml
@@ -1,14 +1,14 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
-import QtQml.Models 2.14
-import QtQml 2.14
-import QtCharts 2.14 // Not actually used here but added so the android deploy script adds the relevant package
-import QtWebView 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQml.Models
+import QtQml
+import QtCharts
+import QtWebView
+import org.qgis
+import org.qfield
+import Theme
 
 Page {
   id: form
@@ -319,7 +319,7 @@ Page {
 
       onHtmlCodeChanged: {
         if (htmlItem === undefined) {
-          htmlItem = Qt.createQmlObject('import QtWebView 1.14;
+          htmlItem = Qt.createQmlObject('import QtWebView;
             WebView {
               id: htmlItem;
               height: 0;
diff --git a/src/qml/FeatureListForm.qml b/src/qml/FeatureListForm.qml
index b62c3ccf7f..4552418dd3 100644
--- a/src/qml/FeatureListForm.qml
+++ b/src/qml/FeatureListForm.qml
@@ -14,14 +14,14 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: featureFormList
diff --git a/src/qml/FeatureListSelectionHighlight.qml b/src/qml/FeatureListSelectionHighlight.qml
index bffa80b510..f06a4208d7 100644
--- a/src/qml/FeatureListSelectionHighlight.qml
+++ b/src/qml/FeatureListSelectionHighlight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
+import QtQuick
+import org.qgis
+import org.qfield
 
 Repeater {
   id: featureListSelectionHighlight
diff --git a/src/qml/GeometryEditorsToolbar.qml b/src/qml/GeometryEditorsToolbar.qml
index fe6c308dc6..6c597c2010 100644
--- a/src/qml/GeometryEditorsToolbar.qml
+++ b/src/qml/GeometryEditorsToolbar.qml
@@ -1,12 +1,12 @@
-import QtQuick 2.14
-import QtQml.Models 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQml.Models
+import org.qgis
+import org.qfield
+import Theme
 
 /**
 This contains several geometry editing tools
-A tool must subclass VisibilityFadingRow
+A tool must subclass QfVisibilityFadingRow
 And contains following functions:
   * function init(featureModel, mapSettings, editorRubberbandModel)
   * function cancel()
@@ -22,7 +22,7 @@ It can optionally implement the functions:
   * canvasLongPressed(point)
   These functions must return true if they catch the event
 */
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: geometryEditorsToolbar
 
   property FeatureModel featureModel //<! the feature which has its geometry being edited
@@ -100,7 +100,7 @@ VisibilityFadingRow {
       return false;
   }
 
-  VisibilityFadingRow {
+  QfVisibilityFadingRow {
     id: selectorRow
     stateVisible: true
 
diff --git a/src/qml/GeometryHighlighter.qml b/src/qml/GeometryHighlighter.qml
index 5901e27d75..3fb920199d 100644
--- a/src/qml/GeometryHighlighter.qml
+++ b/src/qml/GeometryHighlighter.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import org.qfield 1.0
+import QtQuick
+import org.qfield
 
 Item {
   id: geometryHighlighter
diff --git a/src/qml/GeometryRenderer.qml b/src/qml/GeometryRenderer.qml
index 3f2c24143a..8c07b0e6e0 100644
--- a/src/qml/GeometryRenderer.qml
+++ b/src/qml/GeometryRenderer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
+import QtQuick
+import org.qgis
+import org.qfield
 
 Item {
   id: geometryRenderer
diff --git a/src/qml/ImageDial.qml b/src/qml/ImageDial.qml
index 8a73614c6c..e721b9d9e9 100644
--- a/src/qml/ImageDial.qml
+++ b/src/qml/ImageDial.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 Dial {
   id: control
diff --git a/src/qml/InformationDrawer.qml b/src/qml/InformationDrawer.qml
index fb965e26bf..b2bf051c43 100644
--- a/src/qml/InformationDrawer.qml
+++ b/src/qml/InformationDrawer.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 Item {
   id: controller
diff --git a/src/qml/LayerLoginDialog.qml b/src/qml/LayerLoginDialog.qml
index 337e316ee8..8382a31869 100644
--- a/src/qml/LayerLoginDialog.qml
+++ b/src/qml/LayerLoginDialog.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Page {
   signal enter(string usr, string pw)
diff --git a/src/qml/LayerTreeItemProperties.qml b/src/qml/LayerTreeItemProperties.qml
index 492c78b575..d594cd2257 100644
--- a/src/qml/LayerTreeItemProperties.qml
+++ b/src/qml/LayerTreeItemProperties.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/Legend.qml b/src/qml/Legend.qml
index 6629b9cee6..79b020f771 100644
--- a/src/qml/Legend.qml
+++ b/src/qml/Legend.qml
@@ -1,12 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 ListView {
   id: legend
diff --git a/src/qml/LinePolygon.qml b/src/qml/LinePolygon.qml
index e51c070242..4e816bb622 100644
--- a/src/qml/LinePolygon.qml
+++ b/src/qml/LinePolygon.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qfield
+import org.qgis
+import Theme
 
 LinePolygonShape {
   id: linePolygonShape
diff --git a/src/qml/LocationMarker.qml b/src/qml/LocationMarker.qml
index 0d6c522fae..6ed73d985f 100644
--- a/src/qml/LocationMarker.qml
+++ b/src/qml/LocationMarker.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import QtQuick.Window 2.14
-import org.qgis 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Shapes
+import QtQuick.Window
+import org.qgis
+import Theme
 
 Item {
   id: locationMarker
diff --git a/src/qml/LocatorItem.qml b/src/qml/LocatorItem.qml
index 709d59e40a..1f15bf858e 100644
--- a/src/qml/LocatorItem.qml
+++ b/src/qml/LocatorItem.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: locatorItem
diff --git a/src/qml/LocatorSettings.qml b/src/qml/LocatorSettings.qml
index 7c61beebed..2d2530a1ec 100644
--- a/src/qml/LocatorSettings.qml
+++ b/src/qml/LocatorSettings.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/MapCanvas.qml b/src/qml/MapCanvas.qml
index 2a07129e1e..0df53d8bb8 100644
--- a/src/qml/MapCanvas.qml
+++ b/src/qml/MapCanvas.qml
@@ -14,10 +14,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQml 2.15
-import org.qgis 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml
+import org.qgis
 
 Item {
   id: mapArea
diff --git a/src/qml/MeasuringTool.qml b/src/qml/MeasuringTool.qml
index ebbee67eb0..7b97f540f8 100644
--- a/src/qml/MeasuringTool.qml
+++ b/src/qml/MeasuringTool.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: measuringTool
diff --git a/src/qml/MessageLog.qml b/src/qml/MessageLog.qml
index b47327314c..b41ba11cb6 100644
--- a/src/qml/MessageLog.qml
+++ b/src/qml/MessageLog.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Page {
   id: messageLog
diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
index d6ad83c476..1498718212 100644
--- a/src/qml/NavigationBar.qml
+++ b/src/qml/NavigationBar.qml
@@ -14,11 +14,11 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: toolBar
diff --git a/src/qml/NavigationHighlight.qml b/src/qml/NavigationHighlight.qml
index a8b58551a7..ba14d8ef3a 100644
--- a/src/qml/NavigationHighlight.qml
+++ b/src/qml/NavigationHighlight.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: navigationHighlight
diff --git a/src/qml/NavigationInformationView.qml b/src/qml/NavigationInformationView.qml
index 23431ef7d9..2a36b0fe59 100644
--- a/src/qml/NavigationInformationView.qml
+++ b/src/qml/NavigationInformationView.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: navigationInformationView
diff --git a/src/qml/NavigationRenderer.qml b/src/qml/NavigationRenderer.qml
index ddf82ee1f6..3cf8fdae1a 100644
--- a/src/qml/NavigationRenderer.qml
+++ b/src/qml/NavigationRenderer.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: navigationRenderer
diff --git a/src/qml/Nyuki.qml b/src/qml/Nyuki.qml
index 4298eff5a4..f12c290a49 100644
--- a/src/qml/Nyuki.qml
+++ b/src/qml/Nyuki.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 Item {
   id: nyukiContainer
diff --git a/src/qml/OverlayFeatureFormDrawer.qml b/src/qml/OverlayFeatureFormDrawer.qml
index 6e2d9348e0..cb16e7c7fa 100644
--- a/src/qml/OverlayFeatureFormDrawer.qml
+++ b/src/qml/OverlayFeatureFormDrawer.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Window 2.14
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Window
+import org.qfield
 
 Drawer {
   id: overlayFeatureFormDrawer
diff --git a/src/qml/PluginManagerSettings.qml b/src/qml/PluginManagerSettings.qml
index b4ddc13119..44c83b1bd9 100644
--- a/src/qml/PluginManagerSettings.qml
+++ b/src/qml/PluginManagerSettings.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/PositioningDeviceSettings.qml b/src/qml/PositioningDeviceSettings.qml
index 3ac0e21090..a9b3d97e47 100644
--- a/src/qml/PositioningDeviceSettings.qml
+++ b/src/qml/PositioningDeviceSettings.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/PositioningInformationView.qml b/src/qml/PositioningInformationView.qml
index 08d3d074c1..e8dbe1851e 100644
--- a/src/qml/PositioningInformationView.qml
+++ b/src/qml/PositioningInformationView.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: positioningInformationView
diff --git a/src/qml/PositioningPreciseView.qml b/src/qml/PositioningPreciseView.qml
index 6a59d1f57f..4686edf75b 100644
--- a/src/qml/PositioningPreciseView.qml
+++ b/src/qml/PositioningPreciseView.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Shapes 1.14
-import Theme 1.0
-import org.qfield 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Shapes
+import org.qfield
+import Theme
 
 Item {
   id: positioningPreciseView
diff --git a/src/qml/PositioningSettings.qml b/src/qml/PositioningSettings.qml
index 4c95ec744b..87c0a5b4e2 100644
--- a/src/qml/PositioningSettings.qml
+++ b/src/qml/PositioningSettings.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.14
 import QtCore
-import org.qfield 1.0
+import org.qfield
 
 Settings {
   property bool positioningActivated: false
diff --git a/src/qml/ProcessingAlgorithmForm.qml b/src/qml/ProcessingAlgorithmForm.qml
index 1c812ef73d..47475c375d 100644
--- a/src/qml/ProcessingAlgorithmForm.qml
+++ b/src/qml/ProcessingAlgorithmForm.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qfield
+import Theme
 
 Item {
   id: processingAlgorithmForm
diff --git a/src/qml/ProcessingAlgorithmPreview.qml b/src/qml/ProcessingAlgorithmPreview.qml
index 8f4e885c0e..2f236aaca0 100644
--- a/src/qml/ProcessingAlgorithmPreview.qml
+++ b/src/qml/ProcessingAlgorithmPreview.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import Theme 1.0
-import org.qgis 1.0
-import org.qfield 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 
 Repeater {
   id: processingAlgorithmPreview
diff --git a/src/qml/ProcessingAlgorithmsList.qml b/src/qml/ProcessingAlgorithmsList.qml
index b492ff2931..d3ebcc07be 100644
--- a/src/qml/ProcessingAlgorithmsList.qml
+++ b/src/qml/ProcessingAlgorithmsList.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qfield
+import Theme
 
 Item {
   id: processingAlgorithmsList
diff --git a/src/qml/QFieldAudioRecorder.qml b/src/qml/QFieldAudioRecorder.qml
index b5b43cda75..08c3cc2444 100644
--- a/src/qml/QFieldAudioRecorder.qml
+++ b/src/qml/QFieldAudioRecorder.qml
@@ -1,11 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Shapes 1.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Shapes
 import QtMultimedia
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Popup {
   id: audioRecorder
diff --git a/src/qml/QFieldCamera.qml b/src/qml/QFieldCamera.qml
index cae76611e3..cad5e49078 100644
--- a/src/qml/QFieldCamera.qml
+++ b/src/qml/QFieldCamera.qml
@@ -4,8 +4,8 @@ import QtQuick.Shapes
 import QtQuick.Window
 import QtMultimedia
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Popup {
   id: cameraItem
diff --git a/src/qml/QFieldCloudDeltaHistory.qml b/src/qml/QFieldCloudDeltaHistory.qml
index 0cc073d45e..088038f36b 100644
--- a/src/qml/QFieldCloudDeltaHistory.qml
+++ b/src/qml/QFieldCloudDeltaHistory.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/QFieldCloudLogin.qml b/src/qml/QFieldCloudLogin.qml
index 4b660b5c5a..fa994bc120 100644
--- a/src/qml/QFieldCloudLogin.qml
+++ b/src/qml/QFieldCloudLogin.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   id: qfieldCloudLogin
diff --git a/src/qml/QFieldCloudPackageLayersFeedback.qml b/src/qml/QFieldCloudPackageLayersFeedback.qml
index 6e917794b2..b24ea011bc 100644
--- a/src/qml/QFieldCloudPackageLayersFeedback.qml
+++ b/src/qml/QFieldCloudPackageLayersFeedback.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Dialog {
   parent: mainWindow.contentItem
diff --git a/src/qml/QFieldCloudPopup.qml b/src/qml/QFieldCloudPopup.qml
index 87123f6364..a6ca5846e6 100644
--- a/src/qml/QFieldCloudPopup.qml
+++ b/src/qml/QFieldCloudPopup.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/QFieldCloudScreen.qml b/src/qml/QFieldCloudScreen.qml
index afcfabb275..55d5c03120 100644
--- a/src/qml/QFieldCloudScreen.qml
+++ b/src/qml/QFieldCloudScreen.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQml.Models 2.14
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQml.Models
+import org.qfield
+import Theme
 
 Page {
   id: qfieldCloudScreen
diff --git a/src/qml/QFieldLocalDataPickerScreen.qml b/src/qml/QFieldLocalDataPickerScreen.qml
index 050757f574..fe56c35865 100644
--- a/src/qml/QFieldLocalDataPickerScreen.qml
+++ b/src/qml/QFieldLocalDataPickerScreen.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQml.Models 2.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQml.Models
+import org.qfield
+import Theme
 
 Page {
   id: qfieldLocalDataPickerScreen
diff --git a/src/qml/QFieldSettings.qml b/src/qml/QFieldSettings.qml
index cecdb2aa61..69d1278bde 100644
--- a/src/qml/QFieldSettings.qml
+++ b/src/qml/QFieldSettings.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Page {
   signal finished
diff --git a/src/qml/QFieldSketcher.qml b/src/qml/QFieldSketcher.qml
index 7005736e4f..d07e262545 100644
--- a/src/qml/QFieldSketcher.qml
+++ b/src/qml/QFieldSketcher.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import QtCore
-import Theme 1.0
-import org.qfield 1.0
+import org.qfield
+import Theme
 
 Popup {
   id: sketcher
diff --git a/src/qml/RelationCombobox.qml b/src/qml/RelationCombobox.qml
index 7bdc02316d..92a0d9e7d6 100644
--- a/src/qml/RelationCombobox.qml
+++ b/src/qml/RelationCombobox.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import org.qgis
+import Theme
 
 Item {
   id: relationCombobox
diff --git a/src/qml/Rubberband.qml b/src/qml/Rubberband.qml
index cb22039288..ed09ebc80f 100644
--- a/src/qml/Rubberband.qml
+++ b/src/qml/Rubberband.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qfield
+import org.qgis
+import Theme
 
 RubberbandShape {
   id: rubberbandShape
diff --git a/src/qml/ScaleBar.qml b/src/qml/ScaleBar.qml
index c246d8fce3..30f72c524e 100644
--- a/src/qml/ScaleBar.qml
+++ b/src/qml/ScaleBar.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qfield
+import org.qgis
+import Theme
 
 Item {
   id: scaleBar
diff --git a/src/qml/ScreenLocker.qml b/src/qml/ScreenLocker.qml
index 87fe466e71..7b6c7fb285 100644
--- a/src/qml/ScreenLocker.qml
+++ b/src/qml/ScreenLocker.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import Theme
 
 Item {
   id: screenLocker
diff --git a/src/qml/SensorInformationView.qml b/src/qml/SensorInformationView.qml
index b45a33edcc..5414c0b221 100644
--- a/src/qml/SensorInformationView.qml
+++ b/src/qml/SensorInformationView.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: sensorInformationView
diff --git a/src/qml/SerialPortDeviceChooser.qml b/src/qml/SerialPortDeviceChooser.qml
index 6abe8f29ad..ca18c8a871 100644
--- a/src/qml/SerialPortDeviceChooser.qml
+++ b/src/qml/SerialPortDeviceChooser.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   width: parent.width
diff --git a/src/qml/TcpDeviceChooser.qml b/src/qml/TcpDeviceChooser.qml
index 360667c3fb..7492525fe1 100644
--- a/src/qml/TcpDeviceChooser.qml
+++ b/src/qml/TcpDeviceChooser.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   width: parent.width
diff --git a/src/qml/TemporalProperties.qml b/src/qml/TemporalProperties.qml
index 47213d792c..9038fe4f0f 100644
--- a/src/qml/TemporalProperties.qml
+++ b/src/qml/TemporalProperties.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: popup
diff --git a/src/qml/Toast.qml b/src/qml/Toast.qml
index c957f6b767..a4c52c7402 100644
--- a/src/qml/Toast.qml
+++ b/src/qml/Toast.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import Theme
 
 Popup {
   id: toast
diff --git a/src/qml/TrackerSettings.qml b/src/qml/TrackerSettings.qml
index 9f9eaa87d7..94fd7d2934 100644
--- a/src/qml/TrackerSettings.qml
+++ b/src/qml/TrackerSettings.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: trackInformationPopup
diff --git a/src/qml/TrackingSession.qml b/src/qml/TrackingSession.qml
index 63beae2816..8ce0ed9e7c 100644
--- a/src/qml/TrackingSession.qml
+++ b/src/qml/TrackingSession.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: trackingSession
diff --git a/src/qml/UdpDeviceChooser.qml b/src/qml/UdpDeviceChooser.qml
index f4b747fefc..afc42283ab 100644
--- a/src/qml/UdpDeviceChooser.qml
+++ b/src/qml/UdpDeviceChooser.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   width: parent.width
diff --git a/src/qml/VariableEditor.qml b/src/qml/VariableEditor.qml
index fdaab91d18..847088420f 100644
--- a/src/qml/VariableEditor.qml
+++ b/src/qml/VariableEditor.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 ColumnLayout {
   function reset() {
diff --git a/src/qml/VertexRubberband.qml b/src/qml/VertexRubberband.qml
index 634f7a8cc2..b3d4a8c563 100644
--- a/src/qml/VertexRubberband.qml
+++ b/src/qml/VertexRubberband.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQml 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQml
+import org.qgis
+import org.qfield
+import Theme
 
 Repeater {
   id: vertexRubberband
diff --git a/src/qml/WelcomeScreen.qml b/src/qml/WelcomeScreen.qml
index 9e92c66ffe..90782c11a9 100644
--- a/src/qml/WelcomeScreen.qml
+++ b/src/qml/WelcomeScreen.qml
@@ -1,11 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material.impl 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Particles 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material.impl
+import QtQuick.Layouts
+import QtQuick.Particles
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Page {
   id: welcomeScreen
diff --git a/src/qml/editorwidgets/CheckBox.qml b/src/qml/editorwidgets/CheckBox.qml
index 22d40f35e0..29fde46c89 100644
--- a/src/qml/editorwidgets/CheckBox.qml
+++ b/src/qml/editorwidgets/CheckBox.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import Theme
 
 EditorWidgetBase {
   height: childrenRect.height
diff --git a/src/qml/editorwidgets/DateTime.qml b/src/qml/editorwidgets/DateTime.qml
index 3368dfa471..9542cfbdab 100644
--- a/src/qml/editorwidgets/DateTime.qml
+++ b/src/qml/editorwidgets/DateTime.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 import ".."
 
 /*
diff --git a/src/qml/editorwidgets/EditorWidgetBase.qml b/src/qml/editorwidgets/EditorWidgetBase.qml
index 60c30c11b7..f45c1f9e9d 100644
--- a/src/qml/editorwidgets/EditorWidgetBase.qml
+++ b/src/qml/editorwidgets/EditorWidgetBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 Item {
   /**
diff --git a/src/qml/editorwidgets/ExternalResource.qml b/src/qml/editorwidgets/ExternalResource.qml
index 8d8463c4ba..dd282fc03c 100644
--- a/src/qml/editorwidgets/ExternalResource.qml
+++ b/src/qml/editorwidgets/ExternalResource.qml
@@ -1,12 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Window 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
 import QtMultimedia
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
-import "."
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
 EditorWidgetBase {
diff --git a/src/qml/editorwidgets/Range.qml b/src/qml/editorwidgets/Range.qml
index fc323222bd..d98da53e00 100644
--- a/src/qml/editorwidgets/Range.qml
+++ b/src/qml/editorwidgets/Range.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 EditorWidgetBase {
   id: rangeItem
diff --git a/src/qml/editorwidgets/RelationReference.qml b/src/qml/editorwidgets/RelationReference.qml
index 00a5f73171..8e0e492a22 100644
--- a/src/qml/editorwidgets/RelationReference.qml
+++ b/src/qml/editorwidgets/RelationReference.qml
@@ -1,11 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import org.qgis
+import Theme
 import ".."
-import "."
 
 EditorWidgetBase {
   height: childrenRect.height
diff --git a/src/qml/editorwidgets/TextEdit.qml b/src/qml/editorwidgets/TextEdit.qml
index 326e2ceeed..278252ac2b 100644
--- a/src/qml/editorwidgets/TextEdit.qml
+++ b/src/qml/editorwidgets/TextEdit.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 EditorWidgetBase {
   id: topItem
diff --git a/src/qml/editorwidgets/UuidGenerator.qml b/src/qml/editorwidgets/UuidGenerator.qml
index e0c4c84188..246d5932f5 100644
--- a/src/qml/editorwidgets/UuidGenerator.qml
+++ b/src/qml/editorwidgets/UuidGenerator.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 EditorWidgetBase {
   height: childrenRect.height
diff --git a/src/qml/editorwidgets/ValueMap.qml b/src/qml/editorwidgets/ValueMap.qml
index dca9e96d4b..02a186f54c 100644
--- a/src/qml/editorwidgets/ValueMap.qml
+++ b/src/qml/editorwidgets/ValueMap.qml
@@ -1,12 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 import QtQuick.Layouts
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
-import "."
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qfield
+import org.qgis
+import Theme
 import ".."
 
 EditorWidgetBase {
diff --git a/src/qml/editorwidgets/ValueRelation.qml b/src/qml/editorwidgets/ValueRelation.qml
index c5deaf22cc..04e61c9ed3 100644
--- a/src/qml/editorwidgets/ValueRelation.qml
+++ b/src/qml/editorwidgets/ValueRelation.qml
@@ -1,11 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import org.qgis
+import Theme
 import ".."
-import "."
 
 EditorWidgetBase {
   id: valueRelation
diff --git a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml
index 9ba8e361c0..4976107877 100644
--- a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml
+++ b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml
@@ -1,12 +1,12 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQml.Models 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml.Models
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qfield
+import org.qgis
+import Theme
 import "../.."
 import ".."
 
diff --git a/src/qml/editorwidgets/relationeditors/relation_editor.qml b/src/qml/editorwidgets/relationeditors/relation_editor.qml
index 2578b07708..84bbb34ebc 100644
--- a/src/qml/editorwidgets/relationeditors/relation_editor.qml
+++ b/src/qml/editorwidgets/relationeditors/relation_editor.qml
@@ -1,11 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qfield 1.0
-import org.qgis 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qfield
+import org.qgis
+import Theme
 import "../.."
 import ".."
 
diff --git a/src/qml/geometryeditors/Erase.qml b/src/qml/geometryeditors/Erase.qml
index f135635379..5963223450 100644
--- a/src/qml/geometryeditors/Erase.qml
+++ b/src/qml/geometryeditors/Erase.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: eraseToolbar
 
   signal finished
diff --git a/src/qml/geometryeditors/FillRing.qml b/src/qml/geometryeditors/FillRing.qml
index 70c233d340..8d30094e2c 100644
--- a/src/qml/geometryeditors/FillRing.qml
+++ b/src/qml/geometryeditors/FillRing.qml
@@ -1,11 +1,11 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: fillRingToolbar
 
   signal finished
diff --git a/src/qml/geometryeditors/Reshape.qml b/src/qml/geometryeditors/Reshape.qml
index 81825fab1c..a7baae0e57 100644
--- a/src/qml/geometryeditors/Reshape.qml
+++ b/src/qml/geometryeditors/Reshape.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: reshapeToolbar
 
   signal finished
diff --git a/src/qml/geometryeditors/SplitFeature.qml b/src/qml/geometryeditors/SplitFeature.qml
index f8a13d3eaf..d5b36fa796 100644
--- a/src/qml/geometryeditors/SplitFeature.qml
+++ b/src/qml/geometryeditors/SplitFeature.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: splitFeatureToolbar
 
   signal finished
diff --git a/src/qml/geometryeditors/VertexEditor.qml b/src/qml/geometryeditors/VertexEditor.qml
index b2c2cd527f..41faf8daf6 100644
--- a/src/qml/geometryeditors/VertexEditor.qml
+++ b/src/qml/geometryeditors/VertexEditor.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 import ".."
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: vertexEditorToolbar
 
   signal finished
diff --git a/src/qml/imports/Theme/QfButton.qml b/src/qml/imports/Theme/QfButton.qml
index 3d0dcc54f1..9b7a0ebf00 100644
--- a/src/qml/imports/Theme/QfButton.qml
+++ b/src/qml/imports/Theme/QfButton.qml
@@ -1,8 +1,8 @@
-import QtQuick.Controls 2.14
-import QtQuick.Controls.impl 2.14
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
 
 Button {
   id: button
diff --git a/src/qml/imports/Theme/QfCalendarPanel.qml b/src/qml/imports/Theme/QfCalendarPanel.qml
index 34729dca6d..e787ba55c3 100644
--- a/src/qml/imports/Theme/QfCalendarPanel.qml
+++ b/src/qml/imports/Theme/QfCalendarPanel.qml
@@ -1,9 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Theme 1.0
-import org.qfield 1.0
-import "."
+import org.qfield
+import Theme
 
 Popup {
   id: calendarPopup
diff --git a/src/qml/imports/Theme/QfCloseButton.qml b/src/qml/imports/Theme/QfCloseButton.qml
index b12210bf84..041d51f8b9 100644
--- a/src/qml/imports/Theme/QfCloseButton.qml
+++ b/src/qml/imports/Theme/QfCloseButton.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import Theme
 
 ToolButton {
   id: button
diff --git a/src/qml/imports/Theme/QfCollapsibleMessage.qml b/src/qml/imports/Theme/QfCollapsibleMessage.qml
index 562624e956..4f8078ff67 100644
--- a/src/qml/imports/Theme/QfCollapsibleMessage.qml
+++ b/src/qml/imports/Theme/QfCollapsibleMessage.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import Theme
 
 Item {
   property bool collapsed: true
diff --git a/src/qml/imports/Theme/QfComboBox.qml b/src/qml/imports/Theme/QfComboBox.qml
index 5d7444ff2c..30e1a9fd99 100644
--- a/src/qml/imports/Theme/QfComboBox.qml
+++ b/src/qml/imports/Theme/QfComboBox.qml
@@ -1,8 +1,8 @@
-import QtQuick.Controls 2.14
-import QtQuick.Controls.impl 2.14
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
 
 ComboBox {
   id: comboBox
diff --git a/src/qml/imports/Theme/QfDropShadow.qml b/src/qml/imports/Theme/QfDropShadow.qml
index ad57e2112a..058ebc0f15 100644
--- a/src/qml/imports/Theme/QfDropShadow.qml
+++ b/src/qml/imports/Theme/QfDropShadow.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.14
+import QtQuick
 import QtQuick.Effects
 
 MultiEffect {
diff --git a/src/qml/imports/Theme/QfOpacityMask.qml b/src/qml/imports/Theme/QfOpacityMask.qml
index 89557d2026..cbb0764687 100644
--- a/src/qml/imports/Theme/QfOpacityMask.qml
+++ b/src/qml/imports/Theme/QfOpacityMask.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.14
+import QtQuick
 import QtQuick.Effects
 
 MultiEffect {
diff --git a/src/qml/imports/Theme/QfOverlayContainer.qml b/src/qml/imports/Theme/QfOverlayContainer.qml
index b112f8d32f..b613c92481 100644
--- a/src/qml/imports/Theme/QfOverlayContainer.qml
+++ b/src/qml/imports/Theme/QfOverlayContainer.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import Theme 1.0
+import QtQuick
+import Theme
 
 Rectangle {
   id: container
diff --git a/src/qml/imports/Theme/QfPageHeader.qml b/src/qml/imports/Theme/QfPageHeader.qml
index 214dc2bb0e..6fc019014d 100644
--- a/src/qml/imports/Theme/QfPageHeader.qml
+++ b/src/qml/imports/Theme/QfPageHeader.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import Theme
 
 ToolBar {
   property alias title: titleLabel.text
diff --git a/src/qml/imports/Theme/QfSlider.qml b/src/qml/imports/Theme/QfSlider.qml
index 900aa6d1c9..21197c3d16 100644
--- a/src/qml/imports/Theme/QfSlider.qml
+++ b/src/qml/imports/Theme/QfSlider.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Item {
   id: wrapper
diff --git a/src/qml/imports/Theme/QfSwipeAnimator.qml b/src/qml/imports/Theme/QfSwipeAnimator.qml
index 7eb7b059c2..b149b7fd4f 100644
--- a/src/qml/imports/Theme/QfSwipeAnimator.qml
+++ b/src/qml/imports/Theme/QfSwipeAnimator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import Theme 1.0
+import QtQuick
+import Theme
 
 Flickable {
   id: flick
diff --git a/src/qml/imports/Theme/QfSwitch.qml b/src/qml/imports/Theme/QfSwitch.qml
index f7d805d4ed..2f1ecf5fe0 100644
--- a/src/qml/imports/Theme/QfSwitch.qml
+++ b/src/qml/imports/Theme/QfSwitch.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 SwitchDelegate {
   property bool small: false
diff --git a/src/qml/imports/Theme/QfTabBar.qml b/src/qml/imports/Theme/QfTabBar.qml
index 4f04a1c5ee..6ec6147fc1 100644
--- a/src/qml/imports/Theme/QfTabBar.qml
+++ b/src/qml/imports/Theme/QfTabBar.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import Theme
 
 ListView {
   id: tabRow
diff --git a/src/qml/imports/Theme/QfTextField.qml b/src/qml/imports/Theme/QfTextField.qml
index 37fbbb92be..b0af402750 100644
--- a/src/qml/imports/Theme/QfTextField.qml
+++ b/src/qml/imports/Theme/QfTextField.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 TextField {
   id: textField
diff --git a/src/qml/imports/Theme/QfToolButton.qml b/src/qml/imports/Theme/QfToolButton.qml
index e4b65626fb..20021dccf3 100644
--- a/src/qml/imports/Theme/QfToolButton.qml
+++ b/src/qml/imports/Theme/QfToolButton.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
 import Theme 1.0
 
 RoundButton {
diff --git a/src/qml/imports/Theme/QfToolButtonDrawer.qml b/src/qml/imports/Theme/QfToolButtonDrawer.qml
index 5995894a90..abfd6c92b2 100644
--- a/src/qml/imports/Theme/QfToolButtonDrawer.qml
+++ b/src/qml/imports/Theme/QfToolButtonDrawer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import Theme
 
 Container {
   id: container
diff --git a/src/qml/VisibilityFadingRow.qml b/src/qml/imports/Theme/QfVisibilityFadingRow.qml
similarity index 96%
rename from src/qml/VisibilityFadingRow.qml
rename to src/qml/imports/Theme/QfVisibilityFadingRow.qml
index 7bb1461e9d..07d497c56e 100644
--- a/src/qml/VisibilityFadingRow.qml
+++ b/src/qml/imports/Theme/QfVisibilityFadingRow.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.14
+import QtQuick
 
 Row {
   id: visibilityFadingRow
diff --git a/src/qml/imports/Theme/Theme.qml b/src/qml/imports/Theme/Theme.qml
index 7524e52de7..544f5d2289 100644
--- a/src/qml/imports/Theme/Theme.qml
+++ b/src/qml/imports/Theme/Theme.qml
@@ -1,6 +1,6 @@
 pragma Singleton
-import QtQuick 2.14
-import QtQuick.Controls.Material 2.14
+import QtQuick
+import QtQuick.Controls.Material
 
 QtObject {
   property bool darkTheme: false
diff --git a/src/qml/imports/Theme/qmldir b/src/qml/imports/Theme/qmldir
index 5d13df0b54..73ecae353b 100644
--- a/src/qml/imports/Theme/qmldir
+++ b/src/qml/imports/Theme/qmldir
@@ -19,3 +19,4 @@ QfSwipeAnimator 1.0 QfSwipeAnimator.qml
 QfProgrerssRing 1.0 QfProgrerssRing.qml
 QfScrollBar 1.0 QfScrollBar.qml
 QfSearchBar 1.0 QfSearchBar.qml
+QfVisibilityFadingRow 1.0 QfVisibilityFadingRow.qml
diff --git a/src/qml/processingparameterwidgets/ProcessingParameterWidgetBase.qml b/src/qml/processingparameterwidgets/ProcessingParameterWidgetBase.qml
index 504b066f67..e8b0d3432c 100644
--- a/src/qml/processingparameterwidgets/ProcessingParameterWidgetBase.qml
+++ b/src/qml/processingparameterwidgets/ProcessingParameterWidgetBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
 
 Item {
   /* This signal is emmited when a processing parameter widget has changed the value.
diff --git a/src/qml/processingparameterwidgets/boolean.qml b/src/qml/processingparameterwidgets/boolean.qml
index 8f1f2a3273..02a0ffd28e 100644
--- a/src/qml/processingparameterwidgets/boolean.qml
+++ b/src/qml/processingparameterwidgets/boolean.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import Theme
+import org.qfield
+import org.qgis
 
 ProcessingParameterWidgetBase {
   id: booleanItem
diff --git a/src/qml/processingparameterwidgets/distance.qml b/src/qml/processingparameterwidgets/distance.qml
index 57779c8925..075087e952 100644
--- a/src/qml/processingparameterwidgets/distance.qml
+++ b/src/qml/processingparameterwidgets/distance.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import Theme
+import org.qfield
+import org.qgis
 
 ProcessingParameterWidgetBase {
   id: distanceItem
diff --git a/src/qml/processingparameterwidgets/enum.qml b/src/qml/processingparameterwidgets/enum.qml
index 38a7f18720..0229c575df 100644
--- a/src/qml/processingparameterwidgets/enum.qml
+++ b/src/qml/processingparameterwidgets/enum.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import Theme
+import org.qfield
+import org.qgis
 
 ProcessingParameterWidgetBase {
   id: distanceItem
diff --git a/src/qml/processingparameterwidgets/number.qml b/src/qml/processingparameterwidgets/number.qml
index 02edbe84b0..02136d1801 100644
--- a/src/qml/processingparameterwidgets/number.qml
+++ b/src/qml/processingparameterwidgets/number.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import Theme 1.0
-import org.qfield 1.0
-import org.qgis 1.0
-import "."
+import QtQuick
+import QtQuick.Controls
+import Theme
+import org.qfield
+import org.qgis
 
 ProcessingParameterWidgetBase {
   id: numberItem
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
index 600aee5525..806a518ea5 100644
--- a/src/qml/qgismobileapp.qml
+++ b/src/qml/qgismobileapp.qml
@@ -14,17 +14,17 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Effects
-import QtQuick.Window 2.14
-import QtQml 2.14
-import QtSensors 5.14
+import QtQuick.Window
+import QtQml
+import QtSensors
 import QtCore
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import org.qgis
+import org.qfield
+import Theme
 
 ApplicationWindow {
   id: mainWindow
diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
index 8ab4112fc9..63836d9ba2 100644
--- a/src/qml/qml.qrc
+++ b/src/qml/qml.qrc
@@ -69,7 +69,6 @@
         <file>TemporalProperties.qml</file>
         <file>LayerTreeItemProperties.qml</file>
         <file>VertexRubberband.qml</file>
-        <file>VisibilityFadingRow.qml</file>
         <file>LocatorItem.qml</file>
         <file>LocatorSettings.qml</file>
         <file>OverlayFeatureFormDrawer.qml</file>
@@ -100,6 +99,7 @@
         <file>imports/Theme/QfTabBar.qml</file>
         <file>imports/Theme/qmldir</file>
         <file>imports/Theme/QfSwipeAnimator.qml</file>
+        <file>imports/Theme/QfVisibilityFadingRow.qml</file>
         <file>TrackerSettings.qml</file>
         <file>TrackingSession.qml</file>
         <file>EmbeddedFeatureForm.qml</file>
diff --git a/test/qml/tst_editorwidgets.qml b/test/qml/tst_editorwidgets.qml
index 2da2b6ac7f..db7a360c49 100644
--- a/test/qml/tst_editorwidgets.qml
+++ b/test/qml/tst_editorwidgets.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtTest 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtTest
+import org.qfield
+import Theme
 import "../../src/qml/editorwidgets" as EditorWidgets
 
 TestCase {
diff --git a/test/qml/tst_featureForm.qml b/test/qml/tst_featureForm.qml
index 5395208263..54e9fe25a8 100644
--- a/test/qml/tst_featureForm.qml
+++ b/test/qml/tst_featureForm.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtTest 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtTest
+import org.qfield
+import Theme
 import "../../src/qml/" as QFieldControls
 import "Utils.js" as Utils
 
diff --git a/test/qml/tst_positioning.qml b/test/qml/tst_positioning.qml
index 6782f93fd8..819250566c 100644
--- a/test/qml/tst_positioning.qml
+++ b/test/qml/tst_positioning.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtTest 1.0
-import org.qfield 1.0
+import QtQuick
+import QtTest
+import org.qfield
 
 TestCase {
   name: "Positioning"
diff --git a/test/qml/tst_qFieldGuide.qml b/test/qml/tst_qFieldGuide.qml
index a8e97a5d62..030cc6a08d 100644
--- a/test/qml/tst_qFieldGuide.qml
+++ b/test/qml/tst_qFieldGuide.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtTest 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtTest
+import org.qfield
+import Theme
 import "../../src/qml/" as QFieldControls
 import "Utils.js" as Utils