diff --git a/Bar/Modules/Workspace.qml b/Bar/Modules/Workspace.qml
index 8140d43..7d2f788 100644
--- a/Bar/Modules/Workspace.qml
+++ b/Bar/Modules/Workspace.qml
@@ -188,7 +188,7 @@ Item {
                         anchors.fill: parent
                         cursorShape: Qt.PointingHandCursor
                         onClicked: {
-                            WorkspaceManager.switchToWorkspace(model.idx);
+                            WorkspaceManager.switchToWorkspace(model.id);
                         }
                         z: 20
                         hoverEnabled: true
diff --git a/Settings/Theme.json b/Settings/Theme.json
index 0741df8..c20e7b1 100644
--- a/Settings/Theme.json
+++ b/Settings/Theme.json
@@ -23,6 +23,6 @@
   "onAccent": "#0E0F10",
   "outline": "#565758",
   
-  "shadow": "#B30E0F10",
-  "overlay": "#660E0F10"
+  "shadow": "#0E0F10",
+  "overlay": "#0E0F10"
 }
diff --git a/Settings/Theme.qml b/Settings/Theme.qml
index d324c37..c3b5394 100644
--- a/Settings/Theme.qml
+++ b/Settings/Theme.qml
@@ -97,8 +97,8 @@ Singleton {
     property color outline: themeData.outline
 
     // Shadows & Overlays
-    property color shadow: themeData.shadow
-    property color overlay: themeData.overlay
+    property color shadow: applyOpacity(themeData.shadow, "B3")
+    property color overlay: applyOpacity(themeData.overlay, "66")
 
     // Font Properties
     property string fontFamily: "Roboto"         // Family for all text
@@ -108,4 +108,3 @@ Singleton {
     property int fontSizeSmall: 14               // Small text like clock, labels
     property int fontSizeCaption: 12             // Captions and fine print
 }
-