fix: font family

Reviewed-on: #151

.gitea/workflows/python.yml

@@ -1,12 +1,15 @@
 name: Python
 
+env:
+    APT_DEPS: git python3 python3-pip python3-venv python3-gi python3-cairo python3-dbus python3-pyudev python3-psutil python3-evdev python3-yaml python3-xlib python3-pillow gir1.2-gtk-3.0
+
 on:
     pull_request:
 
 jobs:
-    fmt:
-        runs-on: alpine
-        container: node:26-alpine
+    static:
+        runs-on: debian
+        container: node:26-trixie-slim
 
         steps:
             - name: Checkout
@@ -14,10 +17,8 @@ jobs:
 
             - name: Install tools
               run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip
+                  apt-get update
+                  apt-get install -y --no-install-recommends git python3 python3-pip python3-venv
                   python3 -m venv .venv
                   . .venv/bin/activate
                   pip install --no-cache-dir ruff
@@ -27,32 +28,15 @@ jobs:
                   . .venv/bin/activate
                   ruff format --check .
 
-    lint:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir ruff
-
             - name: Lint
               run: |
                   . .venv/bin/activate
                   ruff check .
 
-    test:
-        runs-on: alpine
-        container: node:26-alpine
+    verify:
+        if: always()
+        runs-on: debian
+        container: node:26-trixie-slim
 
         steps:
             - name: Checkout
@@ -60,20 +44,16 @@ jobs:
 
             - name: Install tools
               run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip \
-                    py3-pillow \
-                    build-base
-                  python3 -m venv .venv
+                  apt-get update
+                  apt-get install -y --no-install-recommends $APT_DEPS build-essential python3-dev
+                  python3 -m venv --system-site-packages .venv
                   . .venv/bin/activate
-                  pip install --no-cache-dir \
-                    typer \
-                    pillow \
-                    materialyoucolor \
-                    jinja2 \
-                    pytest
+                  pip install --no-cache-dir basedpyright nuitka .
+
+            - name: Type check
+              run: |
+                  . .venv/bin/activate
+                  basedpyright
 
             - name: Test
               run: |
@@ -81,52 +61,7 @@ jobs:
                   cd cli
                   python -m pytest tests/ -v
 
-    typecheck:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                      git \
-                      python3 \
-                      py3-pip
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir basedpyright typer pillow materialyoucolor jinja2
-
-            - name: Type check
-              run: |
-                  . .venv/bin/activate
-                  basedpyright
-
-    buildcheck:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip \
-                    build-base \
-                    python3-dev \
-                    gcc \
-                    g++
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir nuitka
-
             - name: Nuitka module check
               run: |
                   . .venv/bin/activate
-                  nuitka --module --include-package=zshell cli/src/zshell/
+                  nuitka --module --include-package=zshell cli/src/zshell/

.gitignore

@@ -16,3 +16,5 @@ dist/
 **/test-plugins/
 **/Charts/
 network-dev/
+**/zshell.build/
+**/zshell.dist/

.qmlformat.ini

@@ -3,8 +3,9 @@ FunctionsSpacing=true
 IndentWidth=4
 MaxColumnWidth=-1
 NewlineType=native
-NormalizeOrder=true
+GroupAttributesTogether=false
 ObjectsSpacing=true
 SemicolonRule=always
+SingleLineEmptyObjects=true
 SortImports=false
 UseTabs=true

CMakeLists.txt

@@ -93,6 +93,8 @@ if("shell" IN_LIST ENABLE_MODULES)
 				${NUITKA_EXECUTABLE}
 				--standalone
 				--include-data-dir=${CMAKE_SOURCE_DIR}/cli/src/zshell/assets=zshell/assets
+				--include-package=gi.overrides
+				--include-package-data=solaar
 				--output-dir=${ZSHELL_CLI_BUILD_DIR}
 				--output-filename=zshell-cli
 				${CMAKE_SOURCE_DIR}/cli/src/zshell/

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 {
@@ -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

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/CustomFlickable.qml

@@ -28,6 +28,8 @@ Flickable {
 		interval: 10
 		running: root.doneFakeFlick
 
-		onTriggered: root.doneFakeFlick = false
+		onTriggered: {
+			root.doneFakeFlick = false;
+		}
 	}
 }

Components/CustomListView.qml

@@ -10,24 +10,27 @@ ListView {
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
-		onRunningChanged: {
-			if (!running && !root.doneFakeFlick) {
-				root.doneFakeFlick = true;
-				root.flick(1, 1);
-				root.flick(-1, -1);
-				Qt.callLater(() => root.cancelFlick());
-			}
-		}
+		// onRunningChanged: {
+		// 	if (!running && !root.doneFakeFlick) {
+		// 		root.doneFakeFlick = true;
+		// 		root.flick(1, 1);
+		// 		root.flick(-1, -1);
+		// 		Qt.callLater(() => root.cancelFlick());
+		// 	}
+		// }
 
 		Anim {
 			properties: "x,y"
+			type: Anim.DefaultEffects
 		}
 	}
 
-	Timer {
-		interval: 10
-		running: root.doneFakeFlick
-
-		onTriggered: root.doneFakeFlick = false
-	}
+	// Timer {
+	// 	interval: 10
+	// 	running: root.doneFakeFlick
+	//
+	// 	onTriggered: {
+	// 		root.doneFakeFlick = false;
+	// 	}
+	// }
 }

Components/CustomMouseArea.qml

