diff --git a/assets/qml/Dashboard/DashboardTitle.qml b/assets/qml/Dashboard/DashboardTitle.qml
index 9649c2ab..aeb7b658 100644
--- a/assets/qml/Dashboard/DashboardTitle.qml
+++ b/assets/qml/Dashboard/DashboardTitle.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Dashboard/ViewOptions.qml b/assets/qml/Dashboard/ViewOptions.qml
index 5abf0f31..7b159613 100644
--- a/assets/qml/Dashboard/ViewOptions.qml
+++ b/assets/qml/Dashboard/ViewOptions.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
-import Qt.labs.settings 1.1
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
+import Qt.labs.settings 1.0
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Dashboard/ViewOptionsDelegate.qml b/assets/qml/Dashboard/ViewOptionsDelegate.qml
index efc1f391..782d2b2a 100644
--- a/assets/qml/Dashboard/ViewOptionsDelegate.qml
+++ b/assets/qml/Dashboard/ViewOptionsDelegate.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Dashboard/WidgetDelegate.qml b/assets/qml/Dashboard/WidgetDelegate.qml
index 81fbcc78..60a9fb59 100644
--- a/assets/qml/Dashboard/WidgetDelegate.qml
+++ b/assets/qml/Dashboard/WidgetDelegate.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import SerialStudio 1.0
 
diff --git a/assets/qml/Dashboard/WidgetGrid.qml b/assets/qml/Dashboard/WidgetGrid.qml
index 6673d47f..ba35c91f 100644
--- a/assets/qml/Dashboard/WidgetGrid.qml
+++ b/assets/qml/Dashboard/WidgetGrid.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Dashboard/WidgetModel.qml b/assets/qml/Dashboard/WidgetModel.qml
index 392f8de9..60e4b63e 100644
--- a/assets/qml/Dashboard/WidgetModel.qml
+++ b/assets/qml/Dashboard/WidgetModel.qml
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
+import QtQuick 2.10
 
 Repeater {
     id: root
diff --git a/assets/qml/FramelessWindow/CustomWindow.qml b/assets/qml/FramelessWindow/CustomWindow.qml
index 433eb44c..ca96c40f 100644
--- a/assets/qml/FramelessWindow/CustomWindow.qml
+++ b/assets/qml/FramelessWindow/CustomWindow.qml
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12 as QtWindow
+import QtQuick 2.10
+import QtQuick.Window 2.10 as QtWindow
 
 import "../Widgets" as Widgets
 
@@ -63,7 +63,7 @@ QtWindow.Window {
     readonly property int handleSize: radius > 0 ? radius + shadowMargin + 10 : 0
     readonly property int radius: Cpp_ThemeManager.customWindowDecorations ?
                                       (((root.visibility === QtWindow.Window.Maximized &&
-                                        maximizeEnabled) || isFullscreen) ? 0 : 10) : 0
+                                         maximizeEnabled) || isFullscreen) ? 0 : 10) : 0
 
     //
     // Visibility properties
@@ -77,10 +77,10 @@ QtWindow.Window {
     readonly property int customFlags: {
         // Setup frameless window flags
         var flags = Qt.Window |
-                    Qt.CustomizeWindowHint |
-                    Qt.FramelessWindowHint |
-                    Qt.WindowSystemMenuHint |
-                    Qt.WindowMinMaxButtonsHint
+                Qt.CustomizeWindowHint |
+                Qt.FramelessWindowHint |
+                Qt.WindowSystemMenuHint |
+                Qt.WindowMinMaxButtonsHint
 
         //
         // The macOS window manager is able to generate shadows for Qt frameless
@@ -210,39 +210,6 @@ QtWindow.Window {
         anchors.margins: root.shadowMargin
     }
 
-    //
-    // Handle for resizing the window
-    // Note: this does not work on macOS, see the following article for more information
-    //       https://www.qt.io/blog/custom-window-decorations
-    //
-    DragHandler {
-        id: resizeHandler
-        target: null
-        enabled: !Cpp_IsMac && Cpp_ThemeManager.customWindowDecorations
-        grabPermissions: TapHandler.TakeOverForbidden
-        onActiveChanged: {
-            if (active) {
-                const p = resizeHandler.centroid.position
-                const b = root.handleSize
-                let e = 0;
-
-                if (p.x < b)
-                    e |= Qt.LeftEdge
-
-                if (p.x >= width - b)
-                    e |= Qt.RightEdge
-
-                if (p.y < b)
-                    e |= Qt.TopEdge
-
-                if (p.y >= height - b)
-                    e |= Qt.BottomEdge
-
-                root.startSystemResize(e)
-            }
-        }
-    }
-
     //
     // Global mouse area to set cursor shape while resizing
     //
diff --git a/assets/qml/FramelessWindow/ResizeHandles.qml b/assets/qml/FramelessWindow/ResizeHandles.qml
index 6f78aebc..aab544c1 100644
--- a/assets/qml/FramelessWindow/ResizeHandles.qml
+++ b/assets/qml/FramelessWindow/ResizeHandles.qml
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
 
 Item {
     id: root
@@ -40,7 +40,7 @@ Item {
              (window.visibility !== Window.Maximized)
 
     //
-    // Right resize handle for macOS
+    // Right resize handle
     //
     MouseArea {
         property bool dragging: false
@@ -54,7 +54,6 @@ Item {
         }
 
         width: handleSize
-        enabled: Cpp_IsMac
         onPressedChanged: dragging = pressed
         onPressed: lastMousePos = Qt.point(mouseX, mouseY)
 
@@ -87,7 +86,6 @@ Item {
         }
 
         width: handleSize
-        enabled: Cpp_IsMac
         onPressedChanged: dragging = pressed
         onPressed: lastMousePos = Qt.point(mouseX, mouseY)
 
@@ -131,7 +129,6 @@ Item {
         }
 
         height: handleSize
-        enabled: Cpp_IsMac
         onPressedChanged: dragging = pressed
         onPressed: lastMousePos = Qt.point(mouseX, mouseY)
         onMouseYChanged: {
@@ -235,7 +232,6 @@ Item {
 
         width: handleSize
         height: handleSize
-        enabled: Cpp_IsMac
         onPressedChanged: dragging = pressed
         onMouseXChanged: updateWindowPosition()
         onPressed: lastMousePos = Qt.point(mouseX, mouseY)
diff --git a/assets/qml/FramelessWindow/Titlebar.qml b/assets/qml/FramelessWindow/Titlebar.qml
index 3da05218..f18439fe 100644
--- a/assets/qml/FramelessWindow/Titlebar.qml
+++ b/assets/qml/FramelessWindow/Titlebar.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
@@ -176,34 +176,28 @@ Rectangle {
     }
 
     //
-    // Window drag handler
+    // Window drag handler & maximize by double click
     //
     Item {
         anchors.fill: parent
         enabled: Cpp_ThemeManager.customWindowDecorations
 
-        DragHandler {
-            grabPermissions: TapHandler.CanTakeOverFromAnything
-            onActiveChanged: {
-                if (active)
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton
+
+            onDoubleClicked: {
+                if (root.maximizeEnabled)
+                    root.toggleMaximized()
+            }
+
+            onPressedChanged: {
+                if (pressed)
                     window.startSystemMove()
             }
         }
     }
 
-    //
-    // Window maximize by double click
-    //
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton
-        enabled: Cpp_ThemeManager.customWindowDecorations
-        onDoubleClicked: {
-            if (root.maximizeEnabled)
-                root.toggleMaximized()
-        }
-    }
-
     //
     // macOS layout
     //
diff --git a/assets/qml/FramelessWindow/WindowButton.qml b/assets/qml/FramelessWindow/WindowButton.qml
index e1203097..bb45f4b3 100644
--- a/assets/qml/FramelessWindow/WindowButton.qml
+++ b/assets/qml/FramelessWindow/WindowButton.qml
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
+import QtQuick 2.10
 import "../Widgets" as Widgets
 
 Widgets.Icon {
diff --git a/assets/qml/FramelessWindow/WindowButtonMacOS.qml b/assets/qml/FramelessWindow/WindowButtonMacOS.qml
index 8b178f0f..ae12f505 100644
--- a/assets/qml/FramelessWindow/WindowButtonMacOS.qml
+++ b/assets/qml/FramelessWindow/WindowButtonMacOS.qml
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
+import QtQuick 2.10
 
 Image {
     id: root
diff --git a/assets/qml/JsonEditor/Footer.qml b/assets/qml/JsonEditor/Footer.qml
index 2cfe6728..c0cbcab4 100644
--- a/assets/qml/JsonEditor/Footer.qml
+++ b/assets/qml/JsonEditor/Footer.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/JsonEditor/GroupEditor.qml b/assets/qml/JsonEditor/GroupEditor.qml
index d2a330f3..30e4fb9b 100644
--- a/assets/qml/JsonEditor/GroupEditor.qml
+++ b/assets/qml/JsonEditor/GroupEditor.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/JsonEditor/Header.qml b/assets/qml/JsonEditor/Header.qml
index 13dc8d05..6de36040 100644
--- a/assets/qml/JsonEditor/Header.qml
+++ b/assets/qml/JsonEditor/Header.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/JsonEditor/JsonDatasetDelegate.qml b/assets/qml/JsonEditor/JsonDatasetDelegate.qml
index 61e31fba..0ce0a82f 100644
--- a/assets/qml/JsonEditor/JsonDatasetDelegate.qml
+++ b/assets/qml/JsonEditor/JsonDatasetDelegate.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/JsonEditor/JsonGroupDelegate.qml b/assets/qml/JsonEditor/JsonGroupDelegate.qml
index a4e487cf..0891a1e5 100644
--- a/assets/qml/JsonEditor/JsonGroupDelegate.qml
+++ b/assets/qml/JsonEditor/JsonGroupDelegate.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/JsonEditor/TreeView.qml b/assets/qml/JsonEditor/TreeView.qml
index 7394f0ee..0a5ef77d 100644
--- a/assets/qml/JsonEditor/TreeView.qml
+++ b/assets/qml/JsonEditor/TreeView.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Panes/Console.qml b/assets/qml/Panes/Console.qml
index 58f4bd01..29f9b2a2 100644
--- a/assets/qml/Panes/Console.qml
+++ b/assets/qml/Panes/Console.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
diff --git a/assets/qml/Panes/Dashboard.qml b/assets/qml/Panes/Dashboard.qml
index d9199a76..c6d6a4c8 100644
--- a/assets/qml/Panes/Dashboard.qml
+++ b/assets/qml/Panes/Dashboard.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 import "../Dashboard" as DashboardItems
diff --git a/assets/qml/Panes/Setup.qml b/assets/qml/Panes/Setup.qml
index 38f6b8b0..31038a5d 100644
--- a/assets/qml/Panes/Setup.qml
+++ b/assets/qml/Panes/Setup.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 
 import "../Widgets" as Widgets
 import "SetupPanes" as SetupPanes
diff --git a/assets/qml/Panes/SetupPanes/MQTT.qml b/assets/qml/Panes/SetupPanes/MQTT.qml
index 087bc2fe..d9904ff4 100644
--- a/assets/qml/Panes/SetupPanes/MQTT.qml
+++ b/assets/qml/Panes/SetupPanes/MQTT.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../../Windows" as Windows
 
diff --git a/assets/qml/Panes/SetupPanes/Network.qml b/assets/qml/Panes/SetupPanes/Network.qml
index 1e743ede..de2db4be 100644
--- a/assets/qml/Panes/SetupPanes/Network.qml
+++ b/assets/qml/Panes/SetupPanes/Network.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 Control {
     id: root
diff --git a/assets/qml/Panes/SetupPanes/Serial.qml b/assets/qml/Panes/SetupPanes/Serial.qml
index 695ca23d..2a9f1a6f 100644
--- a/assets/qml/Panes/SetupPanes/Serial.qml
+++ b/assets/qml/Panes/SetupPanes/Serial.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 Control {
     id: root
diff --git a/assets/qml/Panes/SetupPanes/Settings.qml b/assets/qml/Panes/SetupPanes/Settings.qml
index 42fd1b29..fc00dbd1 100644
--- a/assets/qml/Panes/SetupPanes/Settings.qml
+++ b/assets/qml/Panes/SetupPanes/Settings.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 Control {
     id: root
diff --git a/assets/qml/Panes/Toolbar.qml b/assets/qml/Panes/Toolbar.qml
index e281e268..229d734c 100644
--- a/assets/qml/Panes/Toolbar.qml
+++ b/assets/qml/Panes/Toolbar.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../Widgets" as Widgets
 
@@ -238,10 +238,10 @@ Control {
             height: parent.height
             Layout.fillWidth: true
 
-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                         window.startSystemMove()
                 }
             }
diff --git a/assets/qml/PlatformDependent/DecentMenuItem.qml b/assets/qml/PlatformDependent/DecentMenuItem.qml
index 13449239..15f31fee 100644
--- a/assets/qml/PlatformDependent/DecentMenuItem.qml
+++ b/assets/qml/PlatformDependent/DecentMenuItem.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 MenuItem {
     id: root
diff --git a/assets/qml/PlatformDependent/Menubar.qml b/assets/qml/PlatformDependent/Menubar.qml
index 52937bb4..c68e7898 100644
--- a/assets/qml/PlatformDependent/Menubar.qml
+++ b/assets/qml/PlatformDependent/Menubar.qml
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Controls 2.10
 
 MenuBar {
     id: root
@@ -197,7 +197,7 @@ MenuBar {
             sequence: "f11"
             onTriggered: mainWindow.toggleFullscreen()
             text: mainWindow.isFullscreen ? qsTr("Exit full screen") :
-                                                qsTr("Enter full screen")
+                                            qsTr("Enter full screen")
         }
     }
 
diff --git a/assets/qml/PlatformDependent/MenubarMacOS.qml b/assets/qml/PlatformDependent/MenubarMacOS.qml
index 524eaf12..5e7bd1f3 100644
--- a/assets/qml/PlatformDependent/MenubarMacOS.qml
+++ b/assets/qml/PlatformDependent/MenubarMacOS.qml
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
+import QtQuick 2.10
 import Qt.labs.platform 1.0
 
 MenuBar {
diff --git a/assets/qml/Widgets/Icon.qml b/assets/qml/Widgets/Icon.qml
index 27b59de5..b6edc01b 100644
--- a/assets/qml/Widgets/Icon.qml
+++ b/assets/qml/Widgets/Icon.qml
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Controls 2.10
 
 Item {
     id: root
diff --git a/assets/qml/Widgets/JSONDropArea.qml b/assets/qml/Widgets/JSONDropArea.qml
index f771854f..0373c161 100644
--- a/assets/qml/Widgets/JSONDropArea.qml
+++ b/assets/qml/Widgets/JSONDropArea.qml
@@ -20,59 +20,59 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 DropArea {
     //
     // Show rectangle and set color based on file extension on drag enter
     //
     onEntered: {
-                   // Get file name & set color of rectangle accordingly
-                   if (drag.urls.length > 0) {
-                       var path = drag.urls[0].toString()
-                       if (path.endsWith(".json") || path.endsWith(".csv")) {
-                           drag.accept(Qt.LinkAction)
-                           dropRectangle.color = Qt.darker(palette.highlight, 1.4)
-                       }
+        // Get file name & set color of rectangle accordingly
+        if (drag.urls.length > 0) {
+            var path = drag.urls[0].toString()
+            if (path.endsWith(".json") || path.endsWith(".csv")) {
+                drag.accept(Qt.LinkAction)
+                dropRectangle.color = Qt.darker(palette.highlight, 1.4)
+            }
 
-                       // Invalid file name, show red rectangle
-                       else
-                       dropRectangle.color = Cpp_ThemeManager.alternativeHighlight
+            // Invalid file name, show red rectangle
+            else
+                dropRectangle.color = Cpp_ThemeManager.alternativeHighlight
 
-                       // Show drag&drop rectangle
-                       dropRectangle.opacity = 0.8
-                   }
-               }
+            // Show drag&drop rectangle
+            dropRectangle.opacity = 0.8
+        }
+    }
 
     //
     // Open *.json & *.csv files on drag drop
     //
     onDropped: {
-                   // Hide rectangle
-                   dropRectangle.hide()
+        // Hide rectangle
+        dropRectangle.hide()
 
-                   // Get dropped file URL and remove prefixed "file://"
-                   var path = drop.urls[0].toString()
-                   if (!Cpp_IsWin)
-                   path = path.replace(/^(file:\/{2})/,"");
-                   else
-                   path = path.replace(/^(file:\/{3})/,"");
+        // Get dropped file URL and remove prefixed "file://"
+        var path = drop.urls[0].toString()
+        if (!Cpp_IsWin)
+            path = path.replace(/^(file:\/{2})/,"");
+        else
+            path = path.replace(/^(file:\/{3})/,"");
 
-                   // Unescape html codes like '%23' for '#'
-                   var cleanPath = decodeURIComponent(path);
+        // Unescape html codes like '%23' for '#'
+        var cleanPath = decodeURIComponent(path);
 
-                   // Process JSON files
-                   if (cleanPath.endsWith(".json")) {
-                       Cpp_JSON_Generator.setOperationMode(0)
-                       Cpp_JSON_Generator.loadJsonMap(cleanPath)
-                   }
+        // Process JSON files
+        if (cleanPath.endsWith(".json")) {
+            Cpp_JSON_Generator.setOperationMode(0)
+            Cpp_JSON_Generator.loadJsonMap(cleanPath)
+        }
 
-                   // Process CSV files
-                   else if (cleanPath.endsWith(".csv"))
-                   Cpp_CSV_Player.openFile(cleanPath)
-               }
+        // Process CSV files
+        else if (cleanPath.endsWith(".csv"))
+            Cpp_CSV_Player.openFile(cleanPath)
+    }
 
     //
     // Hide drag & drop rectangle on drag exit
diff --git a/assets/qml/Widgets/Shadow.qml b/assets/qml/Widgets/Shadow.qml
index d20233dd..c0b559d0 100644
--- a/assets/qml/Widgets/Shadow.qml
+++ b/assets/qml/Widgets/Shadow.qml
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
+import QtQuick 2.10
 
 Item {
     id: root
diff --git a/assets/qml/Widgets/Terminal.qml b/assets/qml/Widgets/Terminal.qml
index 8da98765..ddb9e601 100644
--- a/assets/qml/Widgets/Terminal.qml
+++ b/assets/qml/Widgets/Terminal.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 import SerialStudio 1.0 as SerialStudio
 
 Item {
diff --git a/assets/qml/Widgets/Window.qml b/assets/qml/Widgets/Window.qml
index 683c10cb..f4cb5431 100644
--- a/assets/qml/Widgets/Window.qml
+++ b/assets/qml/Widgets/Window.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 Page {
     id: root
diff --git a/assets/qml/Windows/About.qml b/assets/qml/Windows/About.qml
index 905838b4..4e56dc74 100644
--- a/assets/qml/Windows/About.qml
+++ b/assets/qml/Windows/About.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../FramelessWindow" as FramelessWindow
 
@@ -94,10 +94,10 @@ FramelessWindow.CustomWindow {
         Item {
             anchors.fill: parent
 
-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                         root.startSystemMove()
                 }
             }
diff --git a/assets/qml/Windows/Acknowledgements.qml b/assets/qml/Windows/Acknowledgements.qml
index cab0e567..9b96d9df 100644
--- a/assets/qml/Windows/Acknowledgements.qml
+++ b/assets/qml/Windows/Acknowledgements.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../FramelessWindow" as FramelessWindow
 
diff --git a/assets/qml/Windows/CsvPlayer.qml b/assets/qml/Windows/CsvPlayer.qml
index c7686208..16ba266b 100644
--- a/assets/qml/Windows/CsvPlayer.qml
+++ b/assets/qml/Windows/CsvPlayer.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
 import "../FramelessWindow" as FramelessWindow
 
diff --git a/assets/qml/Windows/Donate.qml b/assets/qml/Windows/Donate.qml
index 65c7de25..931d240f 100644
--- a/assets/qml/Windows/Donate.qml
+++ b/assets/qml/Windows/Donate.qml
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 import "../FramelessWindow" as FramelessWindow
 
 FramelessWindow.CustomWindow {
@@ -124,10 +124,10 @@ FramelessWindow.CustomWindow {
         Item {
             anchors.fill: parent
 
-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                         root.startSystemMove()
                 }
             }
diff --git a/assets/qml/Windows/JsonEditor.qml b/assets/qml/Windows/JsonEditor.qml
index b546c2eb..c30c0c52 100644
--- a/assets/qml/Windows/JsonEditor.qml
+++ b/assets/qml/Windows/JsonEditor.qml
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 
 import "../JsonEditor"
 import "../Widgets" as Widgets
diff --git a/assets/qml/Windows/MQTTConfiguration.qml b/assets/qml/Windows/MQTTConfiguration.qml
index fafa9358..c62686cf 100644
--- a/assets/qml/Windows/MQTTConfiguration.qml
+++ b/assets/qml/Windows/MQTTConfiguration.qml
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 
 import "../FramelessWindow" as FramelessWindow
 
@@ -110,21 +110,6 @@ FramelessWindow.CustomWindow {
             }
         }
 
-        //
-        // Window drag handler
-        //
-        Item {
-            anchors.fill: parent
-
-            DragHandler {
-                grabPermissions: TapHandler.TakeOverForbidden
-                onActiveChanged: {
-                    if (active)
-                        root.startSystemMove()
-                }
-            }
-        }
-
         //
         // Window controls
         //
diff --git a/assets/qml/Windows/MainWindow.qml b/assets/qml/Windows/MainWindow.qml
index e0e0c35d..8481cfe2 100644
--- a/assets/qml/Windows/MainWindow.qml
+++ b/assets/qml/Windows/MainWindow.qml
@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
 
-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 
 import "../Panes"
 import "../Windows"
diff --git a/assets/qml/main.qml b/assets/qml/main.qml
index 8b78ed61..639f9486 100644
--- a/assets/qml/main.qml
+++ b/assets/qml/main.qml
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Controls 2.10
 
 import "Windows" as Windows
 
diff --git a/src/UI/Widgets/Terminal.cpp b/src/UI/Widgets/Terminal.cpp
index af62c60b..d1b9af07 100644
--- a/src/UI/Widgets/Terminal.cpp
+++ b/src/UI/Widgets/Terminal.cpp
@@ -604,9 +604,7 @@ QString Widgets::Terminal::vt100Processing(const QString &data)
 //---------------------------------------------------------º-----------------------------------------
 
 #define QTC_ASSERT(cond, action)                                                         \
-    if (Q_LIKELY(cond))                                                                  \
-    {                                                                                    \
-    }                                                                                    \
+    if (Q_LIKELY(cond)) { }                                                              \
     else                                                                                 \
     {                                                                                    \
         action;                                                                          \
@@ -866,13 +864,13 @@ Widgets::AnsiEscapeCodeHandler::parseText(const FormattedText &input)
                                     {
                                         (code == RgbTextColor)
                                             ? charFormat.setForeground(
-                                                  QColor(numbers.at(i + 1).toInt(),
-                                                         numbers.at(i + 2).toInt(),
-                                                         numbers.at(i + 3).toInt()))
+                                                QColor(numbers.at(i + 1).toInt(),
+                                                       numbers.at(i + 2).toInt(),
+                                                       numbers.at(i + 3).toInt()))
                                             : charFormat.setBackground(
-                                                  QColor(numbers.at(i + 1).toInt(),
-                                                         numbers.at(i + 2).toInt(),
-                                                         numbers.at(i + 3).toInt()));
+                                                QColor(numbers.at(i + 1).toInt(),
+                                                       numbers.at(i + 2).toInt(),
+                                                       numbers.at(i + 3).toInt()));
                                         setFormatScope(charFormat);
                                     }
                                     i += 3;