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

@@ -18,13 +18,14 @@ Item {
 	property real leftFadeStrength: overflowing && leftFadeEnabled ? fadeStrengthMoving : fadeStrengthIdle
 	property int leftFadeWidth: 28
 	property bool marqueeEnabled: true
-	readonly property bool overflowing: metrics.width > root.width
+	readonly property bool overflowing: metrics.width > content.width
 	property int pauseMs: 1200
 	property real pixelsPerSecond: 40
 	property real rightFadeStrength: overflowing ? fadeStrengthMoving : fadeStrengthIdle
 	property int rightFadeWidth: 28
 	property bool sliding: false
 	property alias text: elideText.text
+	property bool vertical: false
 
 	function durationForDistance(px): int {
 		return Math.max(1, Math.round(Math.abs(px) / root.pixelsPerSecond * 1000));
@@ -41,8 +42,9 @@ Item {
 		}
 	}
 
-	clip: true
-	implicitHeight: elideText.implicitHeight
+	clip: false
+	implicitHeight: vertical ? elideText.implicitWidth : elideText.implicitHeight
+	implicitWidth: vertical ? elideText.implicitHeight : elideText.implicitWidth
 
 	Behavior on leftFadeStrength {
 		Anim {
@@ -53,171 +55,187 @@ Item {
 		}
 	}
 
+	onHeightChanged: resetMarquee()
 	onTextChanged: resetMarquee()
+	onVerticalChanged: resetMarquee()
 	onVisibleChanged: if (!visible)
 		resetMarquee()
 	onWidthChanged: resetMarquee()
 
-	TextMetrics {
-		id: metrics
-
-		font: elideText.font
-		text: elideText.text
-	}
-
-	CustomText {
-		id: elideText
-
-		anchors.verticalCenter: parent.verticalCenter
-		animate: root.animate
-		animateProp: "scale,opacity"
-		color: root.color
-		elide: Text.ElideNone
-		visible: !root.overflowing
-		width: root.width
-	}
-
 	Item {
-		id: marqueeViewport
+		id: content
 
-		anchors.fill: parent
-		clip: true
-		layer.enabled: true
-		visible: root.overflowing
+		anchors.centerIn: parent
+		height: root.vertical ? root.width : root.height
+		width: root.vertical ? root.height : root.width
 
-		layer.effect: OpacityMask {
-			maskSource: rightFadeMask
+		transform: Rotation {
+			angle: root.vertical ? -90 : 0
+			origin.x: content.width / 2
+			origin.y: content.height / 2
+		}
+
+		TextMetrics {
+			id: metrics
+
+			font: elideText.font
+			text: elideText.text
+		}
+
+		CustomText {
+			id: elideText
+
+			anchors.verticalCenter: parent.verticalCenter
+			animate: root.animate
+			animateProp: "scale,opacity"
+			color: root.color
+			elide: Text.ElideNone
+			visible: !root.overflowing
+			width: content.width
 		}
 
 		Item {
-			id: strip
+			id: marqueeViewport
 
-			anchors.verticalCenter: parent.verticalCenter
-			height: t1.implicitHeight
-			width: t1.width + root.gap + t2.width
-			x: 0
+			anchors.fill: parent
+			clip: false
+			layer.enabled: true
+			visible: root.overflowing
 
-			CustomText {
-				id: t1
-
-				animate: root.animate
-				animateProp: "opacity"
-				color: root.color
-				font.pointSize: elideText.font.pointSize
-				text: elideText.text
+			layer.effect: OpacityMask {
+				maskSource: rightFadeMask
 			}
 
-			CustomText {
-				id: t2
+			Item {
+				id: strip
 
-				animate: root.animate
-				animateProp: "opacity"
-				color: root.color
-				font.pointSize: elideText.font.pointSize
-				text: t1.text
-				x: t1.width + root.gap
-			}
-		}
+				anchors.verticalCenter: parent.verticalCenter
+				height: t1.implicitHeight
+				width: t1.width + root.gap + t2.width
+				x: 0
 
-		SequentialAnimation {
-			id: marqueeAnim
+				CustomText {
+					id: t1
 
-			running: false
+					animate: root.animate
+					animateProp: "opacity"
+					color: root.color
+					font.pointSize: elideText.font.pointSize
+					text: elideText.text
+				}
 
-			onFinished: pauseTimer.restart()
+				CustomText {
+					id: t2
 
-			ScriptAction {
-				script: {
-					root.sliding = true;
-					root.leftFadeEnabled = true;
+					animate: root.animate
+					animateProp: "opacity"
+					color: root.color
+					font.pointSize: elideText.font.pointSize
+					text: t1.text
+					x: t1.width + root.gap
 				}
 			}
 
-			Anim {
-				duration: root.durationForDistance(t1.width)
-				easing.bezierCurve: Easing.Linear
-				easing.type: Easing.Linear
-				from: 0
-				property: "x"
-				target: strip
-				to: -t1.width
-			}
+			SequentialAnimation {
+				id: marqueeAnim
 
-			ScriptAction {
-				script: {
-					root.leftFadeEnabled = false;
+				running: false
+
+				onFinished: pauseTimer.restart()
+
+				ScriptAction {
+					script: {
+						root.sliding = true;
+						root.leftFadeEnabled = true;
+					}
+				}
+
+				Anim {
+					duration: root.durationForDistance(t1.width)
+					easing.bezierCurve: Easing.Linear
+					easing.type: Easing.Linear
+					from: 0
+					property: "x"
+					target: strip
+					to: -t1.width
+				}
+
+				ScriptAction {
+					script: {
+						root.leftFadeEnabled = false;
+					}
+				}
+
+				Anim {
+					duration: root.durationForDistance(root.gap)
+					easing.bezierCurve: Easing.Linear
+					easing.type: Easing.Linear
+					from: -t1.width
+					property: "x"
+					target: strip
+					to: -(t1.width + root.gap)
+				}
+
+				ScriptAction {
+					script: {
+						root.sliding = false;
+						strip.x = 0;
+					}
 				}
 			}
 
-			Anim {
-				duration: root.durationForDistance(root.gap)
-				easing.bezierCurve: Easing.Linear
-				easing.type: Easing.Linear
-				from: -t1.width
-				property: "x"
-				target: strip
-				to: -(t1.width + root.gap)
-			}
+			Timer {
+				id: pauseTimer
 
-			ScriptAction {
-				script: {
-					root.sliding = false;
-					strip.x = 0;
+				interval: root.pauseMs
+				repeat: false
+				running: true
+
+				onTriggered: {
+					if (root.marqueeEnabled)
+						marqueeAnim.start();
 				}
 			}
 		}
 
-		Timer {
-			id: pauseTimer
+		Rectangle {
+			id: rightFadeMask
 
-			interval: root.pauseMs
-			repeat: false
-			running: true
-
-			onTriggered: {
-				if (root.marqueeEnabled)
-					marqueeAnim.start();
+			readonly property real fadeStartPos: {
+				const w = Math.max(1, width);
+				return Math.max(0, Math.min(1, (w - root.rightFadeWidth) / w));
 			}
-		}
-	}
-
-	Rectangle {
-		id: rightFadeMask
-
-		readonly property real fadeStartPos: {
-			const w = Math.max(1, width);
-			return Math.max(0, Math.min(1, (w - root.rightFadeWidth) / w));
-		}
-		readonly property real leftFadeEndPos: {
-			const w = Math.max(1, width);
-			return Math.max(0, Math.min(1, root.leftFadeWidth / w));
-		}
-
-		anchors.fill: marqueeViewport
-		layer.enabled: true
-		visible: false
-
-		gradient: Gradient {
-			orientation: Gradient.Horizontal
-
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0 - root.leftFadeStrength)
-				position: 0.0
+			readonly property real leftFadeEndPos: {
+				const w = Math.max(1, width);
+				return Math.max(0, Math.min(1, root.leftFadeWidth / w));
 			}
 
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0)
-				position: rightFadeMask.leftFadeEndPos
-			}
+			anchors.fill: marqueeViewport
+			layer.enabled: true
+			visible: false
 
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0)
-				position: rightFadeMask.fadeStartPos
-			}
+			gradient: Gradient {
+				orientation: Gradient.Horizontal
 
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0 - root.rightFadeStrength)
-				position: 1.0
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 1.0 - root.leftFadeStrength)
+					position: 0.0
+				}
+
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 1.0)
+					position: rightFadeMask.leftFadeEndPos
+				}
+
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 1.0)
+					position: rightFadeMask.fadeStartPos
+				}
+
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 1.0 - root.rightFadeStrength)
+					position: 1.0
+				}
 			}
 		}
 	}

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;
@@ -126,15 +126,15 @@ MouseArea {
 					CustomRect {
 						id: item
 
-						readonly property bool active: modelData === root.active
+						readonly property bool active: modelData === root?.active
 						required property int index
 						required property MenuItem modelData
 
 						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,25 +157,25 @@ MouseArea {
 							id: menuOptionRow
 
 							anchors.fill: parent
-							anchors.margins: Tokens.padding.larger
+							anchors.margins: Tokens.padding.medium
 							spacing: Tokens.spacing.small
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
 								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-								text: item.modelData.icon
+								text: item.modelData?.icon ?? ""
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
 								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
-								text: item.modelData.text
+								text: item.modelData?.text ?? ""
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
-								active: item.modelData.trailingIcon.length > 0
+								active: item.modelData?.trailingIcon.length > 0
 								asynchronous: true
 								visible: active
 

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

@@ -11,15 +11,46 @@ Variants {
 
 		required property ShellScreen modelData
 
+		function rebuild(): void {
+			loader.active = false;
+			loader.active = true;
+		}
+
+		LazyLoader {
+			id: loader
+
+			active: true
+
+			Drawer {
+				screen: scope.modelData
+			}
+		}
+
+		Connections {
+			function onConfigPositionChanged(): void {
+				Qt.callLater(scope.rebuild);
+			}
+
+			target: (loader.item as Drawer)?.geometry ?? null
+		}
+	}
+
+	component Drawer: Scope {
+		id: drawer
+
+		readonly property alias geometry: content.geometry
+		required property ShellScreen screen
+
 		Exclusions {
 			bar: content.bar
-			screen: scope.modelData
+			geometry: content.geometry
+			screen: drawer.screen
 		}
 
 		Windows {
 			id: content
 
-			screen: scope.modelData
+			screen: drawer.screen
 		}
 	}
 }

Drawers/EdgeGeometry.qml

@@ -0,0 +1,55 @@
+import QtQuick
+import qs.Modules.Bar as Bar
+
+QtObject {
+	id: root
+
+	required property Bar.BarLoader bar
+	readonly property real barClamped: bar.clampedExtent
+	readonly property real barExtent: bar.extent
+	readonly property bool barOnBottom: position === "bottom"
+	readonly property bool barOnLeft: position === "left"
+	readonly property bool barOnTop: position === "top"
+	required property string configPosition
+	readonly property bool horizontal: position !== "left"
+	readonly property string position: configPosition === "top" || configPosition === "bottom" ? configPosition : "left"
+	required property var win
+
+	function axisPos(x: real, y: real): real {
+		return horizontal ? x : y;
+	}
+
+	function barContains(x: real, y: real, clamped = false): bool {
+		const extent = clamped ? barClamped : barExtent;
+		if (barOnTop)
+			return y < extent;
+		if (barOnBottom)
+			return y > win.height - extent;
+		return x < extent;
+	}
+
+	function insetBottom(border: real, clamped = false): real {
+		return barOnBottom ? (clamped ? barClamped : barExtent) : border;
+	}
+
+	function insetLeft(border: real, clamped = false): real {
+		return barOnLeft ? (clamped ? barClamped : barExtent) : border;
+	}
+
+	function insetTop(border: real, clamped = false): real {
+		return barOnTop ? (clamped ? barClamped : barExtent) : border;
+	}
+
+	function inwardDrag(dragX: real, dragY: real): real {
+		if (barOnTop)
+			return dragY;
+		if (barOnBottom)
+			return -dragY;
+		return dragX;
+	}
+
+	onConfigPositionChanged: {
+		if (!["left", "top", "bottom"].includes(configPosition))
+			console.warn(`Invalid bar position '${configPosition}', falling back to left`);
+	}
+}

Drawers/Exclusions.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Wayland
 import QtQuick
 import ZShell.Config
 import qs.Components
@@ -9,19 +10,24 @@ Scope {
 	id: root
 
 	required property Item bar
+	required property EdgeGeometry geometry
 	required property ShellScreen screen
 
 	ExclusionZone {
 		id: top
 
+		WlrLayershell.layer: WlrLayer.Overlay
+		anchors.left: true
+		anchors.right: true
 		anchors.top: true
-		exclusiveZone: root.bar.exclusiveZone
+		hasBar: root.geometry.barOnTop
 	}
 
 	ExclusionZone {
 		id: left
 
 		anchors.left: true
+		hasBar: root.geometry.barOnLeft
 	}
 
 	ExclusionZone {
@@ -34,6 +40,7 @@ Scope {
 		id: bottom
 
 		anchors.bottom: true
+		hasBar: root.geometry.barOnBottom
 	}
 
 	Timer {
@@ -44,7 +51,9 @@ Scope {
 	}
 
 	component ExclusionZone: CustomWindow {
-		exclusiveZone: Config.bar.border
+		property bool hasBar
+
+		exclusiveZone: hasBar ? root.bar.exclusiveZone : Config.bar.border
 		implicitHeight: 1
 		implicitWidth: 1
 		name: "Bar-Exclusion"

Drawers/Interactions.qml

@@ -3,7 +3,7 @@ import QtQuick
 import qs.Components
 import ZShell.Config
 import qs.Helpers
-import qs.Modules as BarPopouts
+import qs.Modules.Bar.Popouts
 
 Item {
 	id: root
@@ -12,43 +12,47 @@ Item {
 	required property real borderThickness
 	property bool dashboardShortcutActive
 	required property Drawing drawing
+	required property EdgeGeometry geometry
 	property bool osdShortcutActive
 	required property Panels panels
-	required property BarPopouts.Wrapper popouts
+	required property Wrapper popouts
 	required property ShellScreen screen
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
 	required property PersistentProperties visibilities
 
 	function inBottomPanel(panel: Item, x: real, y: real): bool {
-		return y > root.height - panel.height - Config.bar.border && withinPanelWidth(panel, x, y);
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y > root.height - (panelHeight + geometry.insetBottom(borderThickness)) && withinPanelWidth(panel, x, y);
 	}
 
 	function inLeftPanel(panel: Item, x: real, y: real): bool {
-		return x < panel.x + panel.width + Config.bar.border && withinPanelHeight(panel, x, y);
+		return x < panel.x + panel.width + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function inPopoutArea(x: real, y: real): bool {
+		const panel = panels.popoutsWrapper;
+		if (!geometry.horizontal)
+			return inLeftPanel(panel, x, y);
+		return withinPanelWidth(panel, x, y) && withinPanelHeight(panel, x, y);
 	}
 
 	function inRightPanel(panel: Item, x: real, y: real): bool {
-		return x > panel.x - Config.bar.border && withinPanelHeight(panel, x, y);
+		return x > panel.x + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
 	}
 
 	function inTopPanel(panel: Item, x: real, y: real): bool {
-		return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
-	}
-
-	function onWheel(event: WheelEvent): void {
-		if (event.x < bar.implicitWidth) {
-			bar.handleWheel(event.y, event.angleDelta);
-		}
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y < geometry.insetTop(borderThickness) + panelHeight && withinPanelWidth(panel, x, y);
 	}
 
 	function withinPanelHeight(panel: Item, x: real, y: real): bool {
-		const panelY = panel.y + bar.implicitHeight;
+		const panelY = panel.y + geometry.insetTop(borderThickness);
 		return y >= panelY && y <= panelY + panel.height;
 	}
 
 	function withinPanelWidth(panel: Item, x: real, y: real): bool {
-		const panelX = panel.x + root.borderThickness;
+		const panelX = panel.x + geometry.insetLeft(borderThickness);
 		return x >= panelX && x <= panelX + panel.width;
 	}
 
@@ -81,7 +85,7 @@ Item {
 			if (root.singleGestureTriggered)
 				return;
 
-			if (centroid.pressPosition.y < root.bar.implicitHeight) {
+			if (root.geometry.insetTop(root.borderThickness) > centroid.pressPosition.y) {
 				if (dragY > 20) {
 					root.visibilities.settings = true;
 					root.singleGestureTriggered = true;
@@ -91,10 +95,10 @@ Item {
 				}
 			}
 
-			if (centroid.pressPosition.y > root.screen.height - Config.bar.border && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
+			if (centroid.pressPosition.y > root.screen.height - root.geometry.insetBottom(root.borderThickness) && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
 				root.visibilities.clipboard = true;
 
-			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.bar.implicitHeight && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
+			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.geometry.insetTop(root.borderThickness) && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
 				if (dragY < -10) {
 					root.visibilities.dock = true;
 					root.singleGestureTriggered = true;
@@ -158,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
 
@@ -174,7 +191,7 @@ Item {
 					root.popouts.hasCurrent = false;
 				}
 
-				if (Config.bar.autoHide)
+				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
 			}
 		}
@@ -193,9 +210,12 @@ Item {
 				return;
 			}
 
-			if (!root.visibilities.bar && Config.bar.autoHide && y < root.bar.implicitHeight)
+			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);
 
@@ -219,8 +239,8 @@ Item {
 			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
 				root.visibilities.dock = true;
 
-			if (y < root.bar.implicitHeight)
-				root.bar.checkPopout(x);
+			if (root.geometry.barContains(x, y))
+				root.bar.checkPopout(root.geometry.axisPos(x, y));
 		}
 	}
 
@@ -298,8 +318,6 @@ Item {
 				root.visibilities.sidebar = false;
 				root.panels.popouts.hasCurrent = false;
 				root.visibilities.launcher = false;
-			} else {
-				Config.save();
 			}
 		}
 

Drawers/Panels.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import QtQuick
 import qs.Components
-import qs.Modules as Modules
+import qs.Modules.Bar.Popouts as Popouts
 import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
 import qs.Modules.Notifications.Sidebar.Utils as Utils
@@ -27,6 +27,7 @@ Item {
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
 	required property var drawingItem
+	required property EdgeGeometry geometry
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
@@ -43,24 +44,26 @@ Item {
 	readonly property alias utilities: utilities
 	required property PersistentProperties visibilities
 
+	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
+	anchors.leftMargin: geometry.insetLeft(borderThickness)
 	anchors.margins: borderThickness
-	anchors.topMargin: bar.implicitHeight
+	anchors.topMargin: geometry.insetTop(borderThickness)
 
 	Item {
 		id: resourcesWrapper
 
+		anchors.bottom: root.geometry.position === "bottom" ? parent.bottom : undefined
 		anchors.left: parent.left
-		anchors.top: parent.top
+		anchors.top: root.geometry.position !== "bottom" ? parent.top : undefined
 		clip: true
-		implicitHeight: resources.implicitHeight * (1 - resources.offsetScale)
-		implicitWidth: resources.implicitWidth
+		implicitHeight: root.geometry.horizontal ? resources.implicitHeight * (1 - resources.offsetScale) : resources.implicitHeight
+		implicitWidth: root.geometry.horizontal ? resources.implicitWidth : resources.implicitWidth * (1 - resources.offsetScale)
 
 		Resources.Wrapper {
 			id: resources
 
-			anchors.left: parent.left
-			anchors.top: parent.top
+			position: root.geometry.position
 			visibilities: root.visibilities
 		}
 	}
@@ -96,11 +99,11 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Modules.ClipWrapper {
+	Popouts.ClipWrapper {
 		id: popouts
 
-		anchors.top: parent.top
 		borderThickness: root.borderThickness
+		position: root.geometry.position
 		screen: root.screen
 	}
 
@@ -108,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
 	}
 
@@ -137,7 +140,6 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
 		sidebar: sidebar
 		visibilities: root.visibilities
 	}
@@ -147,26 +149,26 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.right: parent.right
-		anchors.top: parent.top
+		anchors.bottom: root.geometry.barOnLeft || root.geometry.barOnBottom ? parent.bottom : undefined
+		anchors.left: root.geometry.barOnLeft ? parent.left : undefined
+		anchors.right: root.geometry.barOnLeft ? undefined : parent.right
+		anchors.top: root.geometry.barOnBottom || root.geometry.barOnLeft ? undefined : parent.top
 		clip: true
-		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
-		implicitWidth: dashboard.implicitWidth
+		implicitHeight: root.geometry.horizontal ? dashboard.implicitHeight * (1 - offsetScale) : dashboard.implicitHeight
+		implicitWidth: root.geometry.horizontal ? dashboard.implicitWidth : dashboard.implicitWidth * (1 - offsetScale)
 
 		Behavior on offsetScale {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 
 		Dashboard.Wrapper {
 			id: dashboard
 
-			anchors.right: parent.right
-			anchors.top: parent.top
-			anchors.topMargin: (-implicitHeight - 5) * offsetScale
 			offsetScale: dashboardWrapper.offsetScale
+			position: root.geometry.position
 			visibilities: root.visibilities
 		}
 	}

Drawers/Regions.qml

@@ -7,17 +7,18 @@ import qs.Modules.Bar as Bar
 Region {
 	id: root
 
-	required property Bar.BarLoader bar
+	// required property Bar.BarLoader bar
 	readonly property real borderThickness: win.borderThickness
+	required property EdgeGeometry geometry
 	readonly property alias menuPopoutRegion: menuPopoutRegion
 	required property Panels panels
 	required property var win
 
-	height: win.height - bar.implicitHeight - win.borderThickness - win.dragMaskPadding * 2
+	height: win.height - geometry.insetTop(borderThickness, true) - geometry.insetBottom(borderThickness, true) - win.dragMaskPadding * 2
 	intersection: Intersection.Xor
-	width: win.width - win.borderThickness * 2 - win.dragMaskPadding * 2
-	x: win.borderThickness + win.dragMaskPadding
-	y: bar.implicitHeight + win.dragMaskPadding
+	width: win.width - geometry.insetLeft(borderThickness, true) * 2 - win.dragMaskPadding * 2
+	x: geometry.insetLeft(borderThickness, true) + win.dragMaskPadding
+	y: geometry.insetTop(borderThickness, true) + win.dragMaskPadding
 
 	R {
 		panel: root.panels.dashboardWrapper
@@ -41,17 +42,21 @@ Region {
 	}
 
 	R {
+		height: panel.height + root.geometry.insetTop(root.borderThickness)
 		panel: root.panels.notifications
+		y: 0
 	}
 
 	R {
-		height: panel.height * (1 - root.panels.utilities.offsetScale) + root.borderThickness
+		height: panel.height * (1 - root.panels.utilities.offsetScale) + root.geometry.insetBottom(root.borderThickness)
 		panel: root.panels.utilities
 		y: root.win.height - height
 	}
 
 	R {
+		height: root.geometry.horizontal ? panel.height * (1 - root.panels.popoutsWrapper.offsetScale) : panel.height
 		panel: root.panels.popoutsWrapper
+		width: root.geometry.horizontal ? panel.width : panel.width * (1 - root.panels.popoutsWrapper.offsetScale)
 	}
 
 	R {
@@ -82,7 +87,7 @@ Region {
 		height: panel.height
 		intersection: Intersection.Subtract
 		width: panel.width
-		x: panel.x + root.borderThickness
-		y: panel.y + root.bar.implicitHeight
+		x: panel.x + root.geometry.insetLeft(root.borderThickness)
+		y: panel.y + root.geometry.insetTop(root.borderThickness)
 	}
 }

Drawers/Windows.qml

@@ -33,6 +33,7 @@ CustomWindow {
 		return 100;
 	}
 	property real fsTransitionProg: hasFullscreen ? 1 : 0
+	readonly property alias geometry: geometry
 	readonly property bool hasFullscreen: {
 		if (hasSpecialWorkspace) {
 			const specialName = monitor?.lastIpcObject.specialWorkspace?.name;
@@ -50,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: {
@@ -95,13 +94,21 @@ CustomWindow {
 		panels.popouts.hasCurrent = false;
 	}
 
+	EdgeGeometry {
+		id: geometry
+
+		bar: bar
+		configPosition: Config.bar.position
+		win: root
+	}
+
 	Region {
 		id: emptyRegion
 
 		height: panels.notifications.height
 		width: panels.notifications.width
-		x: panels.notifications.x + root.borderThickness
-		y: panels.notifications.y + bar.implicitHeight
+		x: panels.notifications.x + geometry.insetLeft(root.borderThickness)
+		y: panels.notifications.y + geometry.insetTop(root.borderThickness)
 
 		Region {
 			height: panels.osd.height
@@ -109,12 +116,18 @@ 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 {
 		id: regions
 
-		bar: bar
+		geometry: geometry
 		panels: panels
 		win: root
 	}
@@ -193,10 +206,10 @@ CustomWindow {
 		BlobInvertedRect {
 			anchors.fill: parent
 			anchors.margins: -50
-			borderBottom: root.borderThickness - anchors.margins - root.sdfBorderOffset
-			borderLeft: root.borderThickness - anchors.margins - root.sdfBorderOffset
+			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
+			borderLeft: geometry.insetLeft(root.borderThickness) - anchors.margins - root.sdfBorderOffset
 			borderRight: root.borderThickness - anchors.margins - root.sdfBorderOffset
-			borderTop: bar.implicitHeight - anchors.margins - root.sdfBorderOffset
+			borderTop: geometry.insetTop(root.borderThickness) - anchors.margins - root.sdfBorderOffset
 			group: blobGroup
 			radius: root.borderRounding
 		}
@@ -204,15 +217,15 @@ CustomWindow {
 		PanelBg {
 			id: dashBg
 
-			property real extraHeight: 0.2
+			property real extraExtent: 0.2
 
 			deformAmount: 0.06
-			implicitHeight: panels.dashboard.height * (1 + extraHeight)
-			implicitWidth: panels.dashboard.width
+			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
-			x: panels.dashboardWrapper.x + panels.dashboard.x + root.borderThickness
-			y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
+			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)
 		}
 
 		PanelBg {
@@ -223,8 +236,8 @@ CustomWindow {
 			deformAmount: 0.06
 			implicitHeight: panels.launcher.height * (1 + extraHeight)
 			panel: panels.launcher
-			radius: Tokens.rounding.smallest + 5
-			y: panels.launcher.y + bar.implicitHeight
+			radius: Tokens.rounding.medium + (Tokens.padding.largeIncreased / 4)
+			y: panels.launcher.y + geometry.insetTop(root.borderThickness)
 		}
 
 		PanelBg {
@@ -245,15 +258,14 @@ CustomWindow {
 			implicitWidth: panels.osd.width
 			panel: panels.osdWrapper
 			radius: 20
-			x: panels.osdWrapper.x + panels.osd.x + root.borderThickness
-			y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
+			x: panels.osdWrapper.x + panels.osd.x + geometry.insetLeft(root.borderThickness)
 		}
 
 		PanelBg {
 			id: notifsBg
 
 			panel: panels.notifications
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.large
 		}
 
 		PanelBg {
@@ -268,19 +280,18 @@ CustomWindow {
 		PanelBg {
 			id: popoutBg
 
-			property real extraHeight: 0.2
+			property real extraExtent: 0.2
 
 			deformAmount: panels.popouts.currentName.startsWith("traymenu") ? 0.15 : 0.08
-			implicitHeight: panels.popouts.height * (1 + extraHeight)
-			implicitWidth: panels.popouts.width
+			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
-			x: panels.popoutsWrapper.x + panels.popouts.x + root.borderThickness
-			y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
+			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 extraHeight {
-				Anim {
-				}
+			Behavior on extraExtent {
+				Anim {}
 			}
 		}
 
@@ -291,9 +302,9 @@ CustomWindow {
 			implicitHeight: panels.resources.height
 			implicitWidth: panels.resources.width
 			panel: panels.resourcesWrapper
-			radius: Tokens.rounding.large
-			x: panels.resourcesWrapper.x + panels.resources.x + root.borderThickness
-			y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
+			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)
 		}
 
 		PanelBg {
@@ -301,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 {
@@ -309,7 +320,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.dock
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -317,7 +328,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.drawing
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -371,6 +382,7 @@ CustomWindow {
 		borderThickness: root.borderLayoutThickness
 		drawing: drawing
 		enabled: true
+		geometry: geometry
 		panels: panels
 		popouts: panels.popouts
 		screen: root.screen
@@ -382,6 +394,7 @@ CustomWindow {
 			bar: bar
 			borderThickness: root.borderThickness
 			drawingItem: drawing
+			geometry: geometry
 			screen: root.screen
 			visibilities: visibilities
 
@@ -423,14 +436,18 @@ CustomWindow {
 		BarLoader {
 			id: bar
 
+			anchors.bottom: geometry.barOnBottom ? parent.bottom : undefined
 			anchors.left: parent.left
-			anchors.right: parent.right
+			anchors.top: geometry.barOnBottom ? undefined : parent.top
 			enabled: !visibilities.isDrawing
 			fullscreen: root.hasFullscreen
+			height: geometry.horizontal ? implicitHeight : parent.height
 			popouts: panels.popouts
 			popoutsWrapper: panels.popoutsWrapper
+			position: geometry.position
 			screen: root.screen
 			visibilities: visibilities
+			width: geometry.horizontal ? parent.width : implicitWidth
 		}
 	}
 
@@ -442,8 +459,8 @@ CustomWindow {
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width
-		radius: Tokens.rounding.smallest
-		x: panel.x + root.borderThickness
-		y: panel.y + bar.implicitHeight
+		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/Icons.qml

@@ -1,9 +1,8 @@
 pragma Singleton
 
-import ZShell.Config
+import QtQuick
 import Quickshell
 import Quickshell.Services.Notifications
-import QtQuick
 
 Singleton {
 	id: root
@@ -95,6 +94,15 @@ Singleton {
 		return Quickshell.iconPath(icon);
 	}
 
+	function getBatteryIcon(percentage: real, charging = false): string {
+		if (percentage === 1)
+			return charging ? "battery_charging_full" : "battery_full";
+		let level = Math.floor(percentage * 7);
+		if (charging && (level === 4 || level === 1))
+			level--;
+		return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`;
+	}
+
 	function getBluetoothIcon(icon: string): string {
 		if (icon.includes("headset") || icon.includes("headphones"))
 			return "headphones";
@@ -168,6 +176,32 @@ Singleton {
 		return "chat";
 	}
 
+	function getSpecialWsIcon(name: string): string {
+		name = name.toLowerCase().slice("special:".length);
+
+		if (name === "special")
+			return "star";
+		if (name === "communication")
+			return "forum";
+		if (name === "music")
+			return "music_cast";
+		if (name === "todo")
+			return "checklist";
+		if (name === "sysmon")
+			return "monitor_heart";
+		return name[0].toUpperCase();
+	}
+
+	function getTrayIcon(id: string, icon: string): string {
+		if (icon.includes("?path=")) {
+			const [name, path] = icon.split("?path=");
+			const file = name.slice(name.lastIndexOf("/") + 1);
+			const themed = Quickshell.iconPath(file, true);
+			icon = themed ? themed : Qt.resolvedUrl(`${path}/${file}`);
+		}
+		return icon;
+	}
+
 	function getVolumeIcon(volume: real, isMuted: bool): string {
 		if (isMuted)
 			return "no_sound";
@@ -183,4 +217,19 @@ Singleton {
 			return weatherIcons[code];
 		return "air";
 	}
+
+	function matchIconConfig(name: string, iconConfig: var): bool {
+		if (!iconConfig.icon)
+			return false;
+
+		if (iconConfig.regex) {
+			const re = new RegExp(iconConfig.regex, iconConfig.flags ?? "");
+			if (re.test(name))
+				return true;
+		} else if (iconConfig.name === name) {
+			return true;
+		}
+
+		return false;
+	}
 }

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

@@ -73,7 +73,6 @@ Singleton {
 
 		Config.dock.pinnedApps = pinnedApps;
 		root.unpinnedOrder = visibleUnpinned.concat(root.unpinnedOrder.map(normalizeId).filter(id => !pinnedApps.includes(id) && !visibleUnpinned.includes(id)));
-		Config.saveNoToast();
 	}
 
 	function isPinned(appId) {

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

@@ -3,24 +3,29 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
-import qs.Modules
 import ZShell.Config
-import qs.Modules.SysTray
-import qs.Modules.Network
-import qs.Modules.Updates
+import qs.Modules.Bar.Components
+import qs.Modules.Bar.Popouts
 
-RowLayout {
+GridLayout {
 	id: root
 
 	required property bool fullscreen
+	required property bool horizontal
+	required property bool isHovered
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
 	readonly property int vPadding: 6
 	required property PersistentProperties visibilities
 
-	function checkPopout(x: real): void {
-		const ch = childAt(x, height / 2) as EntryWrapper;
+	function axisCenterOf(item: Item): real {
+		const c = item.mapToItem(root, item.implicitWidth / 2, item.implicitHeight / 2);
+		return horizontal ? c.x : c.y;
+	}
+
+	function checkPopout(pos: real): void {
+		const ch = (horizontal ? childAt(pos, height / 2) : childAt(width / 2, pos)) as EntryWrapper;
 		const id = ch?.entryId;
 
 		if (!ch || id === undefined) {
@@ -34,26 +39,21 @@ RowLayout {
 
 		if (id === "statusIcons" && Config.bar.popouts.statusIcons) {
 			const items = (ch.item as StatusIcons).items;
-			const localX = mapToItem(items, x, 0).x;
-			const icon = items.childAt(localX, items.height / 2);
+			const icon = horizontal ? items.childAt(mapToItem(items, pos, 0).x, items.height / 2) : items.childAt(items.width / 2, mapToItem(items, 0, pos).y);
 			if (icon) {
 				popouts.currentName = icon.name;
-				popouts.currentCenter = Qt.binding(() => icon.mapToItem(root, icon.implicitWidth / 2, 0).x);
+				popouts.currentCenter = Qt.binding(() => axisCenterOf(icon));
 				popouts.hasCurrent = true;
 			}
 		} else if (id === "tray" && Config.bar.popouts.tray && Config.bar.tray.showOnHover) {
 			const tray = ch.item as TrayIcons;
 			const layout = tray.layout;
-			const localX = mapToItem(layout, x, 0).x;
-			const trayItem = layout.childAt(localX, layout.height / 2);
+			const trayItem = horizontal ? layout.childAt(mapToItem(layout, pos, 0).x, layout.height / 2) : layout.childAt(tray.width / 2, mapToItem(layout, 0, pos).y);
 
 			if (trayItem) {
 				const idx = trayItem.index;
 				popouts.currentName = `traymenu${idx}`;
-				popouts.currentCenter = Qt.binding(() => {
-					const it = tray.items.itemAt(idx);
-					return it ? it.mapToItem(root, it.implicitWidth / 2, 0).x : popouts.currentCenter;
-				});
+				popouts.currentCenter = Qt.binding(() => axisCenterOf(trayItem));
 				popouts.hasCurrent = true;
 			}
 
@@ -63,12 +63,19 @@ RowLayout {
 
 		if (id === "updates") {
 			popouts.currentName = "updates";
-			popouts.currentCenter = Qt.binding(() => ch.item.mapToItem(root, (ch.item as Item).implicitWidth / 2, 0).x);
+			popouts.currentCenter = Qt.binding(() => axisCenterOf(ch.item as Item));
 			popouts.hasCurrent = true;
 		}
 	}
 
-	spacing: Tokens.spacing.small
+	function entryAt(pos: real): string {
+		const ch = (horizontal ? childAt(pos, height / 2) : childAt(width / 2, pos)) as EntryWrapper;
+		return ch?.entryId ?? "";
+	}
+
+	columnSpacing: Tokens.spacing.small
+	columns: horizontal ? -1 : 1
+	rowSpacing: Tokens.spacing.small
 
 	Repeater {
 		id: repeater
@@ -85,7 +92,8 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					HyprsunsetWidget {
-						visible: !root.fullscreen
+						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -94,7 +102,8 @@ RowLayout {
 				roleValue: "spacer"
 
 				delegate: EntryWrapper {
-					Layout.fillWidth: true
+					Layout.fillHeight: !root.horizontal
+					Layout.fillWidth: root.horizontal
 				}
 			}
 
@@ -103,8 +112,9 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					Workspaces {
+						horizontal: root.horizontal
 						screen: root.screen
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -114,9 +124,10 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					TrayIcons {
+						horizontal: root.horizontal
 						loader: root
 						popouts: root.popouts
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -126,6 +137,8 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					StatusIcons {
+						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -135,8 +148,9 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					Resources {
+						horizontal: root.horizontal
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -146,7 +160,8 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					UpdatesWidget {
-						visible: !root.fullscreen
+						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -156,9 +171,10 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					NotifBell {
+						horizontal: root.horizontal
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -168,10 +184,11 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					Clock {
+						horizontal: root.horizontal
 						loader: root
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -182,7 +199,8 @@ RowLayout {
 				delegate: EntryWrapper {
 					WindowTitle {
 						bar: root
-						visible: !root.fullscreen
+						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -201,7 +219,8 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					MediaWidget {
-						visible: !root.fullscreen
+						horizontal: root.horizontal
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -214,9 +233,11 @@ RowLayout {
 		default property Item item
 		required property var modelData
 
-		Layout.alignment: Qt.AlignVCenter
-		Layout.leftMargin: index === 0 ? root.vPadding : (entryId === "statusIcons") ? -root.spacing + Tokens.spacing.extraSmall : 0
-		Layout.rightMargin: index === repeater.count - 1 ? root.vPadding : 0
+		Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
+		Layout.bottomMargin: !root.horizontal && index === repeater.count - 1 ? root.vPadding : 0
+		Layout.leftMargin: root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && root.horizontal) ? -root.rowSpacing + Tokens.spacing.extraSmall : 0
+		Layout.rightMargin: root.horizontal && index === repeater.count - 1 ? root.vPadding : 0
+		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.columnSpacing + Tokens.spacing.extraSmall : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0
 		implicitWidth: item?.implicitWidth ?? 0

Modules/Bar/BarLoader.qml

@@ -1,45 +1,48 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Hyprland
 import QtQuick
-import QtQuick.Layouts
-import qs.Components
-import qs.Modules
 import ZShell.Config
-import qs.Helpers
-import qs.Modules.SysTray
-import qs.Modules.SysTray.Widgets
-import qs.Modules.Network
+import qs.Modules.Bar.Popouts
+import qs.Components
 
 Item {
 	id: root
 
-	readonly property int contentHeight: Config.bar.height + padding * 2
-	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentHeight
+	readonly property int clampedExtent: Math.max(Config.bar.border, extent)
+	readonly property int contentThickness: Math.floor(Math.max(Config.bar.height, Tokens.bar.innerSize * (horizontal ? 1 : 1.5))) + padding * 2
+	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentThickness
+	property real extent: fullscreen ? 0 : Config.bar.border
 	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
 
-	function checkPopout(x: real): void {
-		content.item?.checkPopout(x);
+	function checkPopout(pos: real): void {
+		(content.item as Bar)?.checkPopout(pos);
 	}
 
-	implicitHeight: fullscreen ? 0 : Config.bar.border
-	visible: height > Config.bar.border
+	function entryAt(pos: real): string {
+		return (content.item as Bar)?.entryAt(pos) ?? "";
+	}
+
+	implicitHeight: extent
+	implicitWidth: extent
+	visible: extent > Config.bar.border
 
 	states: State {
 		name: "visible"
 		when: root.shouldBeVisible
 
 		PropertyChanges {
-			root.implicitHeight: root.contentHeight
+			root.extent: root.contentThickness
 		}
 	}
 	transitions: [
@@ -48,7 +51,7 @@ Item {
 			to: "visible"
 
 			Anim {
-				property: "implicitHeight"
+				property: "extent"
 				target: root
 			}
 		},
@@ -57,7 +60,7 @@ Item {
 			to: ""
 
 			Anim {
-				property: "implicitHeight"
+				property: "extent"
 				target: root
 			}
 		}
@@ -67,13 +70,18 @@ Item {
 		id: content
 
 		active: root.shouldBeVisible || root.visible
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
+		anchors.bottom: root.position !== "bottom" ? parent.bottom : undefined
+		anchors.left: root.horizontal ? parent.left : undefined
 		anchors.right: parent.right
+		anchors.top: root.position !== "top" ? parent.top : undefined
+		height: root.contentThickness
+		width: root.contentThickness
 
 		sourceComponent: Bar {
 			fullscreen: root.fullscreen
-			height: root.contentHeight
+			height: root.contentThickness
+			horizontal: root.horizontal
+			isHovered: root.isHovered
 			popouts: root.popouts
 			popoutsWrapper: root.popoutsWrapper
 			screen: root.screen

Modules/Bar/Components/Clock.qml

@@ -0,0 +1,153 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Modules.Bar.Popouts
+import qs.Modules.Bar.Components.Common
+import qs.Helpers
+import qs.Components
+import qs.Services
+
+WidgetBase {
+	id: root
+
+	readonly property color contentColor: visibilities.dashboard ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+	readonly property string effectiveFormat: {
+		let fmt = Config.general.dateFormat;
+		if (!root.horizontal)
+			fmt = fmt.replace("dddd", "ddd");
+		return fmt;
+	}
+	readonly property var formatParts: {
+		const segments = root.effectiveFormat.split(" - ");
+		let datePart = "";
+		let timePart = "";
+
+		if (segments.length > 1) {
+			datePart = segments[0];
+			timePart = segments[1];
+		} else if (/[hms]/.test(segments[0])) {
+			timePart = segments[0];
+		} else {
+			datePart = segments[0];
+		}
+
+		const dateTokens = datePart.trim().length ? datePart.trim().split(/\s+/) : [];
+		const timeTokens = timePart.trim().length ? timePart.trim().split(":") : [];
+
+		return {
+			dateTokens: dateTokens,
+			timeTokens: timeTokens
+		};
+	}
+	required property GridLayout loader
+	required property Wrapper popouts
+	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
+	implicitHeight: horizontal ? baseSize : size
+	implicitWidth: horizontal ? size : baseSize
+	radius: Tokens.rounding.full
+
+	CustomText {
+		id: timeText
+
+		anchors.centerIn: parent
+		color: root.contentColor
+		font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+		height: implicitHeight
+		text: Time.dateStr
+		visible: root.horizontal
+
+		Behavior on color {
+			CAnim {}
+		}
+	}
+
+	ColumnLayout {
+		id: verticalColumn
+
+		anchors.centerIn: parent
+		spacing: Tokens.padding.extraSmall ?? 2
+		visible: !root.horizontal
+		width: root.baseSize
+
+		Repeater {
+			model: root.formatParts.dateTokens
+
+			CustomText {
+				required property string modelData
+
+				Layout.alignment: Qt.AlignHCenter
+				color: root.contentColor
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+				text: Qt.formatDateTime(Time.date, modelData)
+
+				Behavior on color {
+					CAnim {}
+				}
+			}
+		}
+
+		Rectangle {
+			Layout.alignment: Qt.AlignHCenter
+			Layout.bottomMargin: Tokens.padding.extraSmall ?? 2
+			Layout.topMargin: Tokens.padding.extraSmall ?? 2
+			color: root.contentColor
+			height: 1
+			implicitWidth: root.baseSize * 0.5
+			opacity: 0.4
+			radius: 1
+			visible: root.formatParts.dateTokens.length > 0 && root.formatParts.timeTokens.length > 0
+		}
+
+		Repeater {
+			model: root.formatParts.timeTokens
+
+			CustomText {
+				required property string modelData
+
+				Layout.alignment: Qt.AlignHCenter
+				color: root.contentColor
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+				text: {
+					if (modelData.includes("h"))
+						return Time.hourStr;
+					if (modelData.includes("m"))
+						return Time.minuteStr;
+					if (modelData.includes("s"))
+						return Time.secondStr;
+					return "";
+				}
+
+				Behavior on color {
+					CAnim {}
+				}
+			}
+		}
+
+		CustomText {
+			Layout.alignment: Qt.AlignHCenter
+			color: root.contentColor
+			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 {}
+			}
+		}
+	}
+
+	StateLayer {
+		acceptedButtons: Qt.LeftButton
+		color: root.contentColor
+
+		onClicked: {
+			root.visibilities.dashboard = !root.visibilities.dashboard;
+		}
+	}
+}

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/Common/WidgetBase.qml

@@ -0,0 +1,16 @@
+import QtQuick
+import ZShell.Config
+import qs.Components
+import qs.Services
+
+CustomRect {
+	id: root
+
+	readonly property int baseSize: horizontal ? Math.max(Config.bar.height, Tokens.bar.innerSize) : Math.max(Config.bar.height, Math.floor(Tokens.bar.innerSize * 1.5))
+	required property bool horizontal
+
+	color: Colors.tPalette.m3surfaceContainer
+	implicitHeight: horizontal ? baseSize : width
+	implicitWidth: horizontal ? height : baseSize
+	radius: Tokens.rounding.full
+}

Modules/Bar/Components/HyprsunsetWidget.qml

@@ -1,17 +1,16 @@
 import QtQuick
-import qs.Components
-import qs.Helpers
 import ZShell.Config
+import qs.Components
+import qs.Modules.Bar.Components.Common
+import qs.Helpers
 import qs.Services
 
-CustomRect {
+WidgetBase {
 	id: root
 
 	property bool tempEnabled: Hyprsunset.enabled
 
 	color: root.tempEnabled ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
-	implicitHeight: Config.bar.height + Tokens.padding.smallest * 2
-	implicitWidth: implicitHeight
 	radius: Tokens.rounding.full
 
 	StateLayer {
@@ -26,6 +25,7 @@ CustomRect {
 		animate: true
 		color: root.tempEnabled ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		fill: root.tempEnabled ? 1 : 0
+		font.pointSize: Tokens.font.size.larger
 		text: root.tempEnabled ? "lightbulb" : "light_off"
 
 		Behavior on fill {

Modules/Bar/Components/MediaWidget.qml

@@ -0,0 +1,92 @@
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Components
+import qs.Modules.Bar.Components.Common
+import qs.Helpers
+import qs.Services
+
+WidgetBase {
+	id: root
+
+	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.small * 2
+	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
+	radius: Tokens.rounding.full
+
+	Behavior on implicitHeight {
+		enabled: !root.horizontal
+
+		Anim {
+		}
+	}
+	Behavior on implicitWidth {
+		enabled: root.horizontal
+
+		Anim {
+		}
+	}
+
+	TextMetrics {
+		id: metrics
+
+		font: mediatext.font
+		text: mediatext.text
+	}
+
+	GridLayout {
+		id: layout
+
+		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.small
+		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
+		columns: root.horizontal ? -1 : 1
+
+		Behavior on implicitWidth {
+			Anim {
+			}
+		}
+
+		MaterialIcon {
+			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
+			animate: true
+			color: Players.active?.isPlaying ? Colors.palette.m3primary : Colors.palette.m3onSurface
+			font.pointSize: Tokens.font.size.larger
+			text: Players.active?.isPlaying ? "music_note" : "music_off"
+		}
+
+		MarqueeText {
+			id: mediatext
+
+			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
+			animate: true
+			color: Players.active?.isPlaying ? Colors.palette.m3primary : Colors.palette.m3onSurface
+			font.pointSize: Tokens.font.size.normal
+			horizontalAlignment: Text.AlignHCenter
+			implicitHeight: root.horizontal ? root.implicitHeight : root.textWidth
+			implicitWidth: root.horizontal ? root.textWidth : root.implicitWidth
+			marqueeEnabled: false
+			pauseMs: 4000
+			text: root.currentMedia
+			vertical: !root.horizontal
+		}
+	}
+
+	CustomMouseArea {
+		anchors.fill: parent
+		hoverEnabled: true
+
+		onContainsMouseChanged: {
+			if (!containsMouse) {
+				mediatext.marqueeEnabled = false;
+			} else {
+				mediatext.marqueeEnabled = true;
+				mediatext.anim.start();
+			}
+		}
+	}
+}

Modules/Bar/Components/NotifBell.qml

@@ -1,19 +1,19 @@
 import Quickshell
 import QtQuick
 import ZShell.Config
+import qs.Modules.Bar.Components.Common
+import qs.Modules.Bar.Popouts
 import qs.Daemons
 import qs.Components
 import qs.Services
 
-CustomRect {
+WidgetBase {
 	id: root
 
 	required property Wrapper popouts
 	required property PersistentProperties visibilities
 
 	color: visibilities.sidebar ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
-	implicitHeight: Config.bar.height + Tokens.padding.smallest * 2
-	implicitWidth: implicitHeight
 	radius: Tokens.rounding.full
 
 	MaterialIcon {
@@ -22,7 +22,6 @@ CustomRect {
 		anchors.centerIn: parent
 		color: root.visibilities.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		fill: root.visibilities.sidebar ? 1 : 0
-		font.family: "Material Symbols Rounded"
 		font.pointSize: Tokens.font.size.larger
 		text: NotifServer.list.length ? "\uf4fe" : "\ue7f4"
 

Modules/Bar/Components/Resource.qml

@@ -5,13 +5,14 @@ import qs.Components
 import ZShell.Config
 import qs.Services
 
-RowLayout {
+GridLayout {
 	id: root
 
 	property color accentColor: warning ? Colors.palette.m3error : mainColor
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
+	required property bool horizontal
 	property string icon
 	required property color iconColor
 	required property color mainColor
@@ -21,8 +22,9 @@ RowLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
+	columnSpacing: Tokens.spacing.medium
+	columns: horizontal ? -1 : 1
 	percentage: 0
-	spacing: Tokens.spacing.smaller
 
 	Behavior on animatedPercentage {
 		Anim {
@@ -47,8 +49,8 @@ RowLayout {
 	}
 
 	CustomClippingRect {
-		Layout.preferredHeight: root.height - Tokens.padding.small
-		Layout.preferredWidth: 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
 
@@ -57,9 +59,11 @@ RowLayout {
 
 			anchors.bottom: parent.bottom
 			anchors.left: parent.left
-			anchors.right: parent.right
+			anchors.right: root.horizontal ? parent.right : undefined
+			anchors.top: root.horizontal ? undefined : parent.top
 			color: root.mainColor
-			implicitHeight: Math.ceil(root.percentage * parent.height)
+			implicitHeight: root.horizontal ? Math.ceil(root.percentage * parent.height) : 0
+			implicitWidth: root.horizontal ? 0 : Math.ceil(root.percentage * parent.width)
 
 			// Behavior on implicitHeight {
 			// 	Anim {

Modules/Bar/Components/Resources.qml

@@ -6,18 +6,18 @@ import QtQuick.Layouts
 import ZShell.Config
 import ZShell.Services
 import qs.Services
-import qs.Modules
+import qs.Modules.Bar.Components.Common
 import qs.Components
 
-CustomRect {
+WidgetBase {
 	id: root
 
 	required property PersistentProperties visibilities
 
 	clip: true
 	color: visibilities.resources ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
-	implicitHeight: Config.bar.height + Tokens.padding.smallest * 2
-	implicitWidth: rowLayout.implicitWidth + Tokens.padding.larger * 2
+	implicitHeight: horizontal ? baseSize : gridLayout.implicitHeight + Tokens.padding.medium * 2
+	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.medium * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	StateLayer {
@@ -26,13 +26,14 @@ CustomRect {
 		onClicked: root.visibilities.resources = !root.visibilities.resources
 	}
 
-	RowLayout {
-		id: rowLayout
+	GridLayout {
+		id: gridLayout
 
 		anchors.centerIn: parent
-		anchors.horizontalCenterOffset: -2
-		implicitHeight: root.implicitHeight
-		spacing: Tokens.spacing.smaller
+		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
+		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
+		columnSpacing: Tokens.spacing.small
+		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {
 			service: Gpu
@@ -48,7 +49,9 @@ CustomRect {
 
 		Resource {
 			Layout.alignment: Qt.AlignVCenter
-			Layout.fillHeight: true
+			Layout.fillHeight: root.horizontal
+			Layout.fillWidth: !root.horizontal
+			horizontal: root.horizontal
 			icon: "memory"
 			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary
@@ -57,7 +60,9 @@ CustomRect {
 		}
 
 		Resource {
-			Layout.fillHeight: true
+			Layout.fillHeight: root.horizontal
+			Layout.fillWidth: !root.horizontal
+			horizontal: root.horizontal
 			icon: "memory_alt"
 			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3secondary
@@ -66,7 +71,9 @@ CustomRect {
 		}
 
 		Resource {
-			Layout.fillHeight: true
+			Layout.fillHeight: root.horizontal
+			Layout.fillWidth: !root.horizontal
+			horizontal: root.horizontal
 			icon: "gamepad"
 			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3tertiary
@@ -74,7 +81,9 @@ CustomRect {
 		}
 
 		Resource {
-			Layout.fillHeight: true
+			Layout.fillHeight: root.horizontal
+			Layout.fillWidth: !root.horizontal
+			horizontal: root.horizontal
 			icon: "developer_board"
 			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary

Modules/Bar/Components/StatusIcons.qml

@@ -3,13 +3,14 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
-import qs.Helpers
-import qs.Modules.SysTray.Widgets
 import ZShell.Config
+import qs.Helpers
+import qs.Modules.Bar.Components.StatusIcons
+import qs.Modules.Bar.Components.Common
 import qs.Components
 import qs.Services
 
-CustomClippingRect {
+WidgetBase {
 	id: root
 
 	readonly property int firstPresent: {
@@ -21,7 +22,7 @@ CustomClippingRect {
 	}
 
 	// Index of the first/last entry that isn't collapsed, for edge margin gating
-	readonly property alias items: row
+	readonly property alias items: grid
 	readonly property int lastPresent: {
 		const values = model.values;
 		for (let i = values.length - 1; i >= 0; i--)
@@ -29,7 +30,8 @@ CustomClippingRect {
 				return i;
 		return -1;
 	}
-	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 {
@@ -38,19 +40,36 @@ CustomClippingRect {
 		return false;
 	}
 
-	bottomLeftRadius: Tokens.rounding.smallest / 2
+	bottomLeftRadius: horizontal ? Tokens.rounding.small / 2 : Tokens.rounding.full
 	color: Colors.tPalette.m3surfaceContainer
-	implicitHeight: Config.bar.height + Tokens.padding.smallest * 2
-	implicitWidth: row.implicitWidth + Tokens.padding.small * 2
+	implicitHeight: horizontal ? baseSize : size
+	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
-	topLeftRadius: Tokens.rounding.smallest / 2
+	topLeftRadius: Tokens.rounding.small / 2
+	topRightRadius: horizontal ? Tokens.rounding.full : Tokens.rounding.small / 2
 
-	RowLayout {
-		id: row
+	Behavior on implicitHeight {
+		enabled: !root.horizontal
 
+		Anim {
+		}
+	}
+	Behavior on implicitWidth {
+		enabled: root.horizontal
+
+		Anim {
+		}
+	}
+
+	GridLayout {
+		id: grid
+
+		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.medium
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.small
-		anchors.rightMargin: 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 {
 			model: ScriptModel {
@@ -69,6 +88,7 @@ CustomClippingRect {
 						name: "audio"
 
 						AudioWidget {
+							horizontal: root.horizontal
 						}
 					}
 				}
@@ -80,6 +100,7 @@ CustomClippingRect {
 						name: "audio"
 
 						MicWidget {
+							horizontal: root.horizontal
 						}
 					}
 				}
@@ -109,8 +130,10 @@ CustomClippingRect {
 		property real rightGap: present && index !== root.firstPresent ? margin : 0
 
 		Layout.alignment: Qt.AlignHCenter
-		Layout.leftMargin: Math.round(leftGap)
-		Layout.rightMargin: Math.round(rightGap)
+		Layout.bottomMargin: root.horizontal ? 0 : Math.round(rightGap)
+		Layout.leftMargin: root.horizontal ? Math.round(leftGap) : 0
+		Layout.rightMargin: root.horizontal ? Math.round(rightGap) : 0
+		Layout.topMargin: root.horizontal ? 0 : Math.round(leftGap)
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0
 		implicitWidth: item?.implicitWidth ?? 0

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -1,16 +1,15 @@
 import QtQuick
 import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Services.Pipewire
-import qs.Daemons
-import qs.Modules
 import ZShell.Config
+import qs.Daemons
 import qs.Components
 import qs.Services
 
 MaterialIcon {
 	id: speaker
 
+	required property bool horizontal
+
 	animate: true
 	color: Audio.muted ? Colors.palette.m3error : Colors.palette.m3onSurface
 	fill: 1

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -1,16 +1,15 @@
 import QtQuick
 import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Services.Pipewire
-import qs.Daemons
-import qs.Modules
 import ZShell.Config
+import qs.Daemons
 import qs.Components
 import qs.Services
 
 MaterialIcon {
 	id: mic
 
+	required property bool horizontal
+
 	animate: true
 	color: (Audio.sourceMuted ?? false) ? Colors.palette.m3error : Colors.palette.m3onSurface
 	fill: 1

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -0,0 +1,80 @@
+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
+
+	readonly property Item currentItem: batteryIconLoader?.item ?? peripheralIconLoader?.item ?? upowerIconLoader.item
+
+	implicitHeight: currentItem?.implicitHeight ?? 0
+	implicitWidth: currentItem?.implicitWidth ?? 0
+
+	Behavior on Layout.preferredHeight {
+		Anim {
+		}
+	}
+	Behavior on Layout.preferredWidth {
+		Anim {
+		}
+	}
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	Component.onCompleted: Battery.startDaemon()
+
+	Loader {
+		id: batteryIconLoader
+
+		active: Battery.isLaptop
+		anchors.centerIn: parent
+
+		sourceComponent: BatteryIcon {
+			devState: Battery.deviceStateString
+			percentage: Battery.currentPerc
+		}
+	}
+
+	Loader {
+		id: peripheralIconLoader
+
+		active: (Battery.lowestPeripheral?.isPresent ?? false) && !batteryIconLoader.active
+		anchors.centerIn: parent
+
+		sourceComponent: BatteryIcon {
+			devState: Battery.lowestPeripheral?.state ?? ""
+			percentage: Battery.lowestPeripheral?.percentage ?? 0
+		}
+	}
+
+	Loader {
+		id: upowerIconLoader
+
+		active: !batteryIconLoader.active && !peripheralIconLoader.active
+		anchors.centerIn: parent
+
+		sourceComponent: MaterialIcon {
+			Layout.alignment: Qt.AlignVCenter
+			animate: true
+			fill: 1
+			font.pointSize: Tokens.font.size.larger
+			text: {
+				if (PowerProfiles.profile === PowerProfile.PowerSaver)
+					return "energy_savings_leaf";
+				if (PowerProfiles.profile === PowerProfile.Performance)
+					return "bolt";
+				return "balance";
+			}
+		}
+	}
+}

Modules/Bar/Components/Tray/TrayItem.qml

@@ -1,10 +1,9 @@
 import QtQuick.Layouts
 import QtQuick
-import QtQuick.VectorImage
 import Quickshell
 import Quickshell.Services.SystemTray
 import qs.Helpers
-import qs.Modules
+import qs.Modules.Bar.Popouts
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -13,10 +12,10 @@ Item {
 	id: root
 
 	property bool current: popouts.currentName.startsWith(`traymenu${ind}`) && popouts.hasCurrent
-	readonly property real dpr: Hypr.monitorFor(loader.screen).scale
+	readonly property real dpr: Hypr.monitorFor(loader?.screen).scale
 	required property int ind
 	required property SystemTrayItem item
-	required property RowLayout loader
+	required property GridLayout loader
 	required property Wrapper popouts
 
 	function resolveIcon(app: string, icon: string): string {

Modules/Bar/Components/TrayIcons.qml

@@ -0,0 +1,63 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import Quickshell.Services.SystemTray
+import ZShell.Config
+import qs.Components
+import qs.Modules.Bar.Components.Common
+import qs.Modules.Bar.Components.Tray
+import qs.Modules.Bar.Popouts
+import qs.Services
+
+WidgetBase {
+	id: root
+
+	readonly property alias items: repeater
+	readonly property alias layout: sysGrid
+	required property GridLayout loader
+	readonly property int padding: Tokens.padding.extraSmall
+	required property Wrapper popouts
+	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.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.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
+
+		Repeater {
+			id: repeater
+
+			model: SystemTray.items
+
+			TrayItem {
+				id: trayItem
+
+				required property int index
+				required property SystemTrayItem modelData
+
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+				implicitHeight: 34
+				implicitWidth: 34
+				ind: index
+				item: modelData
+				loader: root.loader
+				popouts: root.popouts
+			}
+		}
+	}
+}

Modules/Bar/Components/UpdatesWidget.qml

@@ -0,0 +1,41 @@
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Components
+import qs.Modules.Bar.Components.Common
+import qs.Helpers
+import qs.Services
+
+WidgetBase {
+	id: root
+
+	property int countUpdates: Updates.availableUpdates
+	property color textColor: Colors.palette.m3onSurface
+
+	color: Colors.tPalette.m3surfaceContainer
+	implicitHeight: horizontal ? baseSize : content.implicitHeight + Tokens.spacing.small
+	implicitWidth: horizontal ? content.implicitWidth + Tokens.spacing.small * 2 : baseSize
+	radius: Tokens.rounding.full
+
+	GridLayout {
+		id: content
+
+		anchors.centerIn: parent
+		columnSpacing: Tokens.spacing.small
+		columns: root.horizontal ? -1 : 1
+		rowSpacing: -Tokens.spacing.extraSmall / 2
+
+		MaterialIcon {
+			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
+			font.pointSize: root.horizontal ? Tokens.font.size.larger : Tokens.font.size.large
+			text: "package_2"
+		}
+
+		CustomText {
+			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
+			color: root.textColor
+			font.pointSize: Tokens.font.size.normal
+			text: root.countUpdates
+		}
+	}
+}

Modules/Bar/Components/WindowTitle.qml

@@ -0,0 +1,98 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import ZShell.Config
+import qs.Components
+import qs.Helpers
+import qs.Services
+
+Item {
+	id: root
+
+	required property var bar
+	property color color: Colors.palette.m3primary
+	property Title current: text1
+	required property bool horizontal
+	// readonly property int maxWidth: 300
+	readonly property int maxSize: {
+		const otherModules = bar.children.filter(c => c.enabled && c.entryId && c.item !== this && c.entryId !== "spacer");
+		const otherSize = otherModules.reduce((acc, curr) => acc + (horizontal ? (curr.item?.nonAnimWidth ?? curr.width ?? 0) : (curr.item.nonAnimHeight ?? curr.height ?? 0)), 0);
+		return horizontal ? (bar.width - otherSize - bar.columnSpacing * (bar.children.length - 1) - bar.vPadding * 2) : (bar.height - otherSize - bar.rowSpacing * (bar.children.length - 1) - bar.vPadding * 4);
+	}
+
+	clip: true
+	implicitHeight: horizontal ? current.implicitHeight : current.implicitWidth + current.anchors.topMargin
+	implicitWidth: horizontal ? current.implicitWidth + current.anchors.leftMargin : current.implicitHeight + current.anchors.topMargin
+
+	Behavior on implicitHeight {
+		enabled: !root.horizontal
+
+		Anim {
+			type: Anim.DefaultEffects
+		}
+	}
+	Behavior on implicitWidth {
+		enabled: root.horizontal
+
+		Anim {
+			type: Anim.DefaultEffects
+		}
+	}
+
+	Title {
+		id: text1
+	}
+
+	Title {
+		id: text2
+	}
+
+	TextMetrics {
+		id: metrics
+
+		elide: Qt.ElideRight
+		elideWidth: root.maxSize - (root.horizontal ? root.current.anchors.leftMargin : 0)
+		font.family: "Rubik"
+		font.pointSize: Tokens.font.size.normal
+		text: Hypr.activeToplevel?.title ?? qsTr("Desktop")
+
+		onElideWidthChanged: root.current.text = elidedText
+		onTextChanged: {
+			const next = root.current === text1 ? text2 : text1;
+			next.text = elidedText;
+			root.current = next;
+		}
+	}
+
+	component Title: CustomText {
+		id: text
+
+		anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
+		anchors.left: root.horizontal ? parent.left : undefined
+		anchors.leftMargin: root.horizontal ? Tokens.spacing.small : 0
+		anchors.top: root.horizontal ? undefined : parent.top
+		anchors.topMargin: root.horizontal ? 0 : Tokens.spacing.small
+		anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
+		color: root.color
+		font.family: metrics.font.family
+		font.pointSize: metrics.font.pointSize
+		height: root.horizontal ? implicitHeight : implicitWidth
+		opacity: root.current === this ? 1 : 0
+		width: root.horizontal ? implicitWidth : implicitHeight
+
+		Behavior on opacity {
+			Anim {
+			}
+		}
+		transform: [
+			Translate {
+				x: !root.horizontal ? -text.implicitWidth + text.implicitHeight : 0
+			},
+			Rotation {
+				angle: root.horizontal ? 0 : 270
+				origin.x: text.implicitHeight / 2
+				origin.y: text.implicitHeight / 2
+			}
+		]
+	}
+}

Modules/Bar/Components/Workspaces.qml

@@ -2,53 +2,69 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Effects
 import Quickshell
 import Quickshell.Hyprland
 import ZShell.Config
+import qs.Modules.Bar.Components.Workspaces
 import qs.Components
 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)
 	required property ShellScreen screen
-	property int workspaceButtonWidth: bgRect.implicitHeight - root.activeWorkspaceMargin * 2
+	readonly property real shortSize: Math.max(Config.bar.height, Tokens.bar.innerSize)
+	readonly property real size: (workspaceButtonWidth * workspacesShown) + activeWorkspaceMargin * 2
+	property int workspaceButtonWidth: (horizontal ? bgRect.implicitHeight : bgRect.implicitWidth) - root.activeWorkspaceMargin * 2
 	property int workspaceIndexInGroup: (effectiveActiveWorkspaceId - 1) % root.workspacesShown
 	readonly property list<var> workspaces: Hyprland.workspaces.values.filter(w => w.monitor === root.monitor)
 	readonly property int workspacesShown: workspaces.length
 
-	height: implicitHeight
-	implicitHeight: Config.bar.height + Tokens.padding.smaller * 2
-	implicitWidth: (root.workspaceButtonWidth * root.workspacesShown) + root.activeWorkspaceMargin * 2
+	implicitHeight: horizontal ? shortSize : size
+	implicitWidth: horizontal ? size : shortSize
 
+	Behavior on implicitHeight {
+		enabled: !root.horizontal
+
+		Anim {
+		}
+	}
 	Behavior on implicitWidth {
+		enabled: root.horizontal
+
 		Anim {
 		}
 	}
 
 	CustomRect {
+		// qmllint disable Quick.anchor-combinations
 		id: bgRect
 
-		anchors.left: parent.left
-		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
+		anchors.bottom: root.horizontal ? undefined : parent.bottom
+		anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
+		anchors.left: root.horizontal ? parent.left : undefined
+		anchors.right: root.horizontal ? parent.right : undefined
+		anchors.top: root.horizontal ? undefined : parent.top
+		anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
 		color: Colors.tPalette.m3surfaceContainer
-		implicitHeight: root.implicitHeight - ((Tokens.padding.small - 1) * 2)
+		implicitHeight: root.horizontal ? root.implicitHeight : 0
+		implicitWidth: root.horizontal ? 0 : root.implicitWidth
 		radius: height / 2
 
+		// qmllint enable Quick.anchor-combinations
 		Grid {
 			id: grid
 
 			anchors.fill: parent
 			anchors.margins: root.activeWorkspaceMargin
 			columnSpacing: 0
-			columns: root.workspacesShown
+			columns: root.horizontal ? root.workspacesShown : 1
 			rowSpacing: 0
-			rows: 1
+			rows: root.horizontal ? 1 : root.workspacesShown
 
 			Repeater {
 				model: root.workspaces
@@ -74,7 +90,7 @@ Item {
 							color: Colors.palette.m3onSecondaryContainer
 							elide: Text.ElideRight
 							horizontalAlignment: Text.AlignHCenter
-							text: button.modelData.name
+							text: button.modelData?.name ?? ""
 							verticalAlignment: Text.AlignVCenter
 						}
 					}
@@ -94,13 +110,15 @@ Item {
 			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * root.workspaceButtonWidth + root.activeWorkspaceMargin
 			property real indicatorThickness: root.workspaceButtonWidth
 
-			anchors.verticalCenter: parent.verticalCenter
+			anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
+			anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
 			clip: true
 			color: Colors.palette.m3primary
-			implicitHeight: indicatorThickness
-			implicitWidth: indicatorLength
+			implicitHeight: root.horizontal ? indicatorThickness : indicatorLength
+			implicitWidth: root.horizontal ? indicatorLength : indicatorThickness
 			radius: Tokens.rounding.full
-			x: indicatorPosition
+			x: root.horizontal ? indicatorPosition : 0
+			y: root.horizontal ? 0 : indicatorPosition
 
 			AnimatedTabIndexPair {
 				id: idxPair
@@ -114,7 +132,8 @@ Item {
 				implicitWidth: grid.width
 				source: grid
 				sourceColor: Colors.palette.m3onSurface
-				x: -indicator.x + 3
+				x: root.horizontal ? -indicator.x + 3 : 0
+				y: root.horizontal ? 0 : -indicator.y + 3
 			}
 		}
 	}

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

@@ -0,0 +1,88 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import qs.Components
+import ZShell.Config
+
+Item {
+	id: root
+
+	required property real borderThickness
+	readonly property alias content: content
+	readonly property bool horizontal: position !== "left"
+	// property real offsetScale: y > 0 || content.hasCurrent ? 0 : 1
+	property real offsetScale: {
+		if (content.hasCurrent)
+			return 0;
+		if (position === "top")
+			return y > 0 ? 0 : 1;
+		if (position === "bottom")
+			return 1;
+		return x > 0 ? 0 : 1;
+	}
+	required property string position
+	required property ShellScreen screen
+
+	anchors.bottom: position === "bottom" ? parent.bottom : undefined
+	clip: true
+	implicitHeight: horizontal ? content.implicitHeight * (1 - offsetScale) : content.implicitHeight
+	implicitWidth: horizontal ? content.implicitWidth : content.implicitWidth * (1 - offsetScale)
+	visible: width > 0 && height > 0
+	x: {
+		if (!horizontal)
+			return 0;
+		const off = content.currentCenter - borderThickness - content.nonAnimWidth / 2;
+		const diff = parent.width - Math.floor(off + content.nonAnimWidth);
+		if (diff < 0)
+			return off + diff;
+		return Math.floor(Math.max(off, 0));
+	}
+	y: {
+		if (horizontal)
+			return 0;
+
+		const off = content.currentCenter - borderThickness - content.nonAnimHeight / 2;
+		const diff = parent.height - Math.floor(off + content.nonAnimHeight);
+		if (diff < 0)
+			return off + diff;
+		return Math.max(off, 0);
+	}
+
+	Behavior on offsetScale {
+		Anim {
+		}
+	}
+	Behavior on x {
+		enabled: !root.horizontal || root.offsetScale < 1
+
+		Anim {
+			duration: content.animLength
+			easing: content.animCurve
+		}
+	}
+	Behavior on y {
+		enabled: root.horizontal || root.offsetScale < 1
+
+		Anim {
+			duration: content.animLength
+			easing: content.animCurve
+		}
+	}
+
+	Wrapper {
+		id: content
+
+		anchors.bottom: root.position === "bottom" ? parent.bottom : undefined
+		anchors.bottomMargin: (-implicitHeight - 5) * root.offsetScale
+		anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
+		anchors.left: root.horizontal ? undefined : parent.left
+		anchors.leftMargin: (-implicitWidth - 5) * root.offsetScale
+		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

@@ -5,20 +5,17 @@ import Quickshell.Services.SystemTray
 import QtQuick
 import ZShell.Config
 import qs.Components
-import qs.Modules.WSOverview
-import qs.Modules.Network
-import qs.Modules.SysTray.Popouts
-import qs.Modules.Updates
 
 Item {
 	id: root
 
 	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
@@ -73,6 +70,7 @@ Item {
 			name: "upower"
 
 			sourceComponent: UPowerPopout {
+				horizontal: root.horizontal
 			}
 		}
 
@@ -100,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