Merge branch 'main' into feat/reposition-bar

Modules/SysTray/TrayIcons.qml

@@ -4,9 +4,9 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell.Services.SystemTray
 import qs.Components
-import qs.Config
-import qs.Modules.SysTray.Widgets
+import ZShell.Config
 import qs.Modules
+import qs.Services
 
 CustomClippingRect {
 	id: root
@@ -15,18 +15,18 @@ CustomClippingRect {
 	readonly property alias items: repeater
 	readonly property alias layout: sysGrid
 	required property GridLayout loader
-	readonly property int padding: Appearance.padding.small
+	readonly property int padding: Tokens.padding.small
 	required property Wrapper popouts
 	readonly property real shortSize: Config.bar.height
-	readonly property real size: horizontal ? sysGrid.implicitWidth + Appearance.padding.small : sysGrid.implicitHeight + Appearance.padding.small
+	readonly property real size: horizontal ? sysGrid.implicitWidth + Tokens.padding.small : sysGrid.implicitHeight + Tokens.padding.small
 
-	bottomLeftRadius: horizontal ? Appearance.rounding.full : Appearance.rounding.smallest / 2
-	bottomRightRadius: Appearance.rounding.smallest / 2
-	color: DynamicColors.tPalette.m3surfaceContainer
+	bottomLeftRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.smallest / 2
+	bottomRightRadius: Tokens.rounding.smallest / 2
+	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? shortSize : size
 	implicitWidth: horizontal ? size : shortSize
-	radius: Appearance.rounding.full
-	topRightRadius: horizontal ? Appearance.rounding.smallest / 2 : Appearance.rounding.full
+	radius: Tokens.rounding.full
+	topRightRadius: horizontal ? Tokens.rounding.smallest / 2 : Tokens.rounding.full
 
 	GridLayout {
 		id: sysGrid