diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml
index 0aa82a9..6ea257b 100644
--- a/modules/bar/Ws.qml
+++ b/modules/bar/Ws.qml
@@ -9,7 +9,7 @@ import qs.settings
 BarComponent {
     id: root
     required property ShellScreen barScreen
-    implicitWidth: 10 * (16 + 4)
+    implicitWidth: wsLayout.implicitWidth + 16
     RowLayout {
         id: wsLayout
 	anchors.verticalCenter: parent.verticalCenter
diff --git a/settings/settings.json b/settings/settings.json
index 9e1c742..522c6dd 100644
--- a/settings/settings.json
+++ b/settings/settings.json
@@ -1,7 +1,7 @@
 {
     "appearance": {
         "accent": "base0D",
-        "currentTheme": "base16-rose-pine-moon.json",
+        "currentTheme": "base16-gruvbox-dark.json",
         "font": "Inter",
         "fontSize": 14,
         "iconSize": 16,