diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 1800555b9d..eae74eeb4c 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -28,8 +28,8 @@ Button {
                 anchors.verticalCenter: parent.verticalCenter
                 height: (label.height / 2) | 0
                 width: height
-                source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
-                color: base.hovered ? palette.highlight : palette.buttonText
+                source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
+                color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("primary_button_text")
             }
         }
         UM.RecolorImage
@@ -38,22 +38,20 @@ Button {
             height: label.height
             width: height
             source: UM.Theme.getIcon(definition.icon)
-            color: base.hovered ? palette.highlight : palette.buttonText
+            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text")
         }
         UM.Label
         {
             id: label
             anchors.verticalCenter: parent.verticalCenter
             text: base.text
-            color: base.hovered ? palette.highlight : palette.buttonText
+            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text")
             font.bold: true
         }
-
-        SystemPalette { id: palette }
     }
 
-    signal showTooltip(string text);
-    signal hideTooltip();
+    signal showTooltip(string text)
+    signal hideTooltip()
     signal contextMenuRequested()
 
     text: definition.label
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 92c9051491..4e2a05a6aa 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -71,7 +71,6 @@ Item
     property alias configureSettingVisibility: configureSettingVisibilityAction
 
     property alias browsePackages: browsePackagesAction
-    property alias openMarketplace: openMarketplaceAction
 
     UM.I18nCatalog{id: catalog; name: "cura"}
 
@@ -483,11 +482,4 @@ Item
         text: "&Marketplace"
         icon.name: "plugins_browse"
     }
-
-    Action
-    {
-        id: openMarketplaceAction
-        text: catalog.i18nc("@action:menu", "&Marketplace")
-        icon.name: "plugins_browse"
-    }
 }
diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index 27a7fd734f..00c4fb8f50 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -45,11 +45,7 @@ UM.Dialog
             visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
         }
 
-        SystemPalette
-        {
-            id: palette
-        }
-        Label
+        UM.Label
         {
             id: mainHeading
             width: parent.width
@@ -86,7 +82,7 @@ UM.Dialog
                 spacing: UM.Theme.getSize("default_margin").height
                 Column
                 {
-                    Label
+                    UM.Label
                     {
                         id: settingsHeading
                         text: catalog.i18nc("@action:label", "Printer settings")
@@ -96,14 +92,14 @@ UM.Dialog
                     {
                         width: parent.width
                         height: childrenRect.height
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@action:label", "Type")
                             width: Math.floor(scroll.width / 3) | 0
                         }
-                        Label
+                        UM.Label
                         {
-                            text: (Cura.MachineManager.activeMachine == null) ? "" : Cura.MachineManager.activeMachine.definition.name
+                            text: Cura.MachineManager.activeMachine == null ? "" : Cura.MachineManager.activeMachine.definition.name
                             width: Math.floor(scroll.width / 3) | 0
                         }
                     }
@@ -111,12 +107,12 @@ UM.Dialog
                     {
                         width: parent.width
                         height: childrenRect.height
-                        Label
+                        UM.Label
                         {
                             text: Cura.MachineManager.activeMachineNetworkGroupName != "" ? catalog.i18nc("@action:label", "Printer Group") : catalog.i18nc("@action:label", "Name")
                             width: Math.floor(scroll.width / 3) | 0
                         }
-                        Label
+                        UM.Label
                         {
                             text:
                             {
@@ -155,7 +151,7 @@ UM.Dialog
                             var material_name = extruder.material.name
                             return (material_name !== undefined) ? material_name : ""
                         }
-                        Label
+                        UM.Label
                         {
                             text: {
                                 var extruder = Number(modelData.position)
@@ -179,7 +175,7 @@ UM.Dialog
                             width: parent.width
                             height: childrenRect.height
 
-                            Label
+                            UM.Label
                             {
                                 text:
                                 {
@@ -192,7 +188,7 @@ UM.Dialog
                                 width: Math.floor(scroll.width / 3) | 0
                                 enabled: modelData.isEnabled
                             }
-                            Label
+                            UM.Label
                             {
                                 text:
                                 {
@@ -212,7 +208,7 @@ UM.Dialog
                 {
                     width: parent.width
                     height: childrenRect.height
-                    Label
+                    UM.Label
                     {
                         text: catalog.i18nc("@action:label", "Profile settings")
                         font.bold: true
@@ -220,12 +216,12 @@ UM.Dialog
                     Row
                     {
                         width: parent.width
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@action:label", "Not in profile")
                             width: Math.floor(scroll.width / 3) | 0
                         }
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", Cura.MachineManager.numUserSettings).arg(Cura.MachineManager.numUserSettings)
                             width: Math.floor(scroll.width / 3) | 0
@@ -236,12 +232,12 @@ UM.Dialog
                     {
                         width: parent.width
                         height: childrenRect.height
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@action:label", "Name")
                             width: Math.floor(scroll.width / 3) | 0
                         }
-                        Label
+                        UM.Label
                         {
                             text: Cura.MachineManager.activeQualityOrQualityChangesName
                             width: Math.floor(scroll.width / 3) | 0
@@ -253,12 +249,12 @@ UM.Dialog
                     {
                         width: parent.width
                         height: childrenRect.height
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@action:label", "Intent")
                             width: Math.floor(scroll.width / 3) | 0
                         }
-                        Label
+                        UM.Label
                         {
                             text: Cura.MachineManager.activeIntentCategory
                             width: Math.floor(scroll.width / 3) | 0
@@ -273,7 +269,7 @@ UM.Dialog
 
     leftButtons:
     [
-        CheckBox
+        UM.CheckBox
         {
             id: dontShowAgainCheckbox
             anchors.left: parent.left
diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml
index 4cbde8424d..85a6d05547 100644
--- a/resources/qml/MainWindow/ApplicationMenu.qml
+++ b/resources/qml/MainWindow/ApplicationMenu.qml
@@ -92,7 +92,8 @@ Item
         target: Cura.Actions.browsePackages
         function onTriggered()
         {
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch")
+        print("beepboop")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "show")
         }
     }
 
@@ -102,8 +103,8 @@ Item
         target: Cura.Actions.marketplaceMaterials
         function onTriggered()
         {
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "launch")
-            extensionMenu.extensionModel.callExtensionMethod("Toolbox", "setViewCategoryToMaterials")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "show")
+            extensionMenu.extensionModel.callExtensionMethod("Marketplace", "setVisibleTabToMaterials")
         }
     }
 }