Merge pull request 'changed old appearance vars for the lockscreen + warning hunting for the polkit' (#154) from fix/lockscreen-font into main

Reviewed-on: #154
Reviewed-by: AramJonghu <aramjonghu@tutamail.com>
Reviewed-by: zach <zach@brohn.se>

Components/AnchorAnim.qml

@@ -27,25 +27,25 @@ AnchorAnimation {
 		if (type == AnchorAnim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 
 		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
+		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type == AnchorAnim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type == AnchorAnim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 
 		if (type >= AnchorAnim.StandardSmall && type <= AnchorAnim.StandardExtraLarge)
-			return Tokens.anim.curves.standard;
+			return Tokens.anim.standard;
 		if (type >= AnchorAnim.EmphasizedSmall && type <= AnchorAnim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
+			return Tokens.anim.emphasized;
 
-		return Tokens.anim.curves.expressiveDefaultSpatial;
+		return Tokens.anim.expressiveDefaultSpatial;
 	}
 }

Components/Anim.qml

@@ -30,34 +30,34 @@ NumberAnimation {
 		if (type === Anim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
 			return Tokens.anim.durations.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
+			return Tokens.anim.durations.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
 			return Tokens.anim.durations.expressiveSlowEffects;
 
 		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
+		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
+			return Tokens.anim.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
+			return Tokens.anim.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
+			return Tokens.anim.expressiveSlowEffects;
 
 		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
+			return Tokens.anim.emphasized;
+		return Tokens.anim.standard;
 	}
 }

Components/BaseStyledSlider.qml

@@ -107,7 +107,7 @@ Slider {
 
 					Anim {
 						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardAccel
+						easing: Tokens.anim.standardAccel
 						property: "scale"
 						target: icon
 						to: 0
@@ -119,7 +119,7 @@ Slider {
 
 					Anim {
 						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardDecel
+						easing: Tokens.anim.standardDecel
 						property: "scale"
 						target: icon
 						to: 1

Components/ButtonBase.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import ZShell.Config
+import qs.Components
 import qs.Services
 
 CustomRect {
@@ -15,7 +16,7 @@ CustomRect {
 	property color activeOnColor
 	property bool checked
 	property real checkedRadius: Tokens.rounding.medium
-	property real defaultRadius: Math.min(width, height) / 2
+	property real defaultRadius: Tokens.rounding.large
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property bool fillWidth
@@ -36,7 +37,7 @@ CustomRect {
 	readonly property color onColor: !enabled ? disabledOnColor : internalChecked ? activeOnColor : inactiveOnColor
 	property real padding
 	readonly property alias pressed: stateLayer.pressed
-	property real pressedRadius: Tokens.rounding.smallest
+	property real pressedRadius: Tokens.rounding.small
 	readonly property alias radiusAnim: radiusAnim
 	property bool radiusMorph: true
 	property alias shapeMorph: stateLayer.shapeMorph

Components/CAnim.qml

@@ -2,62 +2,6 @@ import QtQuick
 import ZShell.Config
 
 ColorAnimation {
-	enum Type {
-		StandardSmall = 0,
-		Standard,
-		StandardLarge,
-		StandardExtraLarge,
-		EmphasizedSmall,
-		Emphasized,
-		EmphasizedLarge,
-		EmphasizedExtraLarge,
-		FastSpatial,
-		DefaultSpatial,
-		SlowSpatial,
-		FastEffects,
-		DefaultEffects,
-		SlowEffects
-	}
-
-	property int type: CAnim.DefaultSpatial
-
-	duration: {
-		if (type < CAnim.StandardSmall || type > Anim.SlowEffects)
-			return Tokens.anim.durations.normal;
-
-		if (type === CAnim.FastSpatial)
-			return Tokens.anim.durations.expressiveFastSpatial;
-		if (type === CAnim.DefaultSpatial)
-			return Tokens.anim.durations.expressiveDefaultSpatial;
-		if (type === CAnim.SlowSpatial)
-			return Tokens.anim.durations.large;
-		if (type === CAnim.FastEffects)
-			return Tokens.anim.durations.expressiveFastEffects;
-		if (type === CAnim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
-		if (type === CAnim.SlowEffects)
-			return Tokens.anim.durations.expressiveSlowEffects;
-
-		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
-		return Tokens.anim.durations[types[idx]];
-	}
-	easing.bezierCurve: {
-		if (type === CAnim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
-		if (type === CAnim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
-		if (type === CAnim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
-		if (type === CAnim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
-		if (type === CAnim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
-		if (type === CAnim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
-
-		if (type >= CAnim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
-	}
+	duration: Tokens.anim.durations.expressiveSlowEffects
+	easing: Tokens.anim.expressiveSlowEffects
 }

Components/CircularIndicator.qml

@@ -23,7 +23,7 @@ BusyIndicator {
 	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
-	property real strokeWidth: Tokens.padding.small * 0.8
+	property real strokeWidth: Tokens.padding.extraSmall * 0.8
 	property alias type: manager.indeterminateAnimationType
 
 	implicitHeight: implicitSize
@@ -34,7 +34,6 @@ BusyIndicator {
 		anchors.fill: parent
 		bgColor: root.bgColor
 		fgColor: root.fgColor
-		hasEndIndicator: false
 		padding: root.padding
 		rotation: manager.rotation
 		startAngle: manager.startFraction * 360
@@ -54,7 +53,6 @@ BusyIndicator {
 		Anim {
 			duration: manager.completeEndDuration * Tokens.anim.durations.scale
 			properties: "opacity,internalStrokeWidth"
-			type: Anim.DefaultEffects
 		}
 	}
 

Components/CircularProgress.qml

@@ -21,7 +21,7 @@ Item {
 	readonly property real size: Math.min(width, height)
 	property int spacing: Tokens.spacing.small
 	property int startAngle: -90
-	property int strokeWidth: Tokens.padding.small
+	property int strokeWidth: Tokens.padding.extraSmall
 	property int sweepAngle: 360
 	readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
 	property real value

Components/CustomCheckbox.qml

@@ -23,7 +23,7 @@ CheckBox {
 		color: Colors.palette.m3surfaceVariant
 		implicitHeight: control.checkHeight
 		implicitWidth: control.checkWidth
-		radius: Tokens.rounding.smallest / 2
+		radius: Tokens.rounding.small / 2
 
 		CustomRect {
 			color: Colors.palette.m3primary

Components/CustomSlider.qml

@@ -141,7 +141,7 @@ Slider {
 					CAnim {
 					}
 				}
-				NumberAnimation on waveProgress {
+				Anim on waveProgress {
 					duration: root.waveDuration
 					easing.type: Easing.Linear
 					from: 0

Components/CustomSpinBox.qml

@@ -38,9 +38,9 @@ DoubleSpinBox {
 		horizontalAlignment: TextField.AlignHCenter
 		implicitWidth: 65
 		inputMethodHints: Qt.ImhFormattedNumbersOnly
-		leftPadding: Tokens.padding.larger
+		leftPadding: Tokens.padding.small
 		readOnly: !root.editable
-		rightPadding: Tokens.padding.larger
+		rightPadding: Tokens.padding.small
 		text: root.textFromValue(root.value, root.locale)
 		validator: root.validator
 

Components/CustomSplitButtonRow.qml

@@ -1,70 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
-
-Item {
-	id: root
-
-	property alias active: splitButton.active
-	property alias buttonAlias: splitButton
-	property alias expanded: splitButton.expanded
-	property int expandedZ: 100
-	required property string label
-	property alias menuItems: splitButton.menuItems
-	property bool shouldBeActive: true
-	property alias type: splitButton.type
-
-	signal selected(item: MenuItem)
-
-	anchors.left: parent.left
-	anchors.right: parent.right
-	clip: false
-	implicitHeight: row.implicitHeight + Tokens.padding.smaller * 2
-	opacity: shouldBeActive ? 1 : 0
-	scale: shouldBeActive ? 1 : 0.8
-	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
-
-	Behavior on opacity {
-		Anim {
-		}
-	}
-	Behavior on scale {
-		Anim {
-		}
-	}
-
-	RowLayout {
-		id: row
-
-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
-		spacing: Tokens.spacing.normal
-
-		CustomText {
-			Layout.fillWidth: true
-			color: root.enabled ? Colors.palette.m3onSurface : Colors.palette.m3onSurfaceVariant
-			font.pointSize: Tokens.font.size.larger
-			text: root.label
-		}
-
-		CustomSplitButton {
-			id: splitButton
-
-			enabled: root.enabled
-			type: CustomSplitButton.Filled
-			z: 2
-
-			menu.onItemSelected: item => {
-				root.selected(item);
-			}
-			stateLayer.onClicked: {
-				splitButton.expanded = !splitButton.expanded;
-			}
-		}
-	}
-}

Components/CustomSwitch.qml

@@ -13,8 +13,12 @@ Switch {
 	implicitWidth: implicitIndicatorWidth
 
 	indicator: CustomRect {
-		color: root.checked && root.enabled ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: Tokens.font.size.medium + Tokens.padding.normal * 2
+		color: {
+			if (!root.enabled)
+				return root.checked ? Qt.alpha(Colors.palette.m3onSurface, 0.12) : Qt.alpha(Colors.palette.m3surfaceContainerHighest, 0.38);
+			return root.checked ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer);
+		}
+		implicitHeight: 14 + Tokens.padding.small * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Tokens.rounding.full
 
@@ -22,7 +26,11 @@ Switch {
 			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked && root.enabled ? Colors.palette.m3onPrimary : Colors.layer(Colors.palette.m3outline, root.cLayer + 1)
+			color: {
+				if (!root.enabled)
+					return root.checked ? Qt.alpha(Colors.palette.m3surface, 0.7) : Qt.alpha(Colors.palette.m3onSurface, 0.12);
+				return root.checked ? Colors.palette.m3onPrimary : Colors.layer(Colors.palette.m3outline, root.cLayer + 1);
+			}
 			implicitHeight: parent.implicitHeight - Tokens.padding.extraSmall
 			implicitWidth: nonAnimWidth
 			radius: Tokens.rounding.full
@@ -92,7 +100,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Tokens.padding.larger
+				height: parent.implicitHeight - Tokens.padding.medium
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -114,12 +122,16 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: ShapePath.RoundCap
+					capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
-					strokeColor: root.checked && root.enabled ? Colors.palette.m3primary : Colors.palette.m3surfaceContainerHighest
-					strokeWidth: Tokens.font.size.larger * 0.15
+					strokeColor: {
+						if (!root.enabled)
+							return root.checked ? Colors.palette.m3outline : Colors.palette.m3surfaceContainer;
+						return root.checked ? Colors.palette.m3primary : Colors.palette.m3surfaceContainerHighest;
+					}
+					strokeWidth: 16 * 0.15
 
 					Behavior on strokeColor {
 						CAnim {
@@ -153,6 +165,6 @@ Switch {
 
 	component PropAnim: PropertyAnimation {
 		duration: Tokens.anim.durations.expressiveFastSpatial
-		easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+		easing: Tokens.anim.expressiveFastSpatial
 	}
 }

Components/CustomTextField.qml

@@ -23,7 +23,6 @@ TextFieldBase {
 	property string leadingIcon
 	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
 	property int radius: Tokens.rounding.small
-	property alias sLayer: stateLayer
 	readonly property real smallFontScale: smallFontSize / font.pointSize
 	property int smallFontSize: Tokens.font.size.small
 	property string supportingText
@@ -130,8 +129,8 @@ TextFieldBase {
 				}
 
 				AnchorAnim {
-					duration: Tokens.anim.durations.expressiveEffects
-					easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+					duration: Tokens.anim.durations.expressiveDefaultEffects
+					easing: Tokens.anim.expressiveDefaultEffects
 				}
 			}
 		}
@@ -141,12 +140,11 @@ TextFieldBase {
 
 			active: root.leadingIcon
 			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.normal
+			anchors.leftMargin: Tokens.padding.small
 			anchors.verticalCenter: parent.verticalCenter
 
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
-				font.pointSize: Tokens.font.size.larger
 				text: root.leadingIcon
 			}
 		}
@@ -156,7 +154,7 @@ TextFieldBase {
 
 			active: root.trailingIcon
 			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.normal
+			anchors.rightMargin: Tokens.padding.small
 			anchors.verticalCenter: parent.verticalCenter
 
 			sourceComponent: MaterialIcon {

Components/IconButton.qml

@@ -27,7 +27,7 @@ ButtonBase {
 			return Colors.palette.m3onPrimary;
 		return type === IconButton.Tonal ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onSurfaceVariant;
 	}
-	padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.small
+	padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.extraSmall
 
 	MaterialIcon {
 		id: label

Components/IconTextButton.qml

@@ -17,7 +17,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.larger
+	horizontalPadding: Tokens.padding.small
 	implicitHeight: row.implicitHeight + verticalPadding * 2
 	implicitWidth: row.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
@@ -32,7 +32,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Tokens.padding.extraSmall
 
 	RowLayout {
 		id: row

Components/Menu.qml

@@ -78,7 +78,7 @@ MouseArea {
 		implicitHeight: column.implicitHeight + column.anchors.margins * 2
 		implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
 		level: 2
-		radius: Tokens.rounding.medium
+		radius: Tokens.rounding.large
 		x: {
 			watcher.transform;
 			const item = root.attachTo;
@@ -132,9 +132,9 @@ MouseArea {
 
 						Layout.fillWidth: true
 						color: Qt.alpha(Colors.palette.m3tertiaryContainer, active ? 1 : 0)
-						implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.larger * 2
-						implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.larger * 2
-						radius: Tokens.rounding.small
+						implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.medium * 2
+						implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.medium * 2
+						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
 							Anim {
@@ -157,7 +157,7 @@ MouseArea {
 							id: menuOptionRow
 
 							anchors.fill: parent
-							anchors.margins: Tokens.padding.larger
+							anchors.margins: Tokens.padding.medium
 							spacing: Tokens.spacing.small
 
 							MaterialIcon {

Components/SearchBar.qml

@@ -70,7 +70,7 @@ TextFieldBase {
 		id: clearIcon
 
 		anchors.right: parent.right
-		anchors.rightMargin: Tokens.padding.larger
+		anchors.rightMargin: Tokens.padding.small
 		anchors.verticalCenter: parent.verticalCenter
 		enabled: root.text
 		icon: "clear"

Components/SplitButton.qml

@@ -12,14 +12,14 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondaryContainer
+	property color color: type == SplitButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondaryContainer
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledTextColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Tokens.padding.larger
+	property real horizontalPadding: Tokens.padding.medium
 	readonly property alias iconLabel: iconLabel
 	readonly property alias label: label
 	readonly property alias menu: menu
@@ -27,20 +27,20 @@ Row {
 	property bool menuOnTop
 	property real minLeftWidth
 	readonly property alias stateLayer: stateLayer
-	property color textColor: type == CustomSplitButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondaryContainer
+	property color textColor: type == SplitButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondaryContainer
 	readonly property alias textRow: textRow
-	property int type: CustomSplitButton.Filled
+	property int type: SplitButton.Filled
 	property real verticalPadding: Tokens.padding.small
 
-	spacing: Math.floor(Tokens.spacing.extraSmall)
+	spacing: Math.floor(Tokens.spacing.extraSmall / 2)
 
 	CustomRect {
-		bottomRightRadius: Tokens.rounding.small / 2
+		bottomRightRadius: Tokens.rounding.medium / 2
 		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandBtn.implicitHeight
 		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
-		topRightRadius: Tokens.rounding.small / 2
+		topRightRadius: Tokens.rounding.medium / 2
 
 		StateLayer {
 			id: stateLayer
@@ -92,7 +92,7 @@ Row {
 	CustomRect {
 		id: expandBtn
 
-		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.small / 2
+		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.medium / 2
 
 		bottomLeftRadius: rad
 		color: !root.enabled ? root.disabledColor : root.color

Components/StateLayer.qml

@@ -1,9 +1,8 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
-import ZShell.Components
-import qs.Helpers
 import ZShell.Config
+import qs.Helpers
 import qs.Services
 
 MouseArea {
@@ -81,7 +80,7 @@ MouseArea {
 
 		alwaysRunToEnd: true
 		duration: Tokens.anim.durations.expressiveSlowEffects * 2
-		easing.bezierCurve: Tokens.anim.curves.standard
+		easing: Tokens.anim.standard
 		property: "circleRadius"
 		target: root
 		to: root.endRadius

Components/TextButton.qml

@@ -14,7 +14,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.normal
+	horizontalPadding: Tokens.padding.small
 	implicitHeight: label.implicitHeight + verticalPadding * 2
 	implicitWidth: label.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
@@ -29,7 +29,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Tokens.padding.extraSmall
 
 	CustomText {
 		id: label

Components/TextFieldBase.qml

@@ -36,7 +36,7 @@ TextField {
 		color: Colors.palette.m3primary
 		implicitHeight: root.cursorRectangle.height
 		implicitWidth: 1.5
-		radius: Tokens.rounding.large
+		radius: Tokens.rounding.largeIncreased
 		x: root.cursorRectangle.x
 		y: root.cursorRectangle.y
 

Components/Toast/ToastItem.qml

@@ -32,8 +32,8 @@ CustomRect {
 			return Colors.palette.m3errorContainer;
 		return Colors.palette.m3surface;
 	}
-	implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
-	radius: Tokens.rounding.normal
+	implicitHeight: layout.implicitHeight + Tokens.padding.small * 2
+	radius: Tokens.rounding.medium
 
 	Behavior on border.color {
 		CAnim {
@@ -52,10 +52,10 @@ CustomRect {
 		id: layout
 
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.normal
-		anchors.margins: Tokens.padding.smaller
-		anchors.rightMargin: Tokens.padding.normal
-		spacing: Tokens.spacing.normal
+		anchors.leftMargin: Tokens.padding.small
+		anchors.margins: Tokens.padding.small
+		anchors.rightMargin: Tokens.padding.small
+		spacing: Tokens.spacing.medium
 
 		CustomRect {
 			color: {
@@ -67,9 +67,9 @@ CustomRect {
 					return Colors.palette.m3error;
 				return Colors.palette.m3surfaceContainerHigh;
 			}
-			implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2
+			implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
 			implicitWidth: implicitHeight
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 
 			MaterialIcon {
 				id: icon

Components/Toast/Toasts.qml

@@ -21,7 +21,7 @@ Item {
 		}
 		return h;
 	}
-	implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.normal * 2
+	implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.small * 2
 
 	Repeater {
 		id: repeater
@@ -82,7 +82,7 @@ Item {
 		Behavior on anchors.bottomMargin {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 		Behavior on opacity {
@@ -105,7 +105,7 @@ Item {
 			id: initAnim
 
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 			from: 0
 			properties: "opacity,scale"
 			target: toast

Drawers/Interactions.qml

@@ -236,7 +236,7 @@ Item {
 				}
 			}
 
-			if (Config.dock.enabled && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
 				root.visibilities.dock = true;
 
 			if (root.geometry.barContains(x, y))

Drawers/Panels.qml

@@ -111,7 +111,7 @@ Item {
 		id: toasts
 
 		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
-		anchors.margins: Tokens.padding.normal
+		anchors.margins: Tokens.padding.small
 		anchors.right: sidebar.left
 	}
 
@@ -161,7 +161,7 @@ Item {
 		Behavior on offsetScale {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 

Drawers/Windows.qml

@@ -11,7 +11,6 @@ import ZShell.Blobs
 import qs.Daemons
 import qs.Components
 import qs.Modules.Bar
-import qs.Modules.Bar.Popouts.Network as N
 import ZShell.Config
 import qs.Helpers
 import qs.Drawers
@@ -145,17 +144,7 @@ CustomWindow {
 	HyprlandFocusGrab {
 		id: focusGrab
 
-		active: {
-			const v = visibilities;
-			const conf = Config;
-			if (!N.PopupManager.closed && panels.popouts.hasCurrent)
-				return true;
-			if ((v.launcher && conf.launcher.enabled) || (v.sidebar && conf.sidebar.enabled) || (v.resources && conf.dashboard.performance.enabled) || (v.dashboard && conf.dashboard.enabled) || v.settings || (v.clipboard && conf.clipboard.enabled) || (v.dock && conf.dock.enabled))
-				return true;
-			if (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!conf.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
-				return true;
-			return false;
-		}
+		active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.clipboard || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!Config.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
 		windows: [root]
 
 		onCleared: {
@@ -236,7 +225,7 @@ CustomWindow {
 			implicitHeight: panels.dashboard.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.dashboard.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.dashboardWrapper
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.extraLarge
 			x: panels.dashboardWrapper.x + panels.dashboard.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.dashboard.width * extraExtent)
 			y: panels.dashboardWrapper.y + panels.dashboard.y + geometry.insetTop(root.borderThickness) - (geometry.horizontal && geometry.position !== "bottom" ? panels.dashboard.height * extraExtent : 0)
 		}
@@ -249,7 +238,7 @@ CustomWindow {
 			deformAmount: 0.06
 			implicitHeight: panels.launcher.height * (1 + extraHeight)
 			panel: panels.launcher
-			radius: Tokens.rounding.smallest + 5
+			radius: Tokens.rounding.medium + (Tokens.padding.largeIncreased / 4)
 			y: panels.launcher.y + geometry.insetTop(root.borderThickness)
 		}
 
@@ -278,7 +267,7 @@ CustomWindow {
 			id: notifsBg
 
 			panel: panels.notifications
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.large
 		}
 
 		PanelBg {
@@ -299,7 +288,7 @@ CustomWindow {
 			implicitHeight: panels.popouts.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.popouts.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.popoutsWrapper
-			radius: panels.popouts.current?.panelRadius ?? Tokens.rounding.normal
+			radius: panels.popouts.current?.panelRadius ?? Tokens.rounding.large
 			x: panels.popoutsWrapper.x + panels.popouts.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.popouts.width * extraExtent)
 			y: panels.popoutsWrapper.y + panels.popouts.y + geometry.insetTop(root.borderThickness) - (geometry.barOnTop ? panels.popouts.height * extraExtent : 0)
 
@@ -316,7 +305,7 @@ CustomWindow {
 			implicitHeight: panels.resources.height
 			implicitWidth: panels.resources.width
 			panel: panels.resourcesWrapper
-			radius: Tokens.rounding.large
+			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
 			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
 			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
 		}
@@ -326,7 +315,7 @@ CustomWindow {
 
 			deformAmount: 0.03
 			panel: panels.settings
-			radius: Tokens.rounding.large + Tokens.padding.normal
+			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
 		}
 
 		PanelBg {
@@ -334,7 +323,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.dock
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -342,7 +331,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.drawing
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -473,7 +462,7 @@ CustomWindow {
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 		x: panel.x + geometry.insetLeft(root.borderThickness)
 		y: panel.y + geometry.insetTop(root.borderThickness)
 	}

Greeter/Center.qml

@@ -18,7 +18,7 @@ ColumnLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
-	spacing: Tokens.spacing.large * 2
+	spacing: Tokens.spacing.largeIncreased * 2
 
 	RowLayout {
 		Layout.alignment: Qt.AlignHCenter
@@ -64,7 +64,7 @@ ColumnLayout {
 
 	CustomClippingRect {
 		Layout.alignment: Qt.AlignHCenter
-		Layout.topMargin: Tokens.spacing.large * 2
+		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: root.centerWidth / 2
 		implicitWidth: root.centerWidth / 2
@@ -99,7 +99,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.tPalette.m3surfaceContainer
 		focus: true
-		implicitHeight: input.implicitHeight + Tokens.padding.small * 2
+		implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2
 		implicitWidth: root.centerWidth * 0.8
 		radius: Tokens.rounding.full
 
@@ -130,11 +130,11 @@ ColumnLayout {
 			id: input
 
 			anchors.fill: parent
-			anchors.margins: Tokens.padding.small
-			spacing: Tokens.spacing.normal
+			anchors.margins: Tokens.padding.extraSmall
+			spacing: Tokens.spacing.medium
 
 			Item {
-				implicitHeight: statusIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: statusIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 
 				MaterialIcon {
@@ -174,7 +174,7 @@ ColumnLayout {
 
 			CustomRect {
 				color: root.greeter.buffer && !root.greeter.launching ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-				implicitHeight: enterIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 				radius: Tokens.rounding.full
 
@@ -200,7 +200,7 @@ ColumnLayout {
 
 	Item {
 		Layout.fillWidth: true
-		Layout.topMargin: -Tokens.spacing.large
+		Layout.topMargin: -Tokens.spacing.largeIncreased
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
 
 		Behavior on implicitHeight {

Greeter/Components/Anim.qml

@@ -30,11 +30,11 @@ NumberAnimation {
 		if (type === Anim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
 			return Tokens.anim.durations.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
+			return Tokens.anim.durations.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
 			return Tokens.anim.durations.expressiveSlowEffects;
 
@@ -42,22 +42,22 @@ NumberAnimation {
 		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
+			return Tokens.anim.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
+			return Tokens.anim.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
+			return Tokens.anim.expressiveSlowEffects;
 
 		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
+			return Tokens.anim.emphasized;
+		return Tokens.anim.standard;
 	}
 }

Greeter/Components/CAnim.qml

@@ -2,62 +2,6 @@ import QtQuick
 import ZShell.Config
 
 ColorAnimation {
-	enum Type {
-		StandardSmall = 0,
-		Standard,
-		StandardLarge,
-		StandardExtraLarge,
-		EmphasizedSmall,
-		Emphasized,
-		EmphasizedLarge,
-		EmphasizedExtraLarge,
-		FastSpatial,
-		DefaultSpatial,
-		SlowSpatial,
-		FastEffects,
-		DefaultEffects,
-		SlowEffects
-	}
-
-	property int type: CAnim.DefaultSpatial
-
-	duration: {
-		if (type < CAnim.StandardSmall || type > Anim.SlowEffects)
-			return Tokens.anim.durations.normal;
-
-		if (type === CAnim.FastSpatial)
-			return Tokens.anim.durations.expressiveFastSpatial;
-		if (type === CAnim.DefaultSpatial)
-			return Tokens.anim.durations.expressiveDefaultSpatial;
-		if (type === CAnim.SlowSpatial)
-			return Tokens.anim.durations.large;
-		if (type === CAnim.FastEffects)
-			return Tokens.anim.durations.expressiveFastEffects;
-		if (type === CAnim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
-		if (type === CAnim.SlowEffects)
-			return Tokens.anim.durations.expressiveSlowEffects;
-
-		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
-		return Tokens.anim.durations[types[idx]];
-	}
-	easing.bezierCurve: {
-		if (type === CAnim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
-		if (type === CAnim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
-		if (type === CAnim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
-		if (type === CAnim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
-		if (type === CAnim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
-		if (type === CAnim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
-
-		if (type >= CAnim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
-	}
+	duration: Tokens.anim.durations.expressiveSlowEffects
+	easing: Tokens.anim.expressiveSlowEffects
 }

Greeter/Components/CircularIndicator.qml

@@ -23,7 +23,7 @@ BusyIndicator {
 	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
-	property real strokeWidth: Tokens.padding.small * 0.8
+	property real strokeWidth: Tokens.padding.extraSmall * 0.8
 	property alias type: manager.indeterminateAnimationType
 
 	implicitHeight: implicitSize

Greeter/Components/CircularProgress.qml

@@ -21,7 +21,7 @@ Item {
 	readonly property real size: Math.min(width, height)
 	property int spacing: Tokens.spacing.small
 	property int startAngle: -90
-	property int strokeWidth: Tokens.padding.small
+	property int strokeWidth: Tokens.padding.extraSmall
 	property int sweepAngle: 360
 	readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
 	property real value

Greeter/Components/CustomTextField.qml

@@ -27,7 +27,7 @@ TextField {
 
 		color: Colors.palette.m3primary
 		implicitWidth: 2
-		radius: Tokens.rounding.normal
+		radius: Tokens.rounding.medium
 
 		Behavior on opacity {
 			Anim {

Greeter/Components/StateLayer.qml

@@ -81,7 +81,7 @@ MouseArea {
 
 		alwaysRunToEnd: true
 		duration: Tokens.anim.durations.expressiveSlowEffects * 2
-		easing.bezierCurve: Tokens.anim.curves.standard
+		easing: Tokens.anim.standard
 		property: "circleRadius"
 		target: root
 		to: root.endRadius

Greeter/Content.qml

@@ -11,18 +11,18 @@ RowLayout {
 	required property var greeter
 	required property real screenHeight
 
-	spacing: Tokens.spacing.large * 2
+	spacing: Tokens.spacing.largeIncreased * 2
 
 	ColumnLayout {
 		Layout.fillWidth: true
-		spacing: Tokens.spacing.normal
+		spacing: Tokens.spacing.medium
 
 		CustomRect {
 			Layout.fillWidth: true
 			color: Colors.tPalette.m3surfaceContainer
 			implicitHeight: weather.implicitHeight
 			radius: Tokens.rounding.small
-			topLeftRadius: Tokens.rounding.large
+			topLeftRadius: Tokens.rounding.largeIncreased
 
 			WeatherInfo {
 				id: weather
@@ -34,7 +34,7 @@ RowLayout {
 		CustomClippingRect {
 			Layout.fillHeight: true
 			Layout.fillWidth: true
-			bottomLeftRadius: Tokens.rounding.large
+			bottomLeftRadius: Tokens.rounding.largeIncreased
 			color: Colors.tPalette.m3surfaceContainer
 			radius: Tokens.rounding.small
 
@@ -51,15 +51,15 @@ RowLayout {
 
 	ColumnLayout {
 		Layout.fillWidth: true
-		spacing: Tokens.spacing.normal
+		spacing: Tokens.spacing.medium
 
 		CustomRect {
 			Layout.fillHeight: true
 			Layout.fillWidth: true
-			bottomRightRadius: Tokens.rounding.large
+			bottomRightRadius: Tokens.rounding.largeIncreased
 			color: Colors.tPalette.m3surfaceContainer
 			radius: Tokens.rounding.small
-			topRightRadius: Tokens.rounding.large
+			topRightRadius: Tokens.rounding.largeIncreased
 
 			SessionDock {
 				greeter: root.greeter

Greeter/GreeterSurface.qml

@@ -43,7 +43,7 @@ Scope {
 					ParallelAnimation {
 						Anim {
 							duration: Tokens.anim.durations.expressiveFastSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+							easing: Tokens.anim.expressiveFastSpatial
 							property: "scale"
 							target: lockContent
 							to: 1
@@ -65,7 +65,7 @@ Scope {
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "scale"
 							target: content
 							to: 1
@@ -74,12 +74,12 @@ Scope {
 						Anim {
 							property: "radius"
 							target: lockBg
-							to: Tokens.rounding.large * 1.5
+							to: Tokens.rounding.largeIncreased * 1.5
 						}
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "implicitWidth"
 							target: lockContent
 							to: (win.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio
@@ -87,7 +87,7 @@ Scope {
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "implicitHeight"
 							target: lockContent
 							to: (win.screen?.height ?? 0) * Config.lock.sizes.heightMult

Greeter/InputField.qml

@@ -113,7 +113,7 @@ Item {
 			Behavior on scale {
 				Anim {
 					duration: Tokens.anim.durations.expressiveFastSpatial
-					easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+					easing: Tokens.anim.expressiveFastSpatial
 				}
 			}
 

Greeter/SessionDock.qml

@@ -13,7 +13,7 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.smaller
+	spacing: Tokens.spacing.small
 
 	CustomText {
 		Layout.fillWidth: true
@@ -41,7 +41,7 @@ ColumnLayout {
 				}
 			}
 			sourceComponent: ColumnLayout {
-				spacing: Tokens.spacing.large
+				spacing: Tokens.spacing.largeIncreased
 
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
@@ -79,8 +79,8 @@ ColumnLayout {
 
 				anchors.left: parent?.left
 				anchors.right: parent?.right
-				implicitHeight: row.implicitHeight + Tokens.padding.normal * 2
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
+				radius: Tokens.rounding.medium - Tokens.padding.small
 
 				StateLayer {
 					onClicked: {
@@ -92,8 +92,8 @@ ColumnLayout {
 					id: row
 
 					anchors.fill: parent
-					anchors.margins: Tokens.padding.normal
-					spacing: Tokens.spacing.normal
+					anchors.margins: Tokens.padding.small
+					spacing: Tokens.spacing.medium
 
 					MaterialIcon {
 						color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
@@ -129,13 +129,13 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: sessions.currentItem?.implicitHeight ?? 0
 				implicitWidth: sessions.width
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				radius: Tokens.rounding.medium - Tokens.padding.small
 				y: sessions.currentItem?.y ?? 0
 
 				Behavior on y {
 					Anim {
 						duration: Tokens.anim.durations.small
-						easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+						easing: Tokens.anim.expressiveDefaultEffects
 					}
 				}
 			}

Greeter/UserDock.qml

@@ -14,7 +14,7 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.smaller
+	spacing: Tokens.spacing.small
 
 	CustomText {
 		Layout.fillWidth: true
@@ -42,7 +42,7 @@ ColumnLayout {
 				}
 			}
 			sourceComponent: ColumnLayout {
-				spacing: Tokens.spacing.large
+				spacing: Tokens.spacing.largeIncreased
 
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
@@ -81,8 +81,8 @@ ColumnLayout {
 
 				anchors.left: parent?.left
 				anchors.right: parent?.right
-				implicitHeight: row.implicitHeight + Tokens.padding.normal * 2
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
+				radius: Tokens.rounding.medium - Tokens.padding.small
 
 				StateLayer {
 					onClicked: {
@@ -94,8 +94,8 @@ ColumnLayout {
 					id: row
 
 					anchors.fill: parent
-					anchors.margins: Tokens.padding.normal
-					spacing: Tokens.spacing.normal
+					anchors.margins: Tokens.padding.small
+					spacing: Tokens.spacing.medium
 
 					CustomClippingRect {
 						Layout.preferredHeight: 50
@@ -135,13 +135,13 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: users.currentItem?.implicitHeight ?? 0
 				implicitWidth: users.width
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				radius: Tokens.rounding.medium - Tokens.padding.small
 				y: users.currentItem?.y ?? 0
 
 				Behavior on y {
 					Anim {
-						duration: Tokens.anim.durations.small
-						easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+						duration: Tokens.anim.durations.expressiveDefaultEffects
+						easing: Tokens.anim.expressiveDefaultEffects
 					}
 				}
 			}

Greeter/WeatherInfo.qml

@@ -34,7 +34,7 @@ ColumnLayout {
 
 	RowLayout {
 		Layout.fillWidth: true
-		spacing: Tokens.spacing.large
+		spacing: Tokens.spacing.largeIncreased
 
 		MaterialIcon {
 			animate: true
@@ -67,7 +67,7 @@ ColumnLayout {
 		}
 
 		Loader {
-			Layout.rightMargin: Tokens.padding.smaller
+			Layout.rightMargin: Tokens.padding.small
 			active: root.width > 400
 			visible: active
 
@@ -103,12 +103,12 @@ ColumnLayout {
 
 		Layout.bottomMargin: Tokens.padding.large * 2
 		Layout.fillWidth: true
-		Layout.topMargin: Tokens.spacing.smaller
+		Layout.topMargin: Tokens.spacing.small
 		active: root.rootHeight > 820
 		visible: active
 
 		sourceComponent: RowLayout {
-			spacing: Tokens.spacing.large
+			spacing: Tokens.spacing.largeIncreased
 
 			Repeater {
 				model: {

Helpers/Icons.qml

@@ -77,6 +77,16 @@ Singleton {
 			"99": "thunderstorm"
 		})
 
+	function getAppCategoryIcon(name: string, fallback: string): string {
+		const categories = DesktopEntries.heuristicLookup(name)?.categories;
+
+		if (categories)
+			for (const [key, value] of Object.entries(categoryIcons))
+				if (categories.includes(key))
+					return value;
+		return fallback;
+	}
+
 	function getAppIcon(name: string, fallback: string): string {
 		const icon = DesktopEntries.heuristicLookup(name)?.icon;
 		if (fallback !== "undefined")

Helpers/Network.qml

@@ -1,114 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Networking
-import QtQuick
-
-Singleton {
-	id: root
-
-	property bool active: false
-	readonly property list<Network> connectedNetworks: networks.filter(n => n.connected)
-	property Network connectingNetwork
-	readonly property list<NetworkDevice> devices: Networking.devices.values
-	property Network failedNetwork
-	readonly property list<Network> knownNetworks: networks.filter(n => n.known && !n.connected)
-	readonly property list<Network> networks: {
-		const list = [];
-		for (const d of wifiDevices) {
-			for (const n of d.networks.values) {
-				if (!list.includes(n))
-					list.push(n);
-			}
-		}
-		return list;
-	}
-	property bool scanning: false
-	readonly property list<Network> unknownNetworks: networks.filter(n => !n.known)
-	readonly property list<WifiDevice> wifiDevices: devices.filter(d => wifiDevice(d))
-	readonly property bool wifiEnabled: Networking.wifiEnabled
-
-	signal networkConnected
-
-	function isSecure(security): bool {
-		return (security === WifiSecurityType.WpaPsk || security === WifiSecurityType.Wpa2Psk || security === WifiSecurityType.Sae);
-	}
-
-	function requestConnect(network: Network, secret = undefined): void {
-		connectingNetwork = network;
-		if (secret === undefined || secret === "") {
-			network.connect();
-		} else {
-			(network as WifiNetwork).connectWithPsk(secret);
-		}
-	}
-
-	function setScan(value: bool): void {
-		for (const d of wifiDevices) {
-			d.scannerEnabled = value;
-		}
-	}
-
-	function setWifi(value: bool): void {
-		Networking.wifiEnabled = value;
-	}
-
-	function wifiDevice(dev): bool {
-		return dev.type === DeviceType.Wifi;
-	}
-
-	onActiveChanged: {
-		for (const d of wifiDevices)
-			d.scannerEnabled = active;
-	}
-
-	Timer {
-		id: flushFailed
-
-		interval: 5000
-		running: root.failedNetwork
-
-		onTriggered: {
-			root.failedNetwork = null;
-		}
-	}
-
-	Timer {
-		id: checkConnection
-
-		interval: 500
-		repeat: true
-		running: root.connectingNetwork
-
-		onTriggered: {
-			var completedNetwork;
-
-			switch (root.connectingNetwork.state) {
-			case ConnectionState.Connecting:
-				break;
-			case ConnectionState.Connected:
-				completedNetwork = root.connectingNetwork;
-				root.networkConnected();
-				break;
-			case ConnectionState.Disconnected:
-				root.failedNetwork = root.connectingNetwork;
-				completedNetwork = root.connectingNetwork;
-				break;
-			}
-
-			if (completedNetwork) {
-				root.connectingNetwork = null;
-			}
-		}
-	}
-
-	Timer {
-		interval: 10000
-		running: checkConnection.running
-
-		onTriggered: {
-			root.failedNetwork = root.connectingNetwork;
-			root.connectingNetwork = null;
-		}
-	}
-}

Helpers/Picker.qml

@@ -391,7 +391,7 @@ Item {
 		tool: root.tool
 		visible: root.mode === "edit"
 		x: Math.max(8, Math.min(root.rsx + root.sw / 2 - width / 2, root.screen.width - width - 8))
-		y: (root.rsy + root.sh + height + Tokens.padding.normal <= root.screen.height) ? root.rsy + root.sh + Tokens.padding.normal : (root.rsy - height - Tokens.padding.normal <= 0) ? root.rsy + root.sh - height - Tokens.padding.normal : root.rsy - height - Tokens.padding.normal
+		y: (root.rsy + root.sh + height + Tokens.padding.small <= root.screen.height) ? root.rsy + root.sh + Tokens.padding.small : (root.rsy - height - Tokens.padding.small <= 0) ? root.rsy + root.sh - height - Tokens.padding.small : root.rsy - height - Tokens.padding.small
 
 		onCancelRequested: root.cancel()
 		onClearRequested: annotations.clearAll()

Helpers/Picker/AnnotationToolbar.qml

@@ -49,9 +49,9 @@ CustomRect {
 	signal undoRequested
 
 	color: Colors.palette.m3surface
-	height: row.implicitHeight + Tokens.padding.normal * 2
+	height: row.implicitHeight + Tokens.padding.small * 2
 	radius: Tokens.rounding.full
-	width: row.implicitWidth + Tokens.padding.normal * 2
+	width: row.implicitWidth + Tokens.padding.small * 2
 
 	RowLayout {
 		id: row
@@ -73,6 +73,7 @@ CustomRect {
 					required property var modelData
 
 					color: root.tool === modelData.id ? "#3584e4" : "transparent"
+					font.pointSize: Tokens.font.size.large
 					icon: tool.modelData.glyph
 					inactiveColor: root.tool === modelData.id ? Colors.palette.m3primary : "transparent"
 					inactiveOnColor: root.tool === modelData.id ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
@@ -98,11 +99,11 @@ CustomRect {
 				model: root.colorPalette
 
 				delegate: IconButton {
-					readonly property real buttonSize: toolRow.implicitHeight - Tokens.padding.normal
+					readonly property real buttonSize: toolRow.implicitHeight - Tokens.padding.small
 					required property color modelData
 
 					fillWidth: false
-					font.pointSize: 0
+					font.pointSize: Tokens.font.size.large
 					icon: ""
 					implicitHeight: buttonSize
 					implicitWidth: buttonSize
@@ -127,6 +128,7 @@ CustomRect {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
+				font.pointSize: Tokens.font.size.large
 				icon: "undo"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -138,6 +140,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font.pointSize: Tokens.font.size.large
 				icon: "delete_history"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -149,6 +152,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font.pointSize: Tokens.font.size.large
 				icon: "content_copy"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -160,6 +164,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font.pointSize: Tokens.font.size.large
 				icon: "delete_forever"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -171,6 +176,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font.pointSize: Tokens.font.size.large
 				icon: "check"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface

Modules/Bar/Bar.qml

@@ -205,6 +205,15 @@ GridLayout {
 				}
 			}
 
+			DelegateChoice {
+				roleValue: "network"
+
+				delegate: EntryWrapper {
+					NetworkWidget {
+					}
+				}
+			}
+
 			DelegateChoice {
 				roleValue: "media"
 

Modules/Bar/BarLoader.qml

@@ -16,7 +16,7 @@ Item {
 	required property bool fullscreen
 	readonly property bool horizontal: position !== "left"
 	property bool isHovered
-	readonly property int padding: Math.max(Tokens.padding.smaller, Config.bar.border)
+	readonly property int padding: Math.max(Tokens.padding.small, Config.bar.border)
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property string position

Modules/Bar/Components/Clock.qml

@@ -44,7 +44,7 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.normal * 2 : verticalColumn.implicitHeight + Tokens.padding.larger * 2
+	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.small * 2 : verticalColumn.implicitHeight + Tokens.padding.small * 2
 	required property PersistentProperties visibilities
 
 	color: visibilities.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
@@ -72,7 +72,7 @@ WidgetBase {
 		id: verticalColumn
 
 		anchors.centerIn: parent
-		spacing: Tokens.padding.small ?? 2
+		spacing: Tokens.padding.extraSmall ?? 2
 		visible: !root.horizontal
 		width: root.baseSize
 
@@ -96,8 +96,8 @@ WidgetBase {
 
 		Rectangle {
 			Layout.alignment: Qt.AlignHCenter
-			Layout.bottomMargin: Tokens.padding.small ?? 2
-			Layout.topMargin: Tokens.padding.small ?? 2
+			Layout.bottomMargin: Tokens.padding.extraSmall ?? 2
+			Layout.topMargin: Tokens.padding.extraSmall ?? 2
 			color: root.contentColor
 			height: 1
 			implicitWidth: root.baseSize * 0.5

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -7,13 +7,13 @@ import qs.Helpers
 Row {
 	id: root
 
-	property real batHeight: Tokens.padding.smaller * 2
-	property real batWidth: Tokens.padding.larger * 2
+	property real batHeight: Tokens.padding.small * 2
+	property real batWidth: Tokens.padding.medium * 2
 	required property string devState
-	property real nubHeight: Tokens.padding.small
+	property real nubHeight: Tokens.padding.extraSmall
 	property real nubWidth: 2
 	required property real percentage
-	property real radius: Tokens.rounding.smallest / 2
+	property real radius: Tokens.rounding.small / 2
 
 	spacing: 1
 

Modules/Bar/Components/MediaWidget.qml

@@ -12,8 +12,8 @@ WidgetBase {
 	readonly property string currentMedia: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title")
 	readonly property int textWidth: Math.min(metrics.width, 200)
 
-	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.normal * 2
-	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.normal * 2 : baseSize
+	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.small * 2
+	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {
@@ -39,11 +39,11 @@ WidgetBase {
 	GridLayout {
 		id: layout
 
-		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.normal
+		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.small
 		anchors.fill: parent
-		anchors.leftMargin: root.horizontal ? Tokens.padding.normal : 0
-		anchors.rightMargin: root.horizontal ? Tokens.padding.normal : 0
-		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.normal
+		anchors.leftMargin: root.horizontal ? Tokens.padding.small : 0
+		anchors.rightMargin: root.horizontal ? Tokens.padding.small : 0
+		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.small
 		columns: root.horizontal ? -1 : 1
 
 		Behavior on implicitWidth {

Modules/Bar/Components/Resource.qml

@@ -22,7 +22,7 @@ GridLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
-	columnSpacing: Tokens.spacing.smaller
+	columnSpacing: Tokens.spacing.medium
 	columns: horizontal ? -1 : 1
 	percentage: 0
 
@@ -49,7 +49,7 @@ GridLayout {
 	}
 
 	CustomClippingRect {
-		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.small : 4
+		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.extraSmall : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		radius: Tokens.rounding.full

Modules/Bar/Components/Resources.qml

@@ -16,8 +16,8 @@ WidgetBase {
 
 	clip: true
 	color: visibilities.resources ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
-	implicitHeight: horizontal ? baseSize : gridLayout.implicitHeight + Tokens.padding.normal * 2
-	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.larger * 2 : baseSize
+	implicitHeight: horizontal ? baseSize : gridLayout.implicitHeight + Tokens.padding.medium * 2
+	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.medium * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	StateLayer {
@@ -32,7 +32,7 @@ WidgetBase {
 		anchors.centerIn: parent
 		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
 		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
-		columnSpacing: Tokens.spacing.smaller
+		columnSpacing: Tokens.spacing.small
 		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {

Modules/Bar/Components/StatusIcons.qml

@@ -30,8 +30,8 @@ WidgetBase {
 				return i;
 		return -1;
 	}
-	readonly property real size: horizontal ? grid.implicitWidth + Tokens.padding.small * 2 : grid.implicitHeight + Tokens.padding.small * 2
-	readonly property int spacing: Tokens.spacing.normal / 2
+	readonly property real size: horizontal ? grid.implicitWidth + grid.anchors.leftMargin + grid.anchors.rightMargin : grid.implicitHeight + grid.anchors.bottomMargin + grid.anchors.topMargin
+	readonly property int spacing: Tokens.spacing.medium / 2
 
 	// Entries that can shrink to nothing, spacing included
 	function collapsed(entry: var): bool {
@@ -40,13 +40,13 @@ WidgetBase {
 		return false;
 	}
 
-	bottomLeftRadius: horizontal ? Tokens.rounding.smallest / 2 : Tokens.rounding.full
+	bottomLeftRadius: horizontal ? Tokens.rounding.small / 2 : Tokens.rounding.full
 	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : size
 	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
-	topLeftRadius: Tokens.rounding.smallest / 2
-	topRightRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.smallest / 2
+	topLeftRadius: Tokens.rounding.small / 2
+	topRightRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.small / 2
 
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
@@ -64,11 +64,11 @@ WidgetBase {
 	GridLayout {
 		id: grid
 
-		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.small
+		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.medium
 		anchors.fill: parent
-		anchors.leftMargin: root.horizontal ? Tokens.padding.small : 0
-		anchors.rightMargin: root.horizontal ? Tokens.padding.small : 0
-		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.small
+		anchors.leftMargin: root.horizontal ? Tokens.padding.extraSmall : 0
+		anchors.rightMargin: root.horizontal ? Tokens.padding.extraSmall : 0
+		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 
 		Repeater {
@@ -105,28 +105,6 @@ WidgetBase {
 					}
 				}
 
-				DelegateChoice {
-					roleValue: "bluetooth"
-
-					delegate: EntryWrapper {
-						name: "bluetooth"
-
-						BluetoothWidget {
-						}
-					}
-				}
-
-				DelegateChoice {
-					roleValue: "network"
-
-					delegate: EntryWrapper {
-						name: "network"
-
-						NetworkWidget {
-						}
-					}
-				}
-
 				DelegateChoice {
 					roleValue: "power"
 

Modules/Bar/Components/StatusIcons/BluetoothWidget.qml

@@ -1,14 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
-import qs.Components
-
-MaterialIcon {
-	Layout.alignment: Qt.AlignVCenter
-	animate: true
-	color: Colors.palette.m3onSurface // Network.connected ? root.textColor : Colors.palette.m3error
-	fill: 1
-	font.pointSize: Tokens.font.size.larger
-	text: "bluetooth"
-}

Modules/Bar/Components/StatusIcons/NetworkWidget.qml

@@ -1,14 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
-import qs.Components
-
-MaterialIcon {
-	Layout.alignment: Qt.AlignVCenter
-	animate: true
-	color: Colors.palette.m3onSurface // Network.connected ? root.textColor : Colors.palette.m3error
-	fill: 1
-	font.pointSize: Tokens.font.size.larger
-	text: "android_wifi_4_bar"
-}

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -40,7 +40,7 @@ Item {
 		anchors.centerIn: parent
 
 		sourceComponent: BatteryIcon {
-			devState: Battery.deviceStateString
+			devState: Battery.deviceStateString.toLowerCase()
 			percentage: Battery.currentPerc
 		}
 	}

Modules/Bar/Components/TrayIcons.qml

@@ -16,22 +16,26 @@ WidgetBase {
 	readonly property alias items: repeater
 	readonly property alias layout: sysGrid
 	required property GridLayout loader
-	readonly property int padding: Tokens.padding.small
+	readonly property int padding: Tokens.padding.extraSmall
 	required property Wrapper popouts
-	readonly property real size: horizontal ? sysGrid.implicitWidth + Tokens.padding.small : sysGrid.implicitHeight + Tokens.padding.small
+	readonly property real size: horizontal ? sysGrid.implicitWidth + sysGrid.anchors.leftMargin + sysGrid.anchors.rightMargin : sysGrid.implicitHeight + sysGrid.anchors.topMargin + sysGrid.anchors.bottomMargin
 
-	bottomLeftRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.smallest / 2
-	bottomRightRadius: Tokens.rounding.smallest / 2
+	bottomLeftRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.small / 2
+	bottomRightRadius: Tokens.rounding.small / 2
 	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : size
 	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
-	topRightRadius: horizontal ? Tokens.rounding.smallest / 2 : Tokens.rounding.full
+	topRightRadius: horizontal ? Tokens.rounding.small / 2 : Tokens.rounding.full
 
 	GridLayout {
 		id: sysGrid
 
+		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		anchors.centerIn: parent
+		anchors.leftMargin: root.horizontal ? Tokens.padding.extraSmall : 0
+		anchors.rightMargin: root.horizontal ? Tokens.padding.extraSmall : 0
+		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 		rowSpacing: -2
 
@@ -46,6 +50,7 @@ WidgetBase {
 				required property int index
 				required property SystemTrayItem modelData
 
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 				implicitHeight: 34
 				implicitWidth: 34
 				ind: index

Modules/Bar/Components/Workspaces.qml

@@ -12,7 +12,7 @@ import qs.Services
 Item {
 	id: root
 
-	property real activeWorkspaceMargin: Math.ceil(Tokens.padding.small / 2)
+	property real activeWorkspaceMargin: Math.ceil(Tokens.padding.medium / 4)
 	readonly property int effectiveActiveWorkspaceId: monitor?.activeWorkspace?.id ?? 1
 	required property bool horizontal
 	readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)

Modules/Bar/Popouts/AudioPopout.qml

@@ -15,12 +15,13 @@ import qs.Services
 Item {
 	id: root
 
-	readonly property int rounding: Tokens.rounding.small - Tokens.padding.small
+	readonly property int panelRadius: Tokens.rounding.largeIncreased + Tokens.padding.smaller
+	readonly property int rounding: panelRadius - Tokens.padding.smaller
 	readonly property int topMargin: 0
 	required property var wrapper
 
-	implicitHeight: vol.implicitHeight + Tokens.padding.small * 2
-	implicitWidth: 500 + Tokens.padding.small * 2
+	implicitHeight: vol.implicitHeight + Tokens.padding.smaller * 2
+	implicitWidth: 500 + Tokens.padding.smaller * 2
 
 	CustomRect {
 		anchors.left: parent.left
@@ -28,7 +29,7 @@ Item {
 		anchors.top: parent.top
 		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: parent.implicitHeight
-		radius: Tokens.rounding.small
+		radius: root.rounding
 		y: parent.y
 
 		Behavior on implicitHeight {
@@ -41,7 +42,7 @@ Item {
 		id: vol
 
 		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
+		anchors.margins: Tokens.padding.smaller
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
 	}
@@ -51,17 +52,17 @@ Item {
 
 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 65 + Tokens.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Tokens.spacing.small * 2
 			Layout.topMargin: root.topMargin
 			color: Colors.tPalette.m3surfaceContainer
-			radius: root.rounding
+			radius: root.rounding - vol.anchors.margins
 
 			ColumnLayout {
-				anchors.bottomMargin: Tokens.padding.smaller
+				anchors.bottomMargin: Tokens.padding.small
 				anchors.fill: parent
-				anchors.leftMargin: Tokens.padding.larger
-				anchors.rightMargin: Tokens.padding.larger
-				anchors.topMargin: Tokens.padding.smaller
+				anchors.leftMargin: Tokens.padding.small
+				anchors.rightMargin: Tokens.padding.small
+				anchors.topMargin: Tokens.padding.small
 
 				RowLayout {
 					Layout.fillHeight: true
@@ -82,12 +83,12 @@ Item {
 				}
 
 				RowLayout {
-					spacing: Tokens.spacing.large
+					spacing: Tokens.spacing.largeIncreased
 
 					CustomMouseArea {
-						Layout.bottomMargin: Tokens.padding.normal
+						Layout.bottomMargin: Tokens.padding.small
 						Layout.fillWidth: true
-						Layout.preferredHeight: Tokens.padding.larger * 3
+						Layout.preferredHeight: Tokens.padding.medium * 3
 
 						CustomSlider {
 							anchors.left: parent.left
@@ -109,7 +110,7 @@ Item {
 					}
 
 					CustomSwitch {
-						Layout.bottomMargin: Tokens.padding.normal
+						Layout.bottomMargin: Tokens.padding.small
 						checked: !Audio.muted
 
 						onToggled: {
@@ -124,10 +125,10 @@ Item {
 
 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 65 + Tokens.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Tokens.spacing.small * 2
 			Layout.topMargin: root.topMargin
 			color: Colors.tPalette.m3surfaceContainer
-			radius: root.rounding
+			radius: root.rounding - vol.anchors.margins
 
 			PwNodePeakMonitor {
 				id: sourcePeak
@@ -151,11 +152,11 @@ Item {
 			}
 
 			ColumnLayout {
-				anchors.bottomMargin: Tokens.padding.smaller
+				anchors.bottomMargin: Tokens.padding.small
 				anchors.fill: parent
-				anchors.leftMargin: Tokens.padding.larger
-				anchors.rightMargin: Tokens.padding.larger
-				anchors.topMargin: Tokens.padding.smaller
+				anchors.leftMargin: Tokens.padding.small
+				anchors.rightMargin: Tokens.padding.small
+				anchors.topMargin: Tokens.padding.small
 
 				RowLayout {
 					Layout.fillHeight: true
@@ -176,12 +177,12 @@ Item {
 				}
 
 				RowLayout {
-					spacing: Tokens.spacing.large
+					spacing: Tokens.spacing.largeIncreased
 
 					CustomMouseArea {
-						Layout.bottomMargin: Tokens.padding.normal
+						Layout.bottomMargin: Tokens.padding.small
 						Layout.fillWidth: true
-						Layout.preferredHeight: Tokens.padding.larger * 3
+						Layout.preferredHeight: Tokens.padding.medium * 3
 
 						CustomSlider {
 							anchors.left: parent.left
@@ -203,7 +204,7 @@ Item {
 					}
 
 					CustomSwitch {
-						Layout.bottomMargin: Tokens.padding.normal
+						Layout.bottomMargin: Tokens.padding.small
 						checked: !Audio.sourceMuted
 
 						onToggled: {
@@ -236,10 +237,10 @@ Item {
 				required property var modelData
 
 				Layout.fillWidth: true
-				Layout.preferredHeight: 65 + Tokens.spacing.smaller * 2
+				Layout.preferredHeight: 65 + Tokens.spacing.small * 2
 				Layout.topMargin: root.topMargin
 				color: Colors.tPalette.m3surfaceContainer
-				radius: root.rounding
+				radius: root.rounding - vol.anchors.margins
 
 				PwNodePeakMonitor {
 					id: peak
@@ -271,11 +272,11 @@ Item {
 				}
 
 				ColumnLayout {
-					anchors.bottomMargin: Tokens.padding.smaller
+					anchors.bottomMargin: Tokens.padding.small
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.larger
-					anchors.rightMargin: Tokens.padding.larger
-					anchors.topMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
+					anchors.rightMargin: Tokens.padding.small
+					anchors.topMargin: Tokens.padding.small
 
 					RowLayout {
 						Layout.fillHeight: true
@@ -297,12 +298,12 @@ Item {
 					}
 
 					RowLayout {
-						spacing: Tokens.spacing.large
+						spacing: Tokens.spacing.largeIncreased
 
 						CustomMouseArea {
-							Layout.bottomMargin: Tokens.padding.normal
+							Layout.bottomMargin: Tokens.padding.small
 							Layout.fillWidth: true
-							Layout.preferredHeight: Tokens.padding.larger * 3
+							Layout.preferredHeight: Tokens.padding.medium * 3
 
 							CustomSlider {
 								anchors.left: parent.left
@@ -324,7 +325,7 @@ Item {
 						}
 
 						CustomSwitch {
-							Layout.bottomMargin: Tokens.padding.normal
+							Layout.bottomMargin: Tokens.padding.small
 							checked: !appBox.modelData.audio.muted
 
 							onToggled: {

Modules/Bar/Popouts/BluetoothPopout.qml

@@ -1,385 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import QtQml.Models
-import Quickshell
-import Quickshell.Bluetooth
-import ZShell.Components
-import ZShell.Config
-import qs.Services
-import qs.Components
-import qs.Helpers
-
-CustomClippingRect {
-	id: root
-
-	readonly property list<var> btConnected: Bluetooth.devices.values.filter(d => d.connected)
-
-	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
-	implicitWidth: 500
-
-	ColumnLayout {
-		id: layout
-
-		anchors.fill: parent
-		anchors.margins: Tokens.padding.larger
-		spacing: Tokens.spacing.extraSmall / 2
-
-		CustomText {
-			Layout.rightMargin: Tokens.padding.extraSmall
-			Layout.topMargin: Tokens.padding.normal
-			font.pointSize: Tokens.font.size.large
-			text: qsTr("Bluetooth")
-		}
-
-		Toggle {
-			checked: Bluetooth.defaultAdapter?.enabled ?? false // qmllint disable unresolved-type
-			first: true
-			subtext: qsTr("Toggle bluetooth device state")
-			text: checked ? qsTr("Enabled") : qsTr("Disabled")
-
-			onToggled: {
-				const adapter = Bluetooth.defaultAdapter; // qmllint disable unresolved-type
-				if (adapter)
-					adapter.enabled = checked;
-			}
-		}
-
-		Toggle {
-			checked: Bluetooth.defaultAdapter?.discovering ?? false // qmllint disable unresolved-type
-			last: root.btConnected.length === 0
-			subtext: qsTr("Enable scanning for new devices")
-			text: qsTr("Discover")
-
-			onToggled: {
-				const adapter = Bluetooth.defaultAdapter; // qmllint disable unresolved-type
-				if (adapter)
-					adapter.discovering = checked;
-			}
-		}
-
-		ListView {
-			id: rows
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: contentHeight
-			interactive: false
-			section.property: "connected"
-			spacing: Tokens.spacing.extraSmall / 2
-
-			add: Transition {
-				Anim {
-					from: 0
-					property: "opacity"
-					to: 1
-				}
-			}
-			delegate: DelegateChooser {
-				role: "isDivider"
-
-				DelegateChoice {
-					roleValue: true
-
-					delegate: StatusDivider {
-					}
-				}
-
-				DelegateChoice {
-					delegate: BluetoothItem {
-						list: rows
-						width: rows.width
-					}
-				}
-			}
-			displaced: Transition {
-				Anim {
-					easing.type: Easing.OutCubic
-					property: "y"
-				}
-			}
-			model: ScriptModel {
-				objectProp: "address"
-				values: {
-					const byName = (a, b) => a.name.localeCompare(b.name);
-					return [...[...Bluetooth.devices.values].filter(d => d.connected).sort(byName).slice(0, 5),
-						{
-							isDivider: true
-						},
-						...[...Bluetooth.devices.values].filter(d => !d.connected).sort(byName).slice(0, 5)];
-				}
-			}
-			move: Transition {
-				Anim {
-					easing.type: Easing.OutCubic
-					property: "y"
-				}
-			}
-			remove: Transition {
-				Anim {
-					property: "opacity"
-					to: 0
-				}
-			}
-			section.delegate: Rectangle {
-				required property string section
-
-				color: "transparent"
-				height: childrenRect.height
-				width: ListView.view.width
-
-				CustomText {
-					text: parent.section
-				}
-			}
-		}
-	}
-
-	component BluetoothItem: ConnectedRect {
-		id: btItem
-
-		readonly property int connectedCount: root.btConnected.length
-		readonly property bool connecting: Network.connectingNetwork === modelData
-		property int horizontalPadding: Tokens.padding.largeIncreased
-		readonly property bool inConnectedGroup: index < connectedCount
-		required property int index
-		required property ListView list
-		readonly property bool loading: modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting // qmllint disable unresolved-type
-
-		required property BluetoothDevice modelData
-		property int verticalPadding: Tokens.padding.smaller
-
-		first: !inConnectedGroup && index === connectedCount + 1
-		implicitHeight: rowLayout.implicitHeight + verticalPadding * 2
-		last: inConnectedGroup ? index === connectedCount - 1 : index === list.count - 1
-		radius: Tokens.rounding.small
-
-		Timer {
-			interval: 50
-			running: btItem.ListView.delayRemove
-
-			onTriggered: btItem.ListView.delayRemove = false
-		}
-
-		Connections {
-			function onConnectedChanged(): void {
-				if (!btItem.modelData.connected)
-					btItem.ListView.delayRemove = true;
-			}
-
-			function onPairedChanged(): void {
-				if (btItem.modelData.paired)
-					btItem.modelData.connect();
-			}
-
-			target: btItem.modelData
-		}
-
-		RowLayout {
-			id: rowLayout
-
-			anchors.fill: parent
-			anchors.leftMargin: btItem.horizontalPadding
-			anchors.rightMargin: btItem.horizontalPadding
-
-			Column {
-				id: column
-
-				Layout.fillWidth: true
-
-				CustomText {
-					Layout.fillWidth: true
-					Layout.leftMargin: Tokens.spacing.extraSmall
-					Layout.rightMargin: Tokens.spacing.extraSmall
-					elide: Text.ElideRight
-					text: btItem.modelData.name
-				}
-
-				CustomText {
-					id: subtext
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					color: Colors.palette.m3outline
-					elide: Text.ElideRight
-					font.pointSize: Tokens.font.size.small
-					text: btItem.modelData.connected ? (btItem.modelData.batteryAvailable ? qsTr("%1 battery left").arg(Math.round(btItem.modelData.battery * 100) + "%") : qsTr("Battery status unknown")) : btItem.modelData.address
-				}
-			}
-
-			Item {
-				Layout.alignment: Qt.AlignRight
-				implicitHeight: icon.height
-				implicitWidth: icon.width
-
-				MaterialIcon {
-					id: icon
-
-					font.pointSize: Tokens.font.size.large
-					opacity: btItem.connecting ? 0 : 1
-					text: btItem.modelData.batteryAvailable ? Icons.getBatteryIcon(btItem.modelData.battery) : "battery_unknown"
-					visible: btItem.modelData.state === BluetoothDeviceState.Connected  // qmllint disable unresolved-type
-
-					Behavior on opacity {
-						Anim {
-						}
-					}
-				}
-
-				Loader {
-					active: opacity > 0
-					anchors.fill: parent
-					opacity: btItem.connecting ? 1 : 0
-
-					Behavior on opacity {
-						Anim {
-						}
-					}
-					sourceComponent: CircularIndicator {
-						bgColor: "transparent"
-						running: true
-					}
-				}
-			}
-
-			ButtonRow {
-				spacing: Tokens.spacing.small
-
-				IconTextButton {
-					font.pointSize: Tokens.font.size.small
-					icon: btItem.modelData.connected ? "link_off" : btItem.modelData.paired ? "link" : "add_link"
-					text: btItem.modelData.connected ? qsTr("Disconnect") : btItem.modelData.paired ? qsTr("Connect") : qsTr("Pair")
-
-					onClicked: {
-						if (btItem.modelData.connected)
-							btItem.modelData.disconnect();
-						else if (btItem.modelData.paired)
-							btItem.modelData.connect();
-						else if (!btItem.modelData.paired)
-							btItem.modelData.pair();
-						else if (btItem.modelData.pairing)
-							btItem.modelData.cancelPair();
-					}
-				}
-			}
-		}
-	}
-	component ConnectedRect: CustomRect {
-		id: bg
-
-		property bool first
-		property bool last
-
-		bottomLeftRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		bottomRightRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		color: Colors.tPalette.m3surfaceContainer
-		topLeftRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		topRightRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
-
-		Behavior on bottomLeftRadius {
-			Anim {
-			}
-		}
-		Behavior on bottomRightRadius {
-			Anim {
-			}
-		}
-		Behavior on topLeftRadius {
-			Anim {
-			}
-		}
-		Behavior on topRightRadius {
-			Anim {
-			}
-		}
-	}
-	component StatusDivider: CustomText {
-		bottomPadding: Tokens.spacing.extraSmall
-		color: Colors.palette.m3onSurfaceVariant
-		font.pointSize: Tokens.font.size.smaller
-		text: {
-			const devices = Bluetooth.devices.values; // qmllint disable unresolved-type
-			const connectedCount = devices.filter(d => d.connected).length;
-			let available = qsTr("%1 device%2 available").arg(devices.length - connectedCount).arg(devices.length === 1 ? "" : "s");
-			return available;
-		}
-		topPadding: Tokens.spacing.small
-	}
-	component Toggle: CustomSwitch {
-		id: toggleItem
-
-		readonly property alias bg: bg
-		property alias first: bg.first
-		property alias last: bg.last
-		property string subtext
-
-		Layout.fillWidth: true
-		cLayer: 2
-		horizontalPadding: Tokens.padding.largeIncreased
-		implicitHeight: Math.max(implicitContentHeight, implicitIndicatorHeight) + verticalPadding * 2
-		implicitWidth: implicitContentWidth + implicitIndicatorWidth + horizontalPadding * 2
-		indicator.anchors.right: right
-		indicator.anchors.rightMargin: toggleItem.horizontalPadding
-		indicator.anchors.verticalCenter: verticalCenter
-		verticalPadding: Tokens.padding.normal
-
-		background: ConnectedRect {
-			id: bg
-
-			StateLayer {
-				id: stateLayer
-
-				manualPressOverride: toggleItem.pressed
-			}
-		}
-		contentItem: Item {
-			anchors.left: parent.left
-			anchors.leftMargin: toggleItem.horizontalPadding
-			anchors.right: toggleItem.indicator.left
-			anchors.rightMargin: Tokens.spacing.normal
-			implicitHeight: column.implicitHeight
-			implicitWidth: column.implicitWidth
-
-			Column {
-				id: column
-
-				anchors.left: parent.left
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 0
-
-				CustomText {
-					id: label
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					elide: Text.ElideRight
-					font: {
-						const f = Qt.font(label.font);
-						f.pointSize = Tokens.font.size.smaller;
-						return f;
-					}
-					text: toggleItem.text
-				}
-
-				CustomText {
-					id: subtext
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					color: Colors.palette.m3outline
-					elide: Text.ElideRight
-					font: {
-						const f = Qt.font(subtext.font);
-						f.pointSize = Tokens.font.size.small;
-						return f;
-					}
-					text: toggleItem.subtext
-					visible: toggleItem.subtext
-				}
-			}
-		}
-
-		onPressed: stateLayer.press(stateLayer.mouseX, stateLayer.mouseY)
-	}
-}

Modules/Bar/Popouts/ClipWrapper.qml

@@ -58,7 +58,7 @@ Item {
 
 		Anim {
 			duration: content.animLength
-			easing.bezierCurve: content.animCurve
+			easing: content.animCurve
 		}
 	}
 	Behavior on y {
@@ -66,7 +66,7 @@ Item {
 
 		Anim {
 			duration: content.animLength
-			easing.bezierCurve: content.animCurve
+			easing: content.animCurve
 		}
 	}
 
@@ -81,6 +81,7 @@ Item {
 		anchors.top: root.position === "top" ? parent.top : undefined
 		anchors.topMargin: (-implicitHeight - 5) * root.offsetScale
 		anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
+		horizontal: root.horizontal
 		offsetScale: root.offsetScale
 		screen: root.screen
 	}

Modules/Bar/Popouts/Content.qml

@@ -11,10 +11,11 @@ Item {
 
 	readonly property Item current: currentPopout?.item ?? null
 	readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
+	required property bool horizontal
 	required property PopoutState popouts
 
-	implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.small * 2
-	implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.small * 2
+	implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.smaller * 2
+	implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.smaller * 2
 
 	Item {
 		id: content
@@ -69,6 +70,7 @@ Item {
 			name: "upower"
 
 			sourceComponent: UPowerPopout {
+				horizontal: root.horizontal
 			}
 		}
 
@@ -80,13 +82,6 @@ Item {
 			}
 		}
 
-		Popout {
-			name: "bluetooth"
-
-			sourceComponent: BluetoothPopout {
-			}
-		}
-
 		Popout {
 			name: "updates"
 
@@ -106,7 +101,7 @@ Item {
 		anchors.centerIn: opacity === 1 ? undefined : parent
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: opacity === 1 ? parent.top : undefined
-		anchors.topMargin: 5
+		anchors.topMargin: Tokens.padding.smaller
 		opacity: 0
 		scale: 0.8
 

Modules/Bar/Popouts/Network/NetworkOverlay.qml

@@ -1,71 +0,0 @@
-import QtQuick
-import ZShell.Config
-import qs.Services
-import qs.Helpers
-import qs.Components
-
-CustomRect {
-	id: root
-
-	readonly property bool closing: PopupManager.closed
-	readonly property url currentPopup: PopupManager.currentPopup
-	property bool shouldBeVisible: loader.status === Loader.Ready
-
-	color: Qt.alpha(Colors.palette.m3shadow, 0.3)
-	opacity: shouldBeVisible && !closing ? 1 : 0
-	visible: opacity > 0
-
-	Behavior on opacity {
-		Anim {
-		}
-	}
-
-	onVisibleChanged: {
-		if (!visible) {
-			PopupManager.requestClose();
-			PopupManager.currentPopup = "";
-		}
-	}
-
-	CustomMouseArea {
-		anchors.fill: parent
-		hoverEnabled: true
-		preventStealing: true
-		propagateComposedEvents: false
-
-		onClicked: {
-			const insideItemWidth = mouseX < loader.x + loader.item.width && mouseX > loader.x;
-			const insideItemHeight = mouseY < loader.y + loader.item.height && mouseY > loader.y;
-			if (insideItemHeight && insideItemWidth)
-				return;
-
-			PopupManager.requestClose();
-		}
-	}
-
-	Loader {
-		id: loader
-
-		anchors.centerIn: parent
-
-		Connections {
-			function onCurrentPopupChanged(): void {
-				if (PopupManager.currentPopup) {
-					loader.setSource(PopupManager.currentPopup, PopupManager.currentPopupProps);
-				} else {
-					loader.source = null;
-				}
-			}
-
-			target: PopupManager
-		}
-	}
-
-	Connections {
-		function onNetworkConnected(): void {
-			PopupManager.requestClose();
-		}
-
-		target: Network
-	}
-}

Modules/Bar/Popouts/Network/PSKOverlay.qml

@@ -1,103 +0,0 @@
-import Quickshell
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Components
-import ZShell.Config
-import qs.Services
-import qs.Components
-import qs.Helpers
-
-CustomClippingRect {
-	id: root
-
-	required property var network
-
-	color: Colors.palette.m3surfaceContainer
-	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
-	implicitWidth: layout.implicitWidth + layout.anchors.margins * 2
-	radius: Tokens.rounding.large
-
-	ColumnLayout {
-		id: layout
-
-		anchors.fill: parent
-		anchors.margins: Tokens.padding.extraLarge
-		spacing: Tokens.spacing.normal
-
-		MaterialIcon {
-			Layout.alignment: Qt.AlignHCenter
-			font.pointSize: Tokens.font.size.extraLarge * 2
-			text: "lock"
-		}
-
-		CustomText {
-			Layout.alignment: Qt.AlignHCenter
-			color: Colors.palette.m3onSurfaceVariant
-			text: qsTr("Connect to %1").arg(root.network.name)
-		}
-
-		CustomTextField {
-			id: passwordField
-
-			Layout.fillWidth: true
-			Layout.preferredWidth: 400
-			echoMode: CustomTextField.Password
-			errorText: qsTr("Failed to connect with given password")
-			isError: Network.failedNetwork
-			leadingIcon: "lock"
-			passwordMaskDelay: 5000
-			placeholderText: qsTr("Input password")
-		}
-
-		ButtonRow {
-			id: buttonRow
-
-			Layout.fillWidth: true
-			spacing: Tokens.spacing.smaller
-
-			IconTextButton {
-				fillWidth: true
-				font.pointSize: Tokens.font.size.normal
-				icon: "close"
-				inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 2)
-				inactiveOnColor: Colors.palette.m3onSurfaceVariant
-				isRound: true
-				isToggle: false
-				shapeMorph: true
-				text: "Cancel"
-
-				onClicked: PopupManager.requestClose()
-			}
-
-			IconTextButton {
-				fillWidth: true
-				font.pointSize: Tokens.font.size.normal
-				icon: Network.connectingNetwork ? "" : "check"
-				inactiveColor: Network.connectingNetwork ? Colors.palette.m3primaryContainer : Network.failedNetwork ? Colors.palette.m3error : Colors.palette.m3primary
-				inactiveOnColor: Network.connectingNetwork ? Colors.palette.m3onPrimaryContainer : Network.failedNetwork ? Colors.palette.m3onError : Colors.palette.m3onPrimary
-				isRound: true
-				isToggle: false
-				shapeMorph: true
-				text: Network.connectingNetwork ? "" : "Apply"
-
-				onClicked: Network.requestConnect(root.network, passwordField.text)
-
-				Loader {
-					active: opacity > 0
-					anchors.centerIn: parent
-					opacity: Network.connectingNetwork ? 1 : 0
-
-					Behavior on opacity {
-						Anim {
-						}
-					}
-					sourceComponent: CircularIndicator {
-						bgColor: "transparent"
-						implicitSize: buttonRow.height - Tokens.padding.normal
-						running: true
-					}
-				}
-			}
-		}
-	}
-}

Modules/Bar/Popouts/Network/PopupManager.qml

@@ -1,22 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import QtQuick
-
-Singleton {
-	id: root
-
-	property bool closed: true
-	property url currentPopup: ""
-	property var currentPopupProps: ({})
-
-	function requestClose(): void {
-		closed = true;
-	}
-
-	function requestOpen(source: url, properties = {}): void {
-		currentPopupProps = properties;
-		currentPopup = source;
-		closed = false;
-	}
-}

Modules/Bar/Popouts/NetworkPopout.qml

@@ -1,362 +1,36 @@
 pragma ComponentBehavior: Bound
 
+import Quickshell
+import Quickshell.Networking
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
-import ZShell.Components
-import ZShell.Config
-import qs.Services
-import qs.Modules.Bar.Popouts.Network
 import qs.Components
-import qs.Helpers
+import ZShell.Config
+import qs.Modules
+import qs.Helpers as Helpers
 
-CustomClippingRect {
+Item {
 	id: root
 
 	required property var wrapper
 
-	anchors.horizontalCenter: parent.horizontalCenter
-	implicitHeight: networkPopContent.height + networkPopContent.anchors.margins * 2
-	implicitWidth: 500 + 8 * 2
-	radius: (20 - Tokens.padding.small) * Tokens.rounding.scale
-
-	Component.onCompleted: Network.active = true
-	Component.onDestruction: Network.active = false
-
 	ColumnLayout {
-		id: networkPopContent
+		id: layout
 
-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.large
-		anchors.right: parent.right
-		anchors.top: parent.top
-		spacing: Tokens.spacing.extraSmall / 2
+		spacing: 8
 
-		CustomText {
-			Layout.preferredHeight: visible ? implicitHeight : 0
-			Layout.rightMargin: Tokens.padding.extraSmall
-			font.pointSize: Tokens.font.size.large
-			text: qsTr("Wifi")
-		}
+		Repeater {
+			model: Helpers.Network.devices
 
-		Toggle {
-			Layout.preferredHeight: visible ? implicitHeight : 0
-			checked: Network.wifiEnabled
-			first: true
-			last: Network.connectedNetworks.length === 0
-			subtext: qsTr("Toggle WiFi device state")
-			text: checked ? qsTr("Enabled") : qsTr("Disabled")
+			CustomRadioButton {
+				id: network
 
-			onToggled: Network.setWifi(checked)
-		}
+				required property NetworkDevice modelData
 
-		ListView {
-			id: rows
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: contentHeight
-			interactive: false
-			section.property: "connected"
-			spacing: Tokens.spacing.extraSmall / 2
-
-			add: Transition {
-				Anim {
-					from: 0
-					property: "opacity"
-					to: 1
-				}
-			}
-			delegate: DelegateChooser {
-				role: "isDivider"
-
-				DelegateChoice {
-					roleValue: true
-
-					delegate: StatusDivider {
-					}
-				}
-
-				DelegateChoice {
-					delegate: NetworkItem {
-						list: rows
-						width: rows.width
-					}
-				}
-			}
-			displaced: Transition {
-				Anim {
-					easing.type: Easing.OutCubic
-					property: "y"
-				}
-			}
-			model: ScriptModel {
-				values: {
-					const byStrengthName = (a, b) => b.signalStrength - a.signalStrength || a.name.localeCompare(b.name);
-					const cNetworks = [...Network.connectedNetworks];
-					const kNetworks = [...Network.knownNetworks];
-					const uNetworks = [...Network.unknownNetworks];
-
-					return [...cNetworks.sort(byStrengthName), ...(kNetworks.length > 0 ? [
-								{
-									isDivider: true,
-									type: "known"
-								},
-								...kNetworks.sort(byStrengthName)] : []), ...(uNetworks.length > 0 ? [
-								{
-									isDivider: true,
-									type: "unknown"
-								},
-								...uNetworks.sort(byStrengthName)] : [])];
-				}
-			}
-			move: Transition {
-				Anim {
-					easing.type: Easing.OutCubic
-					property: "y"
-				}
-			}
-			remove: Transition {
-				Anim {
-					property: "opacity"
-					to: 0
-				}
-			}
-			section.delegate: Rectangle {
-				required property string section
-
-				color: "transparent"
-				height: childrenRect.height
-				width: ListView.view.width
-
-				CustomText {
-					text: parent.section
-				}
+				checked: Helpers.Network.activeDevice?.name === modelData.name
+				text: modelData.description
+				visible: modelData.name !== "lo"
 			}
 		}
 	}
-
-	NetworkOverlay {
-		anchors.fill: parent
-	}
-
-	component ConnectedRect: CustomRect {
-		id: bg
-
-		property bool first
-		property bool last
-
-		bottomLeftRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		bottomRightRadius: last ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		color: Colors.tPalette.m3surfaceContainer
-		topLeftRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
-		topRightRadius: first ? Tokens.rounding.large : Tokens.rounding.extraSmall
-	}
-	component NetworkItem: ConnectedRect {
-		id: networkItem
-
-		readonly property int connectedCount: Network.connectedNetworks.length
-		readonly property bool connecting: Network.connectingNetwork === modelData
-		property int horizontalPadding: Tokens.padding.largeIncreased
-		readonly property bool inConnectedGroup: index < connectedCount
-		// sectioning first / last item in list reminder
-		// if index === network.connectedNetworks.length - 1
-		// if index === network.connectedNetworks.length - 1 + network.knownNetworks.length - 2
-		// if index === network.connectedNetworks.length - 1 + network.knownNetworks.length
-		// list.model.values.length - 1
-		required property int index
-		readonly property bool isSecure: Network.isSecure(modelData.security)
-		required property ListView list
-		required property var modelData
-		property int verticalPadding: Tokens.padding.smaller
-
-		Layout.fillWidth: true
-		first: !inConnectedGroup && index === connectedCount + 1
-		implicitHeight: rowLayout.implicitHeight + verticalPadding * 2
-		last: inConnectedGroup ? index === connectedCount - 1 : index === list.count - 1
-		radius: Tokens.rounding.small
-
-		RowLayout {
-			id: rowLayout
-
-			Layout.preferredHeight: visible ? rowLayout.implicitHeight + Tokens.padding.smaller * 2 : 0
-			anchors.fill: parent
-			anchors.leftMargin: networkItem.horizontalPadding
-			anchors.rightMargin: networkItem.horizontalPadding
-
-			Column {
-				id: column
-
-				Layout.fillWidth: true
-
-				CustomText {
-					Layout.fillWidth: true
-					Layout.leftMargin: Tokens.spacing.extraSmall
-					Layout.rightMargin: Tokens.spacing.extraSmall
-					color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurface
-					elide: Text.ElideRight
-					text: networkItem.modelData.name
-				}
-
-				CustomText {
-					id: subtext
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					color: Colors.palette.m3outline
-					elide: Text.ElideRight
-					font.pointSize: Tokens.font.size.small
-					text: networkItem.modelData.connected ? qsTr("Connected: %1 strength").arg(Math.round(networkItem.modelData.signalStrength * 100) + "%") : qsTr("%1 strength").arg(Math.round(networkItem.modelData.signalStrength * 100) + "%")
-				}
-			}
-
-			Item {
-				Layout.alignment: Qt.AlignRight
-				implicitHeight: icon.height
-				implicitWidth: icon.width
-
-				MaterialIcon {
-					id: icon
-
-					color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
-					font.pointSize: Tokens.font.size.large
-					opacity: networkItem.connecting ? 0 : 1
-					text: Icons.getNetworkIcon(networkItem.modelData.signalStrength * 100, networkItem.isSecure)
-
-					Behavior on opacity {
-						Anim {
-						}
-					}
-				}
-
-				Loader {
-					active: opacity > 0
-					anchors.fill: parent
-					opacity: networkItem.connecting ? 1 : 0
-
-					Behavior on opacity {
-						Anim {
-						}
-					}
-					sourceComponent: CircularIndicator {
-						bgColor: "transparent"
-						running: true
-					}
-				}
-			}
-		}
-
-		StateLayer {
-			color: networkItem.modelData.active ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-
-			onClicked: {
-				if (networkItem.isSecure && !networkItem.known) {
-					PopupManager.requestOpen(Qt.resolvedUrl("Network/PSKOverlay.qml"), {
-						network: networkItem.modelData
-					});
-				} else {
-					Network.requestConnect(networkItem.modelData);
-				}
-			}
-		}
-	}
-	component StatusDivider: CustomText {
-		required property var modelData
-
-		bottomPadding: Tokens.spacing.extraSmall
-		color: Colors.palette.m3onSurfaceVariant
-		font.pointSize: Tokens.font.size.smaller
-		text: {
-			if (modelData.type === "known") {
-				const count = Network.knownNetworks.filter(n => !n.connected).length;
-
-				return qsTr("%1 known network%2").arg(count).arg(count === 1 ? "" : "s");
-			}
-
-			if (modelData.type === "unknown") {
-				const count = Network.unknownNetworks.filter(n => !n.connected).length;
-
-				return qsTr("%1 network%2 available").arg(count).arg(count === 1 ? "" : "s");
-			}
-
-			return qsTr("object unknown");
-		}
-		topPadding: Tokens.spacing.small
-	}
-	component Toggle: CustomSwitch {
-		id: toggleItem
-
-		readonly property alias bg: bg
-		property alias first: bg.first
-		property alias last: bg.last
-		property string subtext
-
-		Layout.fillWidth: true
-		cLayer: 2
-		horizontalPadding: Tokens.padding.largeIncreased
-		implicitHeight: Math.max(implicitContentHeight, implicitIndicatorHeight) + verticalPadding * 2
-		implicitWidth: implicitContentWidth + implicitIndicatorWidth + horizontalPadding * 2
-		indicator.anchors.right: right
-		indicator.anchors.rightMargin: toggleItem.horizontalPadding
-		indicator.anchors.verticalCenter: verticalCenter
-		verticalPadding: Tokens.padding.normal
-
-		background: ConnectedRect {
-			id: bg
-
-			StateLayer {
-				id: stateLayer
-
-				manualPressOverride: toggleItem.pressed
-			}
-		}
-		contentItem: Item {
-			anchors.left: parent.left
-			anchors.leftMargin: toggleItem.horizontalPadding
-			anchors.right: toggleItem.indicator.left
-			anchors.rightMargin: Tokens.spacing.normal
-			implicitHeight: column.implicitHeight
-			implicitWidth: column.implicitWidth
-
-			Column {
-				id: column
-
-				anchors.left: parent.left
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 0
-
-				CustomText {
-					id: label
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					elide: Text.ElideRight
-					font: {
-						const f = Qt.font(label.font);
-						f.pointSize = Tokens.font.size.smaller;
-						return f;
-					}
-					text: toggleItem.text
-				}
-
-				CustomText {
-					id: subtext
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					color: Colors.palette.m3outline
-					elide: Text.ElideRight
-					font: {
-						const f = Qt.font(subtext.font);
-						f.pointSize = Tokens.font.size.small;
-						return f;
-					}
-					text: toggleItem.subtext
-					visible: toggleItem.subtext
-				}
-			}
-		}
-
-		onPressed: stateLayer.press(stateLayer.mouseX, stateLayer.mouseY)
-	}
 }

Modules/Bar/Popouts/TrayMenuPopout.qml

@@ -15,7 +15,7 @@ StackView {
 	id: root
 
 	readonly property int itemHeight: 30
-	readonly property int panelRadius: ((itemHeight / 2) + Tokens.padding.small) * Tokens.rounding.scale
+	readonly property int panelRadius: ((itemHeight / 2) + Tokens.padding.extraSmall) * Tokens.rounding.scale
 	required property PopoutState popouts
 	property int rootWidth: 0
 	required property QsMenuHandle trayItem
@@ -88,10 +88,10 @@ StackView {
 				required property QsMenuEntry modelData
 
 				Layout.fillWidth: true
-				Layout.leftMargin: modelData.isSeparator ? Tokens.padding.normal : 0
-				Layout.rightMargin: modelData.isSeparator ? Tokens.padding.normal : 0
-				color: modelData.isSeparator ? Colors.palette.m3outlineVariant : "transparent"
-				implicitHeight: modelData.isSeparator ? (visible ? 1 : 0) : childrenLoader.item.implicitHeight
+				Layout.leftMargin: modelData?.isSeparator ?? false ? Tokens.padding.small : 0
+				Layout.rightMargin: modelData?.isSeparator ?? false ? Tokens.padding.small : 0
+				color: modelData?.isSeparator ?? false ? Colors.palette.m3outlineVariant : "transparent"
+				implicitHeight: modelData?.isSeparator ?? false ? (visible ? 1 : 0) : childrenLoader.item?.implicitHeight ?? 0
 				implicitWidth: childrenLoader.item?.implicitWidth ?? 0
 				radius: Tokens.rounding.full
 				visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
@@ -99,18 +99,18 @@ StackView {
 				Loader {
 					id: childrenLoader
 
-					active: !item.modelData.isSeparator
+					active: !item.modelData?.isSeparator ?? false
 					anchors.fill: parent
 					asynchronous: true
 
 					sourceComponent: Item {
-						property int iconWidth: icon.active ? icon.width + Tokens.spacing.normal + icon.anchors.rightMargin : 0
+						property int iconWidth: icon.active ? icon.width + Tokens.spacing.medium + icon.anchors.rightMargin : 0
 
 						implicitHeight: root.itemHeight
 						implicitWidth: label.width + label.anchors.leftMargin * 2 + iconWidth + (expand.item?.width ?? 0)
 
 						StateLayer {
-							enabled: item.modelData.enabled
+							enabled: item.modelData?.enabled ?? false
 							radius: item.radius
 
 							onClicked: {
@@ -130,7 +130,7 @@ StackView {
 						Loader {
 							id: icon
 
-							active: item.modelData.icon !== ""
+							active: item.modelData?.icon ?? "" !== ""
 							anchors.right: parent.right
 							anchors.rightMargin: 10
 							anchors.verticalCenter: parent.verticalCenter
@@ -144,7 +144,7 @@ StackView {
 									id: iconImage
 
 									implicitSize: parent.implicitHeight
-									source: item.modelData.icon
+									source: item.modelData?.icon ?? Qt.url("")
 									visible: false
 								}
 
@@ -163,20 +163,20 @@ StackView {
 							anchors.left: parent.left
 							anchors.leftMargin: 10
 							anchors.verticalCenter: parent.verticalCenter
-							color: item.modelData.enabled ? Colors.palette.m3onSurface : Colors.palette.m3outline
-							text: item.modelData.text
+							color: item.modelData?.enabled ?? false ? Colors.palette.m3onSurface : Colors.palette.m3outline
+							text: item.modelData?.text ?? ""
 						}
 
 						Loader {
 							id: expand
 
-							active: item.modelData.hasChildren
+							active: item.modelData?.hasChildren ?? false
 							anchors.right: parent.right
 							anchors.verticalCenter: parent.verticalCenter
 							asynchronous: true
 
 							sourceComponent: MaterialIcon {
-								color: item.modelData.enabled ? Colors.palette.m3onSurface : Colors.palette.m3outline
+								color: item.modelData?.enabled ?? false ? Colors.palette.m3onSurface : Colors.palette.m3outline
 								text: "chevron_right"
 							}
 						}

Modules/Bar/Popouts/UPowerPopout.qml

@@ -12,9 +12,10 @@ import qs.Services
 Column {
 	id: root
 
-	readonly property int panelRadius: ((profiles.height / 2) + Tokens.padding.small) * Tokens.rounding.scale
+	required property bool horizontal
+	readonly property int panelRadius: ((profiles.height / 2) + Tokens.padding.extraSmall) * Tokens.rounding.scale
 
-	spacing: Tokens.spacing.normal
+	spacing: Tokens.spacing.medium
 
 	Loader {
 		active: Battery.isLaptop
@@ -24,6 +25,13 @@ Column {
 		}
 	}
 
+	Item {
+		id: padding
+
+		implicitHeight: root.horizontal ? 0 : Tokens.padding.small
+		implicitWidth: 1
+	}
+
 	Repeater {
 		model: Battery.allPeripherals
 
@@ -33,9 +41,9 @@ Column {
 			required property var modelData
 
 			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.normal
+			anchors.leftMargin: Tokens.padding.small
 			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.normal
+			anchors.rightMargin: Tokens.padding.small
 
 			CustomText {
 				Layout.fillWidth: true
@@ -67,7 +75,7 @@ Column {
 		}
 
 		anchors.left: parent.left
-		anchors.leftMargin: Tokens.padding.normal
+		anchors.leftMargin: Tokens.padding.small
 		text: Battery.isLaptop ? qsTr("Time %1: %2").arg(Battery.onBattery ? "remaining" : "until charged").arg(Battery.onBattery ? formatSeconds(Battery.timeToEmpty, "Calculating...") : formatSeconds(Battery.timeToFull, "Fully charged!")) : qsTr("Power profile: %1").arg(PowerProfile.toString(PowerProfiles.profile))
 	}
 
@@ -80,8 +88,8 @@ Column {
 		sourceComponent: CustomRect {
 			color: Colors.palette.m3error
 			implicitHeight: child.implicitHeight + Tokens.padding.large
-			implicitWidth: child.implicitWidth + Tokens.padding.larger * 2
-			radius: Tokens.rounding.large
+			implicitWidth: child.implicitWidth + Tokens.padding.small * 2
+			radius: Tokens.rounding.largeIncreased
 
 			Column {
 				id: child
@@ -138,7 +146,7 @@ Column {
 		anchors.horizontalCenter: parent.horizontalCenter
 		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: indicator.height + Tokens.padding.extraSmall * 2
-		implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.larger * 2 + Tokens.spacing.small * 8
+		implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.small * 2 + Tokens.spacing.small * 8
 		radius: Tokens.rounding.full
 
 		CustomRect {
@@ -219,8 +227,8 @@ Column {
 		required property string icon
 		required property int profile
 
-		implicitHeight: icon.implicitHeight + Tokens.padding.small
-		implicitWidth: icon.implicitHeight + Tokens.padding.small
+		implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall
+		implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall
 
 		StateLayer {
 			color: profiles.current === parent.icon ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface

Modules/Bar/Popouts/UpdatesPopout.qml

@@ -13,13 +13,13 @@ CustomClippingRect {
 	id: root
 
 	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
-	readonly property int itemHeight: 50 + Tokens.padding.smaller * 2
+	readonly property int itemHeight: 50 + Tokens.padding.small * 2
 	required property var wrapper
 
 	color: Colors.tPalette.m3surfaceContainer
-	implicitHeight: hasUpdates ? updatesListLoader.item?.implicitHeight + Tokens.padding.small * 2 : noUpdatesLoader.item.height
-	implicitWidth: hasUpdates ? updatesListLoader.item?.contentWidth + Tokens.padding.small * 2 : noUpdatesLoader.item.width
-	radius: Tokens.rounding.small
+	implicitHeight: hasUpdates ? updatesListLoader.item?.implicitHeight + Tokens.padding.extraSmall * 2 : noUpdatesLoader.item.height
+	implicitWidth: hasUpdates ? updatesListLoader.item?.contentWidth + Tokens.padding.extraSmall * 2 : noUpdatesLoader.item.width
+	radius: Tokens.rounding.large - Tokens.padding.smaller
 
 	Loader {
 		id: noUpdatesLoader
@@ -70,7 +70,7 @@ CustomClippingRect {
 			displayMarginEnd: root.itemHeight
 			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 			implicitWidth: contentWidth
-			spacing: Tokens.spacing.normal
+			spacing: Tokens.spacing.medium
 
 			delegate: CustomRect {
 				id: update
@@ -81,12 +81,12 @@ CustomClippingRect {
 				color: Colors.tPalette.m3surfaceContainer
 				implicitHeight: root.itemHeight
 				implicitWidth: 600
-				radius: Tokens.rounding.small - Tokens.padding.small
+				radius: root.radius - Tokens.padding.extraSmall
 
 				RowLayout {
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
-					anchors.rightMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
+					anchors.rightMargin: Tokens.padding.small
 
 					MaterialIcon {
 						font.pointSize: Tokens.font.size.large * 2

Modules/Bar/Popouts/Wrapper.qml

@@ -8,7 +8,7 @@ import ZShell.Config
 Item {
 	id: root
 
-	property list<real> animCurve: Tokens.anim.curves.expressiveDefaultSpatial
+	property var animCurve: Tokens.anim.expressiveDefaultSpatial
 	property int animLength: Tokens.anim.durations.expressiveDefaultSpatial
 	readonly property alias content: content
 	readonly property Item current: (content.item as Content)?.current ?? null
@@ -16,6 +16,7 @@ Item {
 	property alias currentName: popoutState.currentName
 	property string detachedMode
 	property alias hasCurrent: popoutState.hasCurrent
+	required property bool horizontal
 	readonly property real nonAnimHeight: content.implicitHeight || 150
 	readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
 	required property real offsetScale
@@ -35,7 +36,7 @@ Item {
 
 		Anim {
 			duration: root.animLength
-			easing.bezierCurve: root.animCurve
+			easing: root.animCurve
 		}
 	}
 	Behavior on implicitWidth {
@@ -43,7 +44,7 @@ Item {
 
 		Anim {
 			duration: root.animLength
-			easing.bezierCurve: root.animCurve
+			easing: root.animCurve
 		}
 	}
 
@@ -58,6 +59,7 @@ Item {
 		shouldBeActive: root.hasCurrent
 
 		sourceComponent: Content {
+			horizontal: root.horizontal
 			popouts: popoutState
 		}
 	}

Modules/Clipboard/Content.qml

@@ -59,7 +59,7 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.left: entries.right
-		anchors.leftMargin: Tokens.spacing.normal
+		anchors.leftMargin: Tokens.spacing.medium
 		anchors.top: parent.top
 		color: Colors.tPalette.m3surfaceContainer
 		implicitWidth: ClipHistory.previewIsImage ? Math.max(Math.min(imagePreview.sourceSize.width + Tokens.padding.large * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth) : Math.max(Math.min(textPreviewColumn.width + textPreviewColumn.anchors.margins * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth)
@@ -75,7 +75,7 @@ Item {
 
 			anchors.left: parent.left
 			anchors.leftMargin: 0
-			anchors.margins: Tokens.padding.normal
+			anchors.margins: Tokens.padding.small
 			anchors.top: parent.top
 			visible: !ClipHistory.previewIsImage
 
@@ -90,7 +90,7 @@ Item {
 					required property int index
 					required property var modelData
 
-					spacing: Tokens.spacing.normal
+					spacing: Tokens.spacing.medium
 
 					CustomRect {
 						color: lineRow.index % 2 ? Colors.tPalette.m3surfaceContainer : "transparent"
@@ -192,7 +192,7 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		anchors.top: search.bottom
-		anchors.topMargin: Tokens.spacing.normal
+		anchors.topMargin: Tokens.spacing.medium
 		implicitWidth: Config.clipboard.sizes.width
 
 		CustomListView {
@@ -204,7 +204,7 @@ Item {
 			highlightRangeMode: ListView.ApplyRange
 			preferredHighlightBegin: 0
 			preferredHighlightEnd: height
-			spacing: Tokens.spacing.normal
+			spacing: Tokens.spacing.medium
 
 			CustomScrollBar.vertical: CustomScrollBar {
 				flickable: view
@@ -250,7 +250,7 @@ Item {
 								id: icon
 
 								anchors.left: parent.left
-								anchors.margins: Tokens.padding.normal
+								anchors.margins: Tokens.padding.small
 								anchors.verticalCenter: parent.verticalCenter
 								font.pointSize: Tokens.font.size.large
 								text: clipItem.isImage ? "image" : "text_fields"
@@ -260,7 +260,7 @@ Item {
 								id: text
 
 								anchors.left: icon.right
-								anchors.margins: Tokens.spacing.normal
+								anchors.margins: Tokens.spacing.medium
 								anchors.verticalCenter: parent.verticalCenter
 								elide: Text.ElideRight
 								text: clipItem.isImage ? qsTr("Image") : ClipHistory.displayText(clipItem.modelData)
@@ -292,7 +292,7 @@ Item {
 
 					IconButton {
 						Layout.fillHeight: true
-						Layout.margins: Tokens.padding.normal
+						Layout.margins: Tokens.padding.small
 						Layout.preferredWidth: height
 						icon: "delete"
 						inactiveColor: Qt.alpha(Colors.palette.m3error, 0.8)
@@ -320,7 +320,7 @@ Item {
 				Behavior on y {
 					Anim {
 						duration: Tokens.anim.durations.small
-						easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+						easing: Tokens.anim.expressiveDefaultEffects
 					}
 				}
 			}

Modules/Clipboard/Wrapper.qml

@@ -15,15 +15,15 @@ Item {
 	required property PersistentProperties visibilities
 
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
-	implicitHeight: content.implicitHeight + Tokens.padding.normal * 2
-	implicitWidth: content.implicitWidth + Tokens.padding.normal * 2 || 400
+	implicitHeight: content.implicitHeight + Tokens.padding.small * 2
+	implicitWidth: content.implicitWidth + Tokens.padding.small * 2 || 400
 	opacity: 1 - offsetScale
 	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 		}
 	}
 

Modules/Dashboard/Content.qml

@@ -32,11 +32,11 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
-		anchors.margins: Tokens.padding.smaller
+		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
 		anchors.top: parent.top
 		color: "transparent"
-		radius: Tokens.rounding.normal - anchors.margins
+		radius: Tokens.rounding.extraLarge - anchors.margins
 
 		Item {
 			id: view

Modules/Dashboard/Dash.qml

@@ -13,11 +13,11 @@ GridLayout {
 
 	required property PersistentProperties dashState
 	readonly property bool dashboardVisible: visibilities.dashboard
-	property int radius: Tokens.rounding.smallest
+	property int radius: Tokens.rounding.medium
 	required property PersistentProperties visibilities
 
-	columnSpacing: Tokens.spacing.smaller
-	rowSpacing: Tokens.spacing.smaller
+	columnSpacing: Tokens.spacing.small
+	rowSpacing: Tokens.spacing.small
 
 	ParallelAnimation {
 		id: openAnim
@@ -104,12 +104,13 @@ GridLayout {
 		}
 	}
 
-	Rect {
+	CustomClippingRect {
 		Layout.column: 0
 		Layout.columnSpan: 5
 		Layout.fillWidth: true
 		Layout.preferredHeight: media.implicitHeight
 		Layout.row: 2
+		color: Colors.tPalette.m3surfaceContainer
 		radius: root.radius
 
 		Media {

Modules/Dashboard/Dash/Calendar.qml

@@ -132,7 +132,7 @@ CustomMouseArea {
 
 			IconButton {
 				icon: "chevron_left"
-				padding: Tokens.padding.small
+				padding: Tokens.padding.extraSmall
 				type: IconButton.Text
 
 				onClicked: root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth - 1, 1)
@@ -150,7 +150,7 @@ CustomMouseArea {
 						const now = new Date();
 						return root.realCurrMonth !== now.getMonth() || root.realCurrYear !== now.getFullYear();
 					}
-					radius: pressed ? Tokens.rounding.small : Tokens.rounding.large
+					radius: pressed ? Tokens.rounding.small : Tokens.rounding.largeIncreased
 
 					Behavior on radius {
 						Anim {
@@ -203,7 +203,7 @@ CustomMouseArea {
 
 			IconButton {
 				icon: "chevron_right"
-				padding: Tokens.padding.small
+				padding: Tokens.padding.extraSmall
 				type: IconButton.Text
 
 				onClicked: root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth + 1, 1)
@@ -259,7 +259,7 @@ CustomMouseArea {
 
 							required property var model
 
-							implicitHeight: text.implicitHeight + Tokens.padding.normal * 2
+							implicitHeight: text.implicitHeight + Tokens.padding.small * 2
 							implicitWidth: implicitHeight
 
 							CustomText {

Modules/Dashboard/Dash/Media.qml

@@ -9,6 +9,7 @@ import QtQuick.Effects
 import ZShell.Components
 import ZShell.Services
 import ZShell.Config
+import qs.Modules.Dashboard.Dash.Media
 import qs.Daemons
 import qs.Components
 import qs.Helpers
@@ -25,7 +26,7 @@ Item {
 
 	anchors.left: parent.left
 	anchors.right: parent.right
-	implicitHeight: layout.implicitHeight
+	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
 	function lengthStr(length: int): string {
 		if (length < 0)
 		return "-1:-1";
@@ -57,14 +58,18 @@ Item {
 		service: Audio.cava
 	}
 
+	BackgroundShapes {
+		anchors.fill: parent
+	}
+
 	Shape {
 		id: visualizer
 
 		readonly property int bars: Config.services.visualizerBars
-		property color color: Colors.palette.m3tertiary
-		property color fillColor: Qt.alpha(color, 0.25)
+		property color color: Qt.alpha(Colors.palette.m3primary, 0.5)
+		property color fillColor: Qt.alpha(color, 0.1)
 
-		anchors.fill: layout
+		anchors.fill: parent
 		anchors.leftMargin: -(shape.strokeWidth / 2)
 		layer.enabled: true
 		asynchronous: true
@@ -87,15 +92,15 @@ Item {
 				if (n < 2)
 				return "";
 
-				const h = layout.height + shape.strokeWidth / 2;
-				const w = layout.width + shape.strokeWidth;
+				const h = root.height + shape.strokeWidth / 2;
+				const w = root.width + shape.strokeWidth;
 
 				function x(i) {
 					return i * w / (n - 1);
 				}
 
 				function y(i) {
-					return h - values[i] * Config.dashboard.sizes.mediaVisualizerSize;
+					return h - (values[i] * Config.dashboard.sizes.mediaVisualizerSize) / 2;
 				}
 
 				let d = `M 0 ${h} `;
@@ -142,48 +147,21 @@ Item {
 	RowLayout {
 		id: layout
 
-		anchors.left: parent.left
-		anchors.right: parent.right
+		anchors.fill: parent
+		anchors.margins: Tokens.padding.large
+		anchors.leftMargin: Tokens.padding.extraLarge
 
-		CustomClippingRect {
-			id: cover
-
-			Layout.alignment: Qt.AlignLeft
-			Layout.bottomMargin: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small
-			Layout.leftMargin: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small
-			Layout.preferredHeight: Config.dashboard.sizes.mediaCoverArtSize
-			Layout.preferredWidth: Config.dashboard.sizes.mediaCoverArtSize
-			Layout.topMargin: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small
-			color: Colors.tPalette.m3surfaceContainerHigh
-			radius: Infinity
-
-			MaterialIcon {
-				anchors.centerIn: parent
-				color: Colors.palette.m3onSurfaceVariant
-				font.pointSize: (parent.width * 0.4) || 1
-				grade: 200
-				text: "art_track"
-			}
-
-			Image {
-				id: image
-
-				anchors.fill: parent
-				asynchronous: true
-				fillMode: Image.PreserveAspectCrop
-				source: Players.active?.trackArtUrl ?? ""
-				sourceSize.height: Math.floor(height)
-				sourceSize.width: Math.floor(width)
-			}
+		CoverVisualizer {
+			Layout.fillHeight: true
+			implicitWidth: Config.dashboard.sizes.mediaCoverArtSize
 		}
 
 		ColumnLayout {
 			Layout.fillWidth: true
-			Layout.leftMargin: Tokens.spacing.large
-			Layout.rightMargin: Tokens.spacing.large
-			Layout.preferredHeight: childrenRect.height
+			Layout.leftMargin: Tokens.spacing.largeIncreased
+			Layout.rightMargin: Tokens.spacing.largeIncreased
 
-			spacing: Tokens.spacing.normal
+			spacing: Tokens.spacing.small
 
 			MarqueeText {
 				id: title
@@ -222,7 +200,7 @@ Item {
 
 			RowLayout {
 				id: positionSliderLayout
-				Layout.topMargin: Tokens.spacing.extraLargeIncreased
+				Layout.topMargin: Tokens.spacing.large
 				Layout.fillWidth: true
 				spacing: Tokens.spacing.small
 
@@ -289,7 +267,6 @@ Item {
 					checked: Players.active?.shuffle ?? false
 					enabled: Players.active?.shuffleSupported
 					onClicked: Players.active.shuffle = !Players.active?.shuffle
-					implicitWidth: Math.round(implicitHeight * 0.9)
 				}
 
 				IconButton {
@@ -301,6 +278,7 @@ Item {
 					shapeMorph: true
 					enabled: Players.active?.canGoPrevious
 					onClicked: Players.active?.previous()
+					font.pointSize: Tokens.font.size.large
 				}
 
 				IconButton {
@@ -313,6 +291,7 @@ Item {
 					checked: Players.active?.isPlaying ?? false
 					enabled: Players.active?.canTogglePlaying
 					onClicked: Players.active?.togglePlaying()
+					font.pointSize: Tokens.font.size.large
 				}
 
 				IconButton {
@@ -324,6 +303,7 @@ Item {
 					shapeMorph: true
 					enabled: Players.active?.canGoNext
 					onClicked: Players.active?.next()
+					font.pointSize: Tokens.font.size.large
 				}
 
 				IconButton {
@@ -342,7 +322,6 @@ Item {
 						else
 						Players.active.loopState = MprisLoopState.None;
 					}
-					implicitWidth: Math.round(implicitHeight * 0.9)
 				}
 			}
 		}

Modules/Dashboard/Dash/Media/BackgroundShapes.qml

@@ -0,0 +1,97 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import M3Shapes
+import qs.Components
+import qs.Services
+import qs.Helpers
+
+Item {
+	id: root
+
+	property int count: 14
+	property list<real> darkOpacities: [0.10, 0.20, 0.10, 0.20]
+	property list<real> lightOpacities: [0.34, 0.34, 0.08, 0.2]
+	property real maxRotSpeed: 12
+	property real maxSize: 124
+	property real maxSpeed: 18
+	property real minRotSpeed: -12
+	property real minSize: 36
+	property real minSpeed: 4
+	readonly property list<int> shapePool: [MaterialShape.Circle, MaterialShape.Cookie4Sided, MaterialShape.Cookie6Sided, MaterialShape.Cookie7Sided, MaterialShape.Cookie9Sided, MaterialShape.Cookie12Sided, MaterialShape.Sunny, MaterialShape.VerySunny, MaterialShape.SoftBurst, MaterialShape.Pentagon, MaterialShape.Gem, MaterialShape.Arch, MaterialShape.Arrow, MaterialShape.Pill, MaterialShape.Triangle, MaterialShape.Fan, MaterialShape.Oval]
+
+	function rand(min: real, max: real): real {
+		return min + Math.random() * (max - min);
+	}
+
+	function signedRand(min: real, max: real): real {
+		return rand(min, max) * (Math.random() < 0.5 ? -1 : 1);
+	}
+
+	Component.onCompleted: shapes.model = count
+
+	Repeater {
+		id: shapes
+
+		DriftingShape {
+		}
+	}
+
+	FrameAnimation {
+		running: root.visible && root.width > 0 && root.height > 0 && (Players.active?.isPlaying ?? false)
+
+		onTriggered: {
+			const dt = frameTime;
+			for (let i = 0; i < shapes.count; i++) {
+				const s = shapes.itemAt(i) as DriftingShape;
+				if (!s)
+					continue;
+
+				s.x += s.vx * dt;
+				s.y += s.vy * dt;
+				s.rotation += s.vr * dt;
+
+				if (s.x + s.width < 0)
+					s.x = root.width;
+				else if (s.x > root.width)
+					s.x = -s.width;
+
+				if (s.y + s.height < 0)
+					s.y = root.height;
+				else if (s.y > root.height)
+					s.y = -s.height;
+			}
+		}
+	}
+
+	component DriftingShape: MaterialShape {
+		id: shapeItem
+
+		readonly property int colorIdx: Math.floor(Math.random() * 4)
+		required property int index
+		property real vr: root.rand(root.minRotSpeed, root.maxRotSpeed)
+		property real vx: root.signedRand(root.minSpeed, root.maxSpeed)
+		property real vy: root.signedRand(root.minSpeed, root.maxSpeed)
+
+		color: [Colors.palette.m3primaryContainer, Colors.palette.m3secondaryContainer, Colors.palette.m3tertiaryContainer, Colors.palette.m3outlineVariant][colorIdx]
+		implicitSize: root.minSize + (index / root.count) * (root.maxSize - root.minSize)
+		opacity: Colors.light ? root.lightOpacities[colorIdx] : root.darkOpacities[colorIdx]
+		rotation: root.rand(0, 360)
+		shape: root.shapePool[Math.floor(Math.random() * root.shapePool.length)]
+
+		Behavior on color {
+			CAnim {
+			}
+		}
+		Behavior on opacity {
+			Anim {
+				type: Anim.SlowEffects
+			}
+		}
+
+		Component.onCompleted: {
+			x = root.rand(0, root.width - implicitSize);
+			y = root.rand(0, root.height - implicitSize);
+		}
+	}
+}

Modules/Dashboard/Dash/Media/CoverArt.qml

@@ -0,0 +1,100 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Effects
+import M3Shapes
+import qs.Helpers
+import qs.Effects
+import qs.Components
+import qs.Services
+
+Item {
+	id: root
+
+	property color fallbackColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 2)
+	property bool hadPrevious
+	readonly property alias shape: shape
+
+	layer.enabled: true
+
+	Behavior on fallbackColor {
+		CAnim {
+		}
+	}
+	layer.effect: MultiEffect {
+		blurMax: 1
+		shadowColor: Colors.palette.m3outline
+		shadowEnabled: true
+		shadowOpacity: 0.3
+	}
+
+	Item {
+		id: shapeWrapper
+
+		anchors.fill: parent
+		layer.enabled: true
+		opacity: root.fallbackColor.a
+
+		MaterialShape {
+			id: shape
+
+			color: Qt.alpha(root.fallbackColor, 1)
+			implicitSize: root.width
+			shape: MaterialShape.Cookie12Sided
+
+			Anim on rotation {
+				duration: 23500
+				easing.type: Easing.Linear
+				from: 360
+				loops: Animation.Infinite
+				paused: !Players.active?.isPlaying
+				running: true
+				to: 0
+			}
+		}
+	}
+
+	MaterialIcon {
+		anchors.centerIn: parent
+		animate: true
+		color: Colors.palette.m3onSurfaceVariant
+		grade: 200
+		opacity: image.status === Image.Null || image.status === Image.Error ? 1 : 0
+		text: image.status === Image.Error ? "broken_image" : "art_track"
+
+		Behavior on opacity {
+			Anim {
+				type: Anim.DefaultEffects
+			}
+		}
+	}
+
+	Loader {
+		active: opacity > 0
+		anchors.centerIn: parent
+		asynchronous: true
+		opacity: image.status === Image.Loading ? 1 : 0
+
+		Behavior on opacity {
+			Anim {
+				type: Anim.DefaultEffects
+			}
+		}
+		sourceComponent: LoadingIndicator {
+			color: Colors.palette.m3primaryContainer
+			implicitSize: root.width * 0.3
+		}
+	}
+
+	FadeImage {
+		id: image
+
+		anchors.fill: parent
+		layer.enabled: true
+		source: Players.getArtUrl(Players.active)
+
+		layer.effect: Mask {
+			maskSource: shapeWrapper
+		}
+	}
+}

Modules/Dashboard/Dash/Media/CoverVisualizer.qml

@@ -0,0 +1,18 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import M3Shapes
+import ZShell.Config
+
+Item {
+	id: root
+
+	CoverArt {
+		id: cover
+
+		anchors.centerIn: parent
+		implicitHeight: Config.dashboard.sizes.mediaCoverArtSize
+		implicitWidth: Config.dashboard.sizes.mediaCoverArtSize
+		shape.shape: MaterialShape.Cookie9Sided
+	}
+}

Modules/Dashboard/Dash/Resources.qml

@@ -35,7 +35,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.margins: Tokens.padding.large
 		anchors.top: parent.top
-		spacing: Tokens.spacing.normal
+		spacing: Tokens.spacing.medium
 
 		Resource {
 			fgColor: Colors.palette.m3primary

Modules/Dashboard/Dash/User.qml

@@ -18,7 +18,7 @@ Row {
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		implicitHeight: info.implicitHeight
 		implicitWidth: info.implicitHeight
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 
 		MaterialIcon {
 			anchors.centerIn: parent

Modules/Dashboard/Dash/Weather.qml

@@ -27,7 +27,7 @@ Item {
 		id: info
 
 		anchors.left: icon.right
-		anchors.leftMargin: Tokens.spacing.large
+		anchors.leftMargin: Tokens.spacing.largeIncreased
 		anchors.verticalCenter: parent.verticalCenter
 		spacing: 8
 

Modules/Dashboard/Tabs.qml

@@ -181,7 +181,7 @@ Item {
 				anchors.verticalCenter: parent.verticalCenter
 				color: "transparent"
 				implicitHeight: parent.height + 8 * 2
-				radius: Tokens.rounding.smallest
+				radius: Tokens.rounding.small
 
 				CustomRect {
 					id: stateLayer

Modules/DesktopIcons/BackgroundContextMenu.qml

@@ -32,7 +32,7 @@ Item {
         y: root.menuY
 
         color: Colors.tPalette.m3surface
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.medium
 
         implicitWidth: menuLayout.implicitWidth + padding * 2
         implicitHeight: menuLayout.implicitHeight + padding * 2
@@ -48,13 +48,13 @@ Item {
             CustomRect {
                 Layout.preferredWidth: 200
                 radius: popupBackground.radius - popupBackground.padding
-                implicitHeight: openTerminalRow.implicitHeight + Tokens.padding.small * 2
+                implicitHeight: openTerminalRow.implicitHeight + Tokens.padding.extraSmall * 2
 
                 RowLayout {
                     id: openTerminalRow
                     spacing: 8
                     anchors.fill: parent
-                    anchors.leftMargin: Tokens.padding.smaller
+                    anchors.leftMargin: Tokens.padding.small
 
                     MaterialIcon { text: "terminal"; font.pointSize: 20 }
                     CustomText { text: "Open terminal"; Layout.fillWidth: true }
@@ -81,13 +81,13 @@ Item {
             CustomRect {
                 Layout.fillWidth: true
                 radius: popupBackground.radius - popupBackground.padding
-                implicitHeight: settingsRow.implicitHeight + Tokens.padding.small * 2
+                implicitHeight: settingsRow.implicitHeight + Tokens.padding.extraSmall * 2
 
                 RowLayout {
                     id: settingsRow
                     spacing: 8
                     anchors.fill: parent
-                    anchors.leftMargin: Tokens.padding.smaller
+                    anchors.leftMargin: Tokens.padding.small
 
                     MaterialIcon { text: "settings"; font.pointSize: 20 }
                     CustomText { text: "ZShell settings"; Layout.fillWidth: true }
@@ -115,13 +115,13 @@ Item {
             CustomRect {
                 Layout.fillWidth: true
                 radius: popupBackground.radius - popupBackground.padding
-                implicitHeight: logoutRow.implicitHeight + Tokens.padding.small * 2
+                implicitHeight: logoutRow.implicitHeight + Tokens.padding.extraSmall * 2
 
                 RowLayout {
                     id: logoutRow
                     spacing: 8
                     anchors.fill: parent
-                    anchors.leftMargin: Tokens.padding.smaller
+                    anchors.leftMargin: Tokens.padding.small
 
                     MaterialIcon { text: "logout"; font.pointSize: 20 }
                     CustomText { text: "Logout"; Layout.fillWidth: true }
@@ -148,13 +148,13 @@ Item {
             // CustomRect {
             //     Layout.fillWidth: true
             //     radius: popupBackground.radius - popupBackground.padding
-            //     implicitHeight: desktopIconsRow.implicitHeight + Tokens.padding.small * 2
+            //     implicitHeight: desktopIconsRow.implicitHeight + Tokens.padding.extraSmall * 2
             //
             //     RowLayout {
             //         id: desktopIconsRow
             //         spacing: 8
             //         anchors.fill: parent
-            //         anchors.leftMargin: Tokens.padding.smaller
+            //         anchors.leftMargin: Tokens.padding.small
             //
             //         MaterialIcon { text: Config.options.background.showDesktopIcons ? "visibility_off" : "visibility"; font.pointSize: 20 }
             //         CustomText { text: Config.options.background.showDesktopIcons ? "Hide icons" : "Show icons"; Layout.fillWidth: true }

Modules/DesktopIcons/DesktopIconContextMenu.qml

@@ -43,13 +43,13 @@ Item {
 	CustomClippingRect {
 		id: popupBackground
 
-		readonly property real padding: Tokens.padding.small
+		readonly property real padding: Tokens.padding.extraSmall
 
 		color: Colors.tPalette.m3surface
 		implicitHeight: menuLayout.implicitHeight + padding * 2
 		implicitWidth: menuLayout.implicitWidth + padding * 2
 		opacity: contextMenu.visible ? 1 : 0
-		radius: Tokens.rounding.normal
+		radius: Tokens.rounding.medium
 		x: contextMenu.menuX
 		y: contextMenu.menuY
 
@@ -66,14 +66,14 @@ Item {
 
 			CustomRect {
 				Layout.preferredWidth: 160
-				implicitHeight: openRow.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: openRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
 				RowLayout {
 					id: openRow
 
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
 					spacing: 8
 
 					MaterialIcon {
@@ -109,14 +109,14 @@ Item {
 
 			CustomRect {
 				Layout.fillWidth: true
-				implicitHeight: openWithRow.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: openWithRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
 				RowLayout {
 					id: openWithRow
 
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
 					spacing: 8
 
 					MaterialIcon {
@@ -154,14 +154,14 @@ Item {
 
 			CustomRect {
 				Layout.fillWidth: true
-				implicitHeight: copyPathRow.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: copyPathRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
 				RowLayout {
 					id: copyPathRow
 
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
 					spacing: 8
 
 					MaterialIcon {
@@ -187,7 +187,7 @@ Item {
 
 			CustomRect {
 				Layout.fillWidth: true
-				implicitHeight: renameRow.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: renameRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 				visible: contextMenu.targetPaths.length === 1
 
@@ -195,7 +195,7 @@ Item {
 					id: renameRow
 
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
 					spacing: 8
 
 					MaterialIcon {
@@ -229,14 +229,14 @@ Item {
 
 			CustomRect {
 				Layout.fillWidth: true
-				implicitHeight: deleteRow.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: deleteRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
 				RowLayout {
 					id: deleteRow
 
 					anchors.fill: parent
-					anchors.leftMargin: Tokens.padding.smaller
+					anchors.leftMargin: Tokens.padding.small
 					spacing: 8
 
 					MaterialIcon {

Modules/DesktopIcons/DesktopIconDelegate.qml

@@ -205,7 +205,7 @@ Item {
 			anchors.margins: 4
 			color: "white"
 			opacity: root.iconsRoot.selectedIcons.includes(root.filePath) ? 0.2 : 0.0
-			radius: Tokens.rounding.smallest
+			radius: Tokens.rounding.small
 
 			Behavior on opacity {
 				Anim {
@@ -265,7 +265,7 @@ Item {
 				anchors.margins: 4
 				color: "white"
 				opacity: parent.containsMouse ? 0.1 : 0.0
-				radius: Tokens.rounding.smallest
+				radius: Tokens.rounding.small
 
 				Behavior on opacity {
 					Anim {

Modules/Dock/Content.qml

@@ -22,10 +22,10 @@ Item {
 	property string draggedAppId: ""
 	property var draggedModelData: null
 	property bool dropAnimating: false
-	readonly property int padding: Tokens.padding.small
+	readonly property int padding: Tokens.padding.extraSmall
 	required property var panels
 	property var pendingCommitIds: []
-	readonly property int rounding: Tokens.rounding.large
+	readonly property int rounding: Tokens.rounding.largeIncreased
 	required property ShellScreen screen
 	required property PersistentProperties visibilities
 	property var visualIds: []
@@ -247,7 +247,7 @@ Item {
 		property bool enableAddAnimation: false
 
 		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
+		anchors.margins: Tokens.padding.extraSmall
 		anchors.top: parent.top
 		boundsBehavior: Flickable.StopAtBounds
 		height: Config.dock.height
@@ -255,7 +255,7 @@ Item {
 		interactive: !(root.dragActive || root.dropAnimating)
 		model: visualModel
 		orientation: ListView.Horizontal
-		spacing: Tokens.padding.smaller
+		spacing: Tokens.padding.small
 
 		add: Transition {
 			ParallelAnimation {

Modules/Dock/Parts/DockAppButton.qml

@@ -23,7 +23,7 @@ CustomRect {
 
 	implicitHeight: Config.dock.height
 	implicitWidth: isSeparator ? 1 : implicitHeight
-	radius: Tokens.rounding.normal - Tokens.padding.small
+	radius: Tokens.rounding.medium - Tokens.padding.extraSmall
 
 	Loader {
 		active: !isSeparator

Modules/Dock/Parts/DockSeparator.qml

@@ -5,9 +5,9 @@ import ZShell.Config
 import qs.Services
 
 CustomRect {
-	Layout.bottomMargin: dockRow.padding + Tokens.rounding.normal
+	Layout.bottomMargin: dockRow.padding + Tokens.rounding.medium
 	Layout.fillHeight: true
-	Layout.topMargin: dockRow.padding + Tokens.rounding.normal
+	Layout.topMargin: dockRow.padding + Tokens.rounding.medium
 	color: Colors.palette.m3outlineVariant
 	implicitWidth: 1
 }

Modules/Dock/Wrapper.qml

@@ -12,7 +12,7 @@ Item {
 	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.dock && Config.dock.enabled
+	readonly property bool shouldBeActive: visibilities.dock && Config.dock.enable
 	required property PersistentProperties visibilities
 
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
@@ -24,7 +24,7 @@ Item {
 	Behavior on offsetScale {
 		Anim {
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 		}
 	}
 

Modules/Drawing/Content.qml

@@ -33,8 +33,8 @@ Item {
 		drawing.drawingState.penColor = Qt.hsva(huePicker.currentHue, saturationSlider.value, brightnessSlider.value, drawing.drawingState.penColor.a);
 	}
 
-	implicitHeight: column.height + Tokens.padding.larger * 2
-	implicitWidth: huePicker.implicitWidth + Tokens.padding.normal * 2
+	implicitHeight: column.height + Tokens.padding.small * 2
+	implicitWidth: huePicker.implicitWidth + Tokens.padding.small * 2
 
 	Component.onCompleted: syncFromPenColor()
 
@@ -97,7 +97,7 @@ Item {
 
 			anchors.left: parent.left
 			anchors.right: parent.right
-			spacing: Tokens.spacing.normal
+			spacing: Tokens.spacing.medium
 
 			Repeater {
 				model: root.colors1
@@ -113,7 +113,7 @@ Item {
 
 			anchors.left: parent.left
 			anchors.right: parent.right
-			spacing: Tokens.spacing.normal
+			spacing: Tokens.spacing.medium
 
 			Repeater {
 				model: root.colors2
@@ -172,7 +172,7 @@ Item {
 	}
 
 	IconButton {
-		anchors.margins: Tokens.padding.normal
+		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
 		anchors.top: parent.top
 		checked: root.wrapper.pinned

Modules/Drawing/Wrapper.qml

@@ -49,13 +49,13 @@ Item {
 	Behavior on implicitWidth {
 		Anim {
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 		}
 	}
 	Behavior on offsetScale {
 		Anim {
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 		}
 	}
 

Modules/Launcher/AppList.qml

@@ -99,13 +99,13 @@ CustomListView {
 		implicitHeight: root.currentItem?.implicitHeight ?? 0
 		implicitWidth: root.width
 		opacity: 0.08
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.medium
 		y: root.currentItem?.y ?? 0
 
 		Behavior on y {
 			Anim {
 				duration: Tokens.anim.durations.small
-				easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+				easing: Tokens.anim.expressiveDefaultEffects
 			}
 		}
 	}
@@ -170,7 +170,7 @@ CustomListView {
 			ParallelAnimation {
 				Anim {
 					duration: Tokens.anim.durations.small
-					easing.bezierCurve: Tokens.anim.curves.standardAccel
+					easing: Tokens.anim.standardAccel
 					from: 1
 					property: "opacity"
 					target: root
@@ -179,7 +179,7 @@ CustomListView {
 
 				Anim {
 					duration: Tokens.anim.durations.small
-					easing.bezierCurve: Tokens.anim.curves.standardAccel
+					easing: Tokens.anim.standardAccel
 					from: 1
 					property: "scale"
 					target: root
@@ -205,7 +205,7 @@ CustomListView {
 			ParallelAnimation {
 				Anim {
 					duration: Tokens.anim.durations.small
-					easing.bezierCurve: Tokens.anim.curves.standardDecel
+					easing: Tokens.anim.standardDecel
 					from: 0
 					property: "opacity"
 					target: root
@@ -214,7 +214,7 @@ CustomListView {
 
 				Anim {
 					duration: Tokens.anim.durations.small
-					easing.bezierCurve: Tokens.anim.curves.standardDecel
+					easing: Tokens.anim.standardDecel
 					from: 0.9
 					property: "scale"
 					target: root

Modules/Launcher/CarouselView.qml

@@ -25,7 +25,7 @@ CarouselView {
 	focalWidth: Config.launcher.sizes.wallpaperWidth
 	glideDuration: 250
 	glideEasingType: Easing.OutCubic
-	implicitHeight: tileHeight + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.normal
+	implicitHeight: tileHeight + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.small
 	itemSpacing: Tokens.spacing.small
 	maxWidth: {
 		if (!screen)

Modules/Launcher/Content.qml

@@ -12,9 +12,9 @@ Item {
 	id: root
 
 	required property real maxHeight
-	readonly property int padding: Tokens.padding.small
+	readonly property int padding: Tokens.padding.largeIncreased / 4
 	required property var panels
-	readonly property int rounding: Tokens.rounding.large
+	readonly property int rounding: Tokens.rounding.largeIncreased
 	required property PersistentProperties visibilities
 
 	implicitHeight: search.height + listWrapper.height + padding * 2
@@ -49,9 +49,9 @@ Item {
 		anchors.left: parent.left
 		anchors.margins: root.padding
 		anchors.right: parent.right
-		bottomPadding: Tokens.padding.larger
+		bottomPadding: Tokens.padding.medium
 		placeholderText: qsTr("Type \"%1\" for commands").arg(Config.launcher.actionPrefix)
-		topPadding: Tokens.padding.larger
+		topPadding: Tokens.padding.medium
 
 		Component.onCompleted: forceActiveFocus()
 		Keys.onDownPressed: list.currentList?.decrementCurrentIndex()

Modules/Launcher/ContentList.qml

@@ -32,7 +32,7 @@ Item {
 
 		Anim {
 			duration: Tokens.anim.durations.small
-			easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+			easing: Tokens.anim.expressiveDefaultEffects
 		}
 	}
 	Behavior on implicitWidth {
@@ -40,7 +40,7 @@ Item {
 
 		Anim {
 			duration: Tokens.anim.durations.small
-			easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+			easing: Tokens.anim.expressiveDefaultEffects
 		}
 	}
 	Behavior on state {
@@ -127,7 +127,7 @@ Item {
 		opacity: root.currentList?.count === 0 ? 1 : 0
 		padding: Tokens.padding.large
 		scale: root.currentList?.count === 0 ? 1 : 0.5
-		spacing: Tokens.spacing.normal
+		spacing: Tokens.spacing.medium
 
 		Behavior on opacity {
 			Anim {

Modules/Launcher/Items/ActionItem.qml

@@ -16,7 +16,7 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 
 		onClicked: {
 			root.modelData?.onClicked(root.list);
@@ -25,9 +25,9 @@ Item {
 
 	Item {
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.larger
-		anchors.margins: Tokens.padding.smaller
-		anchors.rightMargin: Tokens.padding.larger
+		anchors.leftMargin: Tokens.padding.small
+		anchors.margins: Tokens.padding.small
+		anchors.rightMargin: Tokens.padding.small
 
 		MaterialIcon {
 			id: icon
@@ -39,7 +39,7 @@ Item {
 
 		Item {
 			anchors.left: icon.right
-			anchors.leftMargin: Tokens.spacing.normal
+			anchors.leftMargin: Tokens.spacing.medium
 			anchors.verticalCenter: icon.verticalCenter
 			implicitHeight: name.implicitHeight + desc.implicitHeight
 			implicitWidth: parent.width - icon.width
@@ -59,7 +59,7 @@ Item {
 				elide: Text.ElideRight
 				font.pointSize: Tokens.font.size.small
 				text: root.modelData?.desc ?? ""
-				width: root.width - icon.width - Tokens.rounding.normal * 2
+				width: root.width - icon.width - Tokens.rounding.medium * 2
 			}
 		}
 	}

Modules/Launcher/Items/AppItem.qml

@@ -19,7 +19,7 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 
 		onClicked: {
 			Apps.launch(root.modelData);
@@ -29,9 +29,9 @@ Item {
 
 	Item {
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.larger
-		anchors.margins: Tokens.padding.smaller
-		anchors.rightMargin: Tokens.padding.larger
+		anchors.leftMargin: Tokens.padding.medium
+		anchors.margins: Tokens.padding.small
+		anchors.rightMargin: Tokens.padding.medium
 
 		IconImage {
 			id: icon
@@ -43,7 +43,7 @@ Item {
 
 		Item {
 			anchors.left: icon.right
-			anchors.leftMargin: Tokens.spacing.normal
+			anchors.leftMargin: Tokens.spacing.medium
 			anchors.verticalCenter: icon.verticalCenter
 			implicitHeight: name.implicitHeight + comment.implicitHeight
 			implicitWidth: parent.width - icon.width
@@ -63,7 +63,7 @@ Item {
 				elide: Text.ElideRight
 				font.pointSize: Tokens.font.size.small
 				text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? ""
-				width: root.width - icon.width - Tokens.rounding.normal * 2
+				width: root.width - icon.width - Tokens.rounding.medium - Tokens.padding.medium * 2
 			}
 		}
 

Modules/Launcher/Items/CalcItem.qml

@@ -24,7 +24,7 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 
 		onClicked: {
 			root.onClicked();
@@ -33,10 +33,10 @@ Item {
 
 	RowLayout {
 		anchors.left: parent.left
-		anchors.margins: Tokens.padding.larger
+		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		spacing: Tokens.spacing.normal
+		spacing: Tokens.spacing.medium
 
 		MaterialIcon {
 			Layout.alignment: Qt.AlignVCenter
@@ -64,13 +64,13 @@ Item {
 			Layout.alignment: Qt.AlignVCenter
 			clip: true
 			color: Colors.palette.m3tertiary
-			implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.small * 2
-			implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.normal * 2
-			radius: Tokens.rounding.normal
+			implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.extraSmall * 2
+			implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.small * 2
+			radius: Tokens.rounding.medium
 
 			Behavior on implicitWidth {
 				Anim {
-					easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+					easing: Tokens.anim.expressiveDefaultEffects
 				}
 			}
 
@@ -106,7 +106,7 @@ Item {
 				id: icon
 
 				anchors.right: parent.right
-				anchors.rightMargin: Tokens.padding.normal
+				anchors.rightMargin: Tokens.padding.small
 				anchors.verticalCenter: parent.verticalCenter
 				color: Colors.palette.m3onTertiary
 				font.pointSize: Tokens.font.size.large

Modules/Launcher/Items/VariantItem.qml

@@ -15,7 +15,7 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 
 		onClicked: {
 			root.modelData?.onClicked(root.list);
@@ -24,9 +24,9 @@ Item {
 
 	Item {
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.larger
-		anchors.margins: Tokens.padding.smaller
-		anchors.rightMargin: Tokens.padding.larger
+		anchors.leftMargin: Tokens.padding.small
+		anchors.margins: Tokens.padding.small
+		anchors.rightMargin: Tokens.padding.small
 
 		MaterialIcon {
 			id: icon
@@ -38,10 +38,10 @@ Item {
 
 		Column {
 			anchors.left: icon.right
-			anchors.leftMargin: Tokens.spacing.larger
+			anchors.leftMargin: Tokens.spacing.large
 			anchors.verticalCenter: icon.verticalCenter
 			spacing: 0
-			width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.normal : 0)
+			width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.medium : 0)
 
 			CustomText {
 				font.pointSize: Tokens.font.size.normal

Modules/Launcher/Wrapper.qml

@@ -11,7 +11,7 @@ Item {
 
 	property int contentHeight
 	readonly property real maxHeight: {
-		let max = screen.height - Tokens.spacing.large * 2;
+		let max = screen.height - Tokens.spacing.largeIncreased * 2;
 		if (visibilities.resources && panels.resourcesWrapper.x + panels.resourcesWrapper.width > root.x)
 			max -= panels.resources.nonAnimHeight;
 		if (panels.popouts.hasCurrent)
@@ -34,7 +34,7 @@ Item {
 	Behavior on offsetScale {
 		Anim {
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 		}
 	}
 

Modules/Lock/Center.qml

@@ -19,7 +19,7 @@ ColumnLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
-	spacing: Tokens.spacing.large * 2
+	spacing: Tokens.spacing.largeIncreased * 2
 
 	RowLayout {
 		Layout.alignment: Qt.AlignHCenter
@@ -29,7 +29,7 @@ ColumnLayout {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
 			font.bold: true
-			font.family: Appearance.font.family.clock
+			font.family: Config.appearance.font.family.clock
 			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: Time.hourStr
 		}
@@ -38,7 +38,7 @@ ColumnLayout {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3primary
 			font.bold: true
-			font.family: Appearance.font.family.clock
+			font.family: Config.appearance.font.family.clock
 			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: ":"
 		}
@@ -47,7 +47,7 @@ ColumnLayout {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
 			font.bold: true
-			font.family: Appearance.font.family.clock
+			font.family: Config.appearance.font.family.clock
 			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: Time.minuteStr
 		}
@@ -58,14 +58,14 @@ ColumnLayout {
 		Layout.topMargin: -Tokens.padding.large * 2
 		color: Colors.palette.m3tertiary
 		font.bold: true
-		font.family: Appearance.font.family.mono
+		font.family: Config.appearance.font.family.mono
 		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
 	CustomClippingRect {
 		Layout.alignment: Qt.AlignHCenter
-		Layout.topMargin: Tokens.spacing.large * 2
+		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: root.centerWidth / 2
 		implicitWidth: root.centerWidth / 2
@@ -90,7 +90,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.tPalette.m3surfaceContainer
 		focus: true
-		implicitHeight: input.implicitHeight + Tokens.padding.small * 2
+		implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2
 		implicitWidth: root.centerWidth * 0.8
 		radius: Tokens.rounding.full
 
@@ -121,11 +121,11 @@ ColumnLayout {
 			id: input
 
 			anchors.fill: parent
-			anchors.margins: Tokens.padding.small
-			spacing: Tokens.spacing.normal
+			anchors.margins: Tokens.padding.extraSmall
+			spacing: Tokens.spacing.medium
 
 			Item {
-				implicitHeight: fprintIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: fprintIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 
 				MaterialIcon {
@@ -163,7 +163,7 @@ ColumnLayout {
 
 			CustomRect {
 				color: root.lock.pam.buffer ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-				implicitHeight: enterIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 				radius: Tokens.rounding.full
 
@@ -189,7 +189,7 @@ ColumnLayout {
 
 	Item {
 		Layout.fillWidth: true
-		Layout.topMargin: -Tokens.spacing.large
+		Layout.topMargin: -Tokens.spacing.largeIncreased
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
 
 		Behavior on implicitHeight {
@@ -226,7 +226,7 @@ ColumnLayout {
 			anchors.right: parent.right
 			animateProp: "opacity"
 			color: Colors.palette.m3onSurfaceVariant
-			font.family: Appearance.font.family.mono
+			font.family: Config.appearance.font.family.mono
 			horizontalAlignment: Qt.AlignHCenter
 			lineHeight: 1.2
 			opacity: shouldBeVisible && !message.msg ? 1 : 0
@@ -295,7 +295,7 @@ ColumnLayout {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: Colors.palette.m3error
-			font.family: Appearance.font.family.mono
+			font.family: Config.appearance.font.family.mono
 			font.pointSize: Tokens.font.size.small
 			horizontalAlignment: Qt.AlignHCenter
 			opacity: 0