1 files changed, 13 insertions, 30 deletions

diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml
index 455b2b8d5d..a8ddf2348c 100644
--- a/plugins/Marketplace/resources/qml/PackagePage.qml
+++ b/plugins/Marketplace/resources/qml/PackagePage.qml
@@ -56,13 +56,9 @@ Rectangle
                         color: UM.Theme.getColor("text")
                     }
 
-                    Label
+                    UM.Label
                     {
-
                         anchors.verticalCenter: downloadsIcon.verticalCenter
-
-                        color: UM.Theme.getColor("text")
-                        font: UM.Theme.getFont("default")
                         text: packageData.downloadCount
                     }
                 }
@@ -78,25 +74,22 @@ Rectangle
             topPadding: 0
             spacing: UM.Theme.getSize("default_margin").height
 
-            Label
+            UM.Label
             {
                 width: parent.width - parent.padding * 2
 
                 text: catalog.i18nc("@header", "Description")
                 font: UM.Theme.getFont("medium_bold")
-                color: UM.Theme.getColor("text")
                 elide: Text.ElideRight
             }
 
-            Label
+            UM.Label
             {
                 width: parent.width - parent.padding * 2
 
                 text: packageData.formattedDescription
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")
-                wrapMode: Text.Wrap
                 textFormat: Text.RichText
 
                 onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
@@ -110,13 +103,12 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible printers")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
@@ -124,25 +116,23 @@ Rectangle
                 {
                     model: packageData.compatiblePrinters
 
-                    Label
+                    UM.Label
                     {
                         width: compatiblePrinterColumn.width
 
                         text: modelData
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     visible: packageData.compatiblePrinters.length == 0
                     text: "(" + catalog.i18nc("@info", "No compatibility information") + ")"
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -155,13 +145,12 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible support materials")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
@@ -169,25 +158,23 @@ Rectangle
                 {
                     model: packageData.compatibleSupportMaterials
 
-                    Label
+                    UM.Label
                     {
                         width: compatibleSupportMaterialColumn.width
 
                         text: modelData
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     visible: packageData.compatibleSupportMaterials.length == 0
                     text: "(" + catalog.i18nc("@info No materials", "None") + ")"
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -199,23 +186,21 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible with Material Station")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: packageData.isCompatibleMaterialStation ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -227,23 +212,21 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Optimized for Air Manager")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: packageData.isCompatibleAirManager ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }