Merge branch 'main' into feat/reposition-bar

Modules/NotifBell.qml

@@ -1,8 +1,9 @@
 import Quickshell
 import QtQuick
-import qs.Config
+import ZShell.Config
 import qs.Daemons
 import qs.Components
+import qs.Services
 
 CustomRect {
 	id: root
@@ -11,18 +12,18 @@ CustomRect {
 	required property Wrapper popouts
 	required property PersistentProperties visibilities
 
-	color: visibilities.sidebar ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
+	color: visibilities.sidebar ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? Config.bar.height : width
 	implicitWidth: horizontal ? height : Config.bar.height
-	radius: Appearance.rounding.full
+	radius: Tokens.rounding.full
 
 	MaterialIcon {
 		id: notificationCenterIcon
 
 		anchors.centerIn: parent
-		color: root.visibilities.sidebar ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+		color: root.visibilities.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		fill: root.visibilities.sidebar ? 1 : 0
-		font.pointSize: root.horizontal ? Appearance.font.size.larger : Appearance.font.size.large
+		font.pointSize: root.horizontal ? Tokens.font.size.larger : Tokens.font.size.large
 		text: NotifServer.list.length ? "\uf4fe" : "\ue7f4"
 
 		Behavior on color {
@@ -36,7 +37,7 @@ CustomRect {
 	}
 
 	StateLayer {
-		color: root.visibilities.sidebar ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+		color: root.visibilities.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 
 		onClicked: {
 			root.visibilities.sidebar = !root.visibilities.sidebar;