diff --git a/discover/qml/AddonsView.qml b/discover/qml/AddonsView.qml
--- a/discover/qml/AddonsView.qml
+++ b/discover/qml/AddonsView.qml
@@ -22,6 +22,7 @@
 
         Kirigami.Heading {
             level: 3
+            color: Kirigami.Theme.textColor
             text: i18n("Addons")
         }
 
diff --git a/discover/qml/ApplicationDelegate.qml b/discover/qml/ApplicationDelegate.qml
--- a/discover/qml/ApplicationDelegate.qml
+++ b/discover/qml/ApplicationDelegate.qml
@@ -72,6 +72,7 @@
                 Layout.fillWidth: true
                 Kirigami.Heading {
                     level: 4
+                    color: Kirigami.Theme.textColor
                     Layout.fillWidth: true
                     elide: Text.ElideRight
                     text: delegateArea.application.name
@@ -96,16 +97,16 @@
 
             Kirigami.Heading {
                 level: 5
+                color: Kirigami.Theme.textColor
                 Layout.fillWidth: true
-
                 elide: Text.ElideRight
                 text: delegateArea.application.comment
                 maximumLineCount: 1
             }
 
             QQC2.Label {
+                color: Kirigami.Theme.textColor
                 Layout.fillWidth: true
-
                 horizontalAlignment: Text.AlignJustify
                 wrapMode: Text.WordWrap
                 elide: Text.ElideRight
diff --git a/discover/qml/ApplicationPage.qml b/discover/qml/ApplicationPage.qml
--- a/discover/qml/ApplicationPage.qml
+++ b/discover/qml/ApplicationPage.qml
@@ -112,6 +112,7 @@
                 }
                 Kirigami.Heading {
                     level: 3
+                    color: Kirigami.Theme.textColor
                     Layout.maximumWidth: parent.width/2
                     text: appInfo.application.name
                     maximumLineCount: 1
@@ -150,6 +151,7 @@
             spacing: 0
 
             QQC2.Label {
+                color: Kirigami.Theme.textColor
                 Layout.topMargin: Kirigami.Units.largeSpacing
                 Layout.fillWidth: true
                 text: appInfo.application.comment
@@ -169,15 +171,18 @@
                 Layout.fillHeight: true
             }
             QQC2.Label {
+                color: Kirigami.Theme.textColor
                 readonly property string version: appInfo.application.isInstalled ? appInfo.application.installedVersion : appInfo.application.availableVersion
                 visible: version.length > 0
                 text: version ? i18n("Version: %1", version) : ""
             }
             QQC2.Label {
+                color: Kirigami.Theme.textColor
                 text: i18n("Size: %1", appInfo.application.sizeDescription)
             }
             RowLayout {
                 QQC2.Label {
+                    color: Kirigami.Theme.textColor
                     text: i18n("Source:")
                 }
                 LinkButton {
@@ -188,6 +193,7 @@
             }
             RowLayout {
                 QQC2.Label {
+                    color: Kirigami.Theme.textColor
                     text: i18n("License:")
                 }
                 LinkButton {
@@ -206,12 +212,14 @@
 
             Kirigami.Heading {
                 level: 3
+                color: Kirigami.Theme.textColor
                 Layout.topMargin: Kirigami.Units.largeSpacing
                 text: i18n("Description")
                 Layout.fillWidth: true
                 visible: appInfo.application.longDescription.length > 0
             }
             QQC2.Label {
+                color: Kirigami.Theme.textColor
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignJustify
                 wrapMode: Text.WordWrap
@@ -227,6 +235,7 @@
             RowLayout {
                 visible: button.text.length > 0
                 QQC2.Label {
+                    color: Kirigami.Theme.textColor
                     text: i18n("Homepage: ")
                 }
                 LinkButton {
diff --git a/discover/qml/ApplicationsListPage.qml b/discover/qml/ApplicationsListPage.qml
--- a/discover/qml/ApplicationsListPage.qml
+++ b/discover/qml/ApplicationsListPage.qml
@@ -58,6 +58,7 @@
     ListView {
         id: apps
         section.delegate: QQC2.Label {
+            color: Kirigami.Theme.textColor
             text: section
             anchors {
                 right: parent.right
@@ -87,6 +88,7 @@
 
         QQC2.Label {
             anchors.centerIn: parent
+            color: Kirigami.Theme.textColor
             opacity: apps.count == 0 && !appsModel.isBusy ? 0.3 : 0
             Behavior on opacity { PropertyAnimation { duration: Kirigami.Units.longDuration; easing.type: Easing.InOutQuad; } }
             text: i18n("Sorry, nothing found...")
@@ -136,6 +138,7 @@
                     horizontalCenter: parent.horizontalCenter
                     bottom: parent.top
                 }
+                color: Kirigami.Theme.textColor
                 text: i18n("Still looking...")
                 opacity: 0
                 states: [
diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
--- a/discover/qml/DiscoverWindow.qml
+++ b/discover/qml/DiscoverWindow.qml
@@ -129,9 +129,11 @@
             ColumnLayout {
                 Kirigami.Heading {
                     id: heading
+                    color: Kirigami.Theme.textColor
                 }
                 QQC2.Label {
                     id: desc
+                    color: Kirigami.Theme.textColor
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
                 }
diff --git a/discover/qml/LoadingPage.qml b/discover/qml/LoadingPage.qml
--- a/discover/qml/LoadingPage.qml
+++ b/discover/qml/LoadingPage.qml
@@ -8,5 +8,6 @@
         text: i18n("Loading...")
         font.pointSize: 52
         anchors.centerIn: parent
+        color: Kirigami.Theme.textColor
     }
 }
diff --git a/discover/qml/ProgressView.qml b/discover/qml/ProgressView.qml
--- a/discover/qml/ProgressView.qml
+++ b/discover/qml/ProgressView.qml
@@ -47,7 +47,7 @@
             }
         }
     }
-    
+
     readonly property var v2: ListModel {
         id: progressModel
         function applicationAt(app) {
@@ -101,6 +101,7 @@
 
                             QQC2.Label {
                                 anchors.verticalCenter: parent.verticalCenter
+                                color: Kirigami.Theme.textColor
                                 Layout.fillWidth: true
                                 elide: Text.ElideRight
                                 text: model.transaction.name + (listener.isActive ? " "+listener.statusText : "")
diff --git a/discover/qml/ReviewDelegate.qml b/discover/qml/ReviewDelegate.qml
--- a/discover/qml/ReviewDelegate.qml
+++ b/discover/qml/ReviewDelegate.qml
@@ -40,6 +40,7 @@
         Layout.fillWidth: true
         Label {
             id: content
+            color: Kirigami.Theme.textColor
             Layout.fillWidth: true
             elide: Text.ElideRight
             text: i18n("<b>%1</b> by %2", summary, reviewer ? reviewer : i18n("unknown reviewer"))
@@ -51,15 +52,18 @@
         }
     }
     Label {
+        color: Kirigami.Theme.textColor
         Layout.fillWidth: true
         text: display
         wrapMode: Text.Wrap
     }
     Label {
+        color: Kirigami.Theme.textColor
         text: usefulnessToString(usefulnessFavorable, usefulnessTotal)
     }
 
     Label {
+        color: Kirigami.Theme.textColor
         Layout.alignment: Qt.AlignRight
         text: {
             switch(usefulChoice) {
diff --git a/discover/qml/ReviewDialog.qml b/discover/qml/ReviewDialog.qml
--- a/discover/qml/ReviewDialog.qml
+++ b/discover/qml/ReviewDialog.qml
@@ -17,7 +17,7 @@
     signal accepted()
 
     ColumnLayout {
-        Kirigami.Heading { level: 3; text: i18n("Reviewing '%1'", application.name) }
+        Kirigami.Heading { color: Kirigami.Theme.textColor; level: 3; text: i18n("Reviewing '%1'", application.name) }
         Label { text: i18n("Rating:") }
         Rating {
             id: ratingInput
diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml
--- a/discover/qml/SourcesPage.qml
+++ b/discover/qml/SourcesPage.qml
@@ -67,6 +67,7 @@
         section {
             property: "statusTip"
             delegate: Kirigami.Heading {
+                color: Kirigami.Theme.textColor
                 leftPadding: Kirigami.Units.largeSpacing
                 text: section
             }
diff --git a/discover/qml/UpdatesPage.qml b/discover/qml/UpdatesPage.qml
--- a/discover/qml/UpdatesPage.qml
+++ b/discover/qml/UpdatesPage.qml
@@ -82,14 +82,16 @@
                     text: updateModel.toUpdateCount + " (" + updateModel.updateSize+")"
                 }
                 QQC2.Label {
+                    color: Kirigami.Theme.textColor
                     text: i18n("updates selected")
                 }
                 LabelBackground {
                     id: unselectedItem
                     text: page.unselected
                     visible: page.unselected>0
                 }
                 QQC2.Label {
+                    color: Kirigami.Theme.textColor
                     text: i18n("updates not selected")
                     visible: unselectedItem.visible
                 }
@@ -108,6 +110,7 @@
             anchors.right: parent.right
             anchors.left: parent.left
             Kirigami.Heading {
+                color: Kirigami.Theme.textColor
                 Layout.fillWidth: true
                 Layout.alignment: Qt.AlignHCenter
                 horizontalAlignment: Text.AlignHCenter
@@ -134,6 +137,7 @@
         section {
             property: "section"
             delegate: Kirigami.Heading {
+                color: Kirigami.Theme.textColor
                 x: Kirigami.Units.gridUnit
                 level: 2
                 text: section
@@ -181,6 +185,7 @@
                     }
 
                     QQC2.Label {
+                        color: Kirigami.Theme.textColor
                         Layout.fillWidth: true
                         text: i18n("%1 (%2)", display, version)
                         elide: Text.ElideRight
@@ -202,6 +207,7 @@
                     visible: layout.extended && changelog.length>0
 
                     QQC2.Label {
+                        color: Kirigami.Theme.textColor
                         width: view.viewport.width
                         text: changelog
                         textFormat: Text.RichText