Merge branch 'main' into feat/reposition-bar

Modules/HyprsunsetWidget.qml

@@ -1,7 +1,8 @@
 import QtQuick
+import ZShell.Config
 import qs.Components
 import qs.Helpers
-import qs.Config
+import qs.Services
 
 CustomRect {
 	id: root
@@ -9,10 +10,10 @@ CustomRect {
 	required property bool horizontal
 	property bool tempEnabled: Hyprsunset.enabled
 
-	color: root.tempEnabled ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
+	color: root.tempEnabled ? 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
 
 	StateLayer {
 		onClicked: {
@@ -24,9 +25,9 @@ CustomRect {
 	MaterialIcon {
 		anchors.centerIn: parent
 		animate: true
-		color: root.tempEnabled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+		color: root.tempEnabled ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		fill: root.tempEnabled ? 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: root.tempEnabled ? "lightbulb" : "light_off"
 
 		Behavior on fill {