diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml
index 7c5f84e..4f8abb0 100644
--- a/modules/bar/Ws.qml
+++ b/modules/bar/Ws.qml
@@ -15,27 +15,39 @@ Rectangle {
     property HyprlandMonitor hyprBarScreen: Hyprland.monitorFor(root.barScreen)
     radius: Config.rounding
     color: Colors.base01
-    implicitWidth: wsLayout.implicitWidth + 32
+    implicitWidth: wsLayout.implicitWidth 
     implicitHeight: moduleHeight
 
     RowLayout {
         id: wsLayout
-        anchors.centerIn: parent
+        anchors.centerIn: root
+        anchors.fill: root
         anchors.horizontalCenter: parent.horizontalCenter
-        spacing: 8
+        spacing: 0
         Repeater {
             id: wsRepeater
             model: Hyprland.workspaces
-            delegate: WrapperRectangle {
+            delegate: Rectangle {
                 id: wsWrapper
                 anchors.verticalCenter: parent.verticalCenter
+                implicitHeight: root.moduleHeight - 4
+                implicitWidth: modelData.active ? 48 : 32
                 parent: wsLayout
-                color: 'transparent'
+                color: modelData.active ? Colors.base0D : Colors.base01
+                radius: Config.rounding
                 visible: modelData.monitor == root.hyprBarScreen
                 required property var modelData
-                child: StyledText {
+                StyledText {
+                    anchors.centerIn: parent
                     text: wsWrapper.modelData.id
-                    opacity: wsWrapper.modelData.active ? 1.0 : 0.6
+                    color: parent.modelData.active ? Colors.base00 : Colors.base07
+                }
+                MouseArea {
+                    id: clickHandler
+                    anchors.fill: parent
+                    acceptedButtons: Qt.LeftButton
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: parent.modelData.activate()
                 }
             }
         }
diff --git a/settings/settings.ini b/settings/settings.ini
index 5f3fcd0..53e9485 100644
--- a/settings/settings.ini
+++ b/settings/settings.ini
@@ -1,7 +1,7 @@
 [General]
 barHeight=34
-font=FiraCode Nerd Font
+font=Google Sans
 fontSize=14
 opacity=1
 roudning=16
-wallpaper=@Variant(\0\0\0\x11\0\0\0'file:///home/lucy/.wall/frierensuff.png)
+wallpaper=@Variant(\0\0\0\x11\0\0\0)file:///home/lucy/.wall/walkingcastle.png)