@@ -42,11 +42,9 @@ StyledItem {
4242 property int margins
4343 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
4444 readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
45− readonly property color red: "#fc4949"
46− readonly property color green: "#3fb24f"
45+ readonly property color red: UbuntuColors.red
46+ readonly property color green: UbuntuColors.green
4747 readonly property color sdLightGrey: "#eaeaea"
48− readonly property color sdDarkGrey: "#dddddd"
49− readonly property color sdFontColor: "#5d5d5d"
5048 readonly property real contentSpacing: units.gu(2)
5149 readonly property bool canBeClosed: type === Notification.Ephemeral
5250 property bool hasMouse
@@ -59,7 +57,7 @@ StyledItem {
5957 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
6058
6159 theme: ThemeSettings {
62− name: "Ubuntu.Components.Themes.Ambiance"
60+ name: darkOnBright ? "Ubuntu.Components.Themes.Ambiance" : "Ubuntu.Components.Themes.SuruDark"
6361 }
6462
6563 state: {
@@ -285,7 +283,6 @@ StyledItem {
285283 }
286284 visible: type !== Notification.Confirmation
287285 fontSize: "medium"
288− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
289286 elide: Text.ElideRight
290287 textFormat: Text.PlainText
291288 }
@@ -300,7 +297,6 @@ StyledItem {
300297 }
301298 visible: body != "" && type !== Notification.Confirmation
302299 fontSize: "small"
303− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
304300 wrapMode: Text.Wrap
305301 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
306302 elide: Text.ElideRight
@@ -341,7 +337,6 @@ StyledItem {
341337 anchors.horizontalCenter: parent.horizontalCenter
342338 visible: type === Notification.Confirmation && body !== ""
343339 fontSize: "medium"
344− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
345340 wrapMode: Text.WordWrap
346341 maximumLineCount: 1
347342 elide: Text.ElideRight
@@ -361,7 +356,7 @@ StyledItem {
361356 }
362357
363358 height: units.gu(1)
364− backgroundColor: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey
359+ backgroundColor: theme.palette.normal.background
365360 aspect: UbuntuShape.Flat
366361 radius: "small"
367362
@@ -370,7 +365,7 @@ StyledItem {
370365 objectName: "innerBar"
371366 width: valueIndicator.width * valueIndicator.value / 100
372367 height: units.gu(1)
373− backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"
368+ backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? theme.palette.normal.activity : theme.palette.highlighted.foreground
374369 aspect: UbuntuShape.Flat
375370 radius: "small"
376371 }
@@ -447,7 +442,7 @@ StyledItem {
447442 objectName: "notify_oot_button" + index
448443 width: oneOverTwoCase.width
449444 text: oneOverTwoLoaderTop.actionLabel
450− color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : sdDarkGrey
445+ color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : theme.palette.normal.baseText
451446 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
452447 }
453448 }
@@ -475,7 +470,7 @@ StyledItem {
475470 objectName: "notify_oot_button" + index
476471 width: oneOverTwoCase.width / 2 - spacing * 2
477472 text: oneOverTwoLoaderBottom.actionLabel
478− color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : sdDarkGrey
473+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : theme.palette.normal.baseText
479474 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
480475 }
481476 }
@@ -536,7 +531,7 @@ StyledItem {
536531 width: buttonRow.width / 2 - spacing * 2
537532 text: loader.actionLabel
538533 color: {
539− var result = sdDarkGrey;
534+ var result = theme.palette.normal.baseText;
540535 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
541536 result = green;
542537 }