diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 28eb37e939..1521c38eaa 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -21,9 +21,9 @@ Cura.MachineAction
 
     property var extrudersModel: Cura.ExtrudersModel {}
 
-    // If we create a CuraTabButton for "Printer" and use Repeater for extruders, for some reason, once the component
+    // If we create a TabButton for "Printer" and use Repeater for extruders, for some reason, once the component
     // finishes it will automatically change "currentIndex = 1", and it is VERY difficult to change "currentIndex = 0"
-    // after that. Using a model and a Repeater to create both "Printer" and extruder CuraTabButtons seem to solve this
+    // after that. Using a model and a Repeater to create both "Printer" and extruder TabButtons seem to solve this
     // problem.
     Connections
     {
@@ -64,7 +64,7 @@ Cura.MachineAction
             Repeater
             {
                 model: tabNameModel
-                delegate: Cura.CuraTabButton
+                delegate: Cura.TabButton
                 {
                     text: model.name
                 }
diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml
index 262d5df376..dac545990f 100644
--- a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml
+++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml
@@ -1,24 +1,27 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
 
-import UM 1.2 as UM
-import Cura 1.0 as Cura
+import UM 1.3 as UM
+import Cura 1.1 as Cura
 
 
 Cura.MachineAction
 {
-    anchors.fill: parent;
+    UM.I18nCatalog { id: catalog; name: "cura"; }
+
+    anchors.fill: parent
+
     Item
     {
         id: bedLevelMachineAction
-        anchors.fill: parent;
-
-        UM.I18nCatalog { id: catalog; name: "cura"; }
+        anchors.top: parent.top
+        anchors.topMargin: UM.Theme.getSize("default_margin").height * 3
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width * 3 / 4
 
         Label
         {
@@ -26,17 +29,21 @@ Cura.MachineAction
             width: parent.width
             text: catalog.i18nc("@title", "Build Plate Leveling")
             wrapMode: Text.WordWrap
-            font.pointSize: 18;
+            font.pointSize: 18
+            renderType: Text.NativeRendering
         }
+
         Label
         {
             id: pageDescription
             anchors.top: pageTitle.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.topMargin: UM.Theme.getSize("default_margin").height * 3
             width: parent.width
             wrapMode: Text.WordWrap
             text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.")
+            renderType: Text.NativeRendering
         }
+
         Label
         {
             id: bedlevelingText
@@ -45,37 +52,38 @@ Cura.MachineAction
             width: parent.width
             wrapMode: Text.WordWrap
             text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.")
+            renderType: Text.NativeRendering
         }
 
         Row
         {
             id: bedlevelingWrapper
             anchors.top: bedlevelingText.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.topMargin: UM.Theme.getSize("default_margin").height * 3
             anchors.horizontalCenter: parent.horizontalCenter
             width: childrenRect.width
             spacing: UM.Theme.getSize("default_margin").width
 
-            Button
+            Cura.ActionButton
             {
                 id: startBedLevelingButton
-                text: catalog.i18nc("@action:button","Start Build Plate Leveling")
+                text: catalog.i18nc("@action:button", "Start Build Plate Leveling")
                 onClicked:
                 {
-                    startBedLevelingButton.visible = false;
-                    bedlevelingButton.visible = true;
-                    manager.startBedLeveling();
+                    startBedLevelingButton.visible = false
+                    bedlevelingButton.visible = true
+                    manager.startBedLeveling()
                 }
             }
 
-            Button
+            Cura.ActionButton
             {
                 id: bedlevelingButton
-                text: catalog.i18nc("@action:button","Move to Next Position")
+                text: catalog.i18nc("@action:button", "Move to Next Position")
                 visible: false
                 onClicked:
                 {
-                    manager.moveToNextLevelPosition();
+                    manager.moveToNextLevelPosition()
                 }
             }
         }
diff --git a/plugins/UltimakerMachineActions/UM2UpgradeSelection.py b/plugins/UltimakerMachineActions/UM2UpgradeSelection.py
index 6ff3f0b629..999cb1d35a 100644
--- a/plugins/UltimakerMachineActions/UM2UpgradeSelection.py
+++ b/plugins/UltimakerMachineActions/UM2UpgradeSelection.py
@@ -1,13 +1,15 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from UM.Settings.ContainerRegistry import ContainerRegistry
-from cura.MachineAction import MachineAction
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty
+from PyQt5.QtCore import pyqtSignal, pyqtProperty
 
+from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.i18n import i18nCatalog
 from UM.Application import Application
 from UM.Util import parseBool
+
+from cura.MachineAction import MachineAction
+
 catalog = i18nCatalog("cura")
 
 
diff --git a/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml
index 793f3f00a8..69023d3432 100644
--- a/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml
+++ b/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml
@@ -1,32 +1,24 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
-import Cura 1.0 as Cura
+import UM 1.3 as UM
+import Cura 1.1 as Cura
 
 
 Cura.MachineAction
 {
-    anchors.fill: parent;
+    UM.I18nCatalog { id: catalog; name: "cura"; }
+    anchors.fill: parent
 
     Item
     {
         id: upgradeSelectionMachineAction
         anchors.fill: parent
-
-        Label
-        {
-            id: pageTitle
-            width: parent.width
-            text: catalog.i18nc("@title", "Select Printer Upgrades")
-            wrapMode: Text.WordWrap
-            font.pointSize: 18;
-        }
+        anchors.topMargin: UM.Theme.getSize("default_margin").width * 5
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4
 
         Label
         {
@@ -35,15 +27,19 @@ Cura.MachineAction
             anchors.topMargin: UM.Theme.getSize("default_margin").height
             width: parent.width
             wrapMode: Text.WordWrap
-            text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker 2.");
+            text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker 2.")
+            font: UM.Theme.getFont("medium")
+            renderType: Text.NativeRendering
         }
 
-        CheckBox
+        Cura.CheckBox
         {
             id: olssonBlockCheckBox
             anchors.top: pageDescription.bottom
             anchors.topMargin: UM.Theme.getSize("default_margin").height
 
+            height: UM.Theme.getSize("setting_control").height
+
             text: catalog.i18nc("@label", "Olsson Block")
             checked: manager.hasVariants
             onClicked: manager.hasVariants = checked
@@ -54,7 +50,5 @@ Cura.MachineAction
                 onHasVariantsChanged: olssonBlockCheckBox.checked = manager.hasVariants
             }
         }
-
-        UM.I18nCatalog { id: catalog; name: "cura"; }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml
index 2b973ca1bb..b0abad0fcf 100644
--- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml
+++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml
@@ -1,43 +1,38 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
-import Cura 1.0 as Cura
+import UM 1.3 as UM
+import Cura 1.1 as Cura
 
 
 Cura.MachineAction
 {
-    anchors.fill: parent;
+    UM.I18nCatalog { id: catalog; name: "cura"; }
+    anchors.fill: parent
+
     Item
     {
         id: upgradeSelectionMachineAction
         anchors.fill: parent
-
-        Label
-        {
-            id: pageTitle
-            width: parent.width
-            text: catalog.i18nc("@title", "Select Printer Upgrades")
-            wrapMode: Text.WordWrap
-            font.pointSize: 18;
-        }
+        anchors.topMargin: UM.Theme.getSize("default_margin").width * 5
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4
 
         Label
         {
             id: pageDescription
-            anchors.top: pageTitle.bottom
+            anchors.top: parent.top
             anchors.topMargin: UM.Theme.getSize("default_margin").height
             width: parent.width
             wrapMode: Text.WordWrap
-            text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original");
+            text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original")
+            font: UM.Theme.getFont("medium")
+            renderType: Text.NativeRendering
         }
 
-        CheckBox
+        Cura.CheckBox
         {
             anchors.top: pageDescription.bottom
             anchors.topMargin: UM.Theme.getSize("default_margin").height
@@ -46,7 +41,5 @@ Cura.MachineAction
             checked: manager.hasHeatedBed
             onClicked: manager.setHeatedBed(checked)
         }
-
-        UM.I18nCatalog { id: catalog; name: "cura"; }
     }
-}
\ No newline at end of file
+}
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index f9ff706183..7030cd889a 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -9,8 +9,6 @@ import QtQuick.Controls 1.4 as Controls1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-import "../Widgets"
-
 
 // This element contains all the elements the user needs to create a printjob from the
 // model(s) that is(are) on the buildplate. Mainly the button to start/stop the slicing
@@ -66,7 +64,7 @@ Column
     }
 
     // Progress bar, only visible when the backend is in the process of slice the printjob
-    CuraProgressBar
+    Cura.ProgressBar
     {
         id: progressBar
         width: parent.width
diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml
index 012e36817b..bf56d1d58e 100644
--- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml
+++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml
@@ -92,7 +92,7 @@ UM.TooltipArea
         onContainerStackChanged: defaultOptionsModel.updateModel()
     }
 
-    CuraComboBox
+    Cura.ComboBox
     {
         id: comboBox
         anchors.left: fieldLabel.right
diff --git a/resources/qml/MachineSettings/SimpleCheckBox.qml b/resources/qml/MachineSettings/SimpleCheckBox.qml
index 8aa65eff95..d2edc28487 100644
--- a/resources/qml/MachineSettings/SimpleCheckBox.qml
+++ b/resources/qml/MachineSettings/SimpleCheckBox.qml
@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.3
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
-import "../Widgets"
-
 
 //
 // CheckBox widget for the on/off or true/false settings in the Machine Settings Dialog.
@@ -58,7 +56,7 @@ UM.TooltipArea
         renderType: Text.NativeRendering
     }
 
-    CuraCheckBox
+    Cura.CheckBox
     {
         id: checkBox
         anchors.left: fieldLabel.right
diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml
index d9ea47ac4d..37df0bd9b9 100644
--- a/resources/qml/Settings/SettingComboBox.qml
+++ b/resources/qml/Settings/SettingComboBox.qml
@@ -5,8 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 
 import UM 1.3 as UM
-
-import "../Widgets" as Widgets
+import Cura 1.1 as Cura
 
 
 SettingItem
@@ -14,7 +13,7 @@ SettingItem
     id: base
     property var focusItem: control
 
-    contents: Widgets.CuraComboBox
+    contents: Cura.ComboBox
     {
         id: control
 
diff --git a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
index 84f5f5acac..0cd684e409 100644
--- a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
+++ b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
@@ -58,8 +58,7 @@ Item
     {
         anchors.top: titleLabel.bottom
         anchors.bottom: nextButton.top
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+        anchors.margins: UM.Theme.getSize("default_margin").width
         anchors.left: parent.left
         anchors.right: parent.right
 
diff --git a/resources/qml/WelcomePages/StepPanel.qml b/resources/qml/WelcomePages/StepPanel.qml
index daca9bcb90..4cf6307a92 100644
--- a/resources/qml/WelcomePages/StepPanel.qml
+++ b/resources/qml/WelcomePages/StepPanel.qml
@@ -8,8 +8,6 @@ import QtGraphicalEffects 1.0 // For the dropshadow
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
-import "../Widgets"
-
 
 Item
 {
@@ -117,7 +115,7 @@ Item
         z: panelBackground.z - 1
     }
 
-    CuraProgressBar
+    Cura.ProgressBar
     {
         id: progressBar
 
diff --git a/resources/qml/Widgets/CuraCheckBox.qml b/resources/qml/Widgets/CheckBox.qml
similarity index 97%
rename from resources/qml/Widgets/CuraCheckBox.qml
rename to resources/qml/Widgets/CheckBox.qml
index 865d9af5a2..c7536da6d3 100644
--- a/resources/qml/Widgets/CuraCheckBox.qml
+++ b/resources/qml/Widgets/CheckBox.qml
@@ -57,7 +57,7 @@ CheckBox
             width: Math.round(parent.width / 2.5)
             height: Math.round(parent.height / 2.5)
             sourceSize.height: width
-            color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
+            color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
             source: UM.Theme.getIcon("check")
             opacity: control.checked ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 100; } }
diff --git a/resources/qml/Widgets/CuraComboBox.qml b/resources/qml/Widgets/ComboBox.qml
similarity index 100%
rename from resources/qml/Widgets/CuraComboBox.qml
rename to resources/qml/Widgets/ComboBox.qml
diff --git a/resources/qml/Widgets/CuraProgressBar.qml b/resources/qml/Widgets/ProgressBar.qml
similarity index 100%
rename from resources/qml/Widgets/CuraProgressBar.qml
rename to resources/qml/Widgets/ProgressBar.qml
diff --git a/resources/qml/Widgets/CuraTabButton.qml b/resources/qml/Widgets/TabButton.qml
similarity index 100%
rename from resources/qml/Widgets/CuraTabButton.qml
rename to resources/qml/Widgets/TabButton.qml
diff --git a/resources/qml/qmldir b/resources/qml/qmldir
index 6de563e2a0..7ca2b36b4b 100644
--- a/resources/qml/qmldir
+++ b/resources/qml/qmldir
@@ -21,10 +21,10 @@ ToolTip 1.0 ToolTip.qml
 
 # Cura/Widgets
 
-CuraCheckBox    1.0 CuraCheckBox.qml
-CuraComboBox    1.0 CuraComboBox.qml
-CuraProgressBar 1.0 CuraProgressBar.qml
-CuraTabButton   1.0 CuraTabButton.qml
+CheckBox    1.0 CheckBox.qml
+ComboBox    1.0 ComboBox.qml
+ProgressBar 1.0 ProgressBar.qml
+TabButton   1.0 TabButton.qml
 
 
 # Cura/MachineSettings