diff --git a/Colors.qml b/Colors.qml
index e26a0dc..c1ba3b8 100644
--- a/Colors.qml
+++ b/Colors.qml
@@ -5,25 +5,25 @@ import Quickshell
 Singleton {
     id: customColors
     // Core Backgrounds
-    readonly property color background: "#141B1E"
-    readonly property color foreground: "#DADADA"
-    readonly property color cursor: "#DADADA"
+    readonly property color background: "#161616"
+    readonly property color foreground: "#FFFFFF"
+    readonly property color cursor: "#6F6F6F"
 
     // The 16 Colors of the Apocalypse
-    readonly property color color0: "#232A2D"
-    readonly property color color1: "#E57474"
-    readonly property color color2: "#8CCF7E"
-    readonly property color color3: "#E5C76B"
-    readonly property color color4: "#67B0E8"
-    readonly property color color5: "#C47FD5"
-    readonly property color color6: "#6CBFBF"
-    readonly property color color7: "#B3B9B8"
-    readonly property color color8: "#2D3437"
-    readonly property color color9: "#EF7E7E"
-    readonly property color color10: "#96D988"
-    readonly property color color11: "#F4D67A"
-    readonly property color color12: "#71BAF2"
-    readonly property color color13: "#CE89DF"
-    readonly property color color14: "#67CBE7"
-    readonly property color color15: "#BDC3C2"
+    readonly property color color0: "#262626"
+    readonly property color color1: "#EE5396"
+    readonly property color color2: "#42BE65"
+    readonly property color color3: "#FFE97B"
+    readonly property color color4: "#33B1FF"
+    readonly property color color5: "#FF7EB6"
+    readonly property color color6: "#3DDBD9"
+    readonly property color color7: "#DDE1E6"
+    readonly property color color8: "#393939"
+    readonly property color color9: "#EE5396"
+    readonly property color color10: "#42BE65"
+    readonly property color color11: "#FFE97B"
+    readonly property color color12: "#33B1FF"
+    readonly property color color13: "#FF7EB6"
+    readonly property color color14: "#3DDBD9"
+    readonly property color color15: "#FFFFFF"
 }
diff --git a/modules/Bar/Bar.qml b/modules/Bar/Bar.qml
index 1e12357..d5fef64 100644
--- a/modules/Bar/Bar.qml
+++ b/modules/Bar/Bar.qml
@@ -18,15 +18,18 @@ Variants {
             left: true
             right: true
         }
+        margins {
+          left: 10
+          right: 10
+        }
         implicitHeight: Settings.config.barHeight
         RowLayout {
             id: leftStuff
-            spacing: 10
+            spacing: 20
             anchors.left: parent.left
             anchors.verticalCenter: parent.verticalCenter
             Workspaces {
                 property var screen: root.modelData
-                Layout.leftMargin: 10
             }
             Title {}
         }
@@ -44,9 +47,7 @@ Variants {
             anchors.verticalCenter: parent.verticalCenter
             Volume {}
             Battery {}
-            SystemTray {
-                Layout.rightMargin: 10
-            }
+            SystemTray {}
         }
     }
 }
diff --git a/modules/Bar/Battery.qml b/modules/Bar/Battery.qml
index 004ac50..b3a22aa 100644
--- a/modules/Bar/Battery.qml
+++ b/modules/Bar/Battery.qml
@@ -44,7 +44,7 @@ Loader {
             }
         }
 
-        implicitWidth: batRow.implicitWidth
+        implicitWidth: batRow.width
         implicitHeight: Settings.config.barHeight
 
         Row {
diff --git a/modules/Bar/SystemTray.qml b/modules/Bar/SystemTray.qml
index 73e0737..574ecec 100644
--- a/modules/Bar/SystemTray.qml
+++ b/modules/Bar/SystemTray.qml
@@ -7,6 +7,7 @@ Item {
     id: root
     implicitWidth: trayRow.implicitWidth
     implicitHeight: Settings.config.barHeight
+    visible: trayRepeater.count > 0
 
     Row {
         id: trayRow
diff --git a/modules/Bar/Title.qml b/modules/Bar/Title.qml
index 453b892..d5a032e 100644
--- a/modules/Bar/Title.qml
+++ b/modules/Bar/Title.qml
@@ -1,8 +1,6 @@
-import Quickshell
 import QtQuick
 import "../../reusables/"
 import "../../settings/"
-import "../../"
 import Quickshell.Hyprland
 
 Item {
@@ -14,6 +12,6 @@ Item {
         id: text
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
-        text: root.activeWindow?.activated ? Hyprland.activeToplevel.title : "Desktop"
+        text: root.activeWindow ? Hyprland.activeToplevel.title : "Desktop"
     }
 }
diff --git a/modules/Bar/Volume.qml b/modules/Bar/Volume.qml
index 36fc862..759ecc6 100644
--- a/modules/Bar/Volume.qml
+++ b/modules/Bar/Volume.qml
@@ -7,6 +7,8 @@ import "../../"
 
 Item {
     id: root
+    implicitWidth: textRow.width
+    implicitHeight: Settings.config.barHeight
     property var sink: Pipewire.defaultAudioSink
     function getVolumeIcon() {
         // Safety check: if Pipewire is dead or sink is missing
@@ -30,11 +32,9 @@ Item {
         // If it's loud, prepare the ears!
         return "volume_up";
     }
-    implicitWidth: textRow.implicitWidth + 10
-    implicitHeight: Settings.config.barHeight
     Row {
         id: textRow
-        anchors.centerIn: parent
+        anchors.verticalCenter: parent.verticalCenter
         spacing: 5
         CustomText {
             id: volumeText
@@ -42,12 +42,12 @@ Item {
                 objects: Pipewire.ready ? Pipewire.defaultAudioSink : []
             }
             text: Pipewire.ready ? Math.round(root.sink.audio.volume * 100) + "%" : "failure"
-            opacity: root.sink.audio.muted ? 0.5 : 1
+            opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0
         }
         CustomIcon {
             id: volumeIcon
-            opacity: root.sink.audio.muted ? 0.5 : 1
-            text: root.getVolumeIcon()
+            opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0
+            text: Pipewire.ready ? root.getVolumeIcon() : null
         }
     }
 }