feat: drawing popout now clips strokes again + add redo + add undo and redo keybinds

Reviewed-on: #163

Components/CustomProgressBar.qml

@@ -99,6 +99,7 @@ ProgressBar {
 			}
 
 			Line {
+				id: dot
 				property real implicitSize
 
 				anchors.right: parent.right
@@ -124,8 +125,7 @@ ProgressBar {
 				anchors.left: parent.left
 
 				Behavior on implicitWidth {
-					Anim {
+					Anim {}
-					}
 				}
 
 				Component.onCompleted: implicitWidth = Qt.binding(() => parent.width * root.visualPosition)
@@ -222,8 +222,7 @@ ProgressBar {
 			}
 		}
 		Behavior on color {
-			CAnim {
+			CAnim {}
-			}
 		}
 		Anim on waveProgress {
 			duration: root.waveDuration

Components/CustomSlider.qml

@@ -2,10 +2,10 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Templates
-import ZShell.Components
 import ZShell
-import qs.Components
+import ZShell.Components
 import ZShell.Config
+import qs.Components
 import qs.Services
 
 Slider {
@@ -28,7 +28,7 @@ Slider {
 
 	signal interaction(v: real)
 
-	implicitHeight: 12
+	implicitHeight: ZUtils.snap(12, root)
 	implicitWidth: 200
 
 	contentItem: Item {
@@ -123,7 +123,7 @@ Slider {
 				bottomRightRadius: Tokens.rounding.extraSmall / 2
 				color: root.fgColor
 				implicitHeight: root.height
-				implicitWidth: root.filledWidth
+				implicitWidth: ZUtils.snap(root.filledWidth, root)
 				radius: root.radius
 				topRightRadius: Tokens.rounding.extraSmall / 2
 			}
@@ -137,8 +137,8 @@ Slider {
 				frequency: root.waveFrequency
 				fullLength: root.width - handle.implicitWidth - handle.anchors.leftMargin
 				implicitHeight: lineWidth * amplitudeMultiplier * 2 + lineWidth
-				implicitWidth: root.filledWidth
+				implicitWidth: ZUtils.snap(root.filledWidth, root)
-				lineWidth: root.height * 0.7
+				lineWidth: ZUtils.snap(root.height * 0.7, root)
 				startX: x
 
 				Behavior on color {

Components/IconButton.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import ZShell
 import ZShell.Config
 import qs.Services
 
@@ -15,9 +16,9 @@ ButtonBase {
 		const h = label.implicitHeight + padding * 2;
 		if (h % 2 !== 0)
 			return h + 1;
-		return h;
+		return ZUtils.snap(h, root);
 	}
-	implicitWidth: implicitHeight
+	implicitWidth: ZUtils.snap(implicitHeight, root)
 	inactiveColor: {
 		if (!isToggle && type === IconButton.Filled)
 			return Colors.palette.m3primary;

Components/IconTextButton.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Services
 
@@ -34,10 +35,11 @@ ButtonBase {
 	}
 	verticalPadding: Tokens.padding.extraSmall
 
-	RowLayout {
+	SnapLayout {
 		id: row
 
 		anchors.centerIn: parent
+
 		spacing: Tokens.spacing.small
 
 		MaterialIcon {

Components/LineGraph.qml

@@ -1,6 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import QtCanvas2D
+import ZShell
 
 Item {
 	id: root
@@ -36,54 +38,62 @@ Item {
 	property real fillAlpha: 0.15
 	property real lineWidth: 2
 	property real markerDotRadius: 4
-	property real labelFontSize: 10
+	property real labelFontSize: 8
 
-	Canvas {
+	Canvas2D {
 		id: canvas
 
 		anchors.fill: parent
-		renderStrategy: Canvas.Immediate
+
+		alphaBlending: true
+		fillColor: "transparent"
 
 		onWidthChanged: requestPaint()
 		onHeightChanged: requestPaint()
 
+		function snapV(v) {
+			return ZUtils.snap(v, canvas);
+		}
+
 		function strokeCurve(ctx, pts) {
 			ctx.beginPath();
 			ctx.moveTo(pts[0].x, pts[0].y);
 
-			if (root.curveSmoothing && pts.length > 2) {
+			const dpr = ZUtils.dprFor(canvas);
-				const k = 1 / 6;
+			for (let i = 0; i < pts.length - 1; i++) {
-				const n = pts.length;
+				const p1 = pts[i];
+				const p2 = pts[i + 1];
+				const [c1x, c1y, c2x, c2y] = segmentControls(pts, i);
 
-				for (let i = 0; i < n - 1; i++) {
+				const firstCol = Math.ceil(p1.x * dpr) + 1;
-					const p0 = pts[Math.max(i - 1, 0)];
+				const lastCol = Math.floor(p2.x * dpr) - 1;
-					const p1 = pts[i];
+				for (let col = firstCol; col <= lastCol; ++col) {
-					const p2 = pts[i + 1];
+					const x = col / dpr;
-					const p3 = pts[Math.min(i + 2, n - 1)];
+					ctx.lineTo(x, bezierY(p1, c1x, c1y, c2x, c2y, p2, x));
-
-					let c1x = p1.x + (p2.x - p0.x) * k;
-					let c1y = p1.y + (p2.y - p0.y) * k;
-					let c2x = p2.x - (p3.x - p1.x) * k;
-					let c2y = p2.y - (p3.y - p1.y) * k;
-
-					const minY = Math.min(p1.y, p2.y);
-					const maxY = Math.max(p1.y, p2.y);
-					c1y = Math.max(minY, Math.min(maxY, c1y));
-					c2y = Math.max(minY, Math.min(maxY, c2y));
-
-					ctx.bezierCurveTo(c1x, c1y, c2x, c2y, p2.x, p2.y);
-				}
-			} else {
-				for (let i = 0; i < pts.length - 1; i++) {
-					const p0 = pts[i];
-					const p1 = pts[i + 1];
-					const cx = (p0.x + p1.x) * 0.5;
-					ctx.bezierCurveTo(cx, p0.y, cx, p1.y, p1.x, p1.y);
 				}
+
+				ctx.lineTo(p2.x, p2.y);
 			}
 		}
 
-		// Control points for segment i (pts[i] -> pts[i+1]), matching strokeCurve
+		function bezierY(p1, c1x, c1y, c2x, c2y, p2, targetX) {
+			let tlo = 0;
+			let thi = 1;
+			for (let it = 0; it < 16; it++) {
+				const tm = (tlo + thi) / 2;
+				const u = 1 - tm;
+				const x = u * u * u * p1.x + 3 * u * u * tm * c1x + 3 * u * tm * tm * c2x + tm * tm * tm * p2.x;
+				if (x < targetX)
+					tlo = tm;
+				else
+					thi = tm;
+			}
+
+			const t = (tlo + thi) / 2;
+			const u = 1 - t;
+			return u * u * u * p1.y + 3 * u * u * t * c1y + 3 * u * t * t * c2y + t * t * t * p2.y;
+		}
+
 		function segmentControls(pts, i) {
 			const p0 = pts[Math.max(i - 1, 0)];
 			const p1 = pts[i];
@@ -109,7 +119,6 @@ Item {
 			return [cx, p1.y, cx, p2.y];
 		}
 
-		// Point on the curve at a given x (x is monotonic per segment)
 		function pointAtX(pts, targetX) {
 			let j = pts.length - 2;
 			for (let i = 0; i < pts.length - 1; i++) {
@@ -138,10 +147,16 @@ Item {
 			const t = (tlo + thi) / 2;
 			const u = 1 - t;
 			const y = u * u * u * p1.y + 3 * u * u * t * c1y + 3 * u * t * t * c2y + t * t * t * p2.y;
-			return { x: targetX, y };
+			return {
+				x: targetX,
+				y
+			};
+		}
+
+		function cutPoint(pts, targetX) {
+			return pointAtX(pts, targetX);
 		}
 
-		// Part of the curve left/right of a cut x, including the cut point
 		function cutLeft(pts, targetX) {
 			if (targetX <= pts[0].x)
 				return [];
@@ -158,7 +173,7 @@ Item {
 
 			const left = pts.slice(0, j + 1);
 			if (targetX > pts[j].x)
-				left.push(pointAtX(pts, targetX));
+				left.push(cutPoint(pts, targetX));
 			return left;
 		}
 
@@ -184,17 +199,20 @@ Item {
 
 		onPaint: {
 			const ctx = getContext("2d");
+			if (!ctx)
+				return;
 			ctx.reset();
+			ctx.clearRect(0, 0, width, height);
 
 			const W = width;
 			const H = height;
 			if (W < 2 || H < 2)
 				return;
 
-			const padLeft = root.labelFontSize * 3.4;
+			const padLeft = root.labelFontSize * 5;
-			const padRight = 2;
+			const padRight = 0;
-			const padTop = 2;
+			const padTop = 0;
-			const padBottom = root.labelFontSize + 8;
+			const padBottom = root.labelFontSize + 14;
 			const plot = {
 				x: padLeft,
 				y: padTop,
@@ -204,8 +222,6 @@ Item {
 			if (plot.w < 2 || plot.h < 2)
 				return;
 
-			// Auto-fit: NaN yMin/yMax derive from the data, snapped to the
-			// horizontal step grid, honoring minHorizontalLines
 			let lo = root.yMin;
 			let hi = root.yMax;
 			const loAuto = Number.isNaN(lo);
@@ -279,11 +295,17 @@ Item {
 
 			const xAt = i => plot.x + (i / root.xSteps) * plot.w;
 			const yAt = v => plot.y + (1 - (v - scaleBottom) / range) * plot.h;
-			const crisp = v => Math.floor(v) + 0.5;
 
-			// 1. Grid lines
+			const dpr = ZUtils.dprFor(canvas);
+			const devW = w => Math.max(1, Math.round(w * dpr));
+			const snapLine = (v, w) => {
+				const dw = devW(w);
+				return (Math.round(v * dpr - dw / 2) + dw / 2) / dpr;
+			};
+			const gridW = devW(1) / dpr;
+
 			ctx.strokeStyle = Qt.alpha(root.gridColor, root.gridAlpha);
-			ctx.lineWidth = 1;
+			ctx.lineWidth = gridW;
 
 			if (root.verticalLineStep > 0) {
 				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
@@ -292,7 +314,7 @@ Item {
 					if (i === root.xSteps && !root.lastXLine)
 						continue;
 
-					const x = crisp(xAt(i));
+					const x = snapLine(xAt(i), 1);
 					ctx.beginPath();
 					ctx.moveTo(x, plot.y);
 					ctx.lineTo(x, H);
@@ -300,12 +322,11 @@ Item {
 				}
 			}
 
-			// Lines extend down into yPaddingBottom, snapped to the grid
 			const vStart = lo - (root.yPaddingBottom > 0 ? Math.floor(root.yPaddingBottom / root.horizontalLineStep) * root.horizontalLineStep : 0);
 
 			if (root.horizontalLineStep > 0) {
 				for (let v = vStart; v <= hi + 0.001; v += root.horizontalLineStep) {
-					const y = crisp(yAt(v));
+					const y = snapLine(yAt(v), 1);
 					ctx.beginPath();
 					ctx.moveTo(0, y);
 					ctx.lineTo(plot.x + plot.w, y);
@@ -313,9 +334,8 @@ Item {
 				}
 			}
 
-			// 2. Labels
 			ctx.fillStyle = Qt.alpha(root.labelColor, root.labelAlpha);
-			ctx.font = root.labelFontSize + "px sans-serif";
+			ctx.font = root.labelFontSize + "pt 'sans-serif'";
 
 			ctx.textAlign = "left";
 			ctx.textBaseline = "top";
@@ -328,7 +348,7 @@ Item {
 
 					const text = root.xLabel(i);
 					if (text)
-						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 4);
+						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 8);
 				}
 			}
 
@@ -341,7 +361,6 @@ Item {
 				}
 			}
 
-			// 3. Curve, split into segments at null gaps
 			const segments = [];
 			let current = null;
 			for (let i = 0; i < series.length; i++) {
@@ -352,7 +371,7 @@ Item {
 					continue;
 				}
 				const pt = {
-					x: xAt(i),
+					x: snapV(xAt(i)),
 					y: yAt(series[i])
 				};
 				if (!current)
@@ -369,8 +388,6 @@ Item {
 			const markerPx = hasMarker ? xAt(root.markerX) : 0;
 			let gapPx = 0;
 			if (hasMarker) {
-				// markerGap is measured from the dot edge, perpendicular to the
-				// curve; project onto x via the local curve slope
 				let slope = 0;
 				const seg = segments.find(s => s[0].x <= markerPx && markerPx <= s[s.length - 1].x);
 				if (seg && seg.length > 2 && markerPx - 1 >= seg[0].x && markerPx + 1 <= seg[seg.length - 1].x)
@@ -382,7 +399,6 @@ Item {
 				if (seg.length < 2)
 					continue;
 
-				// Fill stays continuous under the marker
 				ctx.fillStyle = Qt.alpha(root.lineColor, root.fillAlpha);
 				strokeCurve(ctx, seg);
 				ctx.lineTo(seg[seg.length - 1].x, plot.y + plot.h);
@@ -390,7 +406,6 @@ Item {
 				ctx.closePath();
 				ctx.fill();
 
-				// Stroke has a gap around the marker
 				const pieces = hasMarker ? [cutLeft(seg, markerPx - gapPx), cutRight(seg, markerPx + gapPx)] : [seg];
 
 				for (const pts of pieces) {
@@ -398,24 +413,32 @@ Item {
 						continue;
 
 					ctx.strokeStyle = root.lineColor;
-					ctx.lineWidth = root.lineWidth;
+					ctx.lineWidth = ZUtils.snap(root.lineWidth, root);
 					strokeCurve(ctx, pts);
 					ctx.stroke();
 				}
 			}
 
-			// 4. Marker: dashed vertical + dot
 			if (root.markerX >= 0 && root.markerX <= root.xSteps) {
 				const x = markerPx;
 
-				ctx.setLineDash([4, 4]);
 				ctx.strokeStyle = Qt.alpha(root.markerColor, 0.6);
-				ctx.lineWidth = 1;
+				ctx.lineWidth = gridW;
-				ctx.beginPath();
+				const lineX = snapLine(x, 1);
-				ctx.moveTo(crisp(x), plot.y);
+				let dashY = plot.y;
-				ctx.lineTo(crisp(x), H);
+				let dashOn = true;
-				ctx.stroke();
+
-				ctx.setLineDash([]);
+				while (dashY < H) {
+					const dashEnd = Math.min(dashY + 4, H);
+					if (dashOn) {
+						ctx.beginPath();
+						ctx.moveTo(lineX, snapV(dashY));
+						ctx.lineTo(lineX, snapV(dashEnd));
+						ctx.stroke();
+					}
+					dashY = dashEnd;
+					dashOn = !dashOn;
+				}
 
 				const i0 = Math.floor(root.markerX);
 				const v0 = series[i0];
@@ -430,7 +453,7 @@ Item {
 				if (y != null) {
 					ctx.fillStyle = root.markerColor;
 					ctx.beginPath();
-					ctx.arc(x, y, root.markerDotRadius, 0, Math.PI * 2);
+					ctx.circle(snapV(x), y, root.markerDotRadius);
 					ctx.fill();
 				}
 			}

Components/Menu.qml

@@ -4,6 +4,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import ZShell.Config
+import ZShell.Components
 import qs.Drawers
 import qs.Services
 
@@ -110,12 +111,14 @@ MouseArea {
 			color: Colors.palette.m3surfaceContainerLow
 			radius: parent.radius
 
-			ColumnLayout {
+			SnapLayout {
 				id: column
 
 				anchors.fill: parent
 				anchors.margins: Tokens.padding.extraSmall
+
 				spacing: Tokens.spacing.extraSmall
+				orientation: Qt.Vertical
 
 				Repeater {
 					id: repeater
@@ -151,11 +154,12 @@ MouseArea {
 							}
 						}
 
-						RowLayout {
+						SnapLayout {
 							id: menuOptionRow
 
 							anchors.fill: parent
 							anchors.margins: Tokens.padding.medium
+
 							spacing: Tokens.spacing.small
 
 							MaterialIcon {

Components/SplitButton.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Services
 
@@ -53,7 +54,7 @@ Row {
 			onClicked: root.active?.clicked()
 		}
 
-		RowLayout {
+		SnapLayout {
 			id: textRow
 
 			anchors.centerIn: parent

Components/Toast/ToastItem.qml

@@ -1,4 +1,5 @@
 import ZShell
+import ZShell.Components
 import QtQuick
 import QtQuick.Layouts
 import qs.Components
@@ -47,7 +48,7 @@ CustomRect {
 		z: -1
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.fill: parent
@@ -88,9 +89,11 @@ CustomRect {
 			}
 		}
 
-		ColumnLayout {
+		SnapLayout {
 			Layout.fillWidth: true
+
 			spacing: 0
+			orientation: Qt.Vertical
 
 			CustomText {
 				id: title

Drawers/Drawing.qml

@@ -4,12 +4,16 @@ import Quickshell
 import QtQuick
 import ZShell.Internal
 import qs.Components
+import qs.Services
 
 Item {
 	id: root
 
 	readonly property alias content: contentLoader.item
+
 	required property ScreenState screenState
+	property rect holeRect
+	property real holeRadius: 0
 
 	Loader {
 		id: contentLoader
@@ -18,6 +22,9 @@ Item {
 		anchors.fill: parent
 
 		sourceComponent: StrokeCanvas {
+			anchors.fill: parent
+			hole: root.holeRect
+			holeRadius: root.holeRadius
 			penColor: root.screenState.penColor
 			penWidth: root.screenState.penWidth
 		}

Drawers/DrawingInput.qml

@@ -0,0 +1,95 @@
+import Quickshell
+import QtQuick
+import ZShell.Config
+import qs.Components
+
+CustomMouseArea {
+	id: root
+
+	required property real borderThickness
+	required property Drawing drawing
+	required property Panels panels
+	required property ScreenState screenState
+	required property EdgeGeometry geometry
+
+	function inLeftPanel(panel: Item, x: real, y: real): bool {
+		return x < panel.x + panel.width + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function withinPanelHeight(panel: Item, x: real, y: real): bool {
+		const panelY = panel.y + geometry.insetTop(borderThickness);
+		return y >= panelY && y <= panelY + panel.height;
+	}
+
+	anchors.fill: parent
+	acceptedButtons: Qt.LeftButton | Qt.RightButton
+	cursorShape: Qt.BlankCursor
+	enabled: z > 0
+	hoverEnabled: true
+	focus: root.screenState.isDrawing
+	z: 2
+
+	Binding {
+		target: root.drawing.content
+		property: "hoverPoint"
+		value: Qt.point(root.mouseX, root.mouseY)
+	}
+
+	Keys.onPressed: e => {
+		const mod = e.modifiers;
+		const key = e.key;
+
+		if ((key == Qt.Key_Z) && (mod & Qt.ControlModifier) && (mod & Qt.ShiftModifier)) {
+			root.drawing.content.redo();
+			e.accepted = true;
+		} else if ((key == Qt.Key_Z) && (mod & Qt.ControlModifier)) {
+			root.drawing.content.undoLastGroup();
+			e.accepted = true;
+		}
+	}
+
+	onPositionChanged: event => {
+		const x = event.x;
+		const y = event.y;
+
+		if (!drawing.content.hoverVisible)
+			drawing.content.showHover();
+
+		if (event.buttons & Qt.LeftButton) {
+			drawing.content.appendPoint(x, y);
+			return;
+		}
+
+		if (!(event.buttons & Qt.LeftButton) && inLeftPanel(panels.drawing, x, y)) {
+			z = -2;
+			panels.drawing.expand();
+			drawing.content.hideHover();
+		}
+	}
+	onPressed: event => {
+		const x = event.x;
+		const y = event.y;
+
+		panels.drawing.collapse();
+
+		if (event.buttons & Qt.LeftButton) {
+			panels.drawing.collapse();
+			drawing.content.beginStroke(x, y);
+			return;
+		}
+
+		if (event.button & Qt.RightButton) {
+			drawing.content.clear();
+			return;
+		}
+	}
+	onReleased: event => {
+		const x = event.x;
+		const y = event.y;
+
+		if (event.button & Qt.LeftButton) {
+			drawing.content.endStroke();
+			drawing.content.showHover();
+		}
+	}
+}

Drawers/Interactions.qml

@@ -1,25 +1,33 @@
 import Quickshell
 import QtQuick
 import ZShell.Config
+import ZShell.Internal
 import qs.Components
 import qs.Helpers
 import qs.Modules.Bar.Popouts
 
-Item {
+CustomMouseArea {
 	id: root
 
+	required property Drawing drawing
+	required property DrawingInput input
+
 	required property Item bar
 	required property real borderThickness
-	property bool dashboardShortcutActive
-	required property Drawing drawing
 	required property EdgeGeometry geometry
-	property bool osdShortcutActive
+
 	required property Panels panels
 	required property Wrapper popouts
+
 	required property ShellScreen screen
+	required property ScreenState screenState
+
+	property bool dashboardShortcutActive
+	property point dragStart
+	property bool osdShortcutActive
+	property bool setInitialPoint: false
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
-	required property ScreenState screenState
 
 	function inBottomPanel(panel: Item, x: real, y: real): bool {
 		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
@@ -56,124 +64,116 @@ Item {
 		return x >= panelX && x <= panelX + panel.width;
 	}
 
+	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
 	anchors.fill: parent
+	hoverEnabled: true
 
-	DragHandler {
+	onContainsMouseChanged: {
-		id: singleHandler
+		if (!containsMouse) {
-
+			if (!osdShortcutActive) {
-		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
+				screenState.osd = false;
-		dragThreshold: 0
+				panels.osd.hovered = false;
-		enabled: !root.screenState.isDrawing
-		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
-		maximumPointCount: 1
-		minimumPointCount: 1
-		target: null
-
-		onActiveChanged: {
-			if (!active)
-				root.singleGestureTriggered = false;
-		}
-		onCentroidChanged: {
-			const x = centroid.position.x;
-			const y = centroid.position.y;
-			const pressX = centroid.pressPosition.x;
-			const pressY = centroid.pressPosition.y;
-			const dragX = x - pressX;
-			const dragY = y - pressY;
-
-			if (pressY >= root.screen.height - Config.bar.border && pressX > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-				root.screenState.launcher = true;
-
-			if (root.singleGestureTriggered)
-				return;
-
-			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, pressX, pressY);
-
-			if (inDashboard && root.withinPanelWidth(root.panels.dashboardWrapper, x, y)) {
-				if (dragY > Config.dashboard.dragThreshold) {
-					root.screenState.dashboard = true;
-					root.singleGestureTriggered = true;
-				} else if (dragY < -Config.dashboard.dragThreshold) {
-					root.screenState.dashboard = false;
-					root.singleGestureTriggered = true;
-				}
 			}
 
-			if (root.geometry.insetTop(root.borderThickness) > pressY && (Config.dashboard.showOnHover || !inDashboard)) {
+			if (!popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
-				if (dragY > 20) {
+				popouts.hasCurrent = false;
-					root.screenState.settings = true;
-					root.singleGestureTriggered = true;
-				} else if (dragY < -20) {
-					root.screenState.settings = false;
-					root.singleGestureTriggered = true;
-				}
 			}
 
-			if (pressY > root.screen.height - root.geometry.insetBottom(root.borderThickness) && pressX < root.screen.width / 5 && dragY < -50)
+			if (Config.bar.autoHide || bar.fullscreen)
-				root.screenState.clipboard = true;
+				bar.isHovered = false;
 
-			if (!Config.dock.hoverToReveal && pressY > root.screen.height - root.geometry.insetTop(root.borderThickness) && pressX > root.screen.width / 5 && !root.screenState.launcher)
+			if (screenState.dashboard && Config.dashboard.showOnHover)
-				if (dragY < -10) {
+				screenState.dashboard = false;
-					root.screenState.dock = true;
-					root.singleGestureTriggered = true;
-				}
-
-			if (pressX > root.screen.width - Config.bar.border && pressY < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
-				root.screenState.sidebar = true;
-				root.singleGestureTriggered = true;
-			}
-
-			if (pressX >= root.screen.width - Config.bar.border && pressY > (root.screen.height / 2) && dragX < -20) {
-				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
-				root.singleGestureTriggered = true;
-			}
-
-			if (pressX <= Config.bar.border && dragX > 20) {
-				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
-				root.singleGestureTriggered = true;
-			}
 		}
 	}
+	onPositionChanged: event => {
+		const x = event.x;
+		const y = event.y;
+		const dragX = x - dragStart.x;
+		const dragY = y - dragStart.y;
 
-	PointHandler {
+		if (screenState.isDrawing && !inLeftPanel(panels.drawing, x, y)) {
-		id: drawingHandler
+			input.z = 2;
+			panels.drawing.collapse();
+		}
 
-		property bool setInitialPoint: false
+		if (root.bar.fullscreen && !root.bar.isHovered)
+			unhideTimer.start();
 
-		acceptedButtons: Qt.LeftButton | Qt.RightButton
+		if (pressed && dragStart.y >= screen.height - Config.bar.border && dragStart.x > screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-		enabled: root.screenState.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
+			screenState.launcher = true;
 
-		onActiveChanged: {
+		const entryAt = bar.entryAt(geometry.axisPos(x, y));
-			if (!active) {
+		const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboardWrapper, x, y) && (!entryAt || entryAt === "activeWindow");
-				setInitialPoint = false;
+
-				root.drawing.content.endStroke();
+		if (!dashboardShortcutActive) {
-			} else {
+			screenState.dashboard = showDashboard;
-				root.panels.drawing.collapse();
+		} else if (showDashboard) {
+			dashboardShortcutActive = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && withinPanelWidth(panels.dashboardWrapper, x, y)) {
+			if (dragY > Config.dashboard.dragThreshold)
+				screenState.dashboard = true;
+			else if (dragY < -Config.dashboard.dragThreshold)
+				screenState.dashboard = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
+			if (dragY > 20) {
+				screenState.settings = true;
+			} else if (dragY < -20) {
+				screenState.settings = false;
 			}
 		}
-		onPointChanged: {
-			if (!active)
-				return;
-			const x = point.position.x;
-			const y = point.position.y;
-			const origX = point.pressPosition.x;
-			const origY = point.pressPosition.y;
 
-			if (point.pressedButtons & Qt.RightButton) {
+		if (pressed && dragStart.y > screen.height - geometry.insetBottom(borderThickness) && dragStart.x < screen.width / 5 && dragY < -50)
-				root.drawing.content.clear();
+			screenState.clipboard = true;
-				return;
+
+		if (pressed && !Config.dock.hoverToReveal && dragStart.y > screen.height - geometry.insetTop(borderThickness) && dragStart.x > screen.width / 5 && !screenState.launcher)
+			if (dragY < -10)
+				screenState.dock = true;
+
+		if (pressed && dragStart.x > screen.width - Config.bar.border && dragStart.y < (screen.height / 2) && dragX < -Config.sidebar.dragThreshold)
+			screenState.sidebar = true;
+
+		if (pressed && dragStart.x >= screen.width - Config.bar.border && dragStart.y > (screen.height / 2) && dragX < -20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
+
+		if (pressed && dragStart.x <= Config.bar.border && dragX > 20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+
+		if (!screenState.bar && Config.bar.autoHide && geometry.barContains(x, y, true))
+			bar.isHovered = true;
+
+		if (panels.sidebar.offsetScale === 1) {
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
+
+			if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
 			}
-			if (x === 0 && y === 0 && origX === 0 && origY === 0)
+		} else {
-				return;
+			const outOfSidebar = x < width - panels.sidebar.width * (1 - panels.sidebar.offsetScale);
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
 
-			if (!setInitialPoint) {
+			if (!osdShortcutActive) {
-				setInitialPoint = true;
+				screenState.osd = showOsd;
-				root.drawing.content.beginStroke(origX, origY);
+				panels.osd.hovered = showOsd;
-				return;
+			} else if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
 			}
-
-			root.drawing.content.appendPoint(x, y);
 		}
+
+		if (Config.dock.enable && Config.dock.hoverToReveal && !screenState.dock && !screenState.launcher && inBottomPanel(panels.dock, x, y))
+			screenState.dock = true;
+
+		if (geometry.barContains(x, y))
+			bar.checkPopout(geometry.axisPos(x, y));
+	}
+	onPressed: event => {
+		dragStart = Qt.point(event.x, event.y);
 	}
 
 	Timer {
@@ -184,98 +184,20 @@ Item {
 		running: false
 
 		onTriggered: {
-			if (hoverHandler.hovered)
+			if (root.containsMouse)
 				root.bar.isHovered = true;
 		}
 	}
 
-	HoverHandler {
-		id: hoverHandler
-
-		cursorShape: root.screenState.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
-
-		onHoveredChanged: {
-			if (!hovered) {
-				if (!root.osdShortcutActive) {
-					root.screenState.osd = false;
-					root.panels.osd.hovered = false;
-				}
-
-				if (!root.popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
-					root.popouts.hasCurrent = false;
-				}
-
-				if (Config.bar.autoHide || root.bar.fullscreen)
-					root.bar.isHovered = false;
-
-				if (root.screenState.dashboard && Config.dashboard.showOnHover)
-					root.screenState.dashboard = false;
-			}
-		}
-		onPointChanged: {
-			const x = point.position.x;
-			const y = point.position.y;
-
-			if (root.screenState.isDrawing) {
-				if (root.inLeftPanel(root.panels.drawing, x, y) && !(drawingHandler.point.pressedButtons & Qt.LeftButton)) {
-					root.panels.drawing.expand();
-					root.drawing.content.hideHover();
-					return;
-				}
-
-				root.drawing.content.showHover(x, y);
-				return;
-			}
-
-			if (!root.screenState.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);
-
-				if (showOsd) {
-					root.osdShortcutActive = false;
-					root.panels.osd.hovered = true;
-				}
-			} else {
-				const outOfSidebar = x < root.width - root.panels.sidebar.width * (1 - root.panels.sidebar.offsetScale);
-				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
-
-				if (!root.osdShortcutActive) {
-					root.screenState.osd = showOsd;
-					root.panels.osd.hovered = showOsd;
-				} else if (showOsd) {
-					root.osdShortcutActive = false;
-					root.panels.osd.hovered = true;
-				}
-			}
-
-			if (Config.dock.enable && Config.dock.hoverToReveal && !root.screenState.dock && !root.screenState.launcher && root.inBottomPanel(root.panels.dock, x, y))
-				root.screenState.dock = true;
-
-			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, x, y);
-
-			if (Config.dashboard.showOnHover)
-				root.screenState.dashboard = inDashboard;
-
-			if (root.geometry.barContains(x, y))
-				root.bar.checkPopout(root.geometry.axisPos(x, y));
-		}
-	}
-
 	Connections {
-		function onDashboardChanged() {
+		function onDashboardChanged(): void {
 			if (root.screenState.dashboard) {
-				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
+				const inDashboardArea = root.inTopPanel(root.panels.dashboardWrapper, root.mouseX, root.mouseY);
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
-				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
-					root.screenState.launcher = false;
 
+				root.screenState.launcher = false;
 				root.screenState.settings = false;
 				root.screenState.sidebar = false;
 				root.screenState.resources = false;
@@ -285,12 +207,15 @@ Item {
 			}
 		}
 
-		function onIsDrawingChanged() {
+		function onIsDrawingChanged(): void {
-			if (!root.screenState.isDrawing)
+			if (root.screenState.isDrawing) {
-				root.drawing.clear();
+				root.drawing.content.showHover();
+			} else {
+				root.drawing.content.clear();
+			}
 		}
 
-		function onLauncherChanged() {
+		function onLauncherChanged(): void {
 			if (!root.screenState.launcher) {
 				root.dashboardShortcutActive = false;
 				root.osdShortcutActive = false;
@@ -305,16 +230,13 @@ Item {
 			}
 
 			if (root.screenState.launcher) {
-				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
+				root.screenState.dashboard = false;
-					root.screenState.dashboard = false;
-				}
-
 				root.screenState.dock = false;
 				root.screenState.settings = false;
 			}
 		}
 
-		function onOsdChanged() {
+		function onOsdChanged(): void {
 			if (root.screenState.osd) {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 				if (!inOsdArea) {
@@ -325,7 +247,7 @@ Item {
 			}
 		}
 
-		function onResourcesChanged() {
+		function onResourcesChanged(): void {
 			if (root.screenState.resources) {
 				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
 					root.popouts.hasCurrent = false;
@@ -335,7 +257,7 @@ Item {
 			}
 		}
 
-		function onSettingsChanged() {
+		function onSettingsChanged(): void {
 			if (root.screenState.settings) {
 				root.screenState.resources = false;
 				root.screenState.dashboard = false;
@@ -345,9 +267,10 @@ Item {
 			}
 		}
 
-		function onSidebarChanged() {
+		function onSidebarChanged(): void {
 			if (root.screenState.sidebar) {
-				root.screenState.dashboard = false;
+				if (root.panels.dashboardWrapper.x + root.panels.dashboardWrapper.width > root.panels.sidebar.x)
+					root.screenState.dashboard = false;
 				root.screenState.settings = false;
 				root.popouts.hasCurrent = false;
 			}

Drawers/Interactions2.qml

@@ -1,315 +0,0 @@
-import Quickshell
-import QtQuick
-import ZShell.Config
-import ZShell.Internal
-import qs.Components
-import qs.Helpers
-import qs.Modules.Bar.Popouts
-
-CustomMouseArea {
-	id: root
-
-	required property Item bar
-	required property real borderThickness
-	property bool dashboardShortcutActive
-	property point dragStart
-	required property Drawing drawing
-	required property EdgeGeometry geometry
-	property bool osdShortcutActive
-	required property Panels panels
-	required property Wrapper popouts
-	required property ShellScreen screen
-	required property ScreenState screenState
-	property bool setInitialPoint: false
-	property bool singleGestureTriggered: false
-	property bool utilitiesShortcutActive
-
-	function inBottomPanel(panel: Item, x: real, y: real): bool {
-		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 + 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 + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
-	}
-
-	function inTopPanel(panel: Item, x: real, y: real): bool {
-		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 + geometry.insetTop(borderThickness);
-		return y >= panelY && y <= panelY + panel.height;
-	}
-
-	function withinPanelWidth(panel: Item, x: real, y: real): bool {
-		const panelX = panel.x + geometry.insetLeft(borderThickness);
-		return x >= panelX && x <= panelX + panel.width;
-	}
-
-	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
-	anchors.fill: parent
-	hoverEnabled: true
-
-	onContainsMouseChanged: {
-		if (!containsMouse) {
-			if (!osdShortcutActive) {
-				screenState.osd = false;
-				panels.osd.hovered = false;
-			}
-
-			if (!popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
-				popouts.hasCurrent = false;
-			}
-
-			if (Config.bar.autoHide || bar.fullscreen)
-				bar.isHovered = false;
-
-			if (screenState.dashboard && Config.dashboard.showOnHover)
-				screenState.dashboard = false;
-		}
-	}
-	onPositionChanged: event => {
-		const x = event.x;
-		const y = event.y;
-		const dragX = x - dragStart.x;
-		const dragY = y - dragStart.y;
-
-		if (screenState.isDrawing) {
-			if (pressed) {
-				drawing.content.appendPoint(x, y);
-			} else {
-				if (inLeftPanel(panels.drawing, x, y)) {
-					if (!(pressedButtons & Qt.LeftButton)) {
-						panels.drawing.expand();
-						drawing.content.hideHover();
-						Cursor.clearOverride();
-					}
-				} else {
-					Cursor.setOverride(Qt.BlankCursor);
-					drawing.content.showHover(x, y);
-				}
-			}
-			if (drawing.content.hoverVisible)
-				drawing.content.showHover(x, y);
-			return;
-		}
-
-		if (root.bar.fullscreen && !root.bar.isHovered)
-			unhideTimer.start();
-
-		if (pressed && dragStart.y >= screen.height - Config.bar.border && dragStart.x > screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-			screenState.launcher = true;
-
-		const entryAt = bar.entryAt(geometry.axisPos(x, y));
-		const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboardWrapper, x, y) && (!entryAt || entryAt === "activeWindow");
-
-		if (!dashboardShortcutActive) {
-			screenState.dashboard = showDashboard;
-		} else if (showDashboard) {
-			dashboardShortcutActive = false;
-		}
-
-		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && withinPanelWidth(panels.dashboardWrapper, x, y)) {
-			if (dragY > Config.dashboard.dragThreshold)
-				screenState.dashboard = true;
-			else if (dragY < -Config.dashboard.dragThreshold)
-				screenState.dashboard = false;
-		}
-
-		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
-			if (dragY > 20) {
-				screenState.settings = true;
-			} else if (dragY < -20) {
-				screenState.settings = false;
-			}
-		}
-
-		if (pressed && dragStart.y > screen.height - geometry.insetBottom(borderThickness) && dragStart.x < screen.width / 5 && dragY < -50)
-			screenState.clipboard = true;
-
-		if (pressed && !Config.dock.hoverToReveal && dragStart.y > screen.height - geometry.insetTop(borderThickness) && dragStart.x > screen.width / 5 && !screenState.launcher)
-			if (dragY < -10)
-				screenState.dock = true;
-
-		if (pressed && dragStart.x > screen.width - Config.bar.border && dragStart.y < (screen.height / 2) && dragX < -Config.sidebar.dragThreshold)
-			screenState.sidebar = true;
-
-		if (pressed && dragStart.x >= screen.width - Config.bar.border && dragStart.y > (screen.height / 2) && dragX < -20)
-			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
-
-		if (pressed && dragStart.x <= Config.bar.border && dragX > 20)
-			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
-
-		if (!screenState.bar && Config.bar.autoHide && geometry.barContains(x, y, true))
-			bar.isHovered = true;
-
-		if (panels.sidebar.offsetScale === 1) {
-			const showOsd = inRightPanel(panels.osdWrapper, x, y);
-
-			if (showOsd) {
-				osdShortcutActive = false;
-				panels.osd.hovered = true;
-			}
-		} else {
-			const outOfSidebar = x < width - panels.sidebar.width * (1 - panels.sidebar.offsetScale);
-			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
-
-			if (!osdShortcutActive) {
-				screenState.osd = showOsd;
-				panels.osd.hovered = showOsd;
-			} else if (showOsd) {
-				osdShortcutActive = false;
-				panels.osd.hovered = true;
-			}
-		}
-
-		if (Config.dock.enable && Config.dock.hoverToReveal && !screenState.dock && !screenState.launcher && inBottomPanel(panels.dock, x, y))
-			screenState.dock = true;
-
-		if (geometry.barContains(x, y))
-			bar.checkPopout(geometry.axisPos(x, y));
-	}
-	onPressed: event => {
-		dragStart = Qt.point(event.x, event.y);
-
-		if (screenState.isDrawing) {
-			if (event.button & Qt.RightButton) {
-				drawing.content.clear();
-				return;
-			}
-
-			if (!inLeftPanel(panels.drawing, mouseX, mouseY))
-				drawing.content.beginStroke(event.x, event.y);
-		}
-	}
-	onPressedChanged: {
-		if (!pressed) {
-			if (screenState.isDrawing) {
-				setInitialPoint = false;
-				drawing.content.endStroke();
-				if (!inLeftPanel(panels.drawing, mouseX, mouseY))
-					drawing.content.showHover(mouseX, mouseY);
-			}
-		} else {
-			if (screenState.isDrawing) {
-				panels.drawing.collapse();
-			}
-		}
-	}
-
-	Timer {
-		id: unhideTimer
-
-		interval: Config.bar.revealDelay
-		repeat: false
-		running: false
-
-		onTriggered: {
-			if (root.containsMouse)
-				root.bar.isHovered = true;
-		}
-	}
-
-	Connections {
-		function onDashboardChanged(): void {
-			if (root.screenState.dashboard) {
-				const inDashboardArea = root.inTopPanel(root.panels.dashboardWrapper, root.mouseX, root.mouseY);
-				if (!inDashboardArea) {
-					root.dashboardShortcutActive = true;
-				}
-
-				root.screenState.launcher = false;
-				root.screenState.settings = false;
-				root.screenState.sidebar = false;
-				root.screenState.resources = false;
-				root.popouts.hasCurrent = false;
-			} else {
-				root.dashboardShortcutActive = false;
-			}
-		}
-
-		function onIsDrawingChanged(): void {
-			if (root.screenState.isDrawing) {
-				Cursor.setOverride(Qt.BlankCursor);
-			} else {
-				Cursor.clearOverride();
-			}
-		}
-
-		function onLauncherChanged(): void {
-			if (!root.screenState.launcher) {
-				root.dashboardShortcutActive = false;
-				root.osdShortcutActive = false;
-				root.utilitiesShortcutActive = false;
-
-				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
-
-				if (!inOsdArea) {
-					root.screenState.osd = false;
-					root.panels.osd.hovered = false;
-				}
-			}
-
-			if (root.screenState.launcher) {
-				root.screenState.dashboard = false;
-				root.screenState.dock = false;
-				root.screenState.settings = false;
-			}
-		}
-
-		function onOsdChanged(): void {
-			if (root.screenState.osd) {
-				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
-				if (!inOsdArea) {
-					root.osdShortcutActive = true;
-				}
-			} else {
-				root.osdShortcutActive = false;
-			}
-		}
-
-		function onResourcesChanged(): void {
-			if (root.screenState.resources) {
-				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
-					root.popouts.hasCurrent = false;
-
-				root.screenState.settings = false;
-				root.screenState.dashboard = false;
-			}
-		}
-
-		function onSettingsChanged(): void {
-			if (root.screenState.settings) {
-				root.screenState.resources = false;
-				root.screenState.dashboard = false;
-				root.screenState.sidebar = false;
-				root.panels.popouts.hasCurrent = false;
-				root.screenState.launcher = false;
-			}
-		}
-
-		function onSidebarChanged(): void {
-			if (root.screenState.sidebar) {
-				if (root.panels.dashboardWrapper.x + root.panels.dashboardWrapper.width > root.panels.sidebar.x)
-					root.screenState.dashboard = false;
-				root.screenState.settings = false;
-				root.popouts.hasCurrent = false;
-			}
-		}
-
-		target: root.screenState
-	}
-}

Drawers/Panels.qml

@@ -1,5 +1,7 @@
 import Quickshell
 import QtQuick
+import ZShell.Config
+import ZShell
 import qs.Components
 import qs.Modules.Bar.Popouts as Popouts
 import qs.Modules.Notifications as Notifications
@@ -14,7 +16,6 @@ import qs.Modules.Settings as Settings
 import qs.Modules.Drawing as Drawing
 import qs.Modules.Dock as Dock
 import qs.Modules.Clipboard as Clipboard
-import ZShell.Config
 
 Item {
 	id: root
@@ -74,7 +75,10 @@ Item {
 
 		anchors.right: parent.right
 		anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
-		anchors.verticalCenter: parent.verticalCenter
+
+		y: ZUtils.snap((parent.height - implicitHeight) / 2, root)
+
+		// anchors.verticalCenter: parent.verticalCenter
 		clip: sidebar.visible
 		implicitHeight: osd.implicitHeight
 		implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
@@ -82,8 +86,7 @@ Item {
 		Osd.Wrapper {
 			id: osd
 
-			anchors.right: parent.right
+			anchors.fill: parent
-			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
 			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
@@ -129,8 +132,9 @@ Item {
 	Launcher.Wrapper {
 		id: launcher
 
+		x: ZUtils.snap((parent.width - implicitWidth) / 2, root)
+
 		anchors.bottom: parent.bottom
-		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
 		screenState: root.screenState
@@ -150,8 +154,10 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
+
+		x: ZUtils.snap((parent.width - implicitWidth) / 2, dashboardWrapper)
+
 		clip: offsetScale > 0
 		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
 		implicitWidth: dashboard.implicitWidth
@@ -190,8 +196,11 @@ Item {
 		Settings.Wrapper {
 			id: settings
 
-			anchors.centerIn: parent
+			x: ZUtils.snap((parent.width - implicitWidth) / 2, settings)
-			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
+			y: ZUtils.snap((parent.height - implicitHeight) / 2 - (implicitHeight + 5 + (parent.height - implicitHeight) / 2) * offsetScale, settings)
+
+			// anchors.centerIn: parent
+			// anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
 			screenState: root.screenState

Drawers/Windows.qml

@@ -56,7 +56,7 @@ CustomWindow {
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar || screenState.isDrawing ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
 	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
@@ -347,12 +347,31 @@ CustomWindow {
 	Drawing {
 		id: drawing
 
+		readonly property int extraWidth: drawingBg.radius * 2
+
 		anchors.fill: parent
+		holeRect: Qt.rect(root.borderThickness + panels.drawing.x - extraWidth, panels.drawing.y + bar.implicitHeight, panels.drawing.implicitWidth + extraWidth, panels.drawing.implicitHeight)
+		holeRadius: drawingBg.radius
 		screenState: root.screenState
 		z: 2
 	}
 
-	Interactions2 {
+	LazyLoader {
+		id: lazyLoader
+
+		activeAsync: root.screenState.isDrawing
+
+		component: DrawingInput {
+			borderThickness: root.borderLayoutThickness
+			drawing: drawing
+			panels: panels
+			screenState: root.screenState
+			geometry: geometry
+			parent: root.contentItem
+		}
+	}
+
+	Interactions {
 		id: interactions
 
 		anchors.fill: parent
@@ -365,6 +384,8 @@ CustomWindow {
 		popouts: panels.popouts
 		screen: root.screen
 		screenState: root.screenState
+		input: lazyLoader.item
+		z: 1
 
 		Panels {
 			id: panels
@@ -442,6 +463,7 @@ CustomWindow {
 			parent: root.contentItem
 			screen: root.screen
 			screenState: root.screenState
+			z: 4
 		}
 	}
 

Greeter/Center.qml

@@ -3,11 +3,12 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Helpers
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
 	id: root
 
 	readonly property real centerScale: Math.min(1, screenHeight / 1440)
@@ -18,9 +19,11 @@ ColumnLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
+
+	orientation: Qt.Vertical
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	RowLayout {
+	SnapLayout {
 		Layout.alignment: Qt.AlignHCenter
 		spacing: Tokens.spacing.small
 
@@ -116,7 +119,7 @@ ColumnLayout {
 			}
 		}
 
-		RowLayout {
+		SnapLayout {
 			id: input
 
 			anchors.fill: parent

Greeter/Content.qml

@@ -1,11 +1,12 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Services
 
-RowLayout {
+SnapLayout {
 	id: root
 
 	required property var greeter

Greeter/InputField.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services

Greeter/SessionDock.qml

@@ -3,17 +3,20 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
 	id: root
 
 	required property var greeter
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
+
 	spacing: Tokens.spacing.large
+	orientation: Qt.Vertical
 
 	CustomText {
 		Layout.fillWidth: true
@@ -37,8 +40,9 @@ ColumnLayout {
 					duration: Tokens.anim.durations.extraLarge
 				}
 			}
-			sourceComponent: ColumnLayout {
+			sourceComponent: SnapLayout {
 				spacing: Tokens.spacing.largeIncreased
+				orientation: Qt.Vertical
 
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
@@ -84,7 +88,7 @@ ColumnLayout {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					id: row
 
 					anchors.fill: parent
@@ -97,9 +101,11 @@ ColumnLayout {
 						text: modelData.kind === "x11" ? "tv" : "desktop_windows"
 					}
 
-					ColumnLayout {
+					SnapLayout {
 						Layout.fillWidth: true
+
 						spacing: Tokens.spacing.small / 2
+						orientation: Qt.Vertical
 
 						CustomText {
 							Layout.fillWidth: true

Greeter/UserDock.qml

@@ -3,18 +3,21 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Helpers
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
 	id: root
 
 	required property var greeter
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
+
 	spacing: Tokens.spacing.large
+	orientation: Qt.Vertical
 
 	CustomText {
 		Layout.fillWidth: true
@@ -38,8 +41,9 @@ ColumnLayout {
 					duration: Tokens.anim.durations.extraLarge
 				}
 			}
-			sourceComponent: ColumnLayout {
+			sourceComponent: SnapLayout {
 				spacing: Tokens.spacing.largeIncreased
+				orientation: Qt.Vertical
 
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
@@ -86,7 +90,7 @@ ColumnLayout {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					id: row
 
 					anchors.fill: parent
@@ -112,9 +116,11 @@ ColumnLayout {
 						}
 					}
 
-					ColumnLayout {
+					SnapLayout {
 						Layout.fillWidth: true
+
 						spacing: Tokens.spacing.small / 2
+						orientation: Qt.Vertical
 
 						CustomText {
 							Layout.fillWidth: true

Helpers/Picker/AnnotationToolbar.qml

@@ -53,7 +53,7 @@ CustomRect {
 	radius: Tokens.rounding.full
 	width: row.implicitWidth + Tokens.padding.small * 2
 
-	RowLayout {
+	SnapLayout {
 		id: row
 
 		anchors.centerIn: parent

Modules/Bar/Bar.qml

@@ -4,11 +4,13 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Modules.Bar.Components
 import qs.Modules.Bar.Popouts
+import ZShell
 
-GridLayout {
+SnapLayout {
 	id: root
 
 	required property bool fullscreen
@@ -22,7 +24,7 @@ GridLayout {
 
 	function axisCenterOf(item: Item): real {
 		const c = item.mapToItem(root, item.implicitWidth / 2, item.implicitHeight / 2);
-		return horizontal ? Math.floor(c.x) : Math.floor(c.y);
+		return horizontal ? ZUtils.snap(c.x, item) : ZUtils.snap(c.y, item);
 	}
 
 	function checkPopout(pos: real): void {
@@ -74,9 +76,47 @@ GridLayout {
 		return ch?.entryId ?? "";
 	}
 
-	columnSpacing: Tokens.spacing.small
+	readonly property var sectionRects: {
-	columns: horizontal ? -1 : 1
+		const count = repeater.count; // dependency: re-run when items are added/removed
-	rowSpacing: Tokens.spacing.small
+		const names = ["start", "middle", "end"]; // constant ids by position
+		const bounds = [null];
+		let spacers = 0;
+
+		for (let i = 0; i < count; i++) {
+			const it = repeater.itemAt(i) as EntryWrapper;
+			if (!it)
+				continue;
+
+			if (it.entryId === "spacer") {
+				bounds.push(null);
+				spacers++;
+				continue;
+			}
+
+			const l = it.x, t = it.y, r = it.x + it.width, b = it.y + it.height;
+			const cur = bounds[spacers];
+
+			bounds[spacers] = cur ? {
+				l: Math.min(cur.l, l),
+				t: Math.min(cur.t, t),
+				r: Math.max(cur.r, r),
+				b: Math.max(cur.b, b)
+			} : {
+				l,
+				t,
+				r,
+				b
+			};
+		}
+
+		return bounds.map((c, n) => ({
+					id: names[n] ?? `section${n}`,
+					rect: c ? Qt.rect(c.l, c.t, c.r - c.l, c.b - c.t) : Qt.rect(0, 0, 0, 0)
+				}));
+	}
+
+	spacing: Tokens.spacing.small
+	orientation: horizontal ? Qt.Horizontal : Qt.Vertical
 
 	Repeater {
 		id: repeater
@@ -228,16 +268,26 @@ GridLayout {
 	}
 
 	component EntryWrapper: Item {
+		readonly property int section: {
+			let n = 0;
+			for (let i = 0; i < index; i++) {
+				if (repeater.model.values[i].id === "spacer")
+					n++;
+			}
+			return n;
+		}
+
 		readonly property string entryId: modelData.id
 		required property int index
-		default property Item item
 		required property var modelData
 
+		default property Item item
+
 		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.leftMargin: root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && root.horizontal) ? -root.spacing + 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
+		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.spacing + Tokens.spacing.extraSmall : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0
 		implicitWidth: item?.implicitWidth ?? 0

Modules/Bar/BarLoader.qml

@@ -9,6 +9,7 @@ import qs.Components
 Item {
 	id: root
 
+	readonly property var sections: (content.item as Bar)?.sectionRects ?? []
 	readonly property int clampedExtent: Math.max(Config.bar.border, extent)
 	readonly property int contentThickness: Math.floor(Math.max(Config.bar.height, Tokens.sizes.bar.innerSize * (horizontal ? 1 : 1.5))) + padding * 2
 	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentThickness

Modules/Bar/Components/Clock.qml

@@ -4,6 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Modules.Bar.Popouts
 import qs.Modules.Bar.Components.Common
 import qs.Helpers
@@ -43,7 +44,7 @@ WidgetBase {
 			timeTokens: timeTokens
 		};
 	}
-	required property GridLayout loader
+	required property SnapLayout loader
 	required property Wrapper popouts
 	readonly property int roundedWidth: Math.round(timeText.implicitWidth)
 	readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
@@ -69,7 +70,8 @@ WidgetBase {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: verticalColumn
 
 		anchors.centerIn: parent

Modules/Bar/Components/MediaWidget.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Modules.Bar.Components.Common

Modules/Bar/Components/NetworkWidget.qml

@@ -1,6 +1,7 @@
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import qs.Modules
 
@@ -11,7 +12,7 @@ Item {
 	anchors.top: parent.top
 	implicitWidth: layout.implicitWidth
 
-	RowLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.bottom: parent.bottom

Modules/Bar/Components/Resource.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import qs.Components
 import ZShell.Config

Modules/Bar/Components/Resources.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import ZShell.Services
 import qs.Services

Modules/Bar/Components/StatusIcons.qml

@@ -4,6 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Helpers
 import qs.Modules.Bar.Components.StatusIcons
 import qs.Modules.Bar.Components.Common
@@ -59,7 +60,7 @@ WidgetBase {
 		Anim {}
 	}
 
-	GridLayout {
+	SnapLayout {
 		id: grid
 
 		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.medium
@@ -67,9 +68,8 @@ WidgetBase {
 		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
+		orientation: root.horizontal ? Qt.Horizontal : Qt.Vertical
-		columnSpacing: root.spacing
+		spacing: root.horizontal ? Tokens.spacing.extraSmall : -2
-		rowSpacing: root.spacing
 
 		Repeater {
 			model: ScriptModel {

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Daemons
 import qs.Components

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Daemons
 import qs.Components

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -1,6 +1,7 @@
 import Quickshell.Services.UPower
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Modules.Bar.Components.Common
 import qs.Components

Modules/Bar/Components/Tray/TrayItem.qml

@@ -2,10 +2,11 @@ import QtQuick.Layouts
 import QtQuick
 import Quickshell
 import Quickshell.Services.SystemTray
+import ZShell.Config
+import ZShell.Components
 import qs.Helpers
 import qs.Modules.Bar.Popouts
 import qs.Components
-import ZShell.Config
 import qs.Services
 
 Item {
@@ -15,7 +16,7 @@ Item {
 	readonly property real dpr: Hypr.monitorFor(loader?.screen).scale
 	required property int ind
 	required property SystemTrayItem item
-	required property GridLayout loader
+	required property SnapLayout loader
 	required property Wrapper popouts
 
 	function resolveIcon(app: string, icon: string): string {

Modules/Bar/Components/TrayIcons.qml

@@ -4,6 +4,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell.Services.SystemTray
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Modules.Bar.Components.Common
 import qs.Modules.Bar.Components.Tray
@@ -15,7 +16,7 @@ WidgetBase {
 
 	readonly property alias items: repeater
 	readonly property alias layout: sysGrid
-	required property GridLayout loader
+	required property SnapLayout 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
@@ -28,7 +29,7 @@ WidgetBase {
 	radius: Tokens.rounding.full
 	topRightRadius: horizontal ? Tokens.rounding.small / 2 : Tokens.rounding.full
 
-	GridLayout {
+	SnapLayout {
 		id: sysGrid
 
 		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
@@ -36,9 +37,8 @@ WidgetBase {
 		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
+		orientation: root.horizontal ? Qt.Horizontal : Qt.Vertical
-		rowSpacing: -2
+		spacing: root.horizontal ? Tokens.spacing.extraSmall : -2
-		columnSpacing: Tokens.spacing.extraSmall
 
 		Repeater {
 			id: repeater

Modules/Bar/Components/UpdatesWidget.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Modules.Bar.Components.Common

Modules/Bar/Components/WindowTitle.qml

@@ -17,7 +17,7 @@ Item {
 	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);
+		return horizontal ? (bar.width - otherSize - bar.spacing * (bar.children.length - 1) - bar.vPadding * 2) : (bar.height - otherSize - bar.spacing * (bar.children.length - 1) - bar.vPadding * 4);
 	}
 
 	clip: true

Modules/Bar/Popouts/AudioPopout.qml

@@ -5,6 +5,7 @@ import Quickshell.Services.Pipewire
 import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import QtQuick.Controls
 import ZShell.Config
 import qs.Components
@@ -46,7 +47,8 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 	}
 
-	component VolumesTab: ColumnLayout {
+	component VolumesTab: SnapLayout {
+orientation: Qt.Vertical
 		spacing: 12
 
 		CustomRect {
@@ -56,14 +58,15 @@ Item {
 			color: Colors.tPalette.m3surfaceContainer
 			radius: root.rounding - vol.anchors.margins
 
-			ColumnLayout {
+			SnapLayout {
+orientation: Qt.Vertical
 				anchors.bottomMargin: Tokens.padding.small
 				anchors.fill: parent
 				anchors.leftMargin: Tokens.padding.small
 				anchors.rightMargin: Tokens.padding.small
 				anchors.topMargin: Tokens.padding.small
 
-				RowLayout {
+				SnapLayout {
 					Layout.fillHeight: true
 					Layout.fillWidth: true
 
@@ -81,7 +84,7 @@ Item {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					spacing: Tokens.spacing.largeIncreased
 
 					CustomMouseArea {
@@ -153,14 +156,15 @@ Item {
 				}
 			}
 
-			ColumnLayout {
+			SnapLayout {
+orientation: Qt.Vertical
 				anchors.bottomMargin: Tokens.padding.small
 				anchors.fill: parent
 				anchors.leftMargin: Tokens.padding.small
 				anchors.rightMargin: Tokens.padding.small
 				anchors.topMargin: Tokens.padding.small
 
-				RowLayout {
+				SnapLayout {
 					Layout.fillHeight: true
 					Layout.fillWidth: true
 
@@ -178,7 +182,7 @@ Item {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					spacing: Tokens.spacing.largeIncreased
 
 					CustomMouseArea {
@@ -276,14 +280,15 @@ Item {
 					text: Audio.getStreamName(appBox.modelData)
 				}
 
-				ColumnLayout {
+				SnapLayout {
+orientation: Qt.Vertical
 					anchors.bottomMargin: Tokens.padding.small
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
 					anchors.rightMargin: Tokens.padding.small
 					anchors.topMargin: Tokens.padding.small
 
-					RowLayout {
+					SnapLayout {
 						Layout.fillHeight: true
 						Layout.fillWidth: true
 
@@ -302,7 +307,7 @@ Item {
 						}
 					}
 
-					RowLayout {
+					SnapLayout {
 						spacing: Tokens.spacing.largeIncreased
 
 						CustomMouseArea {

Modules/Bar/Popouts/ClipWrapper.qml

@@ -4,6 +4,7 @@ import QtQuick
 import Quickshell
 import qs.Components
 import ZShell.Config
+import ZShell
 
 Item {
 	id: root
@@ -36,7 +37,7 @@ Item {
 		const diff = parent.width - Math.floor(off + content.nonAnimWidth);
 		if (diff < 0)
 			return off + diff;
-		return Math.floor(Math.max(off, 0));
+		return ZUtils.snap(Math.max(off, 0), root);
 	}
 	y: {
 		if (horizontal)
@@ -46,12 +47,11 @@ Item {
 		const diff = parent.height - Math.floor(off + content.nonAnimHeight);
 		if (diff < 0)
 			return off + diff;
-		return Math.max(off, 0);
+		return ZUtils.snap(Math.max(off, 0), root);
 	}
 
 	Behavior on offsetScale {
-		Anim {
+		Anim {}
-		}
 	}
 	Behavior on x {
 		enabled: !root.horizontal || root.offsetScale < 1

Modules/Bar/Popouts/NetworkPopout.qml

@@ -4,6 +4,7 @@ import Quickshell
 import Quickshell.Networking
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Modules
@@ -14,7 +15,8 @@ Item {
 
 	required property var wrapper
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: layout
 
 		spacing: 8

Modules/Bar/Popouts/TrayMenuPopout.qml

@@ -4,6 +4,7 @@ import Quickshell
 import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import QtQuick.Controls
 import QtQuick.Effects
 import qs.Components
@@ -47,7 +48,8 @@ StackView {
 			duration: 0
 		}
 	}
-	component SubMenu: ColumnLayout {
+	component SubMenu: SnapLayout {
+orientation: Qt.Vertical
 		id: menu
 
 		required property QsMenuHandle handle

Modules/Bar/Popouts/UPowerPopout.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell.Services.UPower
 import ZShell.Config
 import qs.Modules.Bar.Components.Common
@@ -35,7 +36,7 @@ Column {
 	Repeater {
 		model: Battery.allPeripherals
 
-		RowLayout {
+		SnapLayout {
 			id: layout
 
 			required property var modelData

Modules/Bar/Popouts/UpdatesPopout.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import ZShell.Config
 import qs.Components
@@ -86,7 +87,7 @@ CustomRect {
 				implicitWidth: 600
 				radius: root.radius - Tokens.padding.extraSmall
 
-				RowLayout {
+				SnapLayout {
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
 					anchors.rightMargin: Tokens.padding.small
@@ -96,7 +97,8 @@ CustomRect {
 						text: "package_2"
 					}
 
-					ColumnLayout {
+					SnapLayout {
+orientation: Qt.Vertical
 						Layout.fillWidth: true
 
 						CustomText {
@@ -114,7 +116,7 @@ CustomRect {
 						}
 					}
 
-					RowLayout {
+					SnapLayout {
 						Layout.fillHeight: true
 						Layout.preferredWidth: 300
 

Modules/Bar/Popouts/Wrapper.qml

@@ -2,6 +2,7 @@ import Quickshell
 import QtQuick
 import qs.Components
 import ZShell.Config
+import ZShell
 
 Item {
 	id: root
@@ -26,8 +27,8 @@ Item {
 		detachedMode = "";
 	}
 
-	implicitHeight: nonAnimHeight
+	implicitHeight: ZUtils.snap(nonAnimHeight, root)
-	implicitWidth: nonAnimWidth
+	implicitWidth: ZUtils.snap(nonAnimWidth, root)
 
 	Behavior on implicitHeight {
 		enabled: root.offsetScale < 1

Modules/Clipboard/Content.qml

@@ -4,6 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import qs.Helpers
 import ZShell.Config
@@ -111,7 +112,7 @@ Item {
 					Repeater {
 						model: lineRow.modelData.text.split("\t").slice(1)
 
-						RowLayout {
+						SnapLayout {
 							height: lineText.height
 							width: lineText.height + Tokens.spacing.extraSmall
 
@@ -225,7 +226,7 @@ Item {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 

Modules/Dashboard/Content.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import ZShell
 import qs.Components
@@ -39,8 +40,8 @@ Item {
 		];
 		return allTabs.filter(tab => tab.enabled);
 	}
-	readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
+	readonly property real nonAnimHeight: ZUtils.snap(tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin, root)
-	readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
+	readonly property real nonAnimWidth: ZUtils.snap(view.implicitWidth + viewWrapper.anchors.margins * 2, root)
 	required property ScreenState screenState
 
 	implicitHeight: nonAnimHeight
@@ -93,8 +94,8 @@ Item {
 			}
 
 			anchors.fill: parent
-			implicitHeight: currentItem?.implicitHeight ?? 0
+			implicitHeight: currentItem?.height ?? currentItem?.implicitHeight ?? 0
-			implicitWidth: currentItem?.implicitWidth ?? 0
+			implicitWidth: currentItem?.width ?? currentItem?.implicitWidth ?? 0
 
 			Repeater {
 				id: repeater

Modules/Dashboard/Dash.qml

@@ -1,104 +1,82 @@
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Config
+import ZShell.Components
 import qs.Helpers
 import qs.Components
 import qs.Modules
-import ZShell.Config
 import qs.Modules.Dashboard.Dash
 import qs.Services
 
-GridLayout {
+SnapLayout {
+orientation: Qt.Vertical
 	id: root
 
 	readonly property bool dashboardVisible: screenState.dashboard
 	required property int radius
 	required property ScreenState screenState
 
-	columnSpacing: Tokens.spacing.small
+	spacing: ZUtils.snap(Tokens.spacing.small, root)
-	rowSpacing: Tokens.spacing.small
 
-	ParallelAnimation {
+	height: ZUtils.snap(implicitHeight, root)
-		id: openAnim
+	width: ZUtils.snap(implicitWidth, root)
 
-		Anim {
+	SnapLayout {
-			property: "opacity"
-			target: root
-			to: 1
-		}
-
-		Anim {
-			property: "scale"
-			target: root
-			to: 1
-		}
-	}
-
-	ParallelAnimation {
-		id: closeAnim
-
-		Anim {
-			property: "opacity"
-			target: root
-			to: 0
-		}
-
-		Anim {
-			property: "scale"
-			target: root
-			to: 0.9
-		}
-	}
-
-	Rect {
-		Layout.column: 2
-		Layout.columnSpan: 3
-		Layout.preferredHeight: user.implicitHeight
-		Layout.preferredWidth: user.implicitWidth
-		radius: root.radius
-
-		User {
-			id: user
-
-			screenState: root.screenState
-		}
-	}
-
-	Rect {
-		Layout.columnSpan: 2
-		Layout.fillHeight: true
-		Layout.preferredWidth: Tokens.sizes.dashboard.weatherWidth
-		Layout.row: 0
-		radius: root.radius
-
-		Weather {}
-	}
-
-	Rect {
-		Layout.column: 0
-		Layout.columnSpan: 3
 		Layout.fillWidth: true
-		Layout.preferredHeight: calendar.implicitHeight
+		spacing: parent.spacing
-		Layout.row: 1
-		radius: root.radius
 
-		Calendar {
+		Rect {
-			id: calendar
+			id: weatherRect
+			Layout.fillHeight: true
+			Layout.preferredWidth: ZUtils.snap(Tokens.sizes.dashboard.weatherWidth, root)
+			radius: root.radius
 
-			screenState: root.screenState
+			Weather {}
+		}
+
+		Rect {
+			id: userRect
+			Layout.preferredHeight: ZUtils.snap(user.implicitHeight, root)
+			Layout.preferredWidth: ZUtils.snap(user.implicitWidth, root)
+			radius: root.radius
+
+			User {
+				id: user
+
+				screenState: root.screenState
+			}
 		}
 	}
 
-	Rect {
+	SnapLayout {
-		Layout.column: 3
+		Layout.fillWidth: true
-		Layout.columnSpan: 2
+		spacing: parent.spacing
-		Layout.fillHeight: true
-		Layout.preferredWidth: resources.implicitWidth
-		Layout.row: 1
-		radius: root.radius
 
-		Resources {
+		Rect {
-			id: resources
+			id: calendarRect
+			Layout.fillWidth: true
+			Layout.fillHeight: true
+			implicitHeight: ZUtils.snap(calendar.implicitHeight, root)
+			radius: root.radius
+
+			Calendar {
+				id: calendar
+
+				screenState: root.screenState
+			}
+		}
+
+		Rect {
+			id: resourcesRect
+			Layout.fillHeight: true
+			implicitWidth: ZUtils.snap(resources.implicitWidth, root)
+			radius: root.radius
+
+			Resources {
+				id: resources
+			}
 		}
 	}
 

Modules/Dashboard/Dash/Calendar.qml

@@ -4,6 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -117,14 +118,15 @@ CustomMouseArea {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: inner
 
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
 		spacing: Tokens.spacing.extraSmall
 
-		RowLayout {
+		SnapLayout {
 			id: monthNavigationRow
 
 			Layout.fillWidth: true

Modules/Dashboard/Dash/Resources.qml

@@ -1,5 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
+import ZShell
 import ZShell.Services
 import ZShell.Config
 import qs.Components
@@ -8,9 +10,8 @@ import qs.Services
 Item {
 	id: root
 
-	anchors.bottom: parent.bottom
+	anchors.fill: parent
-	anchors.top: parent.top
+	implicitWidth: ZUtils.snap(layout.implicitWidth + layout.anchors.margins * 2, root)
-	implicitWidth: layout.implicitWidth + layout.anchors.margins * 4
 
 	ServiceRef {
 		service: Storage
@@ -28,13 +29,16 @@ Item {
 		service: Gpu
 	}
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: layout
 
 		anchors.bottom: parent.bottom
-		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.margins: Tokens.padding.large
 		anchors.top: parent.top
+
+		x: ZUtils.snap((root.width - implicitWidth) / 2, root)
+
 		spacing: Tokens.spacing.medium
 
 		Resource {
@@ -73,12 +77,10 @@ Item {
 
 		required property string icon
 
-		Layout.fillHeight: true
+		implicitSize: ZUtils.snap((root.height - layout.anchors.margins * 2 - layout.spacing * 4) / 5, root)
-		implicitSize: height
 
 		Behavior on clampedVal {
-			Anim {
+			Anim {}
-			}
 		}
 
 		MaterialIcon {

Modules/Dashboard/Media.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import M3Shapes
+import ZShell
 import ZShell.Config
 import qs.Modules.Dashboard.Media
 import qs.Components
@@ -13,8 +15,8 @@ Item {
 	property ScreenState screenState
 	required property int radius
 
-	implicitWidth: 1000
+	implicitWidth: ZUtils.snap(1000, root)
-	implicitHeight: 320
+	implicitHeight: ZUtils.snap(320, root)
 
 	ClipRect {
 		anchors.fill: parent
@@ -25,7 +27,7 @@ Item {
 		}
 	}
 
-	RowLayout {
+	SnapLayout {
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
 		spacing: Tokens.spacing.extraLarge
@@ -94,7 +96,8 @@ Item {
 				active: opacity > 0
 				opacity: 0
 
-				sourceComponent: ColumnLayout {
+				sourceComponent: SnapLayout {
+orientation: Qt.Vertical
 					spacing: Tokens.spacing.small
 
 					MaterialShape {
@@ -140,11 +143,12 @@ Item {
 				asynchronous: true
 				active: opacity > 0
 
-				sourceComponent: RowLayout {
+				sourceComponent: SnapLayout {
 					spacing: Tokens.spacing.extraLarge
 
 					Details {
 						Layout.fillWidth: true
+						Layout.fillHeight: true
 					}
 
 					LyricsAndSelector {

Modules/Dashboard/Media/Details.qml

@@ -1,13 +1,14 @@
 import QtQuick
 import QtQuick.Layouts
 import Quickshell.Services.Mpris
+import ZShell
 import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
 import qs.Helpers
 
-ColumnLayout {
+Item {
 	id: root
 
 	readonly property bool hasUnknownLength: (Players.active?.length ?? 0) > 2147483647
@@ -25,46 +26,187 @@ ColumnLayout {
 		return `${mins}:${secs}`;
 	}
 
-	spacing: Tokens.spacing.extraSmall
+	implicitHeight: ZUtils.snap(layout.implicitHeight, root)
+	implicitWidth: layout.implicitWidth
 
-	Timer {
+	SnapLayout {
-		running: Players.active?.isPlaying ?? false
+orientation: Qt.Vertical
-		interval: Config.dashboard.mediaUpdateInterval
+		id: layout
-		triggeredOnStart: true
+		anchors.left: parent.left
-		repeat: true
+		anchors.right: parent.right
-		onTriggered: Players.active?.positionChanged()
+		y: ZUtils.snap((parent.height - implicitHeight) / 2, root)
-	}
 
-	CustomText {
+		spacing: ZUtils.snap(Tokens.spacing.extraSmall, root)
-		Layout.fillWidth: true
-		text: Players.active?.trackTitle ?? ""
-		font: Tokens.font.title.large
-		elide: Text.ElideRight
-		animate: true
-	}
 
-	CustomText {
+		Timer {
-		Layout.fillWidth: true
+			running: Players.active?.isPlaying ?? false
-		text: Players.active?.trackArtist || qsTr("Unknown artist")
+			interval: Config.dashboard.mediaUpdateInterval
-		color: Colors.palette.m3onSurfaceVariant
+			triggeredOnStart: true
-		font: Tokens.font.title.medium
+			repeat: true
-		elide: Text.ElideRight
+			onTriggered: Players.active?.positionChanged()
-		animate: true
+		}
-	}
 
-	CustomText {
+		CustomText {
-		Layout.fillWidth: true
+			id: title
-		text: Players.active?.trackAlbum || qsTr("Unknown album")
+			Layout.fillWidth: true
-		color: Colors.palette.m3secondary
+			Layout.preferredHeight: ZUtils.snapCeil(implicitHeight, root)
-		font: Tokens.font.title.medium
+			text: Players.active?.trackTitle ?? ""
-		elide: Text.ElideRight
+			font: Tokens.font.title.large
-		animate: true
+			elide: Text.ElideRight
-	}
+			animate: true
+		}
 
-	RowLayout {
+		CustomText {
-		Layout.topMargin: Tokens.spacing.extraLargeIncreased
+			id: artist
-		Layout.fillWidth: true
+			Layout.fillWidth: true
-		spacing: Tokens.spacing.small
+			Layout.preferredHeight: ZUtils.snapCeil(implicitHeight, root)
+			text: Players.active?.trackArtist || qsTr("Unknown artist")
+			color: Colors.palette.m3onSurfaceVariant
+			font: Tokens.font.title.medium
+			elide: Text.ElideRight
+			animate: true
+		}
+
+		CustomText {
+			id: album
+			Layout.fillWidth: true
+			Layout.preferredHeight: ZUtils.snapCeil(implicitHeight, root)
+			text: Players.active?.trackAlbum || qsTr("Unknown album")
+			color: Colors.palette.m3secondary
+			font: Tokens.font.title.medium
+			elide: Text.ElideRight
+			animate: true
+		}
+
+		SnapLayout {
+			id: sliderLayout
+			Layout.topMargin: Tokens.spacing.extraLargeIncreased
+			Layout.fillWidth: true
+			spacing: ZUtils.snap(Tokens.spacing.small, root)
+
+			CustomText {
+				id: positionLabel
+
+				Layout.preferredWidth: ZUtils.snapCeil(timeMetrics.width, root)
+				Layout.preferredHeight: positionSlider.implicitHeight
+				text: root.lengthStr(Players.active?.position ?? -1)
+				color: Colors.palette.m3onSurfaceVariant
+				font: timeMetrics.font
+				horizontalAlignment: Text.AlignHCenter
+				verticalAlignment: Text.AlignVCenter
+			}
+
+			CustomSlider {
+				id: positionSlider
+
+				Layout.fillWidth: true
+				Layout.preferredHeight: ZUtils.snap(implicitHeight, root)
+				value: Players.active ? Players.active.position / (Players.active.length || 1) : 0
+				enabled: (Players.active?.canSeek ?? false) && !root.hasUnknownLength
+				wavy: true
+				animateWave: Players.active?.isPlaying ?? false
+				waveFrequency: 5
+				waveDuration: 2000
+				interactionOnMove: false
+				onInteraction: value => {
+					const active = Players.active;
+					if (active?.canSeek && active?.positionSupported)
+						active.position = value * active.length;
+				}
+
+				Binding {
+					target: positionLabel
+					property: "text"
+					value: root.lengthStr(positionSlider.pos * (Players.active?.length ?? 0))
+					when: positionSlider.dragging
+				}
+			}
+
+			CustomText {
+				Layout.preferredWidth: ZUtils.snapCeil(timeMetrics.width, root)
+				Layout.preferredHeight: positionSlider.implicitHeight
+				text: root.hasUnknownLength ? "--:--" : root.lengthStr(Players.active?.length ?? -1)
+				color: Colors.palette.m3onSurfaceVariant
+				font: timeMetrics.font
+				horizontalAlignment: Text.AlignHCenter
+				verticalAlignment: Text.AlignVCenter
+			}
+		}
+
+		ButtonRow {
+			Layout.topMargin: Tokens.spacing.largeIncreased
+			Layout.fillWidth: true
+			spacing: Tokens.spacing.extraSmall
+
+			IconButton {
+				type: IconButton.Tonal
+				icon: "shuffle"
+				isRound: true
+				shapeMorph: true
+				checked: Players.active?.shuffle ?? false
+				font: Tokens.font.icon.builders.medium.weight(Font.Medium).build()
+				enabled: Players.active?.shuffleSupported
+				onClicked: Players.active.shuffle = !Players.active?.shuffle
+				implicitWidth: Math.round(implicitHeight * 0.9)
+			}
+
+			IconButton {
+				id: previousBtn
+
+				type: IconButton.Tonal
+				icon: "skip_previous"
+				isRound: true
+				shapeMorph: true
+				font: Tokens.font.icon.large
+				enabled: Players.active?.canGoPrevious
+				onClicked: Players.active?.previous()
+			}
+
+			IconButton {
+				id: playPauseBtn
+
+				icon: Players.active?.isPlaying ? "pause" : "play_arrow"
+				isRound: true
+				shapeMorph: true
+				fillWidth: true
+				checked: Players.active?.isPlaying ?? false
+				font: Tokens.font.icon.large
+				enabled: Players.active?.canTogglePlaying
+				onClicked: Players.active?.togglePlaying()
+			}
+
+			IconButton {
+				id: nextBtn
+
+				type: IconButton.Tonal
+				icon: "skip_next"
+				isRound: true
+				shapeMorph: true
+				font: Tokens.font.icon.large
+				enabled: Players.active?.canGoNext
+				onClicked: Players.active?.next()
+			}
+
+			IconButton {
+				type: IconButton.Tonal
+				icon: Players.active?.loopState === MprisLoopState.Track ? "repeat_one" : "repeat"
+				isRound: true
+				shapeMorph: true
+				checked: Players.active?.loopState === MprisLoopState.Track || Players.active?.loopState === MprisLoopState.Playlist
+				font: Tokens.font.icon.builders.medium.weight(Font.Medium).build()
+				enabled: Players.active?.loopSupported
+				onClicked: {
+					const state = Players.active.loopState;
+					if (state === MprisLoopState.None)
+						Players.active.loopState = MprisLoopState.Track;
+					else if (state === MprisLoopState.Track)
+						Players.active.loopState = MprisLoopState.Playlist;
+					else
+						Players.active.loopState = MprisLoopState.None;
+				}
+				implicitWidth: Math.round(implicitHeight * 0.9)
+			}
+		}
 
 		TextMetrics {
 			id: timeMetrics
@@ -72,123 +214,5 @@ ColumnLayout {
 			text: Players.active ? root.lengthStr(Math.max(Players.active.position, root.hasUnknownLength ? 0 : Players.active.length)).replace(/[1-9]/g, "0") : "00:00"
 			font: Tokens.font.label.medium
 		}
-
-		CustomText {
-			id: positionLabel
-
-			Layout.preferredWidth: timeMetrics.width
-			text: root.lengthStr(Players.active?.position ?? -1)
-			color: Colors.palette.m3onSurfaceVariant
-			font: timeMetrics.font
-			horizontalAlignment: Text.AlignHCenter
-		}
-
-		CustomSlider {
-			id: positionSlider
-
-			Layout.fillWidth: true
-			value: Players.active ? Players.active.position / (Players.active.length || 1) : 0
-			enabled: (Players.active?.canSeek ?? false) && !root.hasUnknownLength
-			wavy: true
-			animateWave: Players.active?.isPlaying ?? false
-			waveFrequency: 5
-			waveDuration: 2000
-			interactionOnMove: false
-			onInteraction: value => {
-				const active = Players.active;
-				if (active?.canSeek && active?.positionSupported)
-					active.position = value * active.length;
-			}
-
-			Binding {
-				target: positionLabel
-				property: "text"
-				value: root.lengthStr(positionSlider.pos * (Players.active?.length ?? 0))
-				when: positionSlider.dragging
-			}
-		}
-
-		CustomText {
-			Layout.preferredWidth: timeMetrics.width
-			text: root.hasUnknownLength ? "--:--" : root.lengthStr(Players.active?.length ?? -1)
-			color: Colors.palette.m3onSurfaceVariant
-			font: timeMetrics.font
-			horizontalAlignment: Text.AlignHCenter
-		}
-	}
-
-	ButtonRow {
-		Layout.topMargin: Tokens.spacing.largeIncreased
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.extraSmall
-
-		IconButton {
-			type: IconButton.Tonal
-			icon: "shuffle"
-			isRound: true
-			shapeMorph: true
-			checked: Players.active?.shuffle ?? false
-			font: Tokens.font.icon.builders.medium.weight(Font.Medium).build()
-			enabled: Players.active?.shuffleSupported
-			onClicked: Players.active.shuffle = !Players.active?.shuffle
-			implicitWidth: Math.round(implicitHeight * 0.9)
-		}
-
-		IconButton {
-			id: previousBtn
-
-			type: IconButton.Tonal
-			icon: "skip_previous"
-			isRound: true
-			shapeMorph: true
-			font: Tokens.font.icon.large
-			enabled: Players.active?.canGoPrevious
-			onClicked: Players.active?.previous()
-		}
-
-		IconButton {
-			id: playPauseBtn
-
-			icon: Players.active?.isPlaying ? "pause" : "play_arrow"
-			isRound: true
-			shapeMorph: true
-			fillWidth: true
-			checked: Players.active?.isPlaying ?? false
-			font: Tokens.font.icon.large
-			enabled: Players.active?.canTogglePlaying
-			onClicked: Players.active?.togglePlaying()
-		}
-
-		IconButton {
-			id: nextBtn
-
-			type: IconButton.Tonal
-			icon: "skip_next"
-			isRound: true
-			shapeMorph: true
-			font: Tokens.font.icon.large
-			enabled: Players.active?.canGoNext
-			onClicked: Players.active?.next()
-		}
-
-		IconButton {
-			type: IconButton.Tonal
-			icon: Players.active?.loopState === MprisLoopState.Track ? "repeat_one" : "repeat"
-			isRound: true
-			shapeMorph: true
-			checked: Players.active?.loopState === MprisLoopState.Track || Players.active?.loopState === MprisLoopState.Playlist
-			font: Tokens.font.icon.builders.medium.weight(Font.Medium).build()
-			enabled: Players.active?.loopSupported
-			onClicked: {
-				const state = Players.active.loopState;
-				if (state === MprisLoopState.None)
-					Players.active.loopState = MprisLoopState.Track;
-				else if (state === MprisLoopState.Track)
-					Players.active.loopState = MprisLoopState.Playlist;
-				else
-					Players.active.loopState = MprisLoopState.None;
-			}
-			implicitWidth: Math.round(implicitHeight * 0.9)
-		}
 	}
 }

Modules/Dashboard/Media/LyricList.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Effects
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import ZShell.Services
 import qs.Components
@@ -157,7 +158,8 @@ Item {
 		active: opacity > 0
 		opacity: 0
 
-		sourceComponent: ColumnLayout {
+		sourceComponent: SnapLayout {
+orientation: Qt.Vertical
 			spacing: Tokens.spacing.large
 
 			CustomRect {
@@ -198,7 +200,8 @@ Item {
 		active: opacity > 0
 		opacity: 0
 
-		sourceComponent: ColumnLayout {
+		sourceComponent: SnapLayout {
+orientation: Qt.Vertical
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {

Modules/Dashboard/Media/LyricsAndSelector.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import Quickshell.Services.Mpris
 import ZShell.Config
@@ -8,14 +9,15 @@ import qs.Helpers
 import qs.Services
 
 Item {
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: layout
 
 		anchors.fill: parent
 		anchors.leftMargin: Tokens.padding.medium
 		spacing: Tokens.spacing.medium
 
-		RowLayout {
+		SnapLayout {
 			Layout.bottomMargin: -Tokens.spacing.medium
 			spacing: Tokens.spacing.medium
 			z: 1

Modules/Dashboard/Media/LyricsInfo.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell
 import ZShell.Blobs
 import ZShell.Config
@@ -16,7 +17,7 @@ Item {
 	implicitWidth: btn.implicitWidth * 0.9
 	implicitHeight: btn.implicitHeight * 0.9
 
-	BlobGroup {
+	BlobGroup2 {
 		id: blobGroup
 
 		color: Colors.palette.m3surfaceContainerHighest
@@ -28,7 +29,7 @@ Item {
 		}
 	}
 
-	BlobRect {
+	BlobRect2 {
 		id: btnRect
 
 		anchors.fill: parent
@@ -41,7 +42,7 @@ Item {
 		}
 	}
 
-	BlobRect {
+	BlobRect2 {
 		id: rect
 
 		anchors.right: parent.right
@@ -141,8 +142,9 @@ Item {
 				}
 			]
 
-			ColumnLayout {
+			SnapLayout {
 				id: layout
+				orientation: Qt.Vertical
 
 				anchors.centerIn: parent
 				spacing: Tokens.spacing.extraSmall

Modules/Dashboard/Processes/ProcessesHeader.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import ZShell.Config
 import ZShell.Internal

Modules/Dashboard/Processes/ProcessesList.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import Quickshell.Widgets
 import ZShell.Config
@@ -38,7 +39,7 @@ CustomListView {
 			id: rowHover
 		}
 
-		RowLayout {
+		SnapLayout {
 			id: rowLayout
 
 			anchors.left: parent.left

Modules/Dashboard/Processes/SystemInfo.qml

@@ -23,7 +23,7 @@ Item {
 		service: Memory
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: layout
 		anchors.fill: parent
 		spacing: Tokens.spacing.medium
@@ -60,13 +60,14 @@ Item {
 		Layout.fillHeight: true
 		implicitHeight: mainLayout.implicitHeight + mainLayout.anchors.margins * 2
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			id: mainLayout
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.large
 			spacing: 0
 
-			RowLayout {
+			SnapLayout {
 				spacing: Tokens.spacing.small
 
 				MaterialIcon {
@@ -131,7 +132,8 @@ Item {
 					}
 				}
 
-				ColumnLayout {
+				SnapLayout {
+orientation: Qt.Vertical
 					id: infoColumn
 					anchors.right: parent.right
 					anchors.bottom: parent.bottom

Modules/Dashboard/Tabs.qml

@@ -4,6 +4,8 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Templates
 import Quickshell
+import ZShell
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -16,9 +18,17 @@ Item {
 	required property var tabs
 
 	readonly property alias count: bar.count
-	readonly property int tabIndicatorSpacing: Tokens.spacing.small
+	readonly property int tabIndicatorSpacing: ZUtils.snap(Tokens.spacing.small, root)
 
-	implicitHeight: bar.implicitHeight + bar.anchors.topMargin + indicator.implicitHeight + indicator.anchors.topMargin + separator.implicitHeight
+	function snapLayoutHeight(v) {
+		const dpr = ZUtils.dprFor(root);
+		let h = Math.ceil(v);
+		while (Math.abs(h * dpr - Math.round(h * dpr)) > 1e-6)
+			++h;
+		return h;
+	}
+
+	implicitHeight: ZUtils.snap(bar.implicitHeight + bar.anchors.topMargin + indicator.implicitHeight + indicator.anchors.topMargin + separator.implicitHeight, root)
 
 	TabBar {
 		id: bar
@@ -31,9 +41,11 @@ Item {
 		currentIndex: root.screenState.dashboardTab
 		onCurrentIndexChanged: root.screenState.dashboardTab = currentIndex
 
-		implicitHeight: contentHeight
+		topPadding: 0
+		bottomPadding: 0
+		implicitHeight: implicitContentHeight
 		background: null
-		contentItem: RowLayout {
+		contentItem: SnapLayout {
 			spacing: 0
 
 			Repeater {
@@ -116,10 +128,13 @@ Item {
 		readonly property bool current: TabBar.tabBar.currentItem === this
 
 		Layout.fillWidth: true
-		Layout.preferredWidth: 1 // Uniform width across all tabs
+		Layout.fillHeight: true
+		Layout.preferredWidth: 1
 		implicitWidth: implicitContentWidth
 		implicitHeight: implicitContentHeight
 		background: null
+		topPadding: 0
+		bottomPadding: 0
 
 		contentItem: CustomMouseArea {
 			id: mouse
@@ -131,8 +146,8 @@ Item {
 					root.screenState.dashboardTab = Math.max(root.screenState.dashboardTab - 1, 0);
 			}
 
-			implicitWidth: Math.max(icon.width, label.width)
+			implicitWidth: Math.max(icon.implicitWidth, label.implicitWidth)
-			implicitHeight: icon.height + label.height
+			implicitHeight: snapLayout.implicitHeight
 
 			hoverEnabled: true
 			cursorShape: Qt.PointingHandCursor
@@ -146,39 +161,49 @@ Item {
 				anchors.left: parent.left
 				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
-				implicitHeight: parent.height + root.tabIndicatorSpacing * 2
+				anchors.alignWhenCentered: false
+				implicitHeight: ZUtils.snap(parent.height + Tokens.sizes.dashboard.tabIndicatorSpacing * 2, stateLayer)
 
 				radius: Tokens.rounding.medium
 				color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurface
-				onClicked: root.screenState.dashboardTab = tab.TabBar.index
+				onClicked: {
-			}
+					root.screenState.dashboardTab = tab.TabBar.index;
-
-			MaterialIcon {
-				id: icon
-
-				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.bottom: label.top
-
-				text: tab.iconName
-				color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
-				fill: tab.current ? 1 : 0
-				fontStyle: Tokens.font.icon.medium
-
-				Behavior on fill {
-					Anim {
-						type: Anim.DefaultEffects
-					}
 				}
 			}
 
-			CustomText {
+			SnapLayout {
-				id: label
+				id: snapLayout
+				anchors.fill: parent
+				spacing: 0
+				orientation: Qt.Vertical
 
-				anchors.horizontalCenter: parent.horizontalCenter
+				MaterialIcon {
-				anchors.bottom: parent.bottom
+					id: icon
 
-				text: tab.text
+					text: tab.iconName
-				color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+					color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+					fill: tab.current ? 1 : 0
+					fontStyle: Tokens.font.icon.medium
+
+					Layout.fillHeight: true
+					Layout.alignment: Qt.AlignHCenter
+
+					Behavior on fill {
+						Anim {
+							type: Anim.DefaultEffects
+						}
+					}
+				}
+
+				CustomText {
+					id: label
+
+					text: tab.text
+					color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+
+					Layout.fillHeight: true
+					Layout.alignment: Qt.AlignHCenter
+				}
 			}
 		}
 	}

Modules/Dashboard/Weather/Graphs.qml

@@ -1,11 +1,13 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
 import qs.Helpers
 
-RowLayout {
+SnapLayout {
 	id: root
 
 	spacing: Tokens.spacing.largeIncreased
@@ -20,7 +22,7 @@ RowLayout {
 
 	readonly property real markerX: {
 		const d = root.now;
-		return d.getHours() + d.getMinutes() / 60;
+		return ZUtils.snap(d.getHours() + d.getMinutes() / 60, root);
 	}
 
 	function formatHour(h) {
@@ -39,11 +41,13 @@ RowLayout {
 		onTriggered: root.now = new Date()
 	}
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		Layout.fillWidth: true
+		Layout.fillHeight: true
 		Layout.preferredWidth: root.width / 2
 
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
 
 			MaterialIcon {
@@ -90,11 +94,13 @@ RowLayout {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		Layout.fillWidth: true
+		Layout.fillHeight: true
 		Layout.preferredWidth: root.width / 2
 
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
 
 			MaterialIcon {

Modules/Dashboard/WeatherTab.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Modules.Dashboard.Weather
 import qs.Services
@@ -18,13 +19,14 @@ Item {
 	implicitHeight: layout.implicitHeight
 	Component.onCompleted: Weather.reload()
 
-	ColumnLayout {
+	SnapLayout {
+orientation: Qt.Vertical
 		id: layout
 
 		anchors.fill: parent
 		spacing: Tokens.spacing.medium
 
-		RowLayout {
+		SnapLayout {
 			Layout.leftMargin: Tokens.padding.large
 			Layout.rightMargin: Tokens.padding.large
 			Layout.fillWidth: true
@@ -82,7 +84,7 @@ Item {
 			}
 		}
 
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
 			spacing: Tokens.spacing.medium
 
@@ -121,7 +123,9 @@ Item {
 			color: Colors.palette.m3onSurface
 		}
 
-		RowLayout {
+		SnapLayout {
+			id: forecastLayout
+
 			Layout.fillWidth: true
 			spacing: Tokens.spacing.medium
 
@@ -137,12 +141,14 @@ Item {
 					required property var modelData
 
 					Layout.fillWidth: true
+					Layout.fillHeight: true
 					implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.medium * 2
 
 					radius: root.radius
 					color: Colors.tPalette.m3surfaceContainer
 
-					ColumnLayout {
+					SnapLayout {
+orientation: Qt.Vertical
 						id: forecastItemColumn
 
 						anchors.centerIn: parent
@@ -196,7 +202,8 @@ Item {
 		property color colour
 
 		Layout.fillWidth: true
-		Layout.preferredHeight: 60
+		Layout.fillHeight: true
+		implicitHeight: 60
 		radius: Tokens.rounding.medium
 		color: Colors.tPalette.m3surfaceContainer
 
@@ -230,7 +237,7 @@ Item {
 		}
 	}
 
-	component WeatherStat: RowLayout {
+	component WeatherStat: SnapLayout {
 		id: weatherStat
 
 		property string icon

Modules/DesktopIcons/BackgroundContextMenu.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Hyprland
@@ -43,7 +44,8 @@ Item {
 		}
 		opacity: root.visible ? 1 : 0
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			id: menuLayout
 			anchors.centerIn: parent
 			spacing: 0
@@ -53,7 +55,7 @@ Item {
 				radius: popupBackground.radius - popupBackground.padding
 				implicitHeight: openTerminalRow.implicitHeight + Tokens.padding.extraSmall * 2
 
-				RowLayout {
+				SnapLayout {
 					id: openTerminalRow
 					spacing: 8
 					anchors.fill: parent
@@ -92,7 +94,7 @@ Item {
 				radius: popupBackground.radius - popupBackground.padding
 				implicitHeight: settingsRow.implicitHeight + Tokens.padding.extraSmall * 2
 
-				RowLayout {
+				SnapLayout {
 					id: settingsRow
 					spacing: 8
 					anchors.fill: parent
@@ -132,7 +134,7 @@ Item {
 				radius: popupBackground.radius - popupBackground.padding
 				implicitHeight: logoutRow.implicitHeight + Tokens.padding.extraSmall * 2
 
-				RowLayout {
+				SnapLayout {
 					id: logoutRow
 					spacing: 8
 					anchors.fill: parent
@@ -171,7 +173,7 @@ Item {
 			//     radius: popupBackground.radius - popupBackground.padding
 			//     implicitHeight: desktopIconsRow.implicitHeight + Tokens.padding.extraSmall * 2
 			//
-			//     RowLayout {
+			//     SnapLayout {
 			//         id: desktopIconsRow
 			//         spacing: 8
 			//         anchors.fill: parent

Modules/DesktopIcons/DesktopIconContextMenu.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
 import qs.Components
+import ZShell.Components
 import ZShell.Config
 import qs.Services
 
@@ -57,22 +58,25 @@ Item {
 			Anim {}
 		}
 
-		ColumnLayout {
+		SnapLayout {
 			id: menuLayout
 
 			anchors.centerIn: parent
+
 			spacing: 0
+			orientation: Qt.Vertical
 
 			CustomRect {
 				Layout.preferredWidth: 160
 				implicitHeight: openRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
-				RowLayout {
+				SnapLayout {
 					id: openRow
 
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
+
 					spacing: 8
 
 					MaterialIcon {
@@ -111,11 +115,12 @@ Item {
 				implicitHeight: openWithRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
-				RowLayout {
+				SnapLayout {
 					id: openWithRow
 
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
+
 					spacing: 8
 
 					MaterialIcon {
@@ -156,11 +161,12 @@ Item {
 				implicitHeight: copyPathRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
-				RowLayout {
+				SnapLayout {
 					id: copyPathRow
 
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
+
 					spacing: 8
 
 					MaterialIcon {
@@ -190,11 +196,12 @@ Item {
 				radius: popupBackground.radius - popupBackground.padding
 				visible: contextMenu.targetPaths.length === 1
 
-				RowLayout {
+				SnapLayout {
 					id: renameRow
 
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
+
 					spacing: 8
 
 					MaterialIcon {
@@ -231,11 +238,12 @@ Item {
 				implicitHeight: deleteRow.implicitHeight + Tokens.padding.extraSmall * 2
 				radius: popupBackground.radius - popupBackground.padding
 
-				RowLayout {
+				SnapLayout {
 					id: deleteRow
 
 					anchors.fill: parent
 					anchors.leftMargin: Tokens.padding.small
+
 					spacing: 8
 
 					MaterialIcon {

Modules/Dock/Parts/DockAppButton.qml

@@ -4,6 +4,7 @@ import Quickshell
 import Quickshell.Widgets
 import qs.Components
 import qs.Helpers
+import ZShell.Components
 import ZShell.Config
 import qs.Services
 
@@ -29,7 +30,10 @@ CustomRect {
 		active: !isSeparator
 		anchors.centerIn: parent
 
-		sourceComponent: ColumnLayout {
+		sourceComponent: SnapLayout {
+			spacing: Tokens.spacing.extraSmall
+			orientation: Qt.Vertical
+
 			IconImage {
 				id: icon
 
@@ -38,8 +42,9 @@ CustomRect {
 				source: Quickshell.iconPath(AppSearch.guessIcon(appToplevel?.appId), "image-missing")
 			}
 
-			RowLayout {
+			SnapLayout {
 				Layout.alignment: Qt.AlignHCenter
+
 				spacing: 3
 
 				Repeater {

Modules/Dock/Parts/DockSeparator.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services

Modules/Launcher/AppList.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
+import ZShell
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -52,7 +53,7 @@ CustomListView {
 
 	highlightFollowsCurrentItem: false
 	highlightRangeMode: ListView.ApplyRange
-	implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxAppsShown, count) - spacing
+	implicitHeight: (Tokens.sizes.launcher.itemHeight + spacing) * Math.min(Config.launcher.maxAppsShown, count) - spacing
 	orientation: Qt.Vertical
 	preferredHighlightBegin: 0
 	preferredHighlightEnd: height
@@ -97,6 +98,7 @@ CustomListView {
 		}
 	}
 	highlight: CustomRect {
+		id: hl
 		color: Colors.palette.m3onSurface
 		implicitHeight: root.currentItem?.implicitHeight ?? 0
 		implicitWidth: root.width

Modules/Launcher/CarouselView.qml

@@ -22,7 +22,7 @@ CarouselView {
 	delegateProperties: ({
 			screenState: root.screenState
 		})
-	focalWidth: Config.launcher.sizes.wallpaperWidth
+	focalWidth: Tokens.sizes.launcher.wallpaperWidth
 	glideDuration: 250
 	glideEasingType: Easing.OutCubic
 	implicitHeight: tileHeight + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.small
@@ -41,8 +41,7 @@ CarouselView {
 	tileHeight: focalWidth / 16 * 9
 
 	delegate: Component {
-		WallpaperTile {
+		WallpaperTile {}
-		}
 	}
 
 	Component.onDestruction: Wallpapers.stopPreview()

Modules/Launcher/Content.qml

@@ -2,17 +2,18 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
+import ZShell
+import ZShell.Config
 import qs.Modules.Launcher.Services
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Services
 
 Item {
 	id: root
 
 	required property real maxHeight
-	readonly property int padding: Tokens.padding.largeIncreased / 4
+	readonly property int padding: ZUtils.snap(Tokens.padding.medium / 2, root)
 	required property var panels
 	readonly property int rounding: Tokens.rounding.largeIncreased
 	required property ScreenState screenState

Modules/Launcher/ContentList.qml

@@ -2,11 +2,12 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
+import ZShell
+import ZShell.Config
 import qs.Paths
 import qs.Modules
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Services
 
 Item {
@@ -71,7 +72,7 @@ Item {
 			PropertyChanges {
 				appList.active: true
 				root.implicitHeight: Math.min(root.maxHeight, appList.implicitHeight > 0 ? appList.implicitHeight : empty.implicitHeight)
-				root.implicitWidth: Config.launcher.sizes.itemWidth
+				root.implicitWidth: Tokens.sizes.launcher.itemWidth
 			}
 
 			AnchorChanges {
@@ -83,8 +84,8 @@ Item {
 			name: "wallpapers"
 
 			PropertyChanges {
-				root.implicitHeight: Config.launcher.sizes.wallpaperHeight
+				root.implicitHeight: Tokens.sizes.launcher.wallpaperHeight
-				root.implicitWidth: Math.max(Config.launcher.sizes.itemWidth * 1.2, wallpaperList.implicitWidth)
+				root.implicitWidth: Math.max(Tokens.sizes.launcher.itemWidth * 1.2, wallpaperList.implicitWidth)
 				wallpaperList.active: true
 			}
 		}

Modules/Launcher/Items/ActionItem.qml

@@ -13,7 +13,7 @@ Item {
 
 	anchors.left: parent?.left
 	anchors.right: parent?.right
-	implicitHeight: Config.launcher.sizes.itemHeight
+	implicitHeight: Tokens.sizes.launcher.itemHeight
 
 	StateLayer {
 		radius: Tokens.rounding.medium

Modules/Launcher/Items/AppItem.qml

@@ -1,10 +1,13 @@
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import ZShell.Components
+import ZShell
 import qs.Modules.Launcher.Services
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Modules
 import qs.Services
 
@@ -16,53 +19,72 @@ Item {
 
 	anchors.left: parent?.left
 	anchors.right: parent?.right
-	implicitHeight: Config.launcher.sizes.itemHeight
+	implicitHeight: ZUtils.snap(Tokens.sizes.launcher.itemHeight, root)
 
 	StateLayer {
 		radius: Tokens.rounding.medium
 
 		onClicked: {
-			Apps.launch(root.modelData);
+			// Apps.launch(root.modelData);
-			root.screenState.launcher = false;
+			// root.screenState.launcher = false;
+
+			ZUtils.logPlacement(icon, "icon");
+			ZUtils.logPlacement(name, "name");
+			ZUtils.logPlacement(favoriteIcon, "favoriteIcon");
+			ZUtils.logPlacement(comment, "comment");
+			ZUtils.logPlacement(text, "text");
+			ZUtils.logPlacement(mainLayout, "main");
 		}
 	}
 
-	Item {
+	SnapLayout {
+		id: mainLayout
 		anchors.fill: parent
 		anchors.leftMargin: Tokens.padding.medium
-		anchors.margins: Tokens.padding.small
 		anchors.rightMargin: Tokens.padding.medium
+		spacing: Tokens.spacing.medium
 
 		IconImage {
 			id: icon
 
-			anchors.verticalCenter: parent.verticalCenter
+			implicitSize: parent.height - Tokens.padding.small * 2
-			implicitSize: parent.height
 			source: Quickshell.iconPath(root.modelData?.icon, "image-missing")
 		}
 
-		Item {
+		SnapLayout {
-			anchors.left: icon.right
+			id: text
-			anchors.leftMargin: Tokens.spacing.medium
+
-			anchors.verticalCenter: icon.verticalCenter
+			Layout.fillHeight: true
-			implicitHeight: name.implicitHeight + comment.implicitHeight
+			Layout.fillWidth: true
-			implicitWidth: parent.width - icon.width
+			Layout.topMargin: Tokens.padding.extraSmall
+			Layout.bottomMargin: Tokens.padding.extraSmall
+
+			orientation: Qt.Vertical
+			spacing: 0
 
 			CustomText {
 				id: name
 
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+
 				text: root.modelData?.name ?? ""
+				verticalAlignment: CustomText.AlignVCenter
+				horizontalAlignment: CustomText.AlignLeft
 			}
 
 			CustomText {
 				id: comment
 
-				anchors.top: name.bottom
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+
 				color: Colors.palette.m3outline
 				elide: Text.ElideRight
 				font: Tokens.font.body.small
 				text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? ""
-				width: root.width - icon.width - Tokens.rounding.medium - Tokens.padding.medium * 2
+				verticalAlignment: CustomText.AlignVCenter
+				horizontalAlignment: CustomText.AlignLeft
 			}
 		}
 
@@ -70,14 +92,16 @@ Item {
 			id: favoriteIcon
 
 			active: root.modelData && Strings.testRegexList(Config.launcher.favoriteApps, root.modelData.id)
-			anchors.right: parent.right
+			Layout.fillHeight: true
-			anchors.verticalCenter: parent.verticalCenter
+
 			asynchronous: true
 
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3primary
 				fill: 1
 				text: "favorite"
+
+				verticalAlignment: MaterialIcon.AlignVCenter
 			}
 		}
 	}

Modules/Launcher/Items/CalcItem.qml

@@ -2,6 +2,7 @@ import ZShell
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import qs.Modules
 import qs.Helpers
@@ -31,7 +32,7 @@ Item {
 		}
 	}
 
-	RowLayout {
+	SnapLayout {
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right

Modules/Lock/Center.qml

@@ -2,14 +2,15 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Config
+import ZShell.Components
 import qs.Paths
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Modules
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
 	id: root
 
 	readonly property real centerScale: Math.min(1, (lock.screen?.height ?? 1440) / 1440)
@@ -19,10 +20,13 @@ ColumnLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
+
+	orientation: Qt.Vertical
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	RowLayout {
+	SnapLayout {
 		Layout.alignment: Qt.AlignHCenter
+
 		spacing: Tokens.spacing.small
 
 		CustomText {
@@ -109,11 +113,12 @@ ColumnLayout {
 			}
 		}
 
-		RowLayout {
+		SnapLayout {
 			id: input
 
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.extraSmall
+
 			spacing: Tokens.spacing.medium
 
 			Item {

Modules/Lock/Content.qml

@@ -1,8 +1,9 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
+import ZShell.Config
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Services
 
 Item {
@@ -13,15 +14,18 @@ Item {
 	implicitHeight: layout.implicitHeight
 	implicitWidth: layout.implicitWidth
 
-	RowLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.fill: parent
+
 		spacing: Tokens.spacing.largeIncreased * 2
 
-		ColumnLayout {
+		SnapLayout {
 			Layout.fillWidth: true
+
 			spacing: Tokens.spacing.medium
+			orientation: Qt.Vertical
 
 			WeatherInfo {
 				id: weather
@@ -50,8 +54,8 @@ Item {
 		}
 
 		NotifDock {
-			Layout.fillHeight: true
 			Layout.fillWidth: true
+			Layout.fillHeight: true
 			lock: root.lock
 		}
 	}

Modules/Lock/InputField.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Modules
 import qs.Components
 import qs.Helpers

Modules/Lock/Media.qml

@@ -48,14 +48,16 @@ Item {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.extraLarge
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
+
 		spacing: Tokens.spacing.extraSmall
+		orientation: Qt.Vertical
 
 		CustomText {
 			Layout.fillWidth: true

Modules/Lock/NotifDock.qml

@@ -4,10 +4,11 @@ import Quickshell
 import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
+import ZShell.Config
 import qs.Modules
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Daemons
 import qs.Services
 
@@ -21,9 +22,11 @@ CustomRect {
 	radius: Tokens.rounding.small
 	topRightRadius: Tokens.rounding.largeIncreased
 
-	ColumnLayout {
+	SnapLayout {
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
+
+		orientation: Qt.Vertical
 		spacing: Tokens.spacing.small
 
 		CustomText {
@@ -48,15 +51,10 @@ CustomRect {
 						duration: Tokens.anim.durations.extraLarge
 					}
 				}
-				sourceComponent: ColumnLayout {
+				sourceComponent: CustomText {
-					spacing: Tokens.spacing.largeIncreased
+					color: Colors.palette.m3outlineVariant
-
+					font: Tokens.font.headline.builders.small.width(90).build()
-					CustomText {
+					text: qsTr("No Notifications")
-						Layout.alignment: Qt.AlignHCenter
-						color: Colors.palette.m3outlineVariant
-						font: Tokens.font.headline.builders.small.width(90).build()
-						text: qsTr("No Notifications")
-					}
 				}
 			}
 

Modules/Lock/NotifGroup.qml

@@ -5,10 +5,11 @@ import Quickshell.Widgets
 import Quickshell.Services.Notifications
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
+import ZShell.Config
 import qs.Modules
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Daemons
 import qs.Services
 
@@ -36,13 +37,14 @@ CustomRect {
 		}
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: content
 
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
 		anchors.top: parent.top
+
 		spacing: Tokens.spacing.medium
 
 		Item {
@@ -118,15 +120,18 @@ CustomRect {
 			}
 		}
 
-		ColumnLayout {
+		SnapLayout {
 			Layout.bottomMargin: -Tokens.padding.extraSmall / 2 - (root.expanded ? 0 : spacing)
 			Layout.fillWidth: true
 			Layout.topMargin: -Tokens.padding.extraSmall
-			spacing: Math.round(Tokens.spacing.small / 2)
 
-			RowLayout {
+			spacing: Math.round(Tokens.spacing.small / 2)
+			orientation: Qt.Vertical
+
+			SnapLayout {
 				Layout.bottomMargin: -parent.spacing
 				Layout.fillWidth: true
+
 				spacing: Tokens.spacing.small
 
 				CustomText {
@@ -167,10 +172,11 @@ CustomRect {
 						}
 					}
 
-					RowLayout {
+					SnapLayout {
 						id: expandBtn
 
 						anchors.centerIn: parent
+
 						spacing: Tokens.spacing.small / 2
 
 						CustomText {
@@ -261,7 +267,10 @@ CustomRect {
 				Behavior on opacity {
 					Anim {}
 				}
-				sourceComponent: ColumnLayout {
+				sourceComponent: SnapLayout {
+					orientation: Qt.Vertical
+					spacing: Tokens.spacing.extraSmall
+
 					Repeater {
 						model: ScriptModel {
 							values: root.notifs.slice(Config.notifs.groupPreviewNum)

Modules/Lock/Resources.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import M3Shapes
 import ZShell.Services
 import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Effects
 import qs.Services
@@ -33,11 +34,12 @@ CustomRect {
 		service: Storage
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
+
 		spacing: Tokens.spacing.largeIncreased
 
 		Resource {

Modules/Lock/Weather/BriefInfo.qml

@@ -1,11 +1,13 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Helpers
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
+orientation: Qt.Vertical
 	id: root
 
 	required property int rootHeight
@@ -20,7 +22,7 @@ ColumnLayout {
 		text: Weather.description
 	}
 
-	RowLayout {
+	SnapLayout {
 		Layout.alignment: Qt.AlignHCenter
 		spacing: Tokens.spacing.small
 

Modules/Lock/Weather/Forecast.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import M3Shapes
 import ZShell
 import qs.Components
@@ -14,7 +15,7 @@ CustomRect {
 	implicitHeight: header.anchors.margins + header.implicitHeight + Tokens.spacing.small + layout.implicitHeight + layout.anchors.bottomMargin
 	radius: Tokens.rounding.small
 
-	RowLayout {
+	SnapLayout {
 		id: header
 
 		anchors.left: parent.left
@@ -55,7 +56,8 @@ CustomRect {
 		orientation: VerticalFadeListView.Horizontal
 		spacing: Tokens.spacing.medium
 
-		delegate: ColumnLayout {
+		delegate: SnapLayout {
+orientation: Qt.Vertical
 			id: hour
 
 			readonly property bool current: ListView.view.currentItem === this

Modules/Osd/Content.qml

@@ -2,9 +2,11 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Config
+import ZShell.Components
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Daemons
 import qs.Services
 
@@ -19,14 +21,17 @@ Item {
 	required property ScreenState screenState
 	required property real volume
 
-	implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
+	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
-	implicitWidth: layout.implicitWidth + Tokens.padding.smaller * 2
+	implicitWidth: layout.implicitWidth + layout.anchors.margins * 2
 
-	ColumnLayout {
+	SnapLayout {
 		id: layout
 
-		anchors.centerIn: parent
+		anchors.fill: parent
+		anchors.margins: Tokens.padding.extraSmall
+
 		spacing: Tokens.spacing.medium
+		orientation: Qt.Vertical
 
 		// Speaker volume
 		CustomMouseArea {
@@ -37,8 +42,8 @@ Item {
 					Audio.decrementVolume();
 			}
 
-			implicitHeight: Config.osd.sizes.sliderHeight
+			implicitHeight: ZUtils.snap(Config.osd.sizes.sliderHeight, root)
-			implicitWidth: Config.osd.sizes.sliderWidth
+			implicitWidth: ZUtils.snap(Config.osd.sizes.sliderWidth, root)
 
 			FilledSlider {
 				anchors.fill: parent
@@ -63,8 +68,8 @@ Item {
 						Audio.decrementSourceVolume();
 				}
 
-				implicitHeight: Config.osd.sizes.sliderHeight
+				implicitHeight: ZUtils.snap(Config.osd.sizes.sliderHeight, root)
-				implicitWidth: Config.osd.sizes.sliderWidth
+				implicitWidth: ZUtils.snap(Config.osd.sizes.sliderWidth, root)
 
 				FilledSlider {
 					anchors.fill: parent
@@ -93,8 +98,8 @@ Item {
 						monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
 				}
 
-				implicitHeight: Config.osd.sizes.sliderHeight
+				implicitHeight: ZUtils.snap(Config.osd.sizes.sliderHeight, root)
-				implicitWidth: Config.osd.sizes.sliderWidth
+				implicitWidth: ZUtils.snap(Config.osd.sizes.sliderWidth, root)
 
 				FilledSlider {
 					anchors.fill: parent
@@ -131,8 +136,7 @@ Item {
 			}
 		}
 		Behavior on opacity {
-			Anim {
+			Anim {}
-			}
 		}
 	}
 }

Modules/Osd/Wrapper.qml

@@ -2,9 +2,10 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
+import ZShell
+import ZShell.Config
 import qs.Components
 import qs.Helpers
-import ZShell.Config
 import qs.Daemons
 
 Item {
@@ -30,8 +31,8 @@ Item {
 	}
 
 	anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale
-	implicitHeight: content.implicitHeight
+	implicitHeight: ZUtils.snap(content.implicitHeight, root)
-	implicitWidth: content.implicitWidth
+	implicitWidth: ZUtils.snap(content.implicitWidth, root)
 	opacity: 1 - offsetScale
 	visible: offsetScale < 1
 
@@ -98,8 +99,7 @@ Item {
 		id: content
 
 		active: root.shouldBeActive || root.visible
-		anchors.left: parent.left
+		anchors.fill: parent
-		anchors.verticalCenter: parent.verticalCenter
 
 		sourceComponent: Content {
 			brightness: root.brightness

Modules/Polkit/Polkit.qml

@@ -83,13 +83,16 @@ Scope {
 			opacity: 0
 			radius: Tokens.rounding.small * 2
 
-			ColumnLayout {
+			SnapLayout {
 				id: layout
 
 				anchors.fill: parent
 				anchors.margins: Tokens.padding.medium
 
-				RowLayout {
+				spacing: Tokens.spacing.extraSmall
+				orientation: Qt.Vertical
+
+				SnapLayout {
 					id: contentRow
 
 					spacing: 24
@@ -120,12 +123,15 @@ Scope {
 						}
 					}
 
-					ColumnLayout {
+					SnapLayout {
 						id: contentColumn
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
 
+						spacing: Tokens.spacing.extraSmall
+						orientation: Qt.Vertical
+
 						CustomText {
 							Layout.alignment: Qt.AlignLeft
 							Layout.preferredWidth: Math.min(600, contentWidth)
@@ -210,13 +216,15 @@ Scope {
 						}
 					}
 
-					ColumnLayout {
+					SnapLayout {
 						id: textDetailsColumn
 
 						anchors.fill: parent
 						anchors.margins: Tokens.padding.small
 						opacity: 0
+
 						spacing: Tokens.spacing.small
+						orientation: Qt.Vertical
 
 						CustomText {
 							text: `actionId: ${polkitAgent.flow?.actionId}`
@@ -230,8 +238,9 @@ Scope {
 					}
 				}
 
-				RowLayout {
+				SnapLayout {
 					Layout.preferredWidth: contentRow.implicitWidth
+
 					spacing: 8
 
 					IconButton {

Modules/Resources/Cards/BatteryTank.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell.Services.UPower
 import ZShell.Config
 import qs.Components
@@ -50,7 +51,8 @@ ClipRect {
 		}
 	}
 
-	component Contents: ColumnLayout {
+	component Contents: SnapLayout {
+orientation: Qt.Vertical
 		id: contents
 
 		required property color accentColor
@@ -100,7 +102,7 @@ ClipRect {
 			}
 		}
 
-		RowLayout {
+		SnapLayout {
 			Layout.alignment: Qt.AlignRight
 			Layout.bottomMargin: -Tokens.padding.extraSmall
 			Layout.rightMargin: -Tokens.padding.extraSmall

Modules/Resources/Cards/HeroCard.qml

@@ -1,5 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -15,8 +17,8 @@ CustomRect {
 	required property real usage
 
 	color: Colors.tPalette.m3surfaceContainer
-	implicitHeight: Math.max(tempProg.implicitHeight + detailsRow.implicitHeight + Tokens.spacing.largeIncreased, usageColumn.implicitHeight + usageLabel.implicitHeight) + Tokens.padding.large * 2
+	implicitHeight: ZUtils.snap(Math.max(tempProg.implicitHeight + detailsRow.implicitHeight + Tokens.spacing.largeIncreased, usageColumn.implicitHeight + usageLabel.implicitHeight) + Tokens.padding.large * 2, root)
-	implicitWidth: 450
+	implicitWidth: ZUtils.snapCeil(450, root)
 	radius: Tokens.rounding.largeIncreased
 
 	ClipRect {
@@ -43,7 +45,7 @@ CustomRect {
 		anchors.margins: Tokens.padding.large
 		anchors.top: parent.top
 		fgColor: root.accent
-		implicitSize: Math.max(icon.implicitWidth, icon.implicitHeight) + Tokens.padding.small * 2
+		implicitSize: ZUtils.snap(Math.max(icon.implicitWidth, icon.implicitHeight) + Tokens.padding.small * 2, root)
 		spacing: Tokens.spacing.extraSmall
 		strokeWidth: Tokens.padding.extraSmall
 		value: root.usage
@@ -62,12 +64,14 @@ CustomRect {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
 		anchors.left: tempProg.right
 		anchors.margins: Tokens.spacing.largeIncreased
 		anchors.right: usageColumn.left
 		anchors.verticalCenter: tempProg.verticalCenter
+
 		spacing: Tokens.spacing.extraSmall
+		orientation: Qt.Vertical
 
 		CustomText {
 			color: root.accent
@@ -82,15 +86,17 @@ CustomRect {
 		}
 	}
 
-	ColumnLayout {
+	SnapLayout {
 		id: detailsRow
 
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.largeIncreased
-		spacing: Tokens.spacing.extraSmall
 
-		RowLayout {
+		spacing: Tokens.spacing.extraSmall
+		orientation: Qt.Vertical
+
+		SnapLayout {
 			Layout.leftMargin: -Tokens.padding.extraSmall
 			spacing: Tokens.spacing.extraSmall
 
@@ -108,32 +114,34 @@ CustomRect {
 
 		CustomProgressBar {
 			fgColor: root.accent
-			implicitHeight: Tokens.padding.extraSmall
+			implicitHeight: Tokens.padding.small
 			indeterminate: isNaN(root.usage) || isNaN(root.temperature)
 			value: root.temperature / 100
 		}
 	}
 
-	Column {
+	SnapLayout {
 		id: usageColumn
 
 		anchors.margins: Tokens.padding.large
 		anchors.right: parent.right
-		anchors.rightMargin: 32
+		anchors.rightMargin: Tokens.padding.extraLarge
 		anchors.verticalCenter: parent.verticalCenter
+
 		spacing: 0
+		orientation: Qt.Vertical
 
 		CustomText {
 			id: usageLabel
 
-			anchors.right: parent.right
+			Layout.alignment: Qt.AlignRight
 			color: Colors.palette.m3onSurfaceVariant
 			font: Tokens.font.body.medium
 			text: qsTr("Usage")
 		}
 
 		CustomText {
-			anchors.right: parent.right
+			Layout.alignment: Qt.AlignRight
 			color: root.accent
 			font: Tokens.font.headline.builders.small.width(50).build()
 			text: isNaN(root.usage) ? "...%" : Math.round(root.usage * 100) + "%"

Modules/Resources/Cards/MemoryCard.qml

@@ -1,5 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Components
 import ZShell.Services
 import ZShell.Config
 import qs.Components
@@ -10,34 +12,39 @@ CustomRect {
 
 	readonly property color accent: Colors.palette.m3tertiary
 
+	required property real perc
+	required property int used
+	required property int total
+	required property string label
+	required property string icon
+
 	Layout.fillWidth: true
 	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
 	implicitWidth: layout.implicitWidth + Tokens.padding.extraLargeIncreased * 2
 	radius: Tokens.rounding.largeIncreased
 
-	ServiceRef {
+	SnapLayout {
-		service: Memory
-	}
-
-	ColumnLayout {
 		id: layout
 
-		anchors.centerIn: parent
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		orientation: Qt.Vertical
 		spacing: Tokens.spacing.extraSmall
 
-		RowLayout {
+		SnapLayout {
-			Layout.leftMargin: -Tokens.padding.extraSmall
+			Layout.alignment: Qt.AlignHCenter
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {
 				color: root.accent
 				fill: 1
-				text: "memory_alt"
+				text: root.icon
 			}
 
 			CustomText {
-				text: qsTr("Memory")
+				text: root.label
 			}
 		}
 
@@ -45,17 +52,17 @@ CustomRect {
 			Layout.alignment: Qt.AlignHCenter
 			Layout.topMargin: Tokens.spacing.largeIncreased
 			fgColor: root.accent
-			implicitSize: usageColumn.implicitHeight + thickness + Tokens.padding.largeIncreased * 2
+			implicitSize: ZUtils.snap(usageColumn.implicitHeight + thickness + Tokens.padding.largeIncreased * 2, root)
 			startAngle: -225
 			sweepAngle: 270
-			value: Memory.percentage
+			value: root.perc
 
 			Behavior on clampedVal {
-				Anim {
+				Anim {}
-				}
 			}
 
-			ColumnLayout {
+			SnapLayout {
+orientation: Qt.Vertical
 				id: usageColumn
 
 				anchors.centerIn: parent
@@ -66,7 +73,7 @@ CustomRect {
 					Layout.alignment: Qt.AlignHCenter
 					color: root.accent
 					font: Tokens.font.body.large
-					text: Math.round(Memory.percentage * 100) + "%"
+					text: Math.round(root.perc * 100) + "%"
 				}
 
 				CustomText {
@@ -80,7 +87,7 @@ CustomRect {
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
 			text: {
-				const fmt = UsageFmt.formatKib(Memory.used, Memory.total);
+				const fmt = UsageFmt.formatKib(root.used, root.total);
 				return `${fmt.value.toFixed(1)} / ${Math.floor(fmt.total)} ${fmt.unit}`;
 			}
 		}

Modules/Resources/Cards/NetworkCard.qml

@@ -18,15 +18,17 @@ CustomRect {
 		service: NetworkUsage
 	}
 
-	ColumnLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.bottomMargin: Tokens.padding.small
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
-		spacing: 0
 
-		RowLayout {
+		spacing: 0
+		orientation: Qt.Vertical
+
+		SnapLayout {
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {
@@ -108,8 +110,11 @@ CustomRect {
 		}
 
 		// Download row
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
+			Layout.maximumWidth: root.width > root.implicitWidth * 2 ? root.width / 2 : -1
+			Layout.alignment: Qt.AlignRight
+
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {
@@ -136,8 +141,11 @@ CustomRect {
 		}
 
 		// Upload row
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
+			Layout.maximumWidth: root.width > root.implicitWidth * 2 ? root.width / 2 : -1
+			Layout.alignment: Qt.AlignRight
+
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {
@@ -164,8 +172,11 @@ CustomRect {
 		}
 
 		// Session totals
-		RowLayout {
+		SnapLayout {
 			Layout.fillWidth: true
+			Layout.maximumWidth: root.width > root.implicitWidth * 2 ? root.width / 2 : -1
+			Layout.alignment: Qt.AlignRight
+
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {

Modules/Resources/Cards/StorageCard.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
+import ZShell
+import ZShell.Components
 import ZShell.Services
 import ZShell.Config
 import qs.Components
@@ -21,23 +23,26 @@ CustomRect {
 		service: Storage
 	}
 
-	ColumnLayout {
+	SnapLayout {
 		id: layout
 
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		spacing: 0
 
-		RowLayout {
+		spacing: 0
+		orientation: Qt.Vertical
+
+		SnapLayout {
 			id: row
 
 			Layout.alignment: Qt.AlignHCenter
+
 			spacing: Tokens.spacing.largeIncreased
 
 			CircularProgress {
 				fgColor: root.accent
-				implicitSize: usageColumn.implicitHeight + thickness + Tokens.padding.large * 2
+				implicitSize: ZUtils.snap(usageColumn.implicitHeight + thickness + Tokens.padding.large * 2, root)
 				startAngle: -225
 				sweepAngle: 270
 				value: root.percentage
@@ -46,7 +51,8 @@ CustomRect {
 					Anim {}
 				}
 
-				ColumnLayout {
+				SnapLayout {
+orientation: Qt.Vertical
 					id: usageColumn
 
 					anchors.centerIn: parent
@@ -74,8 +80,9 @@ CustomRect {
 				}
 			}
 
-			ColumnLayout {
+			SnapLayout {
 				spacing: Tokens.spacing.extraSmall
+				orientation: Qt.Vertical
 
 				CustomText {
 					text: qsTr("Storage")

Modules/Resources/Cards/VramCard.qml

@@ -1,89 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Services
-import ZShell.Config
-import qs.Components
-import qs.Services
-
-CustomRect {
-	id: root
-
-	readonly property color accent: Colors.palette.m3tertiary
-
-	Layout.fillWidth: true
-	color: Colors.tPalette.m3surfaceContainer
-	implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
-	implicitWidth: layout.implicitWidth + Tokens.padding.extraLargeIncreased
-	radius: Tokens.rounding.largeIncreased
-
-	ServiceRef {
-		service: Gpu
-	}
-
-	ColumnLayout {
-		id: layout
-
-		anchors.centerIn: parent
-		spacing: Tokens.spacing.extraSmall
-
-		RowLayout {
-			Layout.leftMargin: -Tokens.padding.extraSmall
-			spacing: Tokens.spacing.small
-
-			MaterialIcon {
-				color: root.accent
-				fill: 1
-				text: "memory_alt"
-			}
-
-			CustomText {
-				text: qsTr("Video memory")
-			}
-		}
-
-		CircularProgress {
-			id: circularIndicator
-
-			Layout.alignment: Qt.AlignHCenter
-			Layout.topMargin: Tokens.spacing.largeIncreased
-			fgColor: root.accent
-			implicitSize: usageColumn.implicitHeight + thickness + Tokens.padding.largeIncreased * 2
-			startAngle: -225
-			sweepAngle: 270
-			value: Gpu.memoryUsed / Gpu.memoryTotal
-
-			Behavior on clampedVal {
-				Anim {}
-			}
-
-			ColumnLayout {
-				id: usageColumn
-
-				anchors.centerIn: parent
-				anchors.verticalCenterOffset: Tokens.padding.extraSmall
-				spacing: 0
-
-				CustomText {
-					Layout.alignment: Qt.AlignHCenter
-					color: root.accent
-					font: Tokens.font.body.large
-					text: Math.round(circularIndicator.value * 100) + "%"
-				}
-
-				CustomText {
-					Layout.alignment: Qt.AlignHCenter
-					color: Colors.palette.m3onSurfaceVariant
-					text: qsTr("Used")
-				}
-			}
-		}
-
-		CustomText {
-			Layout.alignment: Qt.AlignHCenter
-			text: {
-				const fmt = UsageFmt.formatKib(Gpu.memoryUsed, Gpu.memoryTotal);
-				return `${fmt.value.toFixed(1)} / ${Math.floor(fmt.total)} ${fmt.unit}`;
-			}
-		}
-	}
-}

Modules/Resources/Content.qml

@@ -1,7 +1,10 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell
+import ZShell.Components
 import ZShell.Services
 import ZShell.Config
+import qs.Components
 import qs.Modules.Resources.Cards
 import qs.Helpers
 import qs.Services
@@ -11,25 +14,25 @@ Item {
 
 	required property Wrapper wrapper
 
-	implicitHeight: content.implicitHeight + Tokens.padding.small * 2
+	implicitHeight: ZUtils.snap(content.implicitHeight + Tokens.padding.small * 2, root)
-	implicitWidth: content.implicitWidth
+	implicitWidth: ZUtils.snap(content.implicitWidth, root)
 
-	RowLayout {
+	SnapLayout {
 		id: content
 
-		anchors.left: parent.left
+		anchors.fill: parent
 		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
 		spacing: Tokens.spacing.large
 
-		ColumnLayout {
+		SnapLayout {
 			id: mainColumn
 
 			Layout.fillWidth: true
 			spacing: Tokens.spacing.medium
+			orientation: Qt.Vertical
 
-			RowLayout {
+			SnapLayout {
+				id: hero
 				spacing: Tokens.spacing.medium
 				visible: cpuCard.active || gpuCard.active
 
@@ -72,7 +75,10 @@ Item {
 				}
 			}
 
-			RowLayout {
+			SnapLayout {
+				id: card
+
+				Layout.fillWidth: true
 				spacing: Tokens.spacing.medium
 				visible: storageCard.active || memoryCard.active || vramCard.active || networkCard1.active
 
@@ -81,8 +87,7 @@ Item {
 
 					active: Config.dashboard.performance.showStorage
 
-					sourceComponent: StorageCard {
+					sourceComponent: StorageCard {}
-					}
 				}
 
 				WrappedLoader {
@@ -91,6 +96,15 @@ Item {
 					active: Config.dashboard.performance.showMemory
 
 					sourceComponent: MemoryCard {
+						used: Memory.used
+						total: Memory.total
+						perc: Memory.percentage
+						label: qsTr("Memory")
+						icon: "memory_alt"
+
+						ServiceRef {
+							service: Memory
+						}
 					}
 				}
 
@@ -99,7 +113,12 @@ Item {
 
 					active: Config.dashboard.performance.showVram
 
-					sourceComponent: VramCard {
+					sourceComponent: MemoryCard {
+						used: Gpu.memoryUsed
+						total: Gpu.memoryTotal
+						perc: Gpu.memoryUsed / Gpu.memoryTotal
+						label: qsTr("Video memory")
+						icon: "memory_alt"
 					}
 				}
 
@@ -108,8 +127,7 @@ Item {
 
 					active: Config.dashboard.performance.showNetwork && !vramCard.active
 
-					sourceComponent: NetworkCard {
+					sourceComponent: NetworkCard {}
-					}
 				}
 			}
 
@@ -118,8 +136,7 @@ Item {
 
 				active: Config.dashboard.performance.showNetwork && vramCard.active
 
-				sourceComponent: NetworkCard {
+				sourceComponent: NetworkCard {}
-				}
 			}
 		}
 
@@ -127,8 +144,7 @@ Item {
 			Layout.fillWidth: false
 			active: Battery.isLaptop && Config.dashboard.performance.showBattery
 
-			sourceComponent: BatteryTank {
+			sourceComponent: BatteryTank {}
-			}
 		}
 	}
 

Modules/Settings/Common/AudioDeviceList.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import Quickshell.Services.Pipewire
 import qs.Components
@@ -39,7 +40,7 @@ ItemList {
 			onClicked: root.selected(device.modelData)
 		}
 
-		RowLayout {
+		SnapLayout {
 			id: deviceLayout
 
 			anchors.fill: parent

Modules/Settings/Common/DialogRowButton.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Blobs
 import qs.Components
 import ZShell.Config
@@ -181,7 +182,8 @@ Item {
 
 				onWheel: event => event.accepted = true
 
-				ColumnLayout {
+				SnapLayout {
+orientation: Qt.Vertical
 					anchors.bottomMargin: Tokens.padding.largeIncreased
 					anchors.fill: parent
 					anchors.margins: Tokens.padding.extraLarge
@@ -222,7 +224,7 @@ Item {
 						}
 					}
 
-					RowLayout {
+					SnapLayout {
 						Layout.alignment: Qt.AlignRight
 						spacing: Tokens.spacing.extraSmall
 

Modules/Settings/Common/InfoRow.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -29,7 +30,7 @@ ConnectedRect {
 		}
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: rowLayout
 
 		anchors.fill: parent
@@ -44,7 +45,8 @@ ConnectedRect {
 			visible: root.leadingComponent
 		}
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			Layout.fillWidth: true
 			spacing: 0
 

Modules/Settings/Common/ItemList.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -38,7 +39,8 @@ ConnectedRect {
 				type: Anim.DefaultEffects
 			}
 		}
-		sourceComponent: ColumnLayout {
+		sourceComponent: SnapLayout {
+orientation: Qt.Vertical
 			spacing: Tokens.spacing.extraSmall
 
 			MaterialIcon {

Modules/Settings/Common/ListEditor.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import ZShell.Config
 import qs.Components
@@ -265,7 +266,7 @@ ListView {
 				}
 			}
 
-			RowLayout {
+			SnapLayout {
 				id: row
 
 				anchors.fill: parent

Modules/Settings/Common/PageBase.qml

@@ -2,12 +2,13 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Modules.Settings
 import qs.Components
 import ZShell.Config
 import qs.Services
 
-ColumnLayout {
+SnapLayout {
 	id: root
 
 	property bool animateScroll: false
@@ -67,6 +68,7 @@ ColumnLayout {
 	}
 
 	spacing: Tokens.spacing.largeIncreased
+	orientation: Qt.Vertical
 
 	Component.onCompleted: applySearchAnchor()
 
@@ -118,7 +120,7 @@ ColumnLayout {
 
 		onClicked: focus = true
 
-		RowLayout {
+		SnapLayout {
 			id: header
 
 			spacing: Tokens.spacing.largeIncreased

Modules/Settings/Common/PopupRow.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import Quickshell
 import qs.Components
 import ZShell.Config
@@ -27,7 +28,7 @@ ConnectedRect {
 		onClicked: popup.open = true
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: navLayout
 
 		anchors.fill: parent
@@ -43,7 +44,8 @@ ConnectedRect {
 			fontStyle: Tokens.font.icon.medium
 		}
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			Layout.fillWidth: true
 			spacing: 0
 

Modules/Settings/Common/RowButton.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -30,7 +31,7 @@ ConnectedRect {
 		onClicked: e => root.clicked(e)
 	}
 
-	RowLayout {
+	SnapLayout {
 		id: row
 
 		anchors.left: parent.left

Modules/Settings/Common/SearchPopup.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -19,7 +20,8 @@ DialogRowButton {
 	separateContent: true
 
 	content: Component {
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			VerticalFadeListView {
 				bottomMargin: Tokens.padding.large
 				Layout.fillHeight: true

Modules/Settings/Common/SectionHeader.qml

@@ -1,7 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
-import qs.Components
+import ZShell.Components
 import ZShell.Config
+import qs.Components
 import qs.Services
 
 CustomText {
@@ -10,7 +11,7 @@ CustomText {
 	Layout.bottomMargin: Tokens.spacing.extraSmall
 	Layout.fillWidth: true
 	Layout.leftMargin: Tokens.padding.extraSmall
-	Layout.topMargin: first ? 0 : Tokens.spacing.largeIncreased - ((parent as ColumnLayout).spacing ?? 0)
+	Layout.topMargin: first ? 0 : Tokens.spacing.largeIncreased - ((parent as SnapLayout).spacing ?? 0)
 	color: Colors.palette.m3onSurfaceVariant
 	elide: Text.ElideRight
 	font: Tokens.font.label.medium

Modules/Settings/Common/SelectRow.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -22,7 +23,7 @@ ConnectedRect {
 	implicitHeight: rowLayout.implicitHeight + rowLayout.anchors.margins * 2
 	z: splitButton.expanded ? 1 : 0
 
-	RowLayout {
+	SnapLayout {
 		id: rowLayout
 
 		anchors.fill: parent
@@ -31,7 +32,8 @@ ConnectedRect {
 		anchors.rightMargin: Tokens.padding.largeIncreased
 		spacing: Tokens.spacing.small
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			Layout.fillWidth: true
 			spacing: 0
 

Modules/Settings/Common/SliderRow.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -19,7 +20,7 @@ ConnectedRect {
 	Layout.fillWidth: true
 	implicitHeight: rowLayout.implicitHeight + rowLayout.anchors.margins + rowLayout.anchors.topMargin
 
-	RowLayout {
+	SnapLayout {
 		id: rowLayout
 
 		anchors.fill: parent
@@ -27,11 +28,12 @@ ConnectedRect {
 		anchors.topMargin: Tokens.padding.large
 		spacing: Tokens.spacing.small
 
-		ColumnLayout {
+		SnapLayout {
+orientation: Qt.Vertical
 			Layout.fillWidth: true
 			spacing: Tokens.spacing.small
 
-			RowLayout {
+			SnapLayout {
 				Layout.fillWidth: true
 				spacing: Tokens.spacing.small