remove tertiary colorHEADmain

9 files changed, 16 insertions, 34 deletions

diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml
index 80dd44c..493386d 100644
--- a/components/controls/FilledSlider.qml
+++ b/components/controls/FilledSlider.qml
@@ -25,7 +25,7 @@ Slider {
             y: root.handle.y
             implicitHeight: parent.height - y
 
-            color: Colours.palette.m3secondary
+            color: Colours.palette.m3onSurfaceVariant
             radius: parent.radius
         }
     }
diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml
index db73ea0..c63782e 100644
--- a/components/widgets/ExtraIndicator.qml
+++ b/components/widgets/ExtraIndicator.qml
@@ -10,7 +10,7 @@ StyledRect {
     anchors.right: parent.right
     anchors.margins: Appearance.padding.normal
 
-    color: Colours.palette.m3tertiary
+    color: Colours.palette.m3secondary
     radius: Appearance.rounding.small
 
     implicitWidth: count.implicitWidth + Appearance.padding.normal * 2
@@ -33,7 +33,7 @@ StyledRect {
         anchors.centerIn: parent
         animate: parent.opacity > 0
         text: qsTr("+%1").arg(parent.extra)
-        color: Colours.palette.m3onTertiary
+        color: Colours.palette.m3onSecondary
     }
 
     Behavior on opacity {
diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml
index 662e837..f44f9db 100644
--- a/modules/bar/components/Clock.qml
+++ b/modules/bar/components/Clock.qml
@@ -8,7 +8,7 @@ import QtQuick
 StyledRect {
     id: root
 
-    readonly property color colour: Colours.palette.m3tertiary
+    readonly property color colour: Colours.palette.m3secondary
     readonly property int padding: Appearance.padding.normal
 
     implicitWidth: Config.bar.sizes.innerWidth
diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml
index 6710294..2d2eea3 100644
--- a/modules/bar/components/OsIcon.qml
+++ b/modules/bar/components/OsIcon.qml
@@ -40,7 +40,7 @@ Item {
         ColouredIcon {
             source: SysInfo.osLogo
             implicitSize: Math.round(Appearance.font.size.large * 1.2)
-            colour: Colours.palette.m3tertiary
+            colour: Colours.palette.m3primary
         }
     }
 }
diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index ca7dc2e..ef0db3d 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -13,7 +13,7 @@ import QtQuick.Layouts
 StyledRect {
     id: root
 
-    property color colour: Colours.palette.m3secondary
+    property color colour: Colours.palette.m3primary
     readonly property alias items: iconColumn
 
     color: Colours.tPalette.m3surfaceContainer
diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml
index 9911907..c8bb9af 100644
--- a/modules/bar/components/TrayItem.qml
+++ b/modules/bar/components/TrayItem.qml
@@ -28,7 +28,7 @@ MouseArea {
 
         anchors.fill: parent
         source: Icons.getTrayIcon(root.modelData.id, root.modelData.icon)
-        colour: Colours.palette.m3secondary
+        colour: Colours.palette.m3primary
         layer.enabled: Config.bar.tray.recolour
     }
 }
diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml
index 377f867..5d57e83 100644
--- a/modules/dashboard/Performance.qml
+++ b/modules/dashboard/Performance.qml
@@ -130,7 +130,7 @@ Item {
                         const totalFmt = SystemUsage.formatKib(SystemUsage.memTotal);
                         return `${usedFmt.value.toFixed(1)} / ${Math.floor(totalFmt.value)} ${totalFmt.unit}`;
                     }
-                    accentColor: Colours.palette.m3tertiary
+                    accentColor: Colours.palette.m3primary
                     visible: Config.dashboard.performance.showMemory
                 }
 
@@ -689,7 +689,7 @@ Item {
                     line1Color: Colours.palette.m3secondary
                     line1FillAlpha: 0.15
                     line2: NetworkUsage.downloadBuffer
-                    line2Color: Colours.palette.m3tertiary
+                    line2Color: Colours.palette.m3primary
                     line2FillAlpha: 0.2
                     maxValue: smoothMax
                     historyLength: NetworkUsage.historyLength
@@ -738,7 +738,7 @@ Item {
 
                 MaterialIcon {
                     text: "download"
-                    color: Colours.palette.m3tertiary
+                    color: Colours.palette.m3primary
                     font.pointSize: Appearance.font.size.normal
                 }
 
@@ -759,7 +759,7 @@ Item {
                     }
                     font.pointSize: Appearance.font.size.normal
                     font.weight: Font.Medium
-                    color: Colours.palette.m3tertiary
+                    color: Colours.palette.m3primary
                 }
             }
 
diff --git a/modules/dashboard/Weather.qml b/modules/dashboard/Weather.qml
index d66137b..0e39f88 100644
--- a/modules/dashboard/Weather.qml
+++ b/modules/dashboard/Weather.qml
@@ -53,14 +53,14 @@ Item {
                     icon: "wb_twilight"
                     label: "Sunrise"
                     value: Weather.sunrise
-                    colour: Colours.palette.m3tertiary
+                    colour: Colours.palette.m3secondary
                 }
 
                 WeatherStat {
                     icon: "bedtime"
                     label: "Sunset"
                     value: Weather.sunset
-                    colour: Colours.palette.m3tertiary
+                    colour: Colours.palette.m3secondary
                 }
             }
         }
