diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 9b7d1c8..91c0fd0 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -34,10 +34,10 @@ Variants {
             anchors.fill: parent
             RowLayout {
                 id: leftLayout
-                spacing: 10
+                spacing: 5
                 anchors.left: parent.left
                 anchors.verticalCenter: parent.verticalCenter
-                anchors.leftMargin: Config.floating ? (Config.barHeight - root.moduleHeight) / 2 : Config.rounding
+                anchors.leftMargin: Config.floating ? (Config.barHeight - root.moduleHeight) / 2 : Config.rounding == 0 ? 10 : Config.rounding
                 Ws {
                     moduleHeight: root.moduleHeight
                     barScreen: root.modelData
@@ -64,8 +64,8 @@ Variants {
                 id: rightLayout
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                spacing: 15
-                anchors.rightMargin: Config.floating ? (Config.barHeight - root.moduleHeight) / 2 : Config.rounding
+                spacing: 5
+                anchors.rightMargin: Config.floating ? (Config.barHeight - root.moduleHeight) / 2 : Config.rounding == 0 ? 10 : Config.rounding
                 Mpris {
                     moduleHeight: root.moduleHeight
                 }
diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml
index 201bc6e..49b713c 100644
--- a/modules/bar/Ws.qml
+++ b/modules/bar/Ws.qml
@@ -12,8 +12,8 @@ Rectangle {
     required property ShellScreen barScreen
     required property double moduleHeight
     radius: Config.rounding
-    color: 'transparent'
-    implicitWidth: wsLayout.implicitWidth 
+    color: Colors.moduleBg
+    implicitWidth: wsLayout.implicitWidth + 15
     implicitHeight: moduleHeight
 
     RowLayout {
@@ -41,7 +41,7 @@ Rectangle {
                     id: wsName
                     anchors.centerIn: parent
                     text: wsWrapper.modelData.name
-                    color: wsWrapper.active ? Colors.base0D : Colors.activeModuleBg
+                    color: wsWrapper.active ? Colors.base0D : Colors.base03
                     font.bold: true
                 }
                 MouseArea {