merge

modules/bar/Battery.qml

@@ -15,7 +15,7 @@ Loader {
     sourceComponent: Rectangle {
         id: container
         radius: implicitHeight / 2
-        color: clickHandler.containsMouse ? Colors.color5 : Colors.color6
+        color: clickHandler.containsMouse ? Colors.primary : Colors.secondary
         anchors.verticalCenter: parent.verticalCenter
         implicitWidth: root.implicitWidth + 20
         implicitHeight: Settings.config.barHeight - 10

modules/bar/Clock.qml

@@ -8,7 +8,7 @@ import qs.reusables
 Rectangle {
     id: container
     radius: implicitHeight / 2
-    color: formatSwitch.containsMouse ? Colors.color5 : Colors.color6
+    color: formatSwitch.containsMouse ? Colors.secondaryContainer : Colors.primaryContainer
     anchors.verticalCenter: parent.verticalCenter
     implicitHeight: Settings.config.barHeight - 10
     implicitWidth: root.implicitWidth + 20

modules/bar/Mpris.qml

@@ -8,7 +8,7 @@ Rectangle {
     id: container
     visible: root.spotify != null
     radius: implicitHeight / 2
-    color: clickHandler.containsMouse ? Colors.color5 : Colors.color6
+    color: clickHandler.containsMouse ? Colors.secondaryContainer : Colors.primaryContainer
     implicitWidth: root.implicitWidth + 20
     implicitHeight: Settings.config.barHeight - 10
     Item {

modules/bar/Title.qml

@@ -7,7 +7,7 @@ import qs.reusables
 Rectangle {
     id: container
     radius: implicitHeight / 2
-    color: Colors.color6
+    color: Colors.primaryContainer
     anchors.verticalCenter: parent.verticalCenter
     implicitWidth: root.implicitWidth
     implicitHeight: Settings.config.barHeight - 10

modules/bar/Volume.qml

@@ -9,7 +9,7 @@ import qs
 Rectangle {
     id: container
     radius: implicitHeight / 2
-    color: pavuArea.containsMouse ? Colors.color5 : Colors.color6
+    color: pavuArea.containsMouse ? Colors.secondaryContainer : Colors.primaryContainer
     anchors.verticalCenter: parent.verticalCenter
     implicitWidth: root.implicitWidth + 20
     implicitHeight: Settings.config.barHeight - 10

modules/bar/Workspaces.qml

@@ -11,6 +11,7 @@ Item {
     implicitWidth: workspaceRow.implicitWidth
     implicitHeight: workspaceRow.implicitHeight
     anchors.verticalCenter: parent.verticalCenter
+    property var screen: screen
     Row {
         id: workspaceRow
         anchors.centerIn: parent
@@ -43,8 +44,7 @@ Item {
                 CustomText {
                     anchors.centerIn: workspaceNumber
                     text: parent.modelData.id
-                    color: Colors.primary // Set contrasting color for workspace number
+                    color: workspaceNumber.modelData.focused ? Colors.onSecondaryContainerColor : Colors.surfaceVariant
-                    opacity: workspaceNumber.modelData.focused ? 1 : 0.5
                 }
                 MouseArea {
                     anchors.fill: parent