Reworked the bar display colors/capsule, etc...

Modules/Bar/Clock.qml

@@ -4,25 +4,35 @@ import qs.Services
 import qs.Widgets
 
 // Clock Icon with attached calendar
-NClock {
+Rectangle {
   id: root
+  width: clock.width + Style.marginM * 2 * scaling
+  height: Math.round(Style.capsuleHeight * scaling)
+  radius: Math.round(Style.radiusM * scaling)
+  color: Color.mSurfaceVariant
 
-  NTooltip {
-    id: tooltip
-    text: Time.dateString
-    target: root
-  }
+  NClock {
+    id: clock
+    anchors.verticalCenter: parent.verticalCenter
+    anchors.horizontalCenter: parent.horizontalCenter
 
-  onEntered: {
-    if (!calendarPanel.isLoaded) {
-      tooltip.show()
+    NTooltip {
+      id: tooltip
+      text: Time.dateString
+      target: clock
+    }
+
+    onEntered: {
+      if (!calendarPanel.isLoaded) {
+        tooltip.show()
+      }
+    }
+    onExited: {
+      tooltip.hide()
+    }
+    onClicked: {
+      tooltip.hide()
+      calendarPanel.isLoaded = !calendarPanel.isLoaded
     }
   }
-  onExited: {
-    tooltip.hide()
-  }
-  onClicked: {
-    tooltip.hide()
-    calendarPanel.isLoaded = !calendarPanel.isLoaded
-  }
 }