diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b1022583..945f94525 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(QOpenHDProject VERSION 0.1 LANGUAGES CXX)
+project(QOpenHDProject VERSION 0.1 LANGUAGES C CXX)
 
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -73,6 +75,7 @@ qt_add_executable(QOpenHDApp
     app/videostreaming/vscommon/decodingstatistcs.h
     ##
     lib/geographiclib-c-2.0/src/geodesic.c
+    lib/geographiclib-c-2.0/src/geodesic.h
     ##
     ##
     ##
@@ -90,13 +93,22 @@ target_include_directories(QOpenHDApp PUBLIC app/telemetry/util)
 
 target_include_directories(QOpenHDApp PUBLIC app/videostreaming/vscommon)
 target_include_directories(QOpenHDApp PUBLIC lib)
+target_include_directories(QOpenHDApp PUBLIC lib/geographiclib-c-2.0/src)
 
-qt_add_qml_module(QOpenHDApp
-    URI QOpenHD
-    VERSION 1.0
-    QML_FILES
-        qml/MainX.qml
-)
+#qt_add_qml_module(QOpenHDApp
+#    URI hello
+#    VERSION 1.0
+#    QML_FILES
+#        qml/main.qml
+#        qml/ui/AnyParamBusyIndicator.qml
+#        qml/ui/HUDOverlayGrid.qml
+#        qml/ui/elements/
+#        qml/ui/sidebar/
+#        qml/ui/widgets/
+#)
+#qt6_add_resources(qml_QRC
+#    PREFIX "/"
+#    qml/qml.qrc)
 
 
 target_link_libraries(QOpenHDApp
diff --git a/app/main.cpp b/app/main.cpp
index 00ab6103b..adeabec52 100755
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -419,7 +419,13 @@ int main(int argc, char *argv[]) {
      );
 
     // TODO QT 6
-    engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    //engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    //const QUrl url("qrc:/qt/qml/hello/qml/main.qml");
+    QCoreApplication::addLibraryPath("./");
+    //const QUrl url(QStringLiteral("qrc:/qt/qml/main.qml"));
+    //const QUrl url(QStringLiteral("qrc:/qml/main.qml"));
+    const QUrl url(QStringLiteral("qrc:/main.qml"));
+    engine.load(url);
     //engine.loadFromModule("QOpenHD", "qrc:/main.qml");
     //engine.loadFromModule("QOpenHDApp","qrc:/main.qml");
     //engine.load("qml/main.qml");
diff --git a/app/telemetry/tutil/geodesi_helper.h b/app/telemetry/tutil/geodesi_helper.h
index 6a35526ef..f79da954a 100644
--- a/app/telemetry/tutil/geodesi_helper.h
+++ b/app/telemetry/tutil/geodesi_helper.h
@@ -2,10 +2,13 @@
 #define GEODESI_HELPER_H
 
 //#include <geographiclib-c-2.0/src/geodesic.h>
-#include "lib/geographiclib-c-2.0/src/geodesic.h"
+extern "C" {
+//#include "lib/geographiclib-c-2.0/src/geodesic.h"
+//#include "geodesi.h"
+}
 
 // return: distance in m between 2 points
-static double distance_between(double lat1,double lon1,double lat2,double lon2){
+/*static double distance_between(double lat1,double lon1,double lat2,double lon2){
     double s12;
     //double azi1;
     //double azi2;
@@ -16,10 +19,10 @@ static double distance_between(double lat1,double lon1,double lat2,double lon2){
     geod_init(&geod,a,f);
     geod_inverse(&geod,lat1,lon1,lat2,lon2,&s12,0,0); //&azi1,&azi2
     return s12;
-}
+}*/
 
-/*static double distance_between(double lat1,double lon1,double lat2,double lon2){
+static double distance_between(double lat1,double lon1,double lat2,double lon2){
     return 0;
-}*/
+}
 
 #endif // GEODESI_HELPER_H
diff --git a/qml/MainX.qml b/qml/MainX.qml
deleted file mode 100644
index 755ab5602..000000000
--- a/qml/MainX.qml
+++ /dev/null
@@ -1,171 +0,0 @@
-
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.0
-import Qt.labs.settings 1.0
-
-import OpenHD 1.0
-
-import "./ui"
-import "./ui/widgets"
-import "./ui/elements"
-import "./ui/configpopup"
-import "./video"
-
-ApplicationWindow {
-    id: applicationWindow
-    visible: true
-
-
-    //property int m_window_width: 1280
-    //property int m_window_height: 720
-    property int m_window_width: 850 // This is 480p 16:9
-    property int m_window_height: 480
-
-    //width: 850
-    //height: 480
-    width: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? m_window_height : m_window_width
-    height: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? m_window_width : m_window_height
-
-    onWidthChanged: {
-        _qrenderstats.set_window_width(width)
-    }
-    onHeightChanged: {
-        _qrenderstats.set_window_height(height)
-    }
-
-    contentOrientation: settings.general_screen_rotation===0 ? Qt.PortraitOrientation : Qt.LandscapeOrientation
-    contentItem.rotation: settings.general_screen_rotation
-
-    //minimumWidth: 850
-    //minimumHeight: 480
-    title: qsTr("QOpenHD EVO")
-    // Transparent background is needed when the video is not rendered via (OpenGL) inside QT,
-    // but rather done independently by using a pipeline that directly goes to the HW composer (e.g. mmal on pi).
-    //color: "transparent" //Consti10 transparent background
-    //color : "#2C3E50" // reduce KREBS
-    color: settings.app_background_transparent ? "transparent" : "#2C3E50"
-    //flags: Qt.WindowStaysOnTopHint| Qt.FramelessWindowHint| Qt.X11BypassWindowManagerHint;
-    //flags: Qt.WindowStaysOnTopHint| Qt.X11BypassWindowManagerHint;
-    //visibility: "FullScreen"
-    // android / ios - specifc: We need to explicitly say full screen, otherwise things might be "cut off"
-    visibility: (settings.dev_force_show_full_screen || QOPENHD_IS_MOBILE) ? "FullScreen" : "AutomaticVisibility"
-
-    // This only exists to be able to fully rotate "everything" for users that have their screen upside down for some reason.
-    // Won't affect the video, but heck, then just mount your camera upside down.
-    // TODO: the better fix really would be to somehow the the RPI HDMI config to rotate the screen in HW - but r.n there seems to be
-    // no way, at least on MMAL
-    // NOTE: If this creates issues, just comment it out - I'd love to get rid of it as soon as we can.
-    Item{
-        // rotation: settings.general_screen_rotation
-        anchors.centerIn: parent
-        width: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? parent.height : parent.width
-        height: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? parent.width : parent.height
-
-        // Local app settings. Uses the "user defaults" system on Mac/iOS, the Registry on Windows,
-        // and equivalent settings systems on Linux and Android
-        // On linux, they generally are stored under /home/username/.config/Open.HD
-        // See https://doc.qt.io/qt-5/qsettings.html#platform-specific-notes for more info
-        AppSettings {
-            id: settings
-            Component.onCompleted: {
-                //
-            }
-        }
-
-        // Loads the proper (platform-dependent) video widget for the main (primary) video
-        // primary video is always full-screen and behind the HUD OSD Elements
-        Loader {
-            anchors.fill: parent
-            z: 1.0
-            source: {
-                if(QOPENHD_ENABLE_VIDEO_VIA_ANDROID){
-                    return "../video/ExpMainVideoAndroid.qml"
-                }
-                // If we have avcodec at compile time, we prefer it over qmlglsink since it provides lower latency
-                // (not really avcodec itself, but in this namespace we have 1) the preferred sw decode path and
-                // 2) also the mmal rpi path )
-                if(QOPENHD_ENABLE_VIDEO_VIA_AVCODEC){
-                    return "../video/MainVideoQSG.qml";
-                }
-                // Fallback / windows or similar
-                if(QOPENHD_ENABLE_GSTREAMER_QMLGLSINK){
-                    return "../video/MainVideoGStreamer.qml";
-                }
-                console.warn("No primary video implementation")
-                return ""
-            }
-        }
-
-
-        ColorPicker {
-            id: colorPicker
-            height: 264
-            width: 380
-            z: 15.0
-            anchors.centerIn: parent
-        }
-
-        // UI areas
-
-        HUDOverlayGrid {
-            id: hudOverlayGrid
-            anchors.fill: parent
-            z: 3.0
-            //onSettingsButtonClicked: {
-            //    settings_panel.openSettings();
-            //}
-            // Performance seems to be better on embedded devices like
-            // rpi with layers disabled (aka default) but this is not exact science
-            layer.enabled: false
-        }
-
-
-        ConfigPopup {
-            id: settings_panel
-            visible: false
-        }
-
-        WorkaroundMessageBox{
-            id: workaroundmessagebox
-        }
-
-        CardToast{
-            id: card_toast
-            m_text: _qopenhd.toast_text
-            visible: _qopenhd.toast_visible
-        }
-
-        // Used by settings that require a restart
-        RestartQOpenHDMessageBox{
-            id: restartQOpenHDMessageBox
-        }
-
-        // Allows closing QOpenHD via a keyboard shortcut
-        // also stops the service, such that it is not restartet
-        Shortcut {
-            sequence: "Ctrl+F12"
-            onActivated: {
-                _qopenhd.disable_service_and_quit()
-            }
-        }
-        AnyParamBusyIndicator{
-             z: 10
-        }
-
-        Component.onCompleted: {
-            console.log("Completed");
-            hudOverlayGrid.regain_focus()
-        }
-    }
-}
-
-/*##^##
-Designer {
-    D{i:6;anchors_y:8}D{i:7;anchors_y:32}D{i:8;anchors_y:32}D{i:9;anchors_y:8}D{i:10;anchors_y:32}
-D{i:11;anchors_y:32}D{i:12;anchors_y:11}D{i:13;anchors_y:11}D{i:14;anchors_x:62}D{i:15;anchors_x:128}
-D{i:16;anchors_x:136;anchors_y:11}D{i:17;anchors_x:82;anchors_y:8}D{i:19;anchors_y:8}
-D{i:21;anchors_y:31}D{i:22;anchors_y:8}D{i:23;anchors_y:11}D{i:24;anchors_y:32}
-}
-##^##*/
diff --git a/qml/main.qml b/qml/main.qml
index dce107cf3..a777dde84 100755
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -98,14 +98,14 @@ ApplicationWindow {
             }
         }
 
-
-        ColorPicker {
+        // TODO QT 6
+        /*ColorPicker {
             id: colorPicker
             height: 264
             width: 380
             z: 15.0
             anchors.centerIn: parent
-        }
+        }*/
 
         // UI areas
 
diff --git a/qml/ui/AnyParamBusyIndicator.qml b/qml/ui/AnyParamBusyIndicator.qml
index 6ced62250..086695f97 100644
--- a/qml/ui/AnyParamBusyIndicator.qml
+++ b/qml/ui/AnyParamBusyIndicator.qml
@@ -1,10 +1,10 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
index 77be32dd9..48b89cd4f 100644
--- a/qml/ui/HUDOverlayGrid.qml
+++ b/qml/ui/HUDOverlayGrid.qml
@@ -1,8 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
 
 import OpenHD 1.0
 
@@ -494,12 +492,13 @@ Item {
     }
 
     // Extra element - allows customizing the OSD color(s) and more
-    OSDCustomizer {
+    // TODO QT 6
+    /*OSDCustomizer {
         id: osdCustomizer
         anchors.centerIn: parent
         visible: false
         z: 5.0
-    }
+    }*/
     TapHandler {
         acceptedButtons: Qt.AllButtons
         onTapped: {
diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
index de73ea75f..83152c618 100644
--- a/qml/ui/configpopup/ConfigPopup.qml
+++ b/qml/ui/configpopup/ConfigPopup.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.12
 import QtQuick.Window 2.12
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/ConfigPopupSidebarButton.qml b/qml/ui/configpopup/ConfigPopupSidebarButton.qml
index 38035d150..a2b94359e 100644
--- a/qml/ui/configpopup/ConfigPopupSidebarButton.qml
+++ b/qml/ui/configpopup/ConfigPopupSidebarButton.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.12
 import QtQuick.Window 2.12
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/connect/ConnectPanel.qml b/qml/ui/configpopup/connect/ConnectPanel.qml
index 0ebe6d5f0..18afccc6d 100644
--- a/qml/ui/configpopup/connect/ConnectPanel.qml
+++ b/qml/ui/configpopup/connect/ConnectPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/connect/PaneConnectionMode.qml b/qml/ui/configpopup/connect/PaneConnectionMode.qml
index f1dee8db1..9a60cdadc 100644
--- a/qml/ui/configpopup/connect/PaneConnectionMode.qml
+++ b/qml/ui/configpopup/connect/PaneConnectionMode.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
@@ -235,9 +235,10 @@ Rectangle{
                 TextField {
                     Layout.alignment: Qt.AlignCenter
                     id: textFieldip
-                    validator: RegExpValidator {
-                        regExp:  /^((?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\.){0,3}(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$/
-                    }
+                    // TODO QT 6
+                    //validator: RegExpValidator {
+                    //    regExp:  /^((?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\.){0,3}(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$/
+                    //}
                     inputMethodHints: Qt.ImhFormattedNumbersOnly
                     text: settings.qopenhd_mavlink_connection_manual_tcp_ip
                 }
diff --git a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
index c88657073..8ac4d8917 100644
--- a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
+++ b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml b/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml
index 8e3a8d523..09d0bbc74 100644
--- a/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml
+++ b/qml/ui/configpopup/dev/QOpenHDServiceDialoque.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/log/LogMessagesStatusView.qml b/qml/ui/configpopup/log/LogMessagesStatusView.qml
index a90be3110..7c717e564 100644
--- a/qml/ui/configpopup/log/LogMessagesStatusView.qml
+++ b/qml/ui/configpopup/log/LogMessagesStatusView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/log/LogMessagesView.qml b/qml/ui/configpopup/log/LogMessagesView.qml
index b26a6a5a8..b0b77f5b8 100644
--- a/qml/ui/configpopup/log/LogMessagesView.qml
+++ b/qml/ui/configpopup/log/LogMessagesView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/openhd_settings/ChooseCameraDialoque.qml b/qml/ui/configpopup/openhd_settings/ChooseCameraDialoque.qml
index 8228696c0..aa68662e2 100644
--- a/qml/ui/configpopup/openhd_settings/ChooseCameraDialoque.qml
+++ b/qml/ui/configpopup/openhd_settings/ChooseCameraDialoque.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import "../../elements"
diff --git a/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml b/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
index a23bbbe5c..009eba370 100644
--- a/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
+++ b/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import "../../elements"
diff --git a/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeAirGnd.qml b/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeAirGnd.qml
index 9dc43f634..a4b7b4d85 100644
--- a/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeAirGnd.qml
+++ b/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeAirGnd.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import "../../elements"
diff --git a/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml b/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml
index ed2162fde..a259be552 100644
--- a/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml
+++ b/qml/ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import "../../elements"
diff --git a/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml b/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml
index 56c5eeee2..b4eb997ad 100644
--- a/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml
+++ b/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
index 197ecd781..c88e04cea 100644
--- a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
+++ b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml b/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml
index f28c3cdb7..5ab1b9456 100644
--- a/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml
+++ b/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml b/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml
index f2e0960e5..724396c23 100644
--- a/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml
+++ b/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/openhd_settings/MavlinkParamValueEditElement.qml b/qml/ui/configpopup/openhd_settings/MavlinkParamValueEditElement.qml
index 7dd5f5e21..e9759801b 100644
--- a/qml/ui/configpopup/openhd_settings/MavlinkParamValueEditElement.qml
+++ b/qml/ui/configpopup/openhd_settings/MavlinkParamValueEditElement.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/openhd_settings/OHDSettingsPanel.qml b/qml/ui/configpopup/openhd_settings/OHDSettingsPanel.qml
index 7f2cd993f..90396b4d4 100644
--- a/qml/ui/configpopup/openhd_settings/OHDSettingsPanel.qml
+++ b/qml/ui/configpopup/openhd_settings/OHDSettingsPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml
index 2c7eca68a..caa4596a7 100644
--- a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml
+++ b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/PopupBigGeneric.qml b/qml/ui/configpopup/openhd_settings/PopupBigGeneric.qml
index 65b864df0..c83d003c0 100644
--- a/qml/ui/configpopup/openhd_settings/PopupBigGeneric.qml
+++ b/qml/ui/configpopup/openhd_settings/PopupBigGeneric.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml b/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml
index 4d2de314f..85f6c904c 100644
--- a/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml
+++ b/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml b/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml
index b9370b07c..12c82d339 100644
--- a/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml
+++ b/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/openhd_settings/PopupTxPowerEditor.qml b/qml/ui/configpopup/openhd_settings/PopupTxPowerEditor.qml
index d614f9dc0..fc51c4973 100644
--- a/qml/ui/configpopup/openhd_settings/PopupTxPowerEditor.qml
+++ b/qml/ui/configpopup/openhd_settings/PopupTxPowerEditor.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
index fd2871318..b19fa1701 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
@@ -1,10 +1,9 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 import Qt.labs.settings 1.0
-import Qt.labs.folderlistmodel 2.0
 
 import OpenHD 1.0
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
index 30973d3e7..eb39ae8bb 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
index aaa1c4d3d..5039fbab1 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml b/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
index 4c112a200..2ede04e42 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
index ef6956e26..1441db980 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
index e02b9e9ce..435789f4a 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
index a15c39f16..9b36f0905 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml
index dc2030770..bf57fb1e4 100644
--- a/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/rc/RcDebugScreenFC.qml b/qml/ui/configpopup/rc/RcDebugScreenFC.qml
index aa4630511..2909efab5 100644
--- a/qml/ui/configpopup/rc/RcDebugScreenFC.qml
+++ b/qml/ui/configpopup/rc/RcDebugScreenFC.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Window 2.0
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/rc/RcDebugScreenOpenHD.qml b/qml/ui/configpopup/rc/RcDebugScreenOpenHD.qml
index 77f9fd2e1..be4cf90d9 100644
--- a/qml/ui/configpopup/rc/RcDebugScreenOpenHD.qml
+++ b/qml/ui/configpopup/rc/RcDebugScreenOpenHD.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Window 2.0
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/rc/RcInfoPanel.qml b/qml/ui/configpopup/rc/RcInfoPanel.qml
index 8c4a759ea..2096be750 100644
--- a/qml/ui/configpopup/rc/RcInfoPanel.qml
+++ b/qml/ui/configpopup/rc/RcInfoPanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/rc/RcInfoScreen.qml b/qml/ui/configpopup/rc/RcInfoScreen.qml
index be3027e95..d9d16f283 100644
--- a/qml/ui/configpopup/rc/RcInfoScreen.qml
+++ b/qml/ui/configpopup/rc/RcInfoScreen.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Window 2.0
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/configpopup/status/DialoqueNotAlive.qml b/qml/ui/configpopup/status/DialoqueNotAlive.qml
index 7130f737a..1833e5ec8 100644
--- a/qml/ui/configpopup/status/DialoqueNotAlive.qml
+++ b/qml/ui/configpopup/status/DialoqueNotAlive.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/configpopup/status/PowerActionDialoque.qml b/qml/ui/configpopup/status/PowerActionDialoque.qml
index 4802b0969..4ca6eb99c 100644
--- a/qml/ui/configpopup/status/PowerActionDialoque.qml
+++ b/qml/ui/configpopup/status/PowerActionDialoque.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/status/QOpenHDVersionCard.qml b/qml/ui/configpopup/status/QOpenHDVersionCard.qml
index 098c51c3f..16d38947a 100644
--- a/qml/ui/configpopup/status/QOpenHDVersionCard.qml
+++ b/qml/ui/configpopup/status/QOpenHDVersionCard.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/status/StatusCardBodyFC.qml b/qml/ui/configpopup/status/StatusCardBodyFC.qml
index eae174946..8fda5f62a 100644
--- a/qml/ui/configpopup/status/StatusCardBodyFC.qml
+++ b/qml/ui/configpopup/status/StatusCardBodyFC.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml b/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml
index 8d0cefd74..3c1cc51e0 100644
--- a/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml
+++ b/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/configpopup/status/StatusCardRow.qml b/qml/ui/configpopup/status/StatusCardRow.qml
index 8c2b8cf5f..199a8faa9 100644
--- a/qml/ui/configpopup/status/StatusCardRow.qml
+++ b/qml/ui/configpopup/status/StatusCardRow.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/elements/BaseHeaderItem.qml b/qml/ui/elements/BaseHeaderItem.qml
index 220d08655..f3c6c327e 100644
--- a/qml/ui/elements/BaseHeaderItem.qml
+++ b/qml/ui/elements/BaseHeaderItem.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 // UI element for a header
 // consisting of a title an a close button
diff --git a/qml/ui/elements/BaseHeaderItem2.qml b/qml/ui/elements/BaseHeaderItem2.qml
index 5ef6134d8..73e021879 100644
--- a/qml/ui/elements/BaseHeaderItem2.qml
+++ b/qml/ui/elements/BaseHeaderItem2.qml
@@ -3,9 +3,9 @@ import QtQuick 2.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 // UI element for a header
 // consisting of a title an a close button
diff --git a/qml/ui/elements/BigClickableText.qml b/qml/ui/elements/BigClickableText.qml
index fda16ec16..380139937 100644
--- a/qml/ui/elements/BigClickableText.qml
+++ b/qml/ui/elements/BigClickableText.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.1
+
 import QtQuick.Controls.Material 2.12
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/ButtonDisconnected.qml b/qml/ui/elements/ButtonDisconnected.qml
index 3d031851b..50185f874 100644
--- a/qml/ui/elements/ButtonDisconnected.qml
+++ b/qml/ui/elements/ButtonDisconnected.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Disconnected Icon
diff --git a/qml/ui/elements/ButtonGreen.qml b/qml/ui/elements/ButtonGreen.qml
index 68c8d8ee8..c4a4a82a5 100644
--- a/qml/ui/elements/ButtonGreen.qml
+++ b/qml/ui/elements/ButtonGreen.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/ButtonIconConnect.qml b/qml/ui/elements/ButtonIconConnect.qml
index 480fa55bd..3525d0e66 100644
--- a/qml/ui/elements/ButtonIconConnect.qml
+++ b/qml/ui/elements/ButtonIconConnect.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Connect - either wired (wired icon) or wireless (wireless icon)
diff --git a/qml/ui/elements/ButtonIconGear.qml b/qml/ui/elements/ButtonIconGear.qml
index c2702e1a1..8b6616aed 100644
--- a/qml/ui/elements/ButtonIconGear.qml
+++ b/qml/ui/elements/ButtonIconGear.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Info icon and blue color
diff --git a/qml/ui/elements/ButtonIconInfo.qml b/qml/ui/elements/ButtonIconInfo.qml
index d3331f04f..ef76c51ad 100644
--- a/qml/ui/elements/ButtonIconInfo.qml
+++ b/qml/ui/elements/ButtonIconInfo.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls.Material 2.12
 
 // Info icon and blue color
diff --git a/qml/ui/elements/ButtonIconInfo2.qml b/qml/ui/elements/ButtonIconInfo2.qml
index 8c416e53b..e49b12eb0 100644
--- a/qml/ui/elements/ButtonIconInfo2.qml
+++ b/qml/ui/elements/ButtonIconInfo2.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Info icon, no blue color
diff --git a/qml/ui/elements/ButtonIconWarning.qml b/qml/ui/elements/ButtonIconWarning.qml
index ff58ca9e8..7464ca1d5 100644
--- a/qml/ui/elements/ButtonIconWarning.qml
+++ b/qml/ui/elements/ButtonIconWarning.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Used to hint at something's wrong -
diff --git a/qml/ui/elements/ButtonOrange.qml b/qml/ui/elements/ButtonOrange.qml
index f1b2af167..036b7a69b 100644
--- a/qml/ui/elements/ButtonOrange.qml
+++ b/qml/ui/elements/ButtonOrange.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/ButtonRed.qml b/qml/ui/elements/ButtonRed.qml
index 854b7c22a..d09683127 100644
--- a/qml/ui/elements/ButtonRed.qml
+++ b/qml/ui/elements/ButtonRed.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/ButtonSimple.qml b/qml/ui/elements/ButtonSimple.qml
index f489ddfec..ca03887ab 100644
--- a/qml/ui/elements/ButtonSimple.qml
+++ b/qml/ui/elements/ButtonSimple.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 Button {
diff --git a/qml/ui/elements/ButtonYellow.qml b/qml/ui/elements/ButtonYellow.qml
index 561ad3ebe..69ca48676 100644
--- a/qml/ui/elements/ButtonYellow.qml
+++ b/qml/ui/elements/ButtonYellow.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/Card.qml b/qml/ui/elements/Card.qml
index bee5a4804..b26441958 100644
--- a/qml/ui/elements/Card.qml
+++ b/qml/ui/elements/Card.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
 
 
 
diff --git a/qml/ui/elements/CardToast.qml b/qml/ui/elements/CardToast.qml
index 58210c7d9..e1fff9a0f 100644
--- a/qml/ui/elements/CardToast.qml
+++ b/qml/ui/elements/CardToast.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 //
 // Similar behvaiour to android Toast
diff --git a/qml/ui/elements/ColorPicker.qml b/qml/ui/elements/ColorPicker.qml
index a62d5e15f..41a672b2e 100644
--- a/qml/ui/elements/ColorPicker.qml
+++ b/qml/ui/elements/ColorPicker.qml
@@ -1,9 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
 
 import "colorwheel"
 
diff --git a/qml/ui/elements/ColoredCheckboxForm.ui.qml b/qml/ui/elements/ColoredCheckboxForm.ui.qml
index 647411945..23f2c63fb 100644
--- a/qml/ui/elements/ColoredCheckboxForm.ui.qml
+++ b/qml/ui/elements/ColoredCheckboxForm.ui.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 CheckBox {
     id: el
diff --git a/qml/ui/elements/NewSpinBox.qml b/qml/ui/elements/NewSpinBox.qml
index 67cf124e9..b407642e5 100644
--- a/qml/ui/elements/NewSpinBox.qml
+++ b/qml/ui/elements/NewSpinBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtQuick.Controls.Styles 1.4
+ 
 import Qt.labs.settings 1.0
 
 
diff --git a/qml/ui/elements/OSDCustomizer.qml b/qml/ui/elements/OSDCustomizer.qml
index 0cdce625c..9d08ebf3e 100644
--- a/qml/ui/elements/OSDCustomizer.qml
+++ b/qml/ui/elements/OSDCustomizer.qml
@@ -1,7 +1,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import "colorwheel"
diff --git a/qml/ui/elements/RestartQOpenHDMessageBox.qml b/qml/ui/elements/RestartQOpenHDMessageBox.qml
index a484135e1..3fa97b652 100644
--- a/qml/ui/elements/RestartQOpenHDMessageBox.qml
+++ b/qml/ui/elements/RestartQOpenHDMessageBox.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/SettingBaseElement.qml b/qml/ui/elements/SettingBaseElement.qml
index 23fe9ff56..ce35d179b 100644
--- a/qml/ui/elements/SettingBaseElement.qml
+++ b/qml/ui/elements/SettingBaseElement.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Base element for QOpenHD settings.
diff --git a/qml/ui/elements/SettingBaseElement2.qml b/qml/ui/elements/SettingBaseElement2.qml
index 2f9cc8e60..43dbbc5d2 100644
--- a/qml/ui/elements/SettingBaseElement2.qml
+++ b/qml/ui/elements/SettingBaseElement2.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Base element for QOpenHD settings.
diff --git a/qml/ui/elements/SettingsCategory.qml b/qml/ui/elements/SettingsCategory.qml
index d2dc8ab19..fd9139f32 100644
--- a/qml/ui/elements/SettingsCategory.qml
+++ b/qml/ui/elements/SettingsCategory.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 Column {
diff --git a/qml/ui/elements/SettingsHeaderElement.qml b/qml/ui/elements/SettingsHeaderElement.qml
index b7c015715..9fb173b3e 100644
--- a/qml/ui/elements/SettingsHeaderElement.qml
+++ b/qml/ui/elements/SettingsHeaderElement.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Base element for QOpenHD settings.
diff --git a/qml/ui/elements/SimpleAdvancedChoiceElement.qml b/qml/ui/elements/SimpleAdvancedChoiceElement.qml
index 6724d21f5..3b9524cc8 100644
--- a/qml/ui/elements/SimpleAdvancedChoiceElement.qml
+++ b/qml/ui/elements/SimpleAdvancedChoiceElement.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 // Allows the user to switch between simple and advanced view
diff --git a/qml/ui/elements/SlideSwitchForm.ui.qml b/qml/ui/elements/SlideSwitchForm.ui.qml
index e58d368ba..ed5bf07f7 100644
--- a/qml/ui/elements/SlideSwitchForm.ui.qml
+++ b/qml/ui/elements/SlideSwitchForm.ui.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 Item {
     id: slideSwitch
diff --git a/qml/ui/elements/WorkaroundMessageBox.qml b/qml/ui/elements/WorkaroundMessageBox.qml
index 780dc27c0..685bdcc69 100644
--- a/qml/ui/elements/WorkaroundMessageBox.qml
+++ b/qml/ui/elements/WorkaroundMessageBox.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.0
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/elements/XDecimalSpinBox.qml b/qml/ui/elements/XDecimalSpinBox.qml
index 3e5d3fdc1..f1019ac1d 100644
--- a/qml/ui/elements/XDecimalSpinBox.qml
+++ b/qml/ui/elements/XDecimalSpinBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Dialogs 1.0
+
 import QtQuick.Controls.Material 2.12
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/sidebar/InfoElement2.qml b/qml/ui/sidebar/InfoElement2.qml
index 4f07e9e32..8365161d5 100644
--- a/qml/ui/sidebar/InfoElement2.qml
+++ b/qml/ui/sidebar/InfoElement2.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel2Video.qml b/qml/ui/sidebar/Panel2Video.qml
index 25ab84293..950394e72 100644
--- a/qml/ui/sidebar/Panel2Video.qml
+++ b/qml/ui/sidebar/Panel2Video.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel3Camera.qml b/qml/ui/sidebar/Panel3Camera.qml
index e84f4f347..86f4a759b 100644
--- a/qml/ui/sidebar/Panel3Camera.qml
+++ b/qml/ui/sidebar/Panel3Camera.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel4Recording.qml b/qml/ui/sidebar/Panel4Recording.qml
index b453b8753..ce9b7a97b 100644
--- a/qml/ui/sidebar/Panel4Recording.qml
+++ b/qml/ui/sidebar/Panel4Recording.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel5RC.qml b/qml/ui/sidebar/Panel5RC.qml
index 1ffe3d0c2..4c7fc5b1b 100644
--- a/qml/ui/sidebar/Panel5RC.qml
+++ b/qml/ui/sidebar/Panel5RC.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel6Misc.qml b/qml/ui/sidebar/Panel6Misc.qml
index 650231f53..7bee37768 100644
--- a/qml/ui/sidebar/Panel6Misc.qml
+++ b/qml/ui/sidebar/Panel6Misc.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/Panel7Status.qml b/qml/ui/sidebar/Panel7Status.qml
index 2c53c3b1c..dc191e44d 100644
--- a/qml/ui/sidebar/Panel7Status.qml
+++ b/qml/ui/sidebar/Panel7Status.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/RCChannelView.qml b/qml/ui/sidebar/RCChannelView.qml
index 2e6841cab..778c014af 100644
--- a/qml/ui/sidebar/RCChannelView.qml
+++ b/qml/ui/sidebar/RCChannelView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/SideBarBasePanel.qml b/qml/ui/sidebar/SideBarBasePanel.qml
index 6a9ce004f..57de7accf 100644
--- a/qml/ui/sidebar/SideBarBasePanel.qml
+++ b/qml/ui/sidebar/SideBarBasePanel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/SideBarMain.qml b/qml/ui/sidebar/SideBarMain.qml
index 67ea1b638..5ff31d047 100644
--- a/qml/ui/sidebar/SideBarMain.qml
+++ b/qml/ui/sidebar/SideBarMain.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/sidebar/SidebarStackButton.qml b/qml/ui/sidebar/SidebarStackButton.qml
index 251ddb243..d0886719f 100644
--- a/qml/ui/sidebar/SidebarStackButton.qml
+++ b/qml/ui/sidebar/SidebarStackButton.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.0
 
diff --git a/qml/ui/widgets/AirBatteryWidget.qml b/qml/ui/widgets/AirBatteryWidget.qml
index 1005781e2..c16abc8ee 100644
--- a/qml/ui/widgets/AirBatteryWidget.qml
+++ b/qml/ui/widgets/AirBatteryWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/AirspeedTempWidget.qml b/qml/ui/widgets/AirspeedTempWidget.qml
index a1d27d09a..0ea335031 100644
--- a/qml/ui/widgets/AirspeedTempWidget.qml
+++ b/qml/ui/widgets/AirspeedTempWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/AltitudeSecondWidget.qml b/qml/ui/widgets/AltitudeSecondWidget.qml
index 991e7ac36..65c4f250c 100644
--- a/qml/ui/widgets/AltitudeSecondWidget.qml
+++ b/qml/ui/widgets/AltitudeSecondWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/AltitudeWidget.qml b/qml/ui/widgets/AltitudeWidget.qml
index 3af92c2e7..86b357dbc 100644
--- a/qml/ui/widgets/AltitudeWidget.qml
+++ b/qml/ui/widgets/AltitudeWidget.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Extras 1.4
+ 
+
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/AoaWidget.qml b/qml/ui/widgets/AoaWidget.qml
index 0ee4a12b1..a1bfc13be 100644
--- a/qml/ui/widgets/AoaWidget.qml
+++ b/qml/ui/widgets/AoaWidget.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Extras 1.4
+ 
+
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/ArrowWidget.qml b/qml/ui/widgets/ArrowWidget.qml
index 9db8bc369..ea8ba1680 100644
--- a/qml/ui/widgets/ArrowWidget.qml
+++ b/qml/ui/widgets/ArrowWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/BaseWidgetDefaultUiControlElements.qml b/qml/ui/widgets/BaseWidgetDefaultUiControlElements.qml
index dfb736eb1..54547f07c 100644
--- a/qml/ui/widgets/BaseWidgetDefaultUiControlElements.qml
+++ b/qml/ui/widgets/BaseWidgetDefaultUiControlElements.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 // Can be used to quickly add the right UI elements for (persistently) setting scale and opacity for a HUD element (e.g. an element extending BaseWidget)
diff --git a/qml/ui/widgets/ControlWidget.qml b/qml/ui/widgets/ControlWidget.qml
index 20b4cb1f4..e39e7b4c5 100644
--- a/qml/ui/widgets/ControlWidget.qml
+++ b/qml/ui/widgets/ControlWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/DistanceSensorWidget.qml b/qml/ui/widgets/DistanceSensorWidget.qml
index 03d535792..91fc27932 100644
--- a/qml/ui/widgets/DistanceSensorWidget.qml
+++ b/qml/ui/widgets/DistanceSensorWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/EscTempWidget.qml b/qml/ui/widgets/EscTempWidget.qml
index 1c2eb4934..ada241f73 100644
--- a/qml/ui/widgets/EscTempWidget.qml
+++ b/qml/ui/widgets/EscTempWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FlightDistanceWidget.qml b/qml/ui/widgets/FlightDistanceWidget.qml
index 6af9a4695..4ebf2fbda 100644
--- a/qml/ui/widgets/FlightDistanceWidget.qml
+++ b/qml/ui/widgets/FlightDistanceWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FlightMahKmWidget.qml b/qml/ui/widgets/FlightMahKmWidget.qml
index 479c2eb1f..10bc7c731 100644
--- a/qml/ui/widgets/FlightMahKmWidget.qml
+++ b/qml/ui/widgets/FlightMahKmWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FlightMahWidget.qml b/qml/ui/widgets/FlightMahWidget.qml
index 1a9a727f1..efa6704eb 100644
--- a/qml/ui/widgets/FlightMahWidget.qml
+++ b/qml/ui/widgets/FlightMahWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FlightModeWidget.qml b/qml/ui/widgets/FlightModeWidget.qml
index 9ec8fd080..8f08134bf 100644
--- a/qml/ui/widgets/FlightModeWidget.qml
+++ b/qml/ui/widgets/FlightModeWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FlightTimeWidget.qml b/qml/ui/widgets/FlightTimeWidget.qml
index 1b0455f71..038a86293 100644
--- a/qml/ui/widgets/FlightTimeWidget.qml
+++ b/qml/ui/widgets/FlightTimeWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/FpvWidget.qml b/qml/ui/widgets/FpvWidget.qml
index 99f4b6546..5520a484f 100644
--- a/qml/ui/widgets/FpvWidget.qml
+++ b/qml/ui/widgets/FpvWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Controls.Material 2.12
 
diff --git a/qml/ui/widgets/GPIOWidget.qml b/qml/ui/widgets/GPIOWidget.qml
index 044adff02..b42204190 100644
--- a/qml/ui/widgets/GPIOWidget.qml
+++ b/qml/ui/widgets/GPIOWidget.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
+ 
 
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/GPSWidget.qml b/qml/ui/widgets/GPSWidget.qml
index d49ffda4f..b939a04ff 100644
--- a/qml/ui/widgets/GPSWidget.qml
+++ b/qml/ui/widgets/GPSWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/GroundPowerWidget.qml b/qml/ui/widgets/GroundPowerWidget.qml
index 0e41d3b0d..52a3a3d8a 100644
--- a/qml/ui/widgets/GroundPowerWidget.qml
+++ b/qml/ui/widgets/GroundPowerWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/HeadingWidget.qml b/qml/ui/widgets/HeadingWidget.qml
index cf7500c21..1c750ca78 100644
--- a/qml/ui/widgets/HeadingWidget.qml
+++ b/qml/ui/widgets/HeadingWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/HomeDistanceWidget.qml b/qml/ui/widgets/HomeDistanceWidget.qml
index f6c05b6a9..c996a567e 100644
--- a/qml/ui/widgets/HomeDistanceWidget.qml
+++ b/qml/ui/widgets/HomeDistanceWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/HorizonWidget.qml b/qml/ui/widgets/HorizonWidget.qml
index c697546d5..02c1cc0ca 100644
--- a/qml/ui/widgets/HorizonWidget.qml
+++ b/qml/ui/widgets/HorizonWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/ImuTempWidget.qml b/qml/ui/widgets/ImuTempWidget.qml
index 2286398a0..c3752271c 100644
--- a/qml/ui/widgets/ImuTempWidget.qml
+++ b/qml/ui/widgets/ImuTempWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/LinkDownRSSIWidget.qml b/qml/ui/widgets/LinkDownRSSIWidget.qml
index bd871b985..6ce4d4301 100644
--- a/qml/ui/widgets/LinkDownRSSIWidget.qml
+++ b/qml/ui/widgets/LinkDownRSSIWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/LinkUpRSSIWidget.qml b/qml/ui/widgets/LinkUpRSSIWidget.qml
index 8a27ecd87..a84302284 100644
--- a/qml/ui/widgets/LinkUpRSSIWidget.qml
+++ b/qml/ui/widgets/LinkUpRSSIWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/MessageHUD.qml b/qml/ui/widgets/MessageHUD.qml
index be6343909..e85cac077 100644
--- a/qml/ui/widgets/MessageHUD.qml
+++ b/qml/ui/widgets/MessageHUD.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/widgets/MessageHUDRow.qml b/qml/ui/widgets/MessageHUDRow.qml
index 658fc46c6..7b2c598c7 100644
--- a/qml/ui/widgets/MessageHUDRow.qml
+++ b/qml/ui/widgets/MessageHUDRow.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 
 import Qt.labs.settings 1.0
 
diff --git a/qml/ui/widgets/MissionWidget.qml b/qml/ui/widgets/MissionWidget.qml
index 19f6bfafc..6ed8d47d1 100644
--- a/qml/ui/widgets/MissionWidget.qml
+++ b/qml/ui/widgets/MissionWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/PerformanceHorizonWidget2.qml b/qml/ui/widgets/PerformanceHorizonWidget2.qml
index 74400f464..ff81b009b 100644
--- a/qml/ui/widgets/PerformanceHorizonWidget2.qml
+++ b/qml/ui/widgets/PerformanceHorizonWidget2.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/PressTempWidget.qml b/qml/ui/widgets/PressTempWidget.qml
index 1a2952d02..009107ebd 100644
--- a/qml/ui/widgets/PressTempWidget.qml
+++ b/qml/ui/widgets/PressTempWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/QRenderStatsWidget.qml b/qml/ui/widgets/QRenderStatsWidget.qml
index 249029fb7..5a1c1a2c8 100644
--- a/qml/ui/widgets/QRenderStatsWidget.qml
+++ b/qml/ui/widgets/QRenderStatsWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/RCRssiWidget.qml b/qml/ui/widgets/RCRssiWidget.qml
index 508e314eb..6147f9574 100644
--- a/qml/ui/widgets/RCRssiWidget.qml
+++ b/qml/ui/widgets/RCRssiWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/RollWidget.qml b/qml/ui/widgets/RollWidget.qml
index 5435b5359..6a855c15c 100644
--- a/qml/ui/widgets/RollWidget.qml
+++ b/qml/ui/widgets/RollWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/SOCStatusWidgetAir.qml b/qml/ui/widgets/SOCStatusWidgetAir.qml
index 7201abb8d..123489536 100644
--- a/qml/ui/widgets/SOCStatusWidgetAir.qml
+++ b/qml/ui/widgets/SOCStatusWidgetAir.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/SOCStatusWidgetGeneric.qml b/qml/ui/widgets/SOCStatusWidgetGeneric.qml
index 8b6f5643b..f3d745b13 100644
--- a/qml/ui/widgets/SOCStatusWidgetGeneric.qml
+++ b/qml/ui/widgets/SOCStatusWidgetGeneric.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/SOCStatusWidgetGround.qml b/qml/ui/widgets/SOCStatusWidgetGround.qml
index a9cd64dd6..84883793d 100644
--- a/qml/ui/widgets/SOCStatusWidgetGround.qml
+++ b/qml/ui/widgets/SOCStatusWidgetGround.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/SpeedSecondWidget.qml b/qml/ui/widgets/SpeedSecondWidget.qml
index 4b6dff79a..9cac2e00d 100644
--- a/qml/ui/widgets/SpeedSecondWidget.qml
+++ b/qml/ui/widgets/SpeedSecondWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
diff --git a/qml/ui/widgets/SpeedWidget.qml b/qml/ui/widgets/SpeedWidget.qml
index 34cd5d776..b20cf3e9a 100644
--- a/qml/ui/widgets/SpeedWidget.qml
+++ b/qml/ui/widgets/SpeedWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/ThrottleWidget.qml b/qml/ui/widgets/ThrottleWidget.qml
index fbb719159..12db840d6 100644
--- a/qml/ui/widgets/ThrottleWidget.qml
+++ b/qml/ui/widgets/ThrottleWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/UAVTimeWiget.qml b/qml/ui/widgets/UAVTimeWiget.qml
index 2262bd712..d1a60397b 100644
--- a/qml/ui/widgets/UAVTimeWiget.qml
+++ b/qml/ui/widgets/UAVTimeWiget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 
 import QtQml 2.15
diff --git a/qml/ui/widgets/VerticalSpeedGaugeWidget.qml b/qml/ui/widgets/VerticalSpeedGaugeWidget.qml
index 836bf66a1..b17f957e9 100644
--- a/qml/ui/widgets/VerticalSpeedGaugeWidget.qml
+++ b/qml/ui/widgets/VerticalSpeedGaugeWidget.qml
@@ -1,11 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Extras 1.4
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
 import QtQuick.Shapes 1.0
-
 import Qt.labs.settings 1.0
 
 import OpenHD 1.0
@@ -134,7 +130,8 @@ BaseWidget {
                 }
             }
 
-            CircularGauge {
+            // TODO QT6
+            /*CircularGauge {
                 id: gauge
                 anchors.fill: parent
                 antialiasing: true
@@ -194,7 +191,7 @@ BaseWidget {
                         width: 3
                     }
                 }
-            }
+            }*/
         }
     }
 }
diff --git a/qml/ui/widgets/VerticalSpeedSimpleWidget.qml b/qml/ui/widgets/VerticalSpeedSimpleWidget.qml
index 9576654f0..61e259172 100644
--- a/qml/ui/widgets/VerticalSpeedSimpleWidget.qml
+++ b/qml/ui/widgets/VerticalSpeedSimpleWidget.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Extras 1.4
+ 
+
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/VibrationWidget.qml b/qml/ui/widgets/VibrationWidget.qml
index 85bec7c21..9ed96d361 100644
--- a/qml/ui/widgets/VibrationWidget.qml
+++ b/qml/ui/widgets/VibrationWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/VideoBitrateWidgetGeneric.qml b/qml/ui/widgets/VideoBitrateWidgetGeneric.qml
index 505febe4b..379b46822 100644
--- a/qml/ui/widgets/VideoBitrateWidgetGeneric.qml
+++ b/qml/ui/widgets/VideoBitrateWidgetGeneric.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/VideoBitrateWidgetPrimary.qml b/qml/ui/widgets/VideoBitrateWidgetPrimary.qml
index 551d81971..ec03e6723 100644
--- a/qml/ui/widgets/VideoBitrateWidgetPrimary.qml
+++ b/qml/ui/widgets/VideoBitrateWidgetPrimary.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/VideoBitrateWidgetSecondary.qml b/qml/ui/widgets/VideoBitrateWidgetSecondary.qml
index ebbd9c7e7..fc3b636f3 100644
--- a/qml/ui/widgets/VideoBitrateWidgetSecondary.qml
+++ b/qml/ui/widgets/VideoBitrateWidgetSecondary.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/ui/widgets/WBLinkRateControlWidget.qml b/qml/ui/widgets/WBLinkRateControlWidget.qml
index 5a3866f9a..3d97a128c 100644
--- a/qml/ui/widgets/WBLinkRateControlWidget.qml
+++ b/qml/ui/widgets/WBLinkRateControlWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 import QtQuick.Controls.Material 2.12
 
diff --git a/qml/ui/widgets/WindWidget.qml b/qml/ui/widgets/WindWidget.qml
index 5eed74071..b48d6c1cc 100644
--- a/qml/ui/widgets/WindWidget.qml
+++ b/qml/ui/widgets/WindWidget.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import Qt.labs.settings 1.0
 import QtQuick.Shapes 1.0
 
diff --git a/qml/ui/widgets/map/MapWidgetForm.ui.qml b/qml/ui/widgets/map/MapWidgetForm.ui.qml
index 41f199154..c50da4bf8 100644
--- a/qml/ui/widgets/map/MapWidgetForm.ui.qml
+++ b/qml/ui/widgets/map/MapWidgetForm.ui.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Shapes 1.0
 
 import Qt.labs.settings 1.0
diff --git a/qml/video/MainVideoGStreamer.qml b/qml/video/MainVideoGStreamer.qml
index bbcec3ff3..e76320da6 100644
--- a/qml/video/MainVideoGStreamer.qml
+++ b/qml/video/MainVideoGStreamer.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import QtGraphicalEffects 1.12
+
 
 import org.freedesktop.gstreamer.GLVideoItem 1.0;
 
diff --git a/qml/video/SecondaryVideoGStreamer.qml b/qml/video/SecondaryVideoGStreamer.qml
index 46203e77a..85662aa9e 100644
--- a/qml/video/SecondaryVideoGStreamer.qml
+++ b/qml/video/SecondaryVideoGStreamer.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 
diff --git a/qml/video/SecondaryVideoGstreamerPane.qml b/qml/video/SecondaryVideoGstreamerPane.qml
index 4b7b2df0a..875b9aa89 100644
--- a/qml/video/SecondaryVideoGstreamerPane.qml
+++ b/qml/video/SecondaryVideoGstreamerPane.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import QtGraphicalEffects 1.12
+
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15