diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 6aaea9570ccc77265b0ac030cd2e23f657b59382..7518731a58d96243664bf0e82d63c0209b63a2a4 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -8,11 +8,11 @@
  ****************************************************************************/
 
 
-import QtQuick          2.4
-import QtQuick.Controls 1.2
-import QtLocation       5.3
-import QtPositioning    5.3
-import QtQuick.Dialogs  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtLocation                   5.3
+import QtPositioning                5.3
+import QtQuick.Dialogs              1.2
 
 import QGroundControl               1.0
 import QGroundControl.Airspace      1.0
@@ -176,10 +176,6 @@ FlightMap {
         }
     }
 
-    ExclusiveGroup {
-        id: _mapTypeButtonsExclusiveGroup
-    }
-
     MapFitFunctions {
         id:                         mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        mainWindow.flightDisplayMap
diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index 5f1123aaa1ba91aaea86bdb75954e7ace3973d07..e0ffa378a4d9bb8714c060e8fff0ac1cf9832263 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -7,11 +7,11 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
-import QtLocation       5.3
-import QtPositioning    5.3
-import QtQuick.Dialogs  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtLocation                   5.3
+import QtPositioning                5.3
+import QtQuick.Dialogs              1.2
 
 import QGroundControl                   1.0
 import QGroundControl.ScreenTools       1.0
diff --git a/src/MissionManager/QGCMapPolylineVisuals.qml b/src/MissionManager/QGCMapPolylineVisuals.qml
index 0d5ff3435717aa51830f54ef080984c259a07146..57381b8d143d73aaab93a562a50eb5610f5a41ea 100644
--- a/src/MissionManager/QGCMapPolylineVisuals.qml
+++ b/src/MissionManager/QGCMapPolylineVisuals.qml
@@ -7,11 +7,11 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
-import QtLocation       5.3
-import QtPositioning    5.3
-import QtQuick.Dialogs  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtLocation                   5.3
+import QtPositioning                5.3
+import QtQuick.Dialogs              1.2
 
 import QGroundControl                   1.0
 import QGroundControl.ScreenTools       1.0
diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml
index dc82c4cb2bd01d4b75f69faa7bbc7c7f69550090..3685121eb874a152530e1a9b809437419ae74eab 100644
--- a/src/PlanView/MissionItemEditor.qml
+++ b/src/PlanView/MissionItemEditor.qml
@@ -1,8 +1,8 @@
-import QtQuick                  2.3
-import QtQuick.Controls         1.2
-import QtQuick.Controls.Styles  1.4
-import QtQuick.Dialogs          1.2
-import QtQml                    2.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtQuick.Controls.Styles      1.4
+import QtQuick.Dialogs              1.2
+import QtQml                        2.2
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index aad7d681d9b6b45905e840dce6228c3bf9208e7b..dbc8d402d0bfa46f6c18abb368a27ec3b47b8ae0 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -264,12 +264,6 @@ Item {
         }
     }
 
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
-
-    ExclusiveGroup {
-        id: _mapTypeButtonsExclusiveGroup
-    }
-
     /// Inserts a new simple mission item
     ///     @param coordinate Location to insert item
     ///     @param index Insert item at this index
