diff --git a/KoggerApp.pro b/KoggerApp.pro
index e40a4507..a86e6ef4 100644
--- a/KoggerApp.pro
+++ b/KoggerApp.pro
@@ -2,6 +2,7 @@ QT += quick
 QT += widgets
 QT += network
 QT += qml
+QT += opengl openglwidgets
 
 #CONFIG += FLASHER
 #CONFIG += MOTOR # motor_control definition
diff --git a/LinkManager.cpp b/LinkManager.cpp
index 8685f5f6..f970fcd4 100644
--- a/LinkManager.cpp
+++ b/LinkManager.cpp
@@ -254,10 +254,10 @@ void LinkManager::importPinnedLinksFromXML()
         const QXmlStreamReader::TokenType token = xmlReader.readNext();
 
         if (token == QXmlStreamReader::StartElement) {
-            if (xmlReader.name() == "link") {
+            if (xmlReader.name().toString() == "link") {
                 Link* link = createNewLink();
 
-                while (!(xmlReader.tokenType() == QXmlStreamReader::EndElement && xmlReader.name() == "link")) {
+                while (!(xmlReader.tokenType() == QXmlStreamReader::EndElement && xmlReader.name().toString() == "link")) {
                     if (xmlReader.tokenType() == QXmlStreamReader::StartElement) {
                         if (xmlReader.name().toString() == "uuid") {
                             link->setUuid(QUuid(xmlReader.readElementText()));
diff --git a/QML/BottomTrackControlMenu.qml b/QML/BottomTrackControlMenu.qml
index 64c0e590..17773335 100644
--- a/QML/BottomTrackControlMenu.qml
+++ b/QML/BottomTrackControlMenu.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
-import Qt.labs.settings 1.1
+import QtQuick.Dialogs
+import Qt.labs.settings
 
 import KoggerCommon 1.0
 Item {
diff --git a/QML/CalcMethodTINSettings.qml b/QML/CalcMethodTINSettings.qml
index 7ec971b6..c6f26250 100644
--- a/QML/CalcMethodTINSettings.qml
+++ b/QML/CalcMethodTINSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
diff --git a/QML/ChartBox.qml b/QML/ChartBox.qml
index d42871f0..48648fa1 100644
--- a/QML/ChartBox.qml
+++ b/QML/ChartBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 
diff --git a/QML/CheckButton.qml b/QML/CheckButton.qml
index 4eac4693..ae80359f 100644
--- a/QML/CheckButton.qml
+++ b/QML/CheckButton.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Controls.Styles 1.4
 
 Button {
     id: control
diff --git a/QML/ConnectionViewer.qml b/QML/ConnectionViewer.qml
index 9ec43e60..9d399435 100644
--- a/QML/ConnectionViewer.qml
+++ b/QML/ConnectionViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
@@ -508,7 +508,7 @@ ColumnLayout {
             FileDialog {
                 id: newFileDialog
                 title: qsTr("Please choose a file")
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["Logs (*.klf *.ubx *.xtf)", "Kogger log files (*.klf)", "U-blox (*.ubx)"]
 
@@ -524,7 +524,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: newFileDialog.folder
+                property alias logFolder: newFileDialog.currentFolder
             }
         }
 
@@ -542,7 +542,7 @@ ColumnLayout {
             FileDialog {
                 id: appendFileDialog
                 title: qsTr("Please choose a file")
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["Logs (*.klf *.ubx *.xtf)", "Kogger log files (*.klf)", "U-blox (*.ubx)"]
 
@@ -559,7 +559,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: appendFileDialog.folder
+                property alias logFolder: appendFileDialog.currentFolder
             }
         }
 
diff --git a/QML/DatasetBox.qml b/QML/DatasetBox.qml
index 9d646dd3..876dfebb 100644
--- a/QML/DatasetBox.qml
+++ b/QML/DatasetBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 
diff --git a/QML/DeviceItem.qml b/QML/DeviceItem.qml
index 3d5dd659..04df3aff 100644
--- a/QML/DeviceItem.qml
+++ b/QML/DeviceItem.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 
@@ -202,8 +202,8 @@ ColumnLayout {
 
                 property var items: ["Off", "On"]
 
-                validator: RegExpValidator {
-                    regExp: new RegExp("(Off|On)", "i")
+                validator: RegularExpressionValidator {
+                    regularExpression: new RegExp("(Off|On)", "i")
                 }
 
                 textFromValue: function(value) {
diff --git a/QML/DeviceSettingsViewer.qml b/QML/DeviceSettingsViewer.qml
index 6fd182ea..54d7d739 100644
--- a/QML/DeviceSettingsViewer.qml
+++ b/QML/DeviceSettingsViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {
diff --git a/QML/DiplaySettingsViewer.qml b/QML/DiplaySettingsViewer.qml
index 5b79f5b2..907e5d32 100644
--- a/QML/DiplaySettingsViewer.qml
+++ b/QML/DiplaySettingsViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {
diff --git a/QML/DisplaySettings.qml b/QML/DisplaySettings.qml
index 64f1f50d..b6fee79f 100644
--- a/QML/DisplaySettings.qml
+++ b/QML/DisplaySettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 GridLayout {
@@ -991,21 +991,19 @@ GridLayout {
                         onClicked: exportFileDialog.open()
                     }
 
-                    FileDialog {
+                    FolderDialog {
                         id: exportFileDialog
-                        folder: shortcuts.home
-                        selectExisting: true
-                        selectFolder: true
+                        currentFolder: shortcuts.home
 
                         onAccepted: {
-                            exportPathText.text = exportFileDialog.folder.toString()
+                            exportPathText.text = exportFileDialog.selectedFolder.toString()
                         }
 
                         onRejected: { }
                     }
 
                     Settings {
-                        property alias exportFolder: exportFileDialog.folder
+                        property alias exportFolder: exportFileDialog.currentFolder
                     }
 
                     Settings {
diff --git a/QML/DopplerBox.qml b/QML/DopplerBox.qml
index 275050b0..11dcffe9 100644
--- a/QML/DopplerBox.qml
+++ b/QML/DopplerBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
diff --git a/QML/ExportDist.qml b/QML/ExportDist.qml
index 9dca8bc3..72983fc0 100644
--- a/QML/ExportDist.qml
+++ b/QML/ExportDist.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Item {
diff --git a/QML/ExportSettings.qml b/QML/ExportSettings.qml
index cc43c2f1..47afa698 100644
--- a/QML/ExportSettings.qml
+++ b/QML/ExportSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {
diff --git a/QML/FactoryBox.qml b/QML/FactoryBox.qml
index ec26c6a3..012061a6 100644
--- a/QML/FactoryBox.qml
+++ b/QML/FactoryBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
@@ -11,7 +11,7 @@ DevSettingsBox {
         FileDialog {
             id: fileDialog
             title: qsTr("Please choose a file")
-            folder: shortcuts.home
+            currentFolder: shortcuts.home
             nameFilters: ["Upgrade files (*.bin)"]
             onAccepted: {
                 pathText.text = fileDialog.fileUrl.toString()
@@ -21,7 +21,7 @@ DevSettingsBox {
         }
 
         Settings {
-            property alias upgradeFolder: fileDialog.folder
+            property alias upgradeFolder: fileDialog.currentFolder
         }
 
     MenuBlock {
diff --git a/QML/FlashBox.qml b/QML/FlashBox.qml
index 68b358d9..7824e4de 100644
--- a/QML/FlashBox.qml
+++ b/QML/FlashBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 
diff --git a/QML/KoggerCommon/MenuBlockEx.qml b/QML/KoggerCommon/MenuBlockEx.qml
index 23ea19ba..ed369110 100644
--- a/QML/KoggerCommon/MenuBlockEx.qml
+++ b/QML/KoggerCommon/MenuBlockEx.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Rectangle {
diff --git a/QML/MenuBlock.qml b/QML/MenuBlock.qml
index 44d986fc..fcd5270f 100644
--- a/QML/MenuBlock.qml
+++ b/QML/MenuBlock.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Rectangle {
diff --git a/QML/MenuButton.qml b/QML/MenuButton.qml
index 9286e572..662c69c3 100644
--- a/QML/MenuButton.qml
+++ b/QML/MenuButton.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Controls.Styles 1.4
 
 Button {
     property bool active: false
diff --git a/QML/MotorViewer.qml b/QML/MotorViewer.qml
index e7a6acbf..8813ed70 100644
--- a/QML/MotorViewer.qml
+++ b/QML/MotorViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
@@ -276,7 +276,7 @@ ColumnLayout {
             FileDialog {
                 id: newFileDialog
                 title: "Please choose a CSV file"
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["CSV (*.csv)"]
 
@@ -291,7 +291,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: newFileDialog.folder
+                property alias logFolder: newFileDialog.currentFolder
             }
         }
 
diff --git a/QML/MpcFilterControlMenu.qml b/QML/MpcFilterControlMenu.qml
index d47f1ebb..c0a47bd2 100644
--- a/QML/MpcFilterControlMenu.qml
+++ b/QML/MpcFilterControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0
diff --git a/QML/NpdFilterControlMenu.qml b/QML/NpdFilterControlMenu.qml
index 2a10c7eb..547b95cd 100644
--- a/QML/NpdFilterControlMenu.qml
+++ b/QML/NpdFilterControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0
diff --git a/QML/Plot2D.qml b/QML/Plot2D.qml
index 3500e5a5..bde809a6 100644
--- a/QML/Plot2D.qml
+++ b/QML/Plot2D.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import WaterFall 1.0
diff --git a/QML/PointGroupControlMenu.qml b/QML/PointGroupControlMenu.qml
index 7583983d..600e2cf5 100644
--- a/QML/PointGroupControlMenu.qml
+++ b/QML/PointGroupControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0
diff --git a/QML/PolygonGroupControlMenu.qml b/QML/PolygonGroupControlMenu.qml
index 1e42a011..96864398 100644
--- a/QML/PolygonGroupControlMenu.qml
+++ b/QML/PolygonGroupControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 import QtQuick.Controls 1.4
 
diff --git a/QML/RecorderBox.qml b/QML/RecorderBox.qml
index ff144e3a..889c52fb 100644
--- a/QML/RecorderBox.qml
+++ b/QML/RecorderBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 import QtQml.Models 2.15
 
diff --git a/QML/Scene3DToolbar.qml b/QML/Scene3DToolbar.qml
index 34a16b08..09b0518e 100644
--- a/QML/Scene3DToolbar.qml
+++ b/QML/Scene3DToolbar.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import Qt.labs.settings 1.1
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 
 
 ColumnLayout {
diff --git a/QML/SmoothMethodTriDivideSettings.qml b/QML/SmoothMethodTriDivideSettings.qml
index 1a4b8bd3..1b14f3cb 100644
--- a/QML/SmoothMethodTriDivideSettings.qml
+++ b/QML/SmoothMethodTriDivideSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
diff --git a/QML/SmoothMethodUGINSettings.qml b/QML/SmoothMethodUGINSettings.qml
index 1a4b8bd3..1b14f3cb 100644
--- a/QML/SmoothMethodUGINSettings.qml
+++ b/QML/SmoothMethodUGINSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
diff --git a/QML/SonarBox.qml b/QML/SonarBox.qml
index f5e5d296..023a5c72 100644
--- a/QML/SonarBox.qml
+++ b/QML/SonarBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
@@ -83,7 +83,7 @@ DevSettingsBox {
             FileDialog {
                 id: importFileDialog
                 title: qsTr("Open file")
-                selectExisting: true
+                fileMode: FileDialog.OpenFile
                 nameFilters: ["XML files (*.xml)"]
 
                 onAccepted: {
@@ -100,7 +100,7 @@ DevSettingsBox {
             FileDialog {
                 id: exportFileDialog
                 title: qsTr("Save as file")
-                selectExisting: false
+                fileMode: FileDialog.SaveFile
                 nameFilters: ["XML files (*.xml)"]
 
                 onAccepted: {
diff --git a/QML/SurfaceControlMenu.qml b/QML/SurfaceControlMenu.qml
index cba6dc32..ae3b36b0 100644
--- a/QML/SurfaceControlMenu.qml
+++ b/QML/SurfaceControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 import KoggerCommon 1.0
 import SceneObject 1.0
diff --git a/QML/TitleMenuBox.qml b/QML/TitleMenuBox.qml
index 0e1f6900..a3bd9ddb 100644
--- a/QML/TitleMenuBox.qml
+++ b/QML/TitleMenuBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 RowLayout {
diff --git a/QML/USBLBox.qml b/QML/USBLBox.qml
index bbed8ea1..ebc8dc6c 100644
--- a/QML/USBLBox.qml
+++ b/QML/USBLBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
diff --git a/QML/UpgradeBox.qml b/QML/UpgradeBox.qml
index 5a34d185..f38c8a2e 100644
--- a/QML/UpgradeBox.qml
+++ b/QML/UpgradeBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
@@ -12,7 +12,7 @@ DevSettingsBox {
     FileDialog {
         id: fileDialog
         title: qsTr("Please choose a file")
-        folder: shortcuts.home
+        currentFolder: shortcuts.home
         nameFilters: ["Upgrade files (*.ufw)"]
         onAccepted: {
             pathText.text = fileDialog.fileUrl.toString()
@@ -22,7 +22,7 @@ DevSettingsBox {
     }
 
     Settings {
-        property alias upgradeFolder: fileDialog.folder
+        property alias upgradeFolder: fileDialog.currentFolder
     }
 
     ColumnLayout {
diff --git a/QML/main.qml b/QML/main.qml
index c6c4672d..ea66ff41 100644
--- a/QML/main.qml
+++ b/QML/main.qml
@@ -3,10 +3,11 @@ import SceneGraphRendering 1.0
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15
 import Qt.labs.settings 1.1
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import QtQuick.Controls 2.15
 import WaterFall 1.0
 import KoggerCommon 1.0
+import '.' as KControls
 
 
 Window  {
@@ -603,7 +604,7 @@ Window  {
         }
     }
 
-    MenuBar {
+    KControls.MenuBar {
         id:                menuBar
         objectName:        "menuBar"
         Layout.fillHeight: true
diff --git a/controllers/boattrackcontrolmenucontroller.h b/controllers/boattrackcontrolmenucontroller.h
index 14ad79c0..09eee23b 100644
--- a/controllers/boattrackcontrolmenucontroller.h
+++ b/controllers/boattrackcontrolmenucontroller.h
@@ -5,6 +5,12 @@
 
 class BoatTrack;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_BoatTrack
+#define OPAQUE_BoatTrack
+Q_DECLARE_OPAQUE_POINTER(BoatTrack*)
+#endif
+
 class BoatTrackControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/bottomtrackcontrolmenucontroller.h b/controllers/bottomtrackcontrolmenucontroller.h
index 50150cad..60b6ed35 100644
--- a/controllers/bottomtrackcontrolmenucontroller.h
+++ b/controllers/bottomtrackcontrolmenucontroller.h
@@ -7,6 +7,12 @@
 
 class BottomTrack;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_BottomTrack
+#define OPAQUE_BottomTrack
+Q_DECLARE_OPAQUE_POINTER(BottomTrack*)
+#endif
+
 class BottomTrackControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/image_view_control_menu_controller.h b/controllers/image_view_control_menu_controller.h
index 4c5147ce..8ab2d327 100644
--- a/controllers/image_view_control_menu_controller.h
+++ b/controllers/image_view_control_menu_controller.h
@@ -4,6 +4,12 @@
 
 class ImageView;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_ImageView
+#define OPAQUE_ImageView
+Q_DECLARE_OPAQUE_POINTER(ImageView*)
+#endif
+
 class ImageViewControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/pointgroupcontrolmenucontroller.h b/controllers/pointgroupcontrolmenucontroller.h
index 862ee446..cde2f9b1 100644
--- a/controllers/pointgroupcontrolmenucontroller.h
+++ b/controllers/pointgroupcontrolmenucontroller.h
@@ -9,6 +9,12 @@
 class GraphicsScene3dView;
 class PointGroup;
 class PointObject;
+
+#ifndef OPAQUE_PointGroup
+#define OPAQUE_PointGroup
+Q_DECLARE_OPAQUE_POINTER(PointGroup*)
+#endif
+
 class PointGroupControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/polygongroupcontrolmenucontroller.h b/controllers/polygongroupcontrolmenucontroller.h
index 3aca13dd..3aa3749e 100644
--- a/controllers/polygongroupcontrolmenucontroller.h
+++ b/controllers/polygongroupcontrolmenucontroller.h
@@ -11,6 +11,12 @@
 class PolygonGroup;
 class GraphicsScene3dView;
 class PointObject;
+
+#ifndef OPAQUE_PolygonGroup
+#define OPAQUE_PolygonGroup
+Q_DECLARE_OPAQUE_POINTER(PolygonGroup*)
+#endif
+
 class PolygonGroupControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/side_scan_view_control_menu_controller.h b/controllers/side_scan_view_control_menu_controller.h
index 0683ed01..4cbbe101 100644
--- a/controllers/side_scan_view_control_menu_controller.h
+++ b/controllers/side_scan_view_control_menu_controller.h
@@ -6,6 +6,13 @@
 class Core;
 class SideScanView;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_SideScanView
+#define OPAQUE_SideScanView
+Q_DECLARE_OPAQUE_POINTER(SideScanView*)
+#endif
+
+
 class SideScanViewControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/surfacecontrolmenucontroller.h b/controllers/surfacecontrolmenucontroller.h
index 4411a037..ce52d231 100644
--- a/controllers/surfacecontrolmenucontroller.h
+++ b/controllers/surfacecontrolmenucontroller.h
@@ -9,6 +9,12 @@
 
 class Surface;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_SurfaceGroup
+#define OPAQUE_SurfaceGroup
+Q_DECLARE_OPAQUE_POINTER(Surface*)
+#endif
+
 class SurfaceControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/controllers/usbl_view_control_menu_controller.h b/controllers/usbl_view_control_menu_controller.h
index cf4e02e4..186cb14f 100644
--- a/controllers/usbl_view_control_menu_controller.h
+++ b/controllers/usbl_view_control_menu_controller.h
@@ -8,6 +8,12 @@
 
 class UsblView;
 class GraphicsScene3dView;
+
+#ifndef OPAQUE_UsblView
+#define OPAQUE_UsblView
+Q_DECLARE_OPAQUE_POINTER(UsblView*)
+#endif
+
 class UsblViewControlMenuController : public QmlComponentController
 {
     Q_OBJECT
diff --git a/domain/boattrack.cpp b/domain/boattrack.cpp
index 598638ad..b2fab3e3 100644
--- a/domain/boattrack.cpp
+++ b/domain/boattrack.cpp
@@ -1,6 +1,6 @@
 #include "boattrack.h"
 
-#include <QtOpenGLExtensions/QOpenGLExtensions>
+#include <QOpenGLFunctions>
 #include <QHash>
 #include "graphicsscene3dview.h"
 #include <epochevent.h>
diff --git a/domain/bottomtrack.cpp b/domain/bottomtrack.cpp
index 748f4cec..84e85fe3 100644
--- a/domain/bottomtrack.cpp
+++ b/domain/bottomtrack.cpp
@@ -4,7 +4,7 @@
 //#include <textrenderer.h> TODO
 #include <draw_utils.h>
 #include "boattrack.h"
-#include <QtOpenGLExtensions/QOpenGLExtensions>
+#include <QOpenGLFunctions>
 
 #include <QHash>
 
diff --git a/domain/side_scan_view.cpp b/domain/side_scan_view.cpp
index 6de2c9e9..85e08323 100644
--- a/domain/side_scan_view.cpp
+++ b/domain/side_scan_view.cpp
@@ -78,7 +78,7 @@ void SideScanView::startUpdateDataInThread(int endIndx, int endOffset)
 
 void SideScanView::updateData(int endIndx, int endOffset, bool backgroundThread)
 {
-    std::unique_ptr<QMutexLocker> locker;
+    QMutexLocker<QMutex> locker(nullptr);
     std::function<void()> cleanFunc;
     if (backgroundThread) {
         cleanFunc = [&, this]() {
@@ -87,7 +87,7 @@ void SideScanView::updateData(int endIndx, int endOffset, bool backgroundThread)
                 emit sendStartedInThread(startedInThread_);
             }
         };
-        locker = std::make_unique<QMutexLocker>(&mutex_);
+        locker = QMutexLocker(&mutex_);
     }
 
     if (!datasetPtr_) {
diff --git a/main.cpp b/main.cpp
index b52ac90b..0a946a29 100644
--- a/main.cpp
+++ b/main.cpp
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Round);
 #endif
 
-    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::OpenGLRhi);
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 
     QSurfaceFormat format;
     format.setSwapInterval(0);
diff --git a/processors/surfaceprocessor.h b/processors/surfaceprocessor.h
index a4726b9d..62adb03a 100644
--- a/processors/surfaceprocessor.h
+++ b/processors/surfaceprocessor.h
@@ -23,6 +23,12 @@
 #include <abstractentitydatafilter.h>
 
 class BottomTrack;
+
+#ifndef OPAQUE_BottomTrack
+#define OPAQUE_BottomTrack
+Q_DECLARE_OPAQUE_POINTER(BottomTrack*)
+#endif
+
 class SurfaceProcessorTask{
     Q_GADGET
     Q_PROPERTY(BottomTrack*              bottomTrack           READ bottomTrack           CONSTANT)