diff --git a/modules/Bar.qml b/modules/Bar.qml
index 9d1072b..6893eb0 100644
--- a/modules/Bar.qml
+++ b/modules/Bar.qml
@@ -96,16 +96,16 @@ PanelWindow {
 
     Item {
         anchors.fill: parent
-        anchors.topMargin: M.Theme.groupSpacing
-        anchors.leftMargin: M.Theme.groupSpacing
-        anchors.rightMargin: M.Theme.groupSpacing
+        anchors.topMargin: 3
+        anchors.leftMargin: 6
+        anchors.rightMargin: 6
 
         // ---- center (declared first so left/right can anchor to it) ----
         RowLayout {
             id: centerSection
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
-            spacing: M.Theme.groupSpacing
+            spacing: M.Theme.barSpacing
 
             M.Privacy {}
             M.BarGroup {
@@ -124,7 +124,7 @@ PanelWindow {
             anchors.left: parent.left
             anchors.right: centerSection.left
             anchors.verticalCenter: parent.verticalCenter
-            spacing: M.Theme.groupSpacing
+            spacing: M.Theme.barSpacing
 
             M.BarGroup {
                 leftEdge: true
@@ -156,7 +156,7 @@ PanelWindow {
             anchors.left: centerSection.right
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
-            spacing: M.Theme.groupSpacing
+            spacing: M.Theme.barSpacing
 
             Item {
                 Layout.fillWidth: true
diff --git a/modules/Theme.qml b/modules/Theme.qml
index 1e49b02..6c9e834 100644
--- a/modules/Theme.qml
+++ b/modules/Theme.qml
@@ -33,7 +33,6 @@ QtObject {
     property int barPadding: 8
     property int barSpacing: 12
     property int moduleSpacing: 4
-    property int groupSpacing: 6
     property int radius: 4
     property int screenRadius: 15
 
@@ -72,8 +71,6 @@ QtObject {
             root.barSpacing = data.barSpacing;
         if (data.moduleSpacing !== undefined)
             root.moduleSpacing = data.moduleSpacing;
-        if (data.groupSpacing !== undefined)
-            root.groupSpacing = data.groupSpacing;
         if (data.radius !== undefined)
             root.radius = data.radius;
         if (data.screenRadius !== undefined)
diff --git a/modules/Workspaces.qml b/modules/Workspaces.qml
index 5efaf51..f4970b4 100644
--- a/modules/Workspaces.qml
+++ b/modules/Workspaces.qml
@@ -100,7 +100,7 @@ Row {
             Text {
                 anchors.centerIn: parent
                 text: pill.modelData.idx
-                color: pill.active ? M.Theme.base00 : (root.parent?.accentColor ?? M.Theme.base05)
+                color: pill.active ? M.Theme.base00 : M.Theme.base04
                 font.pixelSize: M.Theme.fontSize - 2
                 font.family: M.Theme.fontFamily
                 font.bold: pill.active