@@ -1031,7 +1025,7 @@ Item {
                 }
 
                 QGCButton {
-                    text:               qsTr("Save Mission Waypoints As KML...")                    
+                    text:               qsTr("Save Mission Waypoints As KML...")
                     Layout.columnSpan:  2
                     enabled:            !_planMasterController.syncInProgress && _visualItems.count > 1
                     onClicked: {
diff --git a/src/PlanView/RallyPointItemEditor.qml b/src/PlanView/RallyPointItemEditor.qml
index 9ec63847a3e4b813db249765b7d25f4d98126362..2aab07c5353f30c387e7b4a3fbe9027680383498 100644
--- a/src/PlanView/RallyPointItemEditor.qml
+++ b/src/PlanView/RallyPointItemEditor.qml
@@ -1,6 +1,6 @@
-import QtQuick          2.3
-import QtQuick.Controls 1.2
-import QtQuick.Layouts  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtQuick.Layouts              1.11
 
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Vehicle       1.0
diff --git a/src/PlanView/SimpleItemEditor.qml b/src/PlanView/SimpleItemEditor.qml
index 7ee452e8665f6c37deefdcbad2e1736388e10c91..070fd4d4b13fd6c0352c54f35697598364afb160 100644
--- a/src/PlanView/SimpleItemEditor.qml
+++ b/src/PlanView/SimpleItemEditor.qml
@@ -1,8 +1,7 @@
-import QtQuick                  2.3
-import QtQuick.Controls         1.2
-import QtQuick.Controls.Styles  1.4
-import QtQuick.Dialogs          1.2
-import QtQuick.Layouts          1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtQuick.Controls.Styles      1.4
+import QtQuick.Layouts              1.11
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml
index f66ba517580aeca688ced0d1bbed4da644a13a25..a1d3635336e47dce54dfc225ac33a8253b39b895 100644
--- a/src/QmlControls/FlightModeMenu.qml
+++ b/src/QmlControls/FlightModeMenu.qml
@@ -7,8 +7,8 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
 
 import QGroundControl               1.0
 import QGroundControl.Controls      1.0
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 3bf3ee573f777f5f3aae7d3af0b77792bf0bd5ae..71de4c74ebd7c3caf0f3af73dcfa0e888af71a80 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -7,10 +7,10 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
-import QtQuick.Dialogs  1.2
-import QtQuick.Layouts  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtQuick.Dialogs              1.2
+import QtQuick.Layouts              1.11
 
 import QGroundControl               1.0
 import QGroundControl.Controls      1.0
diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml
index 41ddb97b2bf779f724dc5fa343cba0bd5f83ec69..0a0723f71adc5d8da90b528d3348e5a60cacb335 100644
--- a/src/QmlControls/QGCFileDialog.qml
+++ b/src/QmlControls/QGCFileDialog.qml
@@ -1,7 +1,7 @@
-import QtQuick          2.3
-import QtQuick.Controls 1.2
-import QtQuick.Dialogs  1.2
-import QtQuick.Layouts  1.2
+import QtQuick                      2.11
+import QtQuick.Controls             2.4
+import QtQuick.Dialogs              1.2
+import QtQuick.Layouts              1.11
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml
index e62fd60f31095ad06692dee2749da394f48d5b07..c075f33b271203c9cfe13d916c228c496cd2fe41 100644
--- a/src/QmlControls/QmlTest.qml
+++ b/src/QmlControls/QmlTest.qml
@@ -1,7 +1,7 @@
 import QtQuick                  2.11
 import QtQuick.Controls         2.4
 import QtQuick.Controls.Styles  1.4
-import QtQuick.Layouts          1.2
+import QtQuick.Layouts          1.11
 
 import QGroundControl.Palette       1.0
 import QGroundControl.Controls      1.0
diff --git a/src/ui/toolbar/LinkIndicator.qml b/src/ui/toolbar/LinkIndicator.qml
index e88a49373f2804268985d10e351ff8d46222e0e8..6c739fdba34a6b64795f1609c7bbb7e57b35b2b6 100644
--- a/src/ui/toolbar/LinkIndicator.qml
+++ b/src/ui/toolbar/LinkIndicator.qml
@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
+import QtQuick                              2.11
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0
diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml
index de181304f517b716788ee2e8b151b81bc2b69fb4..74f764190d8e081e039cfd425078570b18e522ed 100644
--- a/src/ui/toolbar/ModeIndicator.qml
+++ b/src/ui/toolbar/ModeIndicator.qml
@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
+import QtQuick                              2.11
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0
diff --git a/src/ui/toolbar/MultiVehicleSelector.qml b/src/ui/toolbar/MultiVehicleSelector.qml
index 0b1c8ca50022a9039672f6b90106aac82235a040..3360d597fdb9f5f327a9e1a32ee1c0581c8dc1d4 100644
--- a/src/ui/toolbar/MultiVehicleSelector.qml
+++ b/src/ui/toolbar/MultiVehicleSelector.qml
@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
-import QtQuick.Controls 1.2
+import QtQuick                              2.11
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0