diff --git a/src/declarativeimports/plasmacomponents/qml/Label.qml b/src/declarativeimports/plasmacomponents/qml/Label.qml
index 1243ca628..a22efb6e6 100644
--- a/src/declarativeimports/plasmacomponents/qml/Label.qml
+++ b/src/declarativeimports/plasmacomponents/qml/Label.qml
@@ -50,7 +50,7 @@ Text {
     font.underline: theme.defaultFont.underline
     font.weight: theme.defaultFont.weight
     font.wordSpacing: theme.defaultFont.wordSpacing
-    color: theme.textColor
+    color: PlasmaCore.ColorScope.textColor
 
     opacity: enabled? 1 : 0.6
 
diff --git a/src/declarativeimports/plasmacomponents/qml/styles/TextAreaStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/TextAreaStyle.qml
index 68f1a8b21..90af0c541 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/TextAreaStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/TextAreaStyle.qml
@@ -36,9 +36,9 @@ QtQuickControlStyle.TextAreaStyle {
 
     font: theme.defaultFont
     backgroundColor: "transparent"
-    textColor: theme.viewTextColor
-    selectionColor: theme.viewFocusColor
-    selectedTextColor: theme.viewBackgroundColor
+    textColor: control.backgroundVisible ? theme.viewTextColor : PlasmaCore.ColorScope.textColor
+    selectionColor: control.backgroundVisible ? theme.viewFocusColor : PlasmaCore.ColorScope.highlightColor
+    selectedTextColor: control.backgroundVisible ? theme.viewBackgroundColor : PlasmaCore.ColorScope.backgroundColor
 
     renderType: Text.NativeRendering
 
diff --git a/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
index af04469ea..cf195242c 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
@@ -87,7 +87,7 @@ QtQuickControlStyle.ButtonStyle {
                 visible: control.text != ""
                 Layout.fillWidth: true
                 height: parent.height
-                color: control.hovered || !control.flat ? theme.buttonTextColor : theme.textColor
+                color: control.hovered || !control.flat ? theme.buttonTextColor : PlasmaCore.ColorScope.textColor
                 horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 elide: Text.ElideRight