@@ -4,6 +4,7 @@ MouseArea {
 	property int scrollAccumulatedY: 0
 
 	function onWheel(event: WheelEvent): void {
+		event.accepted = false;
 	}
 
 	onWheel: event => {

Components/CustomScrollBar.qml

@@ -1,32 +1,37 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Templates
 import qs.Helpers
 import ZShell.Config
-import qs.Services
 
 ScrollBar {
 	id: root
 
+	required property Flickable flickable
+	readonly property bool isHorizontal: flickable && flickable.ScrollBar.horizontal === root
+	readonly property real axisSize: isHorizontal ? flickable.width : flickable.height
+	readonly property real axisContentSize: isHorizontal ? flickable.contentWidth : flickable.contentHeight
+	readonly property real axisContentPos: isHorizontal ? (flickable.contentX - flickable.originX) : (flickable.contentY - flickable.originY)
+	readonly property real axisLength: isHorizontal ? root.width : root.height
 	readonly property real effectiveSize: Math.max(nonAnimHeight, root.minimumSize)
 	readonly property real effectiveTravel: Math.max(0, 1 - root.effectiveSize)
-	required property Flickable flickable
-	readonly property real nonAnimHeight: flickable.height / flickable.contentHeight
-	readonly property real nonAnimY: flickable.contentY / flickable.contentHeight
+	readonly property real nonAnimHeight: root.axisSize / root.axisContentSize
+	readonly property real nonAnimY: root.axisContentPos / root.axisContentSize
 	readonly property real rawTravel: Math.max(0, 1 - root.nonAnimHeight)
-	readonly property bool reversed: flickable instanceof ListView && flickable.verticalLayoutDirection === ListView.BottomToTop
+	readonly property bool reversed: isHorizontal ? (flickable instanceof ListView && flickable.layoutDirection === Qt.RightToLeft) : (flickable instanceof ListView && flickable.verticalLayoutDirection === ListView.BottomToTop)
 	property bool shouldBeActive
 	readonly property real travelScale: root.rawTravel > 0 ? root.effectiveTravel / root.rawTravel : 0
 
 	enabled: !Visibilities.getForActive().isDrawing
-	implicitWidth: Tokens.padding.extraSmall * 2
+	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
+	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0
 
-	contentItem: Item {
-	}
+	contentItem: Item {}
 	Behavior on position {
 		enabled: !fullMouse.pressed
 
-		Anim {
-		}
+		Anim {}
 	}
 
 	onHoveredChanged: {
@@ -47,54 +52,27 @@ ScrollBar {
 		target: root.flickable
 	}
 
-	CustomClippingRect {
-		anchors.bottom: parent.bottom
-		anchors.right: parent.right
-		anchors.top: parent.top
-		implicitWidth: handle.implicitWidth
-		radius: Tokens.rounding.full
+	Loader {
+		anchors.fill: parent
+		active: root.size < 1
+		sourceComponent: root.isHorizontal ? horizontalTrack : verticalTrack
+	}
 
-		CustomRect {
-			id: handle
+	Component {
+		id: verticalTrack
 
-			anchors.right: parent.right
-			color: Colors.palette.m3secondary
-			implicitHeight: root.height * root.effectiveSize
-			implicitWidth: fullMouse.pressed || fullMouse.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
-			opacity: {
-				if (!root.enabled)
-					return 0;
-				if (root.size === 1)
-					return 0;
-				if (fullMouse.pressed)
-					return 1;
-				if (fullMouse.containsMouse)
-					return 0.8;
-				if (root.policy === ScrollBar.AlwaysOn || root.shouldBeActive)
-					return 0.6;
-				return 0;
-			}
-			radius: Tokens.rounding.full
-			y: root.reversed ? root.height * (1 + root.nonAnimY) * root.travelScale : root.height * root.nonAnimY * root.travelScale
+		VerticalScrollBarTrack {
+			scrollBar: root
+			mouseArea: fullMouse
+		}
+	}
 
-			Behavior on implicitWidth {
-				Anim {
-				}
-			}
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
+	Component {
+		id: horizontalTrack
 
-			MouseArea {
-				id: mouse
-
-				acceptedButtons: Qt.NoButton
-				anchors.fill: parent
-				cursorShape: Qt.PointingHandCursor
-				hoverEnabled: true
-			}
+		HorizontalScrollBarTrack {
+			scrollBar: root
+			mouseArea: fullMouse
 		}
 	}
 
@@ -111,25 +89,40 @@ ScrollBar {
 
 		property real pressOffset: 0
 
-		function contentYFromThumbTop(thumbTop) {
-			var visualPos = root.effectiveTravel > 0 ? thumbTop / root.travelScale : 0;
-
-			return root.reversed ? (visualPos - 1) * root.flickable.contentHeight : visualPos * root.flickable.contentHeight;
+		function contentPosFromThumbStart(thumbStart) {
+			var visualPos = root.effectiveTravel > 0 ? thumbStart / root.travelScale : 0;
+			return root.reversed ? (visualPos - 1) * root.axisContentSize : visualPos * root.axisContentSize;
 		}
 
 		function updateFromEvent(event) {
-			var posInTrack = event.y / root.height;
-			var thumbTop = posInTrack - pressOffset;
-			thumbTop = Math.max(0, Math.min(root.effectiveTravel, thumbTop));
+			var eventPos = root.isHorizontal ? event.x : event.y;
+			var posInTrack = eventPos / root.axisLength;
+			var thumbStart = posInTrack - pressOffset;
+			thumbStart = Math.max(0, Math.min(root.effectiveTravel, thumbStart));
 
-			root.flickable.contentY = contentYFromThumbTop(thumbTop);
+			var newPos = contentPosFromThumbStart(thumbStart);
+			if (root.isHorizontal)
+				root.flickable.contentX = newPos + root.flickable.originX;
+			else
+				root.flickable.contentY = newPos + root.flickable.originY;
 		}
 
-		function visualThumbTop() {
+		function visualThumbStart() {
 			const visualPos = root.reversed ? (1 + root.nonAnimY) : root.nonAnimY;
 			return visualPos * root.travelScale;
 		}
 
+		function onWheel(event: WheelEvent): void {
+			if (root.horizontal) {
+				event.accepted = false;
+				return;
+			}
+
+			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
+			var newPos = Math.max(0, Math.min(1 - root.size, root.position + delta));
+			root.position = newPos;
+		}
+
 		anchors.fill: parent
 		cursorShape: undefined
 		hoverEnabled: true
@@ -140,24 +133,15 @@ ScrollBar {
 				updateFromEvent(event);
 		}
 		onPressed: event => {
-			var currentTop = visualThumbTop();
-			var currentBottom = currentTop + root.effectiveSize;
-			var clickPos = event.y / root.height;
+			var currentStart = visualThumbStart();
+			var currentEnd = currentStart + root.effectiveSize;
+			var eventPos = root.isHorizontal ? event.x : event.y;
+			var clickPos = eventPos / root.axisLength;
 
-			var clickedInsideThumb = clickPos >= currentTop && clickPos <= currentBottom;
-
-			if (clickedInsideThumb) {
-				pressOffset = clickPos - currentTop;
-			} else {
-				pressOffset = root.effectiveSize / 2;
-			}
+			var clickedInsideThumb = clickPos >= currentStart && clickPos <= currentEnd;
+			pressOffset = clickedInsideThumb ? (clickPos - currentStart) : root.effectiveSize / 2;
 
 			updateFromEvent(event);
 		}
-		onWheel: event => {
-			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
-			var newPos = Math.max(0, Math.min(1 - root.size, root.position + delta));
-			root.position = newPos;
-		}
 	}
 }

Components/CustomSlider.qml

@@ -13,11 +13,13 @@ Slider {
 
 	property bool animateWave
 	property color bgColor: enabled ? Colors.palette.m3secondaryContainer : Qt.alpha(Colors.palette.m3onSurface, 0.1)
+	readonly property bool dragging: mouse.pressed
 	property color fgColor: enabled ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property real filledWidth
 	property alias inset: inset
 	property color insetColor: enabled ? (inset.attached ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onPrimary) : Colors.palette.m3onSurface
 	property string insetIcon: ""
+	property bool interactionOnMove: true
 	property real pos: visualPosition
 	property int radius: Tokens.rounding.small
 	property int waveDuration: 1000
@@ -186,7 +188,8 @@ Slider {
 
 		onPositionChanged: e => {
 			dragMovement = (e.x - pressStartX) / width;
-			root.interaction(posBinding.value);
+			if (root.interactionOnMove)
+				root.interaction(posBinding.value);
 		}
 		onPressed: e => {
 			widthBehavior.enabled = false;

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

@@ -129,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
 				}
 			}
 		}
@@ -140,7 +140,7 @@ TextFieldBase {
 
 			active: root.leadingIcon
 			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.normal
+			anchors.leftMargin: Tokens.padding.small
 			anchors.verticalCenter: parent.verticalCenter
 
 			sourceComponent: MaterialIcon {
@@ -154,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/HorizontalScrollBarTrack.qml

@@ -0,0 +1,56 @@
+import QtQuick
+import ZShell.Config
+import qs.Services
+
+CustomClippingRect {
+	id: track
+
+	required property var scrollBar
+	required property var mouseArea
+
+	anchors.left: parent.left
+	anchors.right: parent.right
+	anchors.bottom: parent.bottom
+	implicitHeight: handle.implicitHeight
+	radius: Tokens.rounding.full
+
+	CustomRect {
+		id: handle
+
+		anchors.bottom: parent.bottom
+		color: Colors.palette.m3secondary
+		implicitWidth: track.scrollBar.width * track.scrollBar.effectiveSize
+		implicitHeight: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+		opacity: {
+			if (!track.scrollBar.enabled)
+				return 0;
+			if (track.scrollBar.size === 1)
+				return 0;
+			if (track.mouseArea.pressed)
+				return 1;
+			if (track.mouseArea.containsMouse)
+				return 0.8;
+			if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
+				return 0.6;
+			return 0;
+		}
+		radius: Tokens.rounding.full
+		x: track.scrollBar.reversed ? track.scrollBar.width * (1 + track.scrollBar.nonAnimY) * track.scrollBar.travelScale : track.scrollBar.width * track.scrollBar.nonAnimY * track.scrollBar.travelScale
+
+		Behavior on implicitHeight {
+			Anim {}
+		}
+		Behavior on opacity {
+			Anim {
+				type: Anim.DefaultEffects
+			}
+		}
+
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+			hoverEnabled: true
+		}
+	}
+}

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/TextAreaBase.qml

@@ -0,0 +1,86 @@
+import QtQuick
+import QtQuick.Templates
+import ZShell.Config
+import qs.Services
+
+TextArea {
+	id: root
+
+	color: Colors.palette.m3onSurface
+	cursorVisible: !readOnly
+	font.pointSize: Tokens.font.size.small
+	implicitHeight: contentHeight + topPadding + bottomPadding
+	implicitWidth: contentWidth + leftPadding + rightPadding
+	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
+	renderType: TextArea.NativeRendering
+	selectedTextColor: color
+	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
+	verticalAlignment: TextInput.AlignVCenter
+
+	Behavior on color {
+		CAnim {}
+	}
+	Behavior on selectionColor {
+		CAnim {}
+	}
+	cursorDelegate: Item {}
+
+	CustomRect {
+		id: cursor
+
+		property bool disableBlink
+
+		color: Colors.palette.m3primary
+		implicitHeight: root.cursorRectangle.height
+		implicitWidth: 1.5
+		radius: Tokens.rounding.largeIncreased
+		x: root.cursorRectangle.x
+		y: root.cursorRectangle.y
+
+		Behavior on x {
+			Anim {
+				duration: Tokens.anim.durations.expressiveFastEffects
+				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
+			}
+		}
+		Behavior on opacity {
+			Anim {
+				type: Anim.StandardSmall
+			}
+		}
+
+		Connections {
+			function onCursorPositionChanged(): void {
+				if (root.activeFocus && root.cursorVisible) {
+					cursor.opacity = 1;
+					cursor.disableBlink = true;
+					enableBlink.restart();
+				}
+			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 500
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
+		}
+	}
+}

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/TextEditBase.qml

@@ -0,0 +1,100 @@
+import QtQuick
+import QtQuick.Templates
+import ZShell.Config
+import qs.Services
+
+TextEdit {
+	id: root
+
+	property bool animateCursor: true
+	property alias cursor: cursor
+
+	color: Colors.palette.m3onSurface
+	cursorVisible: !readOnly
+	font.pointSize: Tokens.font.size.small
+	font.family: Config.appearance.font.family.sans
+	renderType: TextField.NativeRendering
+	selectedTextColor: color
+	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
+	verticalAlignment: TextInput.AlignVCenter
+
+	Behavior on color {
+		CAnim {
+		}
+	}
+	cursorDelegate: Item {
+	}
+	Behavior on selectionColor {
+		CAnim {
+		}
+	}
+
+	CustomRect {
+		id: cursor
+
+		property bool disableBlink
+
+		color: Colors.palette.m3primary
+		implicitHeight: root.cursorRectangle.height
+		implicitWidth: 1.5
+		radius: Tokens.rounding.largeIncreased
+		x: root.cursorRectangle.x
+		y: root.cursorRectangle.y
+
+		Behavior on opacity {
+			Anim {
+				type: Anim.StandardSmall
+			}
+		}
+		Behavior on x {
+			enabled: root.animateCursor
+
+			Anim {
+				duration: Tokens.anim.durations.expressiveFastEffects
+				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
+			}
+		}
+		Behavior on y {
+			enabled: root.animateCursor
+
+			Anim {
+				duration: Tokens.anim.durations.expressiveFastEffects
+				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
+			}
+		}
+
+		Connections {
+			function onCursorPositionChanged(): void {
+				if (root.activeFocus && root.cursorVisible) {
+					cursor.opacity = 1;
+					cursor.disableBlink = true;
+					enableBlink.restart();
+				}
+			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 500
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
+		}
+	}
+}

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

Components/VerticalFadeListView.qml

@@ -8,6 +8,7 @@ CustomListView {
 
 	property real endFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
 	property real fadeAmount: 0.1
+	property real fadeThreshold: 0.0
 	readonly property bool horizontal: orientation === ListView.Horizontal
 	property real startFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
 
@@ -28,11 +29,11 @@ CustomListView {
 	}
 
 	function marginEnd(): real {
-		return horizontal ? rightMargin : bottomMargin;
+		return horizontal ? rightMargin - fadeThreshold : bottomMargin - fadeThreshold;
 	}
 
 	function marginStart(): real {
-		return horizontal ? leftMargin : topMargin;
+		return horizontal ? leftMargin - fadeThreshold : topMargin - fadeThreshold;
 	}
 
 	function overshootStart(): real {

Components/VerticalScrollBarTrack.qml

@@ -0,0 +1,56 @@
+import QtQuick
+import ZShell.Config
+import qs.Services
+
+CustomClippingRect {
+	id: track
+
+	required property var scrollBar
+	required property var mouseArea
+
+	anchors.bottom: parent.bottom
+	anchors.right: parent.right
+	anchors.top: parent.top
+	implicitWidth: handle.implicitWidth
+	radius: Tokens.rounding.full
+
+	CustomRect {
+		id: handle
+
+		anchors.right: parent.right
+		color: Colors.palette.m3secondary
+		implicitHeight: track.scrollBar.height * track.scrollBar.effectiveSize
+		implicitWidth: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+		opacity: {
+			if (!track.scrollBar.enabled)
+				return 0;
+			if (track.scrollBar.size === 1)
+				return 0;
+			if (track.mouseArea.pressed)
+				return 1;
+			if (track.mouseArea.containsMouse)
+				return 0.8;
+			if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
+				return 0.6;
+			return 0;
+		}
+		radius: Tokens.rounding.full
+		y: track.scrollBar.reversed ? track.scrollBar.height * (1 + track.scrollBar.nonAnimY) * track.scrollBar.travelScale : track.scrollBar.height * track.scrollBar.nonAnimY * track.scrollBar.travelScale
+
+		Behavior on implicitWidth {
+			Anim {}
+		}
+		Behavior on opacity {
+			Anim {
+				type: Anim.DefaultEffects
+			}
+		}
+
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+			hoverEnabled: true
+		}
+	}
+}

Drawers/Exclusions.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Wayland
 import QtQuick
 import ZShell.Config
 import qs.Components
@@ -15,6 +16,9 @@ Scope {
 	ExclusionZone {
 		id: top
 
+		WlrLayershell.layer: WlrLayer.Overlay
+		anchors.left: true
+		anchors.right: true
 		anchors.top: true
 		hasBar: root.geometry.barOnTop
 	}

Drawers/Interactions.qml

@@ -162,6 +162,19 @@ Item {
 		}
 	}
 
+	Timer {
+		id: unhideTimer
+
+		interval: Config.bar.revealDelay
+		repeat: false
+		running: false
+
+		onTriggered: {
+			if (hoverHandler.hovered)
+				root.bar.isHovered = true;
+		}
+	}
+
 	HoverHandler {
 		id: hoverHandler
 
@@ -178,7 +191,7 @@ Item {
 					root.popouts.hasCurrent = false;
 				}
 
-				if (Config.bar.autoHide)
+				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
 			}
 		}
@@ -200,6 +213,9 @@ Item {
 			if (!root.visibilities.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
 				root.bar.isHovered = true;
 
+			if (root.bar.fullscreen && !root.bar.isHovered)
+				unhideTimer.start();
+
 			if (root.panels.sidebar.offsetScale === 1) {
 				const showOsd = root.inRightPanel(root.panels.osdWrapper, 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
 	}
 
@@ -140,7 +140,6 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
 		sidebar: sidebar
 		visibilities: root.visibilities
 	}
@@ -161,7 +160,7 @@ Item {
 		Behavior on offsetScale {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 

Drawers/Windows.qml

@@ -51,24 +51,22 @@ CustomWindow {
 	readonly property HyprlandMonitor monitor: Hypr.monitorFor(screen)
 	property var root: Quickshell.shellDir
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.7 * (1 - fsTransitionProg)
+	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings || visibilities.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
 	contentItem.focus: true
-	mask: visibilities.isDrawing ? null : (hasFullscreen ? emptyRegion : regions)
+	mask: visibilities.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on surfaceColor {
-		CAnim {
-		}
+		CAnim {}
 	}
 
 	contentItem.Keys.onEscapePressed: {
@@ -118,6 +116,12 @@ CustomWindow {
 			x: root.width - width
 			y: panels.osdWrapper.y + bar.implicitHeight
 		}
+
+		Region {
+			height: geometry.horizontal ? 1 : root.screen.height
+			width: geometry.horizontal ? root.screen.width : 1
+			y: geometry.position === "bottom" ? root.screen.height - 1 : 0
+		}
 	}
 
 	Regions {
@@ -219,7 +223,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)
 		}
@@ -232,7 +236,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)
 		}
 
@@ -261,7 +265,7 @@ CustomWindow {
 			id: notifsBg
 
 			panel: panels.notifications
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.large
 		}
 
 		PanelBg {
@@ -282,13 +286,12 @@ 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)
 
 			Behavior on extraExtent {
-				Anim {
-				}
+				Anim {}
 			}
 		}
 
@@ -299,7 +302,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)
 		}
@@ -309,7 +312,7 @@ CustomWindow {
 
 			deformAmount: 0.03
 			panel: panels.settings
-			radius: Tokens.rounding.large + Tokens.padding.normal
+			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
 		}
 
 		PanelBg {
@@ -317,7 +320,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.dock
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -325,7 +328,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.drawing
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -456,7 +459,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)
 	}

Effects/ShadowRect.qml

@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-
-Item {
-	id: root
-
-	property real radius
-
-	Rectangle {
-		id: shadowRect
-
-		anchors.fill: root
-		color: "black"
-		layer.enabled: true
-		radius: root.radius
-		visible: false
-	}
-
-	MultiEffect {
-		id: effects
-
-		anchors.fill: shadowRect
-		autoPaddingEnabled: true
-		maskEnabled: true
-		maskInverted: true
-		maskSource: shadowRect
-		shadowBlur: 2.0
-		shadowColor: "black"
-		shadowEnabled: true
-		shadowOpacity: 1
-		source: shadowRect
-	}
-}

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/CustomTextInput.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
@@ -11,6 +10,6 @@ TextInput {
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Config.appearance?.font.size.normal ?? 15
+		pixelSize: Tokens?.font.size.normal ?? 15
 	}
 }

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/Services/Colors.qml

@@ -13,21 +13,17 @@ import qs.Paths
 Singleton {
 	id: root
 
-	readonly property M3Palette current: M3Palette {
-	}
+	readonly property M3Palette current: M3Palette {}
 	property bool currentLight
 	property string flavour
 	readonly property bool light: showPreview ? previewLight : currentLight
 	readonly property M3Palette palette: showPreview ? preview : current
-	readonly property M3Palette preview: M3Palette {
-	}
+	readonly property M3Palette preview: M3Palette {}
 	property bool previewLight
 	property string scheme
 	property bool showPreview
-	readonly property M3TPalette tPalette: M3TPalette {
-	}
-	readonly property Transparency transparency: Transparency {
-	}
+	readonly property M3TPalette tPalette: M3TPalette {}
+	readonly property Transparency transparency: Transparency {}
 	readonly property alias wallLuminance: analyser.luminance
 
 	function alterColor(c: color, a: real, layer: int): color {
@@ -112,8 +108,7 @@ Singleton {
 
 	function setMode(mode: string): void {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", mode]);
-		Config.general.color.mode = mode;
-		Config.save();
+		Config.colors.mode = mode;
 	}
 
 	function swapRG(c: color): color {

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/Battery.qml

@@ -1,35 +1,63 @@
 pragma Singleton
 
 import Quickshell
+import Quickshell.Io
 import Quickshell.Services.UPower
 import ZShell.Config
 import qs.Services
+import qs.Paths
 
 Singleton {
 	id: root
 
-	readonly property var colors: {
-		if (deviceState === UPowerDeviceState.Charging || deviceState === UPowerDeviceState.FullyCharged)
+	readonly property list<var> allPeripherals: [...logiDevices, ...upowerDevices.filter(d => !Battery.logiDevices.some(l => l.nativePath === d.nativePath))]
+	readonly property real currentPerc: UPower.displayDevice.percentage
+	readonly property var deviceState: UPower.displayDevice.state
+	readonly property string deviceStateString: UPowerDeviceState.toString(deviceState)
+	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
+	readonly property alias logiDevices: adapter.devices
+	readonly property var lowestPeripheral: allPeripherals.reduce((lowest, current) => current.percentage < lowest.percentage ? current : lowest)
+	readonly property bool onBattery: UPower.onBattery
+	readonly property bool ready: UPower.displayDevice.ready
+	readonly property real timeToEmpty: UPower.displayDevice.timeToEmpty
+	readonly property real timeToFull: UPower.displayDevice.timeToFull
+	readonly property list<UPowerDevice> upowerDevices: UPower.devices.values.filter(d => d.state !== UPowerDeviceState.Unknown)
+
+	function getColors(percentage: real, state: string): var {
+		if (state === "charging" || state === "full" || state === "recharging")
 			return {
 				fg: Colors.swapRG(Colors.palette.m3error),
 				bg: Colors.swapRG(Colors.palette.m3onError)
 			};
-		else if (currentPerc <= 0.2)
+		else if (percentage <= 0.2)
 			return {
 				fg: Colors.palette.m3error,
 				bg: Colors.palette.m3onError
 			};
 		else
 			return {
-				fg: Colors.palette.m3onSurface,
-				bg: Colors.palette.m3surface
+				fg: Colors.palette.m3tertiary,
+				bg: Colors.palette.m3onTertiary
 			};
 	}
-	readonly property real currentPerc: UPower.displayDevice.percentage
-	readonly property var deviceState: UPower.displayDevice.state
-	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
-	readonly property bool onBattery: UPower.onBattery
-	readonly property bool ready: UPower.displayDevice.ready
-	readonly property real timeToEmpty: UPower.displayDevice.timeToEmpty
-	readonly property real timeToFull: UPower.displayDevice.timeToFull
+
+	function startDaemon(): void {
+		Quickshell.execDetached(["zshell-cli", "battery", "daemon"]);
+	}
+
+	FileView {
+		id: fileView
+
+		path: `${Paths.cache}/battery.json`
+		watchChanges: true
+
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property list<var> devices: []
+			property real updated: 0.0
+		}
+	}
 }

Helpers/DockApps.qml

@@ -1,70 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Components
-import ZShell.Config
-
-Singleton {
-	id: root
-
-	property list<var> apps: {
-		var map = new Map();
-
-		const pinnedApps = Config.dock?.pinnedApps ?? [];
-		for (const appId of pinnedApps) {
-			if (!map.has(appId.toLowerCase()))
-				map.set(appId.toLowerCase(), ({
-						pinned: true,
-						toplevels: []
-					}));
-		}
-
-		if (pinnedApps.length > 0) {
-			map.set("SEPARATOR", {
-				pinned: false,
-				toplevels: []
-			});
-		}
-
-		var values = [];
-
-		for (const [key, value] of map) {
-			values.push(appEntryComp.createObject(null, {
-				appId: key,
-				toplevels: value.toplevels,
-				pinned: value.pinned
-			}));
-		}
-
-		return values;
-	}
-
-	function isPinned(appId) {
-		return Config.dock.pinnedApps.indexOf(appId) !== -1;
-	}
-
-	function togglePin(appId) {
-		if (root.isPinned(appId)) {
-			Config.dock.pinnedApps = Config.dock.pinnedApps.filter(id => id !== appId);
-		} else {
-			Config.dock.pinnedApps = Config.dock.pinnedApps.concat([appId]);
-		}
-	}
-
-	Component {
-		id: appEntryComp
-
-		TaskbarAppEntry {
-		}
-	}
-
-	component TaskbarAppEntry: QtObject {
-		id: wrapper
-
-		required property string appId
-		required property bool pinned
-		required property list<var> toplevels
-	}
-}

Helpers/FetchPresets.qml

@@ -1,63 +0,0 @@
-// FetchPresets.qml
-pragma Singleton
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-	id: root
-
-	property var parsedPresets: ({})
-	readonly property var presets: parsedPresets
-	property bool ready: false
-
-	function accents(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.accents ?? [];
-	}
-
-	function defaultAccent(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.default_accent ?? "";
-	}
-
-	function modes(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.modes ?? [];
-	}
-
-	function presetNames() {
-		return Object.keys(parsedPresets);
-	}
-
-	function variantNames(presetName) {
-		const preset = parsedPresets[presetName];
-
-		if (!preset || !preset.variants)
-			return [];
-
-		return Object.keys(preset.variants);
-	}
-
-	Process {
-		command: ["zshell-cli", "scheme", "list-presets", "--json"]
-		running: true
-
-		stdout: StdioCollector {
-			onStreamFinished: {
-				try {
-					const parsed = JSON.parse(text);
-
-					root.parsedPresets = parsed.presets ?? {};
-					root.ready = true;
-				} catch (e) {
-					console.error("Failed to parse presets JSON:", e);
-				}
-			}
-		}
-	}
-}

Helpers/Hyprsunset.qml

@@ -9,13 +9,13 @@ Singleton {
 	id: root
 
 	readonly property bool enabled: service.enabled
-	readonly property int end: Config.general.color.scheduleHyprsunsetEnd
+	readonly property int end: Config.display.nightlight.scheduleEnd
 	property bool manualToggle: false
-	readonly property int start: Config.general.color.scheduleHyprsunsetStart
-	readonly property int temp: Config.general.color.hyprsunsetTemp
+	readonly property int start: Config.display.nightlight.scheduleStart
+	readonly property int temp: Config.display.nightlight.temp
 
 	function checkStartup(): void {
-		if (!Config.general.color.scheduleHyprsunset)
+		if (!Config.display.nightlight.schedule)
 			return;
 
 		service.apply();
@@ -26,12 +26,14 @@ Singleton {
 		service.toggle();
 	}
 
-	HyprsunsetManager {
+	NightlightManager {
 		id: service
 
-		activeAuto: Config.general.color.scheduleHyprsunset
+		activeAuto: Config.display.nightlight.schedule
 		endTime: root.end
 		startTime: root.start
 		temp: root.temp
+		fadeDuration: Config.display.nightlight.fadeDuration / 1000
+		useNativeNightlight: Config.display.nightlight.useNative
 	}
 }

Helpers/ModeScheduler.qml

@@ -11,14 +11,14 @@ import qs.Services
 Singleton {
 	id: root
 
-	readonly property int darkEnd: Config.general.color.scheduleDarkEnd
-	readonly property int darkStart: Config.general.color.scheduleDarkStart
-	readonly property bool enabled: Config.general.color.scheduleDark && Config.general.color.schemeGeneration
+	readonly property int darkEnd: Config.colors.scheduleDarkEnd
+	readonly property int darkStart: Config.colors.scheduleDarkStart
+	readonly property bool enabled: Config.colors.scheduleDark && Config.colors.schemeGen
 
 	function applyDarkMode() {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "dark"]);
 
-		Config.general.color.mode = "dark";
+		Config.colors.mode = "dark";
 
 		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-dark'"]);
 
@@ -30,13 +30,13 @@ Singleton {
 	function applyLightMode() {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "light"]);
 
-		Config.general.color.mode = "light";
+		Config.colors.mode = "light";
 
 		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-light'"]);
 
 		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Dark.colors/color_scheme_path=\\1Light.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`]);
 
-		if (Config.general.color.neovimColors)
+		if (Config.colors.neovimColors)
 			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"]);
 	}
 

Helpers/Picker.qml

@@ -126,33 +126,29 @@ Item {
 	focus: true
 	opacity: 0
 
-	Behavior on opacity {
-		Anim {
-			duration: 300
-		}
-	}
 	Behavior on rsx {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {
-		}
+		ExAnim {}
 	}
 	Behavior on rsy {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {
-		}
+		ExAnim {}
 	}
 	Behavior on sh {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {
-		}
+		ExAnim {}
 	}
 	Behavior on sw {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {
+		ExAnim {}
+	}
+	Behavior on opacity {
+		Anim {
+			duration: 300
 		}
 	}
 
@@ -352,8 +348,7 @@ Item {
 		y: selectionRect.y - root.realBorderWidth
 
 		Behavior on border.color {
-			Anim {
-			}
+			Anim {}
 		}
 	}
 
@@ -391,7 +386,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()
@@ -402,6 +397,5 @@ Item {
 		onUndoRequested: annotations.undo()
 	}
 
-	component ExAnim: Anim {
-	}
+	component ExAnim: Anim {}
 }

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

Helpers/Updates.qml

@@ -11,8 +11,8 @@ Singleton {
 	id: root
 
 	property int availableUpdates: 0
-	property string cmd: ""
 	property bool commandReady
+	property bool hasHelper
 	property bool loaded
 	property double now: Date.now()
 	property var updates: ({})
@@ -38,18 +38,12 @@ Singleton {
 	}
 
 	function performPackageUpdate(pkg: string): void {
-		if (root.cmd === "pacman")
-			pkgUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Sy", pkg];
-		else
-			pkgUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Sy", pkg];
+		pkgUpdateProc.command = ["pkexec", "pacman", "--noconfirm", "-Sy", pkg];
 		pkgUpdateProc.running = true;
 	}
 
 	function performSystemUpdate(): void {
-		if (root.cmd === "pacman")
-			sysUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Syu"];
-		else
-			sysUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Syu"];
+		sysUpdateProc.command = ["pkexec", "pacman", "--noconfirm", "-Syu"];
 		sysUpdateProc.running = true;
 	}
 
@@ -87,7 +81,7 @@ Singleton {
 	Process {
 		id: cmdDetect
 
-		command: ["sh", "-c", "command -v checkupdates || command -v yay || command -v paru"]
+		command: ["sh", "-c", "command -v checkupdates"]
 		running: true
 
 		stdout: StdioCollector {
@@ -96,47 +90,20 @@ Singleton {
 				let helper;
 
 				if (cmd.length > 0) {
-					helper = cmd.split("/").pop();
+					helper = true;
 				} else {
-					helper = "pacman";
-				}
-
-				if (helper === "checkupdates") {
-					updatesProc.command = [helper];
-				} else {
-					updatesProc.command = [helper, "-Qu"];
+					helper = false;
 				}
+				root.hasHelper = helper;
 				root.commandReady = true;
 			}
 		}
 	}
 
-	Process {
-		id: updateCmdDetect
-
-		command: ["sh", "-c", "command -v yay || command -v paru"]
-		running: true
-
-		stdout: StdioCollector {
-			onStreamFinished: {
-				const cmd = this.text.trim();
-				let helper;
-
-				if (cmd.length > 0) {
-					helper = cmd.split("/").pop();
-				} else {
-					helper = "pacman";
-				}
-
-				root.cmd = helper;
-			}
-		}
-	}
-
 	Process {
 		id: updatesProc
 
-		command: []
+		command: root.hasHelper ? ["checkupdates"] : []
 		running: false
 
 		stdout: StdioCollector {

Helpers/WallpaperPath.qml

@@ -17,7 +17,10 @@ Singleton {
 		watchChanges: true
 
 		onAdapterUpdated: writeAdapter()
-		onFileChanged: reload()
+		onFileChanged: {
+			reload();
+			Wallpapers.previewColorLock = false;
+		}
 
 		JsonAdapter {
 			id: adapter

Helpers/Wallpapers.qml

@@ -6,7 +6,7 @@ import Quickshell.Io
 import QtQuick
 import ZShell.Models
 import ZShell.Config
-import qs.Modules
+import qs.Services
 import qs.Helpers
 import qs.Paths
 
@@ -17,6 +17,8 @@ Searcher {
 	property alias crops: adapter.monitorCrops
 	readonly property string current: showPreview ? previewPath : actualCurrent
 	property alias monitorCrops: monitorCrops
+	property bool pendingPreviewClear
+	property bool previewColorLock
 	property string previewPath
 	property bool recentlyChanged
 	property bool showPreview: false
@@ -34,9 +36,10 @@ Searcher {
 
 	function preview(path: string): void {
 		previewPath = path;
-		if (Config.general.color.schemeGeneration)
-			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${previewPath}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
 		showPreview = true;
+
+		if (Config.colors.schemeGen)
+			previewColorsProc.running = true;
 	}
 
 	function setCrop(screen: string, rect: rect, zoom: real): void {
@@ -52,7 +55,6 @@ Searcher {
 			height: rect.height,
 			zoom: zoom
 		};
-		// root.crops = updated;
 	}
 
 	function setWallpaper(path: string): void {
@@ -60,14 +62,16 @@ Searcher {
 		WallpaperPath.currentWallpaperPath = path;
 		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 1, 1), 1.0));
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
-		if (Config.general.color.schemeGeneration)
-			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
+		if (Config.colors.schemeGen)
+			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.colors.mode}`]);
 	}
 
 	function stopPreview(): void {
 		showPreview = false;
-		if (Config.general.color.schemeGeneration)
-			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
+		if (previewColorLock)
+			pendingPreviewClear = true;
+		else
+			Colors.showPreview = false;
 	}
 
 	extraOpts: useFuzzy ? ({}) : ({
@@ -77,6 +81,11 @@ Searcher {
 	list: wallpapers.entries
 	useFuzzy: true
 
+	onPreviewColorLockChanged: {
+		if (!previewColorLock && pendingPreviewClear)
+			Colors.showPreview = false;
+	}
+
 	IpcHandler {
 		function set(path: string): void {
 			root.setWallpaper(path);
@@ -118,4 +127,17 @@ Searcher {
 		path: Config.general.wallpaperPath
 		recursive: true
 	}
+
+	Process {
+		id: previewColorsProc
+
+		command: ["zshell-cli", "scheme", "generate", "-p", "-i", root.previewPath]
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				Colors.load(text, true);
+				Colors.showPreview = true;
+			}
+		}
+	}
 }

Modules/Bar/Bar.qml

@@ -12,6 +12,7 @@ GridLayout {
 
 	required property bool fullscreen
 	required property bool horizontal
+	required property bool isHovered
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
@@ -92,7 +93,7 @@ GridLayout {
 				delegate: EntryWrapper {
 					HyprsunsetWidget {
 						horizontal: root.horizontal
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -113,7 +114,7 @@ GridLayout {
 					Workspaces {
 						horizontal: root.horizontal
 						screen: root.screen
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -126,7 +127,7 @@ GridLayout {
 						horizontal: root.horizontal
 						loader: root
 						popouts: root.popouts
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -137,6 +138,7 @@ GridLayout {
 				delegate: EntryWrapper {
 					StatusIcons {
 						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -148,7 +150,7 @@ GridLayout {
 					Resources {
 						horizontal: root.horizontal
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -159,7 +161,7 @@ GridLayout {
 				delegate: EntryWrapper {
 					UpdatesWidget {
 						horizontal: root.horizontal
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -172,7 +174,7 @@ GridLayout {
 						horizontal: root.horizontal
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -186,7 +188,7 @@ GridLayout {
 						loader: root
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -198,7 +200,7 @@ GridLayout {
 					WindowTitle {
 						bar: root
 						horizontal: root.horizontal
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -218,7 +220,7 @@ GridLayout {
 				delegate: EntryWrapper {
 					MediaWidget {
 						horizontal: root.horizontal
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}

Modules/Bar/BarLoader.qml

@@ -16,12 +16,12 @@ 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
 	required property ShellScreen screen
-	readonly property bool shouldBeVisible: !fullscreen && (!Config.bar.autoHide || visibilities.bar || isHovered)
+	readonly property bool shouldBeVisible: (!fullscreen && (!Config.bar.autoHide || visibilities.bar)) || isHovered
 	readonly property int vPadding: 6
 	required property PersistentProperties visibilities
 
@@ -79,7 +79,9 @@ Item {
 
 		sourceComponent: Bar {
 			fullscreen: root.fullscreen
+			height: root.contentThickness
 			horizontal: root.horizontal
+			isHovered: root.isHovered
 			popouts: root.popouts
 			popoutsWrapper: root.popoutsWrapper
 			screen: root.screen

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.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
 	required property PersistentProperties visibilities
 
 	color: visibilities.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
@@ -57,14 +57,13 @@ WidgetBase {
 
 		anchors.centerIn: parent
 		color: root.contentColor
-		font: Config.appearance.font.family.mono // qmllint disable incompatible-type
+		font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 		height: implicitHeight
 		text: Time.dateStr
 		visible: root.horizontal
 
 		Behavior on color {
-			CAnim {
-			}
+			CAnim {}
 		}
 	}
 
@@ -72,7 +71,7 @@ WidgetBase {
 		id: verticalColumn
 
 		anchors.centerIn: parent
-		spacing: Tokens.padding.small ?? 2
+		spacing: Tokens.padding.extraSmall ?? 2
 		visible: !root.horizontal
 		width: root.baseSize
 
@@ -84,20 +83,19 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: Config.appearance.font.family.mono // qmllint disable incompatible-type
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 				text: Qt.formatDateTime(Time.date, modelData)
 
 				Behavior on color {
-					CAnim {
-					}
+					CAnim {}
 				}
 			}
 		}
 
 		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
@@ -114,7 +112,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: Config.appearance.font.family.mono // qmllint disable incompatible-type
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 				text: {
 					if (modelData.includes("h"))
 						return Time.hourStr;
@@ -126,8 +124,7 @@ WidgetBase {
 				}
 
 				Behavior on color {
-					CAnim {
-					}
+					CAnim {}
 				}
 			}
 		}
@@ -135,13 +132,12 @@ WidgetBase {
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
 			color: root.contentColor
-			font: Config.appearance.font.family.mono // qmllint disable incompatible-type
+			font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 			text: Qt.formatDateTime(Time.date, "AP")
 			visible: Config.services.useTwelveHourClock && root.formatParts.timeTokens.length > 0
 
 			Behavior on color {
-				CAnim {
-				}
+				CAnim {}
 			}
 		}
 	}

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -0,0 +1,85 @@
+import QtQuick
+import ZShell.Config
+import qs.Services
+import qs.Components
+import qs.Helpers
+
+Row {
+	id: root
+
+	property real batHeight: Tokens.padding.small * 2
+	property real batWidth: Tokens.padding.medium * 2
+	required property string devState
+	property real nubHeight: Tokens.padding.extraSmall
+	property real nubWidth: 2
+	required property real percentage
+	property real radius: Tokens.rounding.small / 2
+
+	spacing: 1
+
+	CustomRect {
+		id: track
+
+		anchors.verticalCenter: parent.verticalCenter
+		color: Battery.getColors(root.percentage, root.devState).bg
+		height: root.batHeight
+		radius: root.radius
+		width: root.batWidth
+
+		CustomText {
+			color: Battery.getColors(root.percentage, root.devState).fg
+			font.pointSize: Tokens.font.size.larger / 1.5
+			font.weight: 800
+			height: track.height
+			horizontalAlignment: Text.AlignHCenter
+			text: Math.round(root.percentage * 100)
+			verticalAlignment: Text.AlignVCenter
+			width: track.width
+		}
+
+		Item {
+			clip: true
+			width: parent.width * root.percentage
+
+			anchors {
+				bottom: parent.bottom
+				left: parent.left
+				top: parent.top
+			}
+
+			CustomRect {
+				id: fill
+
+				color: Battery.getColors(root.percentage, root.devState).fg
+				height: track.height
+				radius: track.radius
+				width: track.width
+
+				CustomText {
+					id: batteryLabel
+
+					clip: true
+					color: Battery.getColors(root.percentage, root.devState).bg
+					font.pointSize: Tokens.font.size.larger / 1.5
+					font.weight: 800
+					height: track.height
+					horizontalAlignment: Text.AlignHCenter
+					text: Math.round(root.percentage * 100)
+					verticalAlignment: Text.AlignVCenter
+					width: track.width
+				}
+			}
+		}
+	}
+
+	CustomRect {
+		id: nub
+
+		anchors.verticalCenter: parent.verticalCenter
+		bottomRightRadius: 20
+		color: root.percentage < 0.99 ? track.color : fill.color
+		height: root.nubHeight
+		topRightRadius: 20
+		width: root.nubWidth
+	}
+}

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 {
@@ -112,7 +112,6 @@ WidgetBase {
 						name: "upower"
 
 						UPowerWidget {
-							horizontal: root.horizontal
 						}
 					}
 				}

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -2,16 +2,17 @@ import Quickshell.Services.UPower
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import qs.Modules.Bar.Components.Common
 import qs.Components
 import qs.Helpers
 
 Item {
 	id: root
 
-	required property bool horizontal
+	readonly property Item currentItem: batteryIconLoader?.item ?? peripheralIconLoader?.item ?? upowerIconLoader.item
 
-	implicitHeight: Battery.isLaptop ? batteryIconLoader.item.implicitHeight : upowerIconLoader.item.implicitHeight
-	implicitWidth: Battery.isLaptop ? batteryIconLoader.item.implicitWidth : upowerIconLoader.item.implicitWidth
+	implicitHeight: currentItem?.implicitHeight ?? 0
+	implicitWidth: currentItem?.implicitWidth ?? 0
 
 	Behavior on Layout.preferredHeight {
 		Anim {
@@ -30,95 +31,36 @@ Item {
 		}
 	}
 
+	Component.onCompleted: Battery.startDaemon()
+
 	Loader {
 		id: batteryIconLoader
 
 		active: Battery.isLaptop
 		anchors.centerIn: parent
 
-		sourceComponent: Row {
-			id: batteryIcon
+		sourceComponent: BatteryIcon {
+			devState: Battery.deviceStateString
+			percentage: Battery.currentPerc
+		}
+	}
 
-			property real batHeight: 16
-			property real batWidth: 30
-			property real nubHeight: 6
-			property real nubWidth: 2
-			property real radius: Tokens.rounding.smallest / 2
+	Loader {
+		id: peripheralIconLoader
 
-			spacing: 1
+		active: (Battery.lowestPeripheral?.isPresent ?? false) && !batteryIconLoader.active
+		anchors.centerIn: parent
 
-			CustomRect {
-				id: track
-
-				anchors.verticalCenter: parent.verticalCenter
-				color: Battery.colors.bg
-				height: batteryIcon.batHeight
-				radius: batteryIcon.radius
-				width: batteryIcon.batWidth
-
-				CustomText {
-					color: Battery.colors.fg
-					font.pointSize: Tokens.font.size.larger / 1.5
-					font.weight: 800
-					height: track.height
-					horizontalAlignment: Text.AlignHCenter
-					text: Math.round(Battery.currentPerc * 100)
-					verticalAlignment: Text.AlignVCenter
-					width: track.width
-				}
-
-				Item {
-					clip: true
-					width: parent.width * Battery.currentPerc
-
-					anchors {
-						bottom: parent.bottom
-						left: parent.left
-						top: parent.top
-					}
-
-					CustomRect {
-						id: fill
-
-						color: Battery.colors.fg
-						height: track.height
-						radius: track.radius
-						width: track.width
-
-						CustomText {
-							id: batteryLabel
-
-							clip: true
-							color: Battery.colors.bg
-							font.pointSize: 7.5
-							font.weight: 800
-							height: track.height
-							horizontalAlignment: Text.AlignHCenter
-							text: Math.round(Battery.currentPerc * 100)
-							verticalAlignment: Text.AlignVCenter
-							width: track.width
-						}
-					}
-				}
-			}
-
-			CustomRect {
-				id: nub
-
-				anchors.verticalCenter: parent.verticalCenter
-				bottomRightRadius: 20
-				color: Battery.currentPerc < 0.99 ? track.color : fill.color
-				height: batteryIcon.nubHeight
-				topRightRadius: 20
-				width: batteryIcon.nubWidth
-			}
+		sourceComponent: BatteryIcon {
+			devState: Battery.lowestPeripheral?.state ?? ""
+			percentage: Battery.lowestPeripheral?.percentage ?? 0
 		}
 	}
 
 	Loader {
 		id: upowerIconLoader
 
-		active: !Battery.isLaptop
+		active: !batteryIconLoader.active && !peripheralIconLoader.active
 		anchors.centerIn: parent
 
 		sourceComponent: MaterialIcon {

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/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
 			}
 		}
 
@@ -96,10 +98,10 @@ Item {
 		readonly property bool shouldBeActive: root.popouts.currentName === name
 
 		active: false
-		// anchors.horizontalCenter: parent.horizontalCenter
-		// anchors.top: parent.top
-		// anchors.topMargin: 5
-		anchors.centerIn: parent
+		anchors.centerIn: opacity === 1 ? undefined : parent
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: opacity === 1 ? parent.top : undefined
+		anchors.topMargin: Tokens.padding.smaller
 		opacity: 0
 		scale: 0.8
 

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

@@ -1,8 +1,10 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import QtQuick.Layouts
 import Quickshell.Services.UPower
 import ZShell.Config
+import qs.Modules.Bar.Components.Common
 import qs.Helpers
 import qs.Components
 import qs.Services
@@ -10,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
@@ -22,6 +25,38 @@ Column {
 		}
 	}
 
+	Item {
+		id: padding
+
+		implicitHeight: root.horizontal ? 0 : Tokens.padding.small
+		implicitWidth: 1
+	}
+
+	Repeater {
+		model: Battery.allPeripherals
+
+		RowLayout {
+			id: layout
+
+			required property var modelData
+
+			anchors.left: parent.left
+			anchors.leftMargin: Tokens.padding.small
+			anchors.right: parent.right
+			anchors.rightMargin: Tokens.padding.small
+
+			CustomText {
+				Layout.fillWidth: true
+				text: layout.modelData.model
+			}
+
+			BatteryIcon {
+				devState: layout.modelData.state
+				percentage: layout.modelData.percentage
+			}
+		}
+	}
+
 	CustomText {
 		function formatSeconds(s: int, fallback: string): string {
 			const day = Math.floor(s / 86400);
@@ -40,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))
 	}
 
@@ -53,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
@@ -75,7 +110,7 @@ Column {
 					CustomText {
 						anchors.verticalCenter: parent.verticalCenter
 						color: Colors.palette.m3onError
-						font.family: Appearance.font.family.mono
+						font.family: Config.appearance.font.family.mono
 						text: qsTr("Performance Degraded")
 					}
 
@@ -111,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 {
@@ -192,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
@@ -78,17 +78,15 @@ CustomClippingRect {
 				required property var modelData
 				readonly property list<string> sections: modelData.update.split(" ")
 
-				// anchors.left: parent.left
-				// anchors.right: parent.right
 				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
 		}
 	}
 
@@ -54,10 +55,11 @@ Item {
 	Comp {
 		id: content
 
-		anchors.centerIn: parent
+		anchors.fill: parent
 		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,16 +32,16 @@ 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
 
-			readonly property int currentIndex: root.state.currentTab
+			readonly property int currentIndex: root.dashState?.currentTab
 			readonly property Item currentItem: row.children[currentIndex]
 
 			anchors.fill: parent

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

@@ -1,12 +1,15 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Services.Mpris
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Shapes
 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
@@ -14,7 +17,7 @@ import qs.Services
 
 Item {
 	id: root
-
+	readonly property bool hasUnknownLength: (Players.active?.length ?? 0) > 2147483647
 	property real playerProgress: {
 		const active = Players.active;
 		return active?.length ? (active.position % active.length) / active.length : 0;
@@ -23,7 +26,19 @@ Item {
 
 	anchors.left: parent.left
 	anchors.right: parent.right
-	implicitHeight: cover.height + rowHeight * 2
+	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	function lengthStr(length: int): string {
+		if (length < 0)
+		return "-1:-1";
+
+		const hours = Math.floor(length / 3600);
+		const mins = Math.floor((length % 3600) / 60);
+		const secs = Math.floor(length % 60).toString().padStart(2, "0");
+
+		if (hours > 0)
+		return `${hours}:${mins.toString().padStart(2, "0")}:${secs}`;
+		return `${mins}:${secs}`;
+	}
 
 	Behavior on playerProgress {
 		Anim {
@@ -32,11 +47,10 @@ Item {
 	}
 
 	Timer {
-		interval: Config.dashboard.mediaUpdateInterval
-		repeat: true
 		running: Players.active?.isPlaying ?? false
+		interval: Config.dashboard.mediaUpdateInterval
 		triggeredOnStart: true
-
+		repeat: true
 		onTriggered: Players.active?.positionChanged()
 	}
 
@@ -44,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
@@ -72,17 +90,17 @@ Item {
 				const n = values.length;
 
 				if (n < 2)
-					return "";
+				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} `;
@@ -126,232 +144,186 @@ Item {
 		}
 	}
 
-	Shape {
-		preferredRendererType: Shape.CurveRenderer
-
-		ShapePath {
-			capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
-			fillColor: "transparent"
-			strokeColor: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-			strokeWidth: Config.dashboard.sizes.mediaProgressThickness
-
-			Behavior on strokeColor {
-				CAnim {
-				}
-			}
-
-			PathAngleArc {
-				centerX: cover.x + cover.width / 2
-				centerY: cover.y + cover.height / 2
-				radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small
-				radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small
-				startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2
-				sweepAngle: Config.dashboard.sizes.mediaProgressSweep
-			}
-		}
-
-		ShapePath {
-			capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
-			fillColor: "transparent"
-			strokeColor: Colors.palette.m3primary
-			strokeWidth: Config.dashboard.sizes.mediaProgressThickness
-
-			Behavior on strokeColor {
-				CAnim {
-				}
-			}
-
-			PathAngleArc {
-				centerX: cover.x + cover.width / 2
-				centerY: cover.y + cover.height / 2
-				radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small
-				radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small
-				startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2
-				sweepAngle: Config.dashboard.sizes.mediaProgressSweep * root.playerProgress
-			}
-		}
-	}
-
 	RowLayout {
 		id: layout
 
-		anchors.left: parent.left
-		anchors.right: parent.right
-		implicitHeight: root.implicitHeight
+		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
 		}
 
-		CustomRect {
+		ColumnLayout {
 			Layout.fillWidth: true
-			Layout.preferredHeight: childrenRect.height
+			Layout.leftMargin: Tokens.spacing.largeIncreased
+			Layout.rightMargin: Tokens.spacing.largeIncreased
+
+			spacing: Tokens.spacing.small
 
 			MarqueeText {
 				id: title
 
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: parent.top
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 				color: Colors.palette.m3primary
 				font.pointSize: Tokens.font.size.normal
 				horizontalAlignment: Text.AlignHCenter
 				pauseMs: 4000
 				text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title")
-				width: parent.width - Tokens.padding.large * 4
+				implicitWidth: parent.width - Tokens.padding.large * 4
 			}
 
 			MarqueeText {
 				id: album
 
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: title.bottom
-				anchors.topMargin: Tokens.spacing.small
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 				color: Colors.palette.m3outline
 				font.pointSize: Tokens.font.size.small
 				horizontalAlignment: Text.AlignHCenter
 				pauseMs: 4000
 				text: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album")
-				width: parent.width - Tokens.padding.large * 4
+				implicitWidth: parent.width - Tokens.padding.large * 4
 			}
 
 			MarqueeText {
 				id: artist
 
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: album.bottom
-				anchors.topMargin: Tokens.spacing.small
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 				color: Colors.palette.m3secondary
 				horizontalAlignment: Text.AlignHCenter
 				pauseMs: 4000
 				text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist")
-				width: parent.width - Tokens.padding.large * 4
+				implicitWidth: parent.width - Tokens.padding.large * 4
 			}
 
 			RowLayout {
-				id: controls
-
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.top: artist.bottom
-				anchors.topMargin: Tokens.spacing.smaller
+				id: positionSliderLayout
+				Layout.topMargin: Tokens.spacing.large
+				Layout.fillWidth: true
 				spacing: Tokens.spacing.small
 
-				Control {
-					function onClicked(): void {
-						Players.active?.previous();
-					}
+				TextMetrics {
+					id: timeMetrics
 
-					canUse: Players.active?.canGoPrevious ?? false
+					text: Players.active ? root.lengthStr(Math.max(Players.active.position, root.hasUnknownLength ? 0 : Players.active.length)).replace(/[1-9]/g, "0") : "00:00"
+				}
+
+				CustomText {
+					id: positionLabel
+
+					Layout.preferredWidth: timeMetrics.width
+					text: root.lengthStr(Players.active?.position ?? -1)
+					color: Colors.palette.m3onSurfaceVariant
+					font: timeMetrics.font
+					horizontalAlignment: Text.AlignHCenter
+				}
+
+				CustomSlider {
+					id: positionSlider
+
+					Layout.fillWidth: true
+					value: Players.active ? Players.active.position / (Players.active.length || 1) : 0
+					enabled: (Players.active?.canSeek ?? false) && !root.hasUnknownLength
+					wavy: true
+					animateWave: Players.active?.isPlaying ?? false
+					waveFrequency: 5
+					waveDuration: 2000
+					interactionOnMove: false
+					onInteraction: value => {
+						const active = Players.active;
+						if (active?.canSeek && active?.positionSupported)
+						active.position = value * active.length;
+					}
+					Binding {
+						target: positionLabel
+						property: "text"
+						value: root.lengthStr(positionSlider.pos * (Players.active?.length ?? 0))
+						when: positionSlider.dragging
+					}
+				}
+
+				CustomText {
+					Layout.preferredWidth: timeMetrics.width
+					text: root.hasUnknownLength ? "--:--" : root.lengthStr(Players.active?.length ?? -1)
+					color: Colors.palette.m3onSurfaceVariant
+					font: timeMetrics.font
+					horizontalAlignment: Text.AlignHCenter
+				}
+			}
+			ButtonRow {
+				Layout.topMargin: Tokens.spacing.largeIncreased
+				Layout.fillWidth: true
+				spacing: Tokens.spacing.extraSmall
+				Layout.leftMargin: positionSliderLayout.implicitWidth / 4
+				Layout.rightMargin: positionSliderLayout.implicitWidth / 4
+
+				IconButton {
+					type: IconButton.Tonal
+					icon: "shuffle"
+					isRound: true
+					shapeMorph: true
+					checked: Players.active?.shuffle ?? false
+					enabled: Players.active?.shuffleSupported
+					onClicked: Players.active.shuffle = !Players.active?.shuffle
+				}
+
+				IconButton {
+					id: previousBtn
+
+					type: IconButton.Tonal
 					icon: "skip_previous"
+					isRound: true
+					shapeMorph: true
+					enabled: Players.active?.canGoPrevious
+					onClicked: Players.active?.previous()
+					font.pointSize: Tokens.font.size.large
 				}
 
-				Control {
-					function onClicked(): void {
-						Players.active?.togglePlaying();
-					}
+				IconButton {
+					id: playPauseBtn
 
-					canUse: Players.active?.canTogglePlaying ?? false
 					icon: Players.active?.isPlaying ? "pause" : "play_arrow"
+					isRound: true
+					shapeMorph: true
+					fillWidth: true
+					checked: Players.active?.isPlaying ?? false
+					enabled: Players.active?.canTogglePlaying
+					onClicked: Players.active?.togglePlaying()
+					font.pointSize: Tokens.font.size.large
 				}
 
-				Control {
-					function onClicked(): void {
-						Players.active?.next();
-					}
+				IconButton {
+					id: nextBtn
 
-					canUse: Players.active?.canGoNext ?? false
+					type: IconButton.Tonal
 					icon: "skip_next"
+					isRound: true
+					shapeMorph: true
+					enabled: Players.active?.canGoNext
+					onClicked: Players.active?.next()
+					font.pointSize: Tokens.font.size.large
+				}
+
+				IconButton {
+					type: IconButton.Tonal
+					icon: Players.active?.loopState === MprisLoopState.Track ? "repeat_one" : "repeat"
+					isRound: true
+					shapeMorph: true
+					checked: Players.active?.loopState === MprisLoopState.Track || Players.active?.loopState === MprisLoopState.Playlist
+					enabled: Players.active?.loopSupported
+					onClicked: {
+						const state = Players.active.loopState;
+						if (state === MprisLoopState.None)
+						Players.active.loopState = MprisLoopState.Track;
+						else if (state === MprisLoopState.Track)
+						Players.active.loopState = MprisLoopState.Playlist;
+						else
+						Players.active.loopState = MprisLoopState.None;
+					}
 				}
 			}
 		}
 	}
-
-	component Control: CustomRect {
-		id: control
-
-		required property bool canUse
-		required property string icon
-		property int level: 1
-		property string set_color: "Secondary"
-
-		function onClicked(): void {
-		}
-
-		Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.normal * 2 : 0)
-		color: canUse ? Colors.palette[`m3${set_color.toLowerCase()}`] : Colors.palette[`m3${set_color.toLowerCase()}Container`]
-		implicitHeight: implicitWidth
-		implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Tokens.padding.small
-		radius: Tokens.rounding.full
-
-		Behavior on Layout.preferredWidth {
-			Anim {
-				duration: Tokens.anim.durations.expressiveFastSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
-			}
-		}
-		Behavior on radius {
-			Anim {
-				duration: Tokens.anim.durations.expressiveFastSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
-			}
-		}
-
-		Elevation {
-			anchors.fill: parent
-			level: controlState.containsMouse && !controlState.pressed ? control.level + 1 : control.level
-			radius: parent.radius
-			z: -1
-		}
-
-		StateLayer {
-			id: controlState
-
-			color: control.canUse ? Colors.palette[`m3on${control.set_color}`] : Colors.palette[`m3on${control.set_color}Container`]
-			enabled: control.canUse
-
-			onClicked: {
-				control.onClicked();
-			}
-			// radius: Tokens.rounding.full
-		}
-
-		MaterialIcon {
-			id: icon
-
-			anchors.centerIn: parent
-			anchors.verticalCenterOffset: font.pointSize * 0.05
-			animate: true
-			color: control.canUse ? Colors.palette[`m3on${control.set_color}`] : Colors.palette[`m3on${control.set_color}Container`]
-			fill: control.canUse ? 1 : 0
-			font.pointSize: Tokens.font.size.large
-			text: control.icon
-		}
-	}
 }

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 {