diff --git a/modules/BarGroup.qml b/modules/BarGroup.qml
index 9f42a7d..c628b9d 100644
--- a/modules/BarGroup.qml
+++ b/modules/BarGroup.qml
@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Effects
 import "." as M
 
 Rectangle {
@@ -7,6 +6,7 @@ Rectangle {
 
     default property alias content: row.children
     property color borderColor: M.Theme.base02
+
     color: "transparent"
     border.color: borderColor
     border.width: 1
@@ -14,15 +14,6 @@ Rectangle {
 
     visible: row.visibleChildren.length > 0
 
-    layer.enabled: true
-    layer.effect: MultiEffect {
-        shadowEnabled: true
-        shadowColor: root.borderColor
-        shadowBlur: 0.6
-        shadowVerticalOffset: 0
-        shadowHorizontalOffset: 0
-    }
-
     implicitWidth: row.implicitWidth + _pad * 2
     implicitHeight: row.implicitHeight + _pad * 2
 
diff --git a/modules/Battery.qml b/modules/Battery.qml
index 5a060c3..d0e07c1 100644
--- a/modules/Battery.qml
+++ b/modules/Battery.qml
@@ -18,7 +18,7 @@ M.BarSection {
     readonly property var dev: UPower.displayDevice
     readonly property real pct: (dev?.percentage ?? 0) * 100
     readonly property bool charging: dev?.state === UPowerDeviceState.Charging
-    property color _stateColor: charging ? M.Theme.base0B : pct < 15 ? M.Theme.base09 : pct < 30 ? M.Theme.base0A : M.Theme.base08
+    property color _stateColor: charging ? M.Theme.base0B : pct < 15 ? M.Theme.base08 : pct < 30 ? M.Theme.base09 : M.Theme.base0B
 
     Behavior on _stateColor { ColorAnimation { duration: 300 } }
 
diff --git a/modules/Disk.qml b/modules/Disk.qml
index 37d682f..c8eb68b 100644
--- a/modules/Disk.qml
+++ b/modules/Disk.qml
@@ -34,12 +34,12 @@ M.BarSection {
 
     M.BarIcon {
         icon: "\uF0C9"
-        color: M.Theme.base08
+        color: M.Theme.base09
         anchors.verticalCenter: parent.verticalCenter
     }
     M.BarLabel {
         label: root.freePct + "% " + root.totalTb.toFixed(1)
-        color: M.Theme.base08
+        color: M.Theme.base09
         anchors.verticalCenter: parent.verticalCenter
     }
 }
diff --git a/modules/Memory.qml b/modules/Memory.qml
index 284629e..3b7d81f 100644
--- a/modules/Memory.qml
+++ b/modules/Memory.qml
@@ -34,12 +34,12 @@ M.BarSection {
 
     M.BarIcon {
         icon: "\uEFC5"
-        color: M.Theme.base08
+        color: M.Theme.base0B
         anchors.verticalCenter: parent.verticalCenter
     }
     M.BarLabel {
         label: root.percent + "%"
-        color: M.Theme.base08
+        color: M.Theme.base0B
         anchors.verticalCenter: parent.verticalCenter
     }
 }
diff --git a/modules/Network.qml b/modules/Network.qml
index d093be6..5f36332 100644
--- a/modules/Network.qml
+++ b/modules/Network.qml
@@ -81,13 +81,13 @@ M.BarSection {
                 return "\uDB85\uDE16";
             return "\uDB82\uDCFD";
         }
-        color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0D
+        color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C
         anchors.verticalCenter: parent.verticalCenter
     }
     M.BarLabel {
         visible: root.state === "wifi"
         label: root.essid
-        color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0D
+        color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C
         anchors.verticalCenter: parent.verticalCenter
     }
 
diff --git a/modules/Notifications.qml b/modules/Notifications.qml
index 6ab70ae..faac1d2 100644
--- a/modules/Notifications.qml
+++ b/modules/Notifications.qml
@@ -44,12 +44,12 @@ M.BarSection {
                 return root.count > 0 ? "\uDB80\uDCA0" : "\uDB82\uDE93";
             return root.count > 0 ? "\uDB84\uDD6B" : "\uDB80\uDC9C";
         }
-        color: root.count > 0 ? M.Theme.base0D : (root.dnd ? M.Theme.base04 : M.Theme.base0D)
+        color: root.count > 0 ? M.Theme.base09 : (root.dnd ? M.Theme.base04 : M.Theme.base09)
         anchors.verticalCenter: parent.verticalCenter
     }
     M.BarLabel {
         label: root.count > 0 ? String(root.count) : ""
-        color: M.Theme.base0D
+        color: M.Theme.base09
         anchors.verticalCenter: parent.verticalCenter
     }
 
diff --git a/modules/PowerProfile.qml b/modules/PowerProfile.qml
index 07813ca..f533c98 100644
--- a/modules/PowerProfile.qml
+++ b/modules/PowerProfile.qml
@@ -8,7 +8,7 @@ M.BarIcon {
 
     property string profile: ""
 
-    color: root.profile === "performance" ? M.Theme.base09 : root.profile === "power-saver" ? M.Theme.base0B : M.Theme.base0A
+    color: root.profile === "performance" ? M.Theme.base09 : root.profile === "power-saver" ? M.Theme.base0B : M.Theme.base05
 
     icon: {
         if (root.profile === "performance")
diff --git a/modules/Temperature.qml b/modules/Temperature.qml
index 0c94b3c..4301187 100644
--- a/modules/Temperature.qml
+++ b/modules/Temperature.qml
@@ -8,7 +8,7 @@ M.BarSection {
     tooltip: "Temperature: " + root.celsius + "\u00B0C"
 
     property int celsius: 0
-    property color _stateColor: celsius > 80 ? M.Theme.base09 : celsius > 60 ? M.Theme.base0A : M.Theme.base08
+    property color _stateColor: celsius > 80 ? M.Theme.base08 : celsius > 60 ? M.Theme.base09 : M.Theme.base0C
     Behavior on _stateColor { ColorAnimation { duration: 300 } }
 
     FileView {
diff --git a/modules/Tray.qml b/modules/Tray.qml
index c22df94..e575b42 100644
--- a/modules/Tray.qml
+++ b/modules/Tray.qml
@@ -25,7 +25,7 @@ RowLayout {
             M.ThemedIcon {
                 anchors.fill: parent
                 source: iconItem.modelData.icon
-                tint: M.Theme.base0D
+                tint: M.Theme.base05
             }
 
             HoverHandler {
diff --git a/modules/Weather.qml b/modules/Weather.qml
index a2bc162..0fbc987 100644
--- a/modules/Weather.qml
+++ b/modules/Weather.qml
@@ -35,7 +35,7 @@ M.BarSection {
 
     M.BarIcon {
         id: label
-        color: M.Theme.base08
+        color: M.Theme.base0C
         anchors.verticalCenter: parent.verticalCenter
     }
 }
diff --git a/modules/WindowTitle.qml b/modules/WindowTitle.qml
index 169cd6b..08e694c 100644
--- a/modules/WindowTitle.qml
+++ b/modules/WindowTitle.qml
@@ -76,13 +76,13 @@ M.BarSection {
         layer.enabled: true
         layer.effect: MultiEffect {
             colorization: 1.0
-            colorizationColor: M.Theme.base0D
+            colorizationColor: M.Theme.base05
         }
     }
 
     M.BarLabel {
         label: root._title
-        color: M.Theme.base0D
+        color: M.Theme.base05
         elide: Text.ElideRight
         anchors.verticalCenter: parent.verticalCenter
     }