@@ -121,13 +121,13 @@ Item {
                 icon: "thermostat"
                 label: "Feels Like"
                 value: Weather.feelsLike
-                colour: Colours.palette.m3primary
+                colour: Colours.palette.m3secondary
             }
             DetailCard {
                 icon: "air"
                 label: "Wind"
                 value: Weather.windSpeed ? Weather.windSpeed + " km/h" : "--"
-                colour: Colours.palette.m3tertiary
+                colour: Colours.palette.m3secondary
             }
         }
 
@@ -196,7 +196,7 @@ Item {
                             Layout.alignment: Qt.AlignHCenter
                             text: Config.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°"
                             font.weight: 600
-                            color: Colours.palette.m3tertiary
+                            color: Colours.palette.m3primary
                         }
                     }
                 }
diff --git a/services/Colours.qml b/services/Colours.qml
index 26f666b..279a03d 100644
--- a/services/Colours.qml
+++ b/services/Colours.qml
@@ -86,7 +86,6 @@ Singleton {
     component M3TPalette: QtObject {
         readonly property color m3primary_paletteKeyColor: root.layer(root.palette.m3primary_paletteKeyColor)
         readonly property color m3secondary_paletteKeyColor: root.layer(root.palette.m3secondary_paletteKeyColor)
-        readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
         readonly property color m3neutral_paletteKeyColor: root.layer(root.palette.m3neutral_paletteKeyColor)
         readonly property color m3neutral_variant_paletteKeyColor: root.layer(root.palette.m3neutral_variant_paletteKeyColor)
         readonly property color m3background: root.layer(root.palette.m3background, 0)
@@ -118,10 +117,6 @@ Singleton {
         readonly property color m3onSecondary: root.layer(root.palette.m3onSecondary)
         readonly property color m3secondaryContainer: root.layer(root.palette.m3secondaryContainer)
         readonly property color m3onSecondaryContainer: root.layer(root.palette.m3onSecondaryContainer)
-        readonly property color m3tertiary: root.layer(root.palette.m3tertiary)
-        readonly property color m3onTertiary: root.layer(root.palette.m3onTertiary)
-        readonly property color m3tertiaryContainer: root.layer(root.palette.m3tertiaryContainer)
-        readonly property color m3onTertiaryContainer: root.layer(root.palette.m3onTertiaryContainer)
         readonly property color m3error: root.layer(root.palette.m3error)
         readonly property color m3onError: root.layer(root.palette.m3onError)
         readonly property color m3errorContainer: root.layer(root.palette.m3errorContainer)
@@ -138,16 +133,11 @@ Singleton {
         readonly property color m3secondaryFixedDim: root.layer(root.palette.m3secondaryFixedDim)
         readonly property color m3onSecondaryFixed: root.layer(root.palette.m3onSecondaryFixed)
         readonly property color m3onSecondaryFixedVariant: root.layer(root.palette.m3onSecondaryFixedVariant)
-        readonly property color m3tertiaryFixed: root.layer(root.palette.m3tertiaryFixed)
-        readonly property color m3tertiaryFixedDim: root.layer(root.palette.m3tertiaryFixedDim)
-        readonly property color m3onTertiaryFixed: root.layer(root.palette.m3onTertiaryFixed)
-        readonly property color m3onTertiaryFixedVariant: root.layer(root.palette.m3onTertiaryFixedVariant)
     }
 
     component M3Palette: QtObject {
         property color m3primary_paletteKeyColor: "#a8627b"
         property color m3secondary_paletteKeyColor: "#8e6f78"
-        property color m3tertiary_paletteKeyColor: "#986e4c"
         property color m3neutral_paletteKeyColor: "#807477"
         property color m3neutral_variant_paletteKeyColor: "#837377"
         property color m3background: "#191114"
@@ -179,10 +169,6 @@ Singleton {
         property color m3onSecondary: "#422932"
         property color m3secondaryContainer: "#5a3f48"
         property color m3onSecondaryContainer: "#ffd9e3"
-        property color m3tertiary: "#f0bc95"
-        property color m3onTertiary: "#48290c"
-        property color m3tertiaryContainer: "#b58763"
-        property color m3onTertiaryContainer: "#000000"
         property color m3error: "#ffb4ab"
         property color m3onError: "#690005"
         property color m3errorContainer: "#93000a"
@@ -199,10 +185,6 @@ Singleton {
         property color m3secondaryFixedDim: "#e2bdc7"
         property color m3onSecondaryFixed: "#2b151d"
         property color m3onSecondaryFixedVariant: "#5a3f48"
-        property color m3tertiaryFixed: "#ffdcc3"
-        property color m3tertiaryFixedDim: "#f0bc95"
-        property color m3onTertiaryFixed: "#2f1500"
-        property color m3onTertiaryFixedVariant: "#623f21"
         property color term0: "#353434"
         property color term1: "#ff4c8a"
         property color term2: "#ffbbb7"