More cleanup

shell/plugins/background/Background.qml

@@ -4,7 +4,7 @@ import Quickshell.Wayland
 import QtQuick
 import QtQuick.Effects
 import QtQuick.Shapes
-import qs.Commons as NoctaliaCommons
+import qs.Commons
 
 Item {
   id: root
@@ -74,12 +74,11 @@ Item {
 
   function applyPendingTheme() {
     if (pendingThemeVersion !== backgroundVersion) return
-    NoctaliaCommons.Color.loadColors(pendingColorsRaw)
-    NoctaliaCommons.Color.loadShell(pendingShellRaw)
-    // Push style tokens synchronously so the type scale flips with the
+    Color.loadColors(pendingColorsRaw)
+    // Color.loadShell also refreshes Style so the type scale flips with the
     // background reveal instead of waiting for a separate reload path.
-    NoctaliaCommons.Style.loadShell(pendingShellRaw)
-    NoctaliaCommons.Style.scheduleRefresh()
+    Color.loadShell(pendingShellRaw)
+    Style.scheduleRefresh()
     pendingThemeVersion = -1
     pendingColorsRaw = ""
     pendingShellRaw = ""

shell/plugins/image-picker/ImagePicker.qml

@@ -29,7 +29,9 @@ Item {
   property string filterText: ""
   property var doneFilesToRelease: []
   // Bound to the central [image-picker] section in shell.toml via Color.qml.
-  property color background: Color.imagePicker.background
+  // `dimColor` tints unselected slices and text outlines on top of the scrim;
+  // it intentionally tracks the foundational background, not a surface role.
+  property color dimColor: Color.background
   property color foreground: Color.imagePicker.text
   property color scrim: Color.imagePicker.scrim
   property color selectedBorder: Color.imagePicker.selectedBorder
@@ -583,7 +585,7 @@ Item {
 
                 Rectangle {
                   anchors.fill: parent
-                  color: root.withAlpha(root.background, item.selected ? 0 : 0.42)
+                  color: root.withAlpha(root.dimColor, item.selected ? 0 : 0.42)
                 }
               }
 
@@ -622,7 +624,7 @@ Item {
           text: root.currentLabel()
           color: root.foreground
           style: Text.Outline
-          styleColor: root.withAlpha(root.background, 0.7)
+          styleColor: root.withAlpha(root.dimColor, 0.7)
           font.pixelSize: Style.font.display
           font.weight: Font.DemiBold
           horizontalAlignment: Text.AlignHCenter
@@ -639,7 +641,7 @@ Item {
           color: root.foreground
           opacity: 0.85
           style: Text.Outline
-          styleColor: root.withAlpha(root.background, 0.7)
+          styleColor: root.withAlpha(root.dimColor, 0.7)
           font.pixelSize: Style.font.title
           horizontalAlignment: Text.AlignHCenter
           elide: Text.ElideRight

shell/plugins/notifications/Service.qml

@@ -1,7 +1,4 @@
-// Notification service. Adapted from noctalia-shell (MIT) and
-// DankMaterialShell (MIT). Original implementations:
-//   https://github.com/noctalia-dev/noctalia-shell
-//   https://github.com/AvengeMedia/DankMaterialShell
+// Notification service for the omarchy shell.
 
 import QtQuick
 import QtQuick.Layouts
@@ -200,8 +197,7 @@ Item {
     }
 
     // Qt.callLater avoids "QV4::Object::insertMember" crashes when a
-    // Repeater is mid-incubation while we mutate its model — see noctalia
-    // NotificationService.qml ~L307.
+    // Repeater is mid-incubation while we mutate its model.
     Qt.callLater(function() {
       removeByOriginalId(popupModel, snapshot.originalId)
       popupModel.insert(0, snapshot)