Merge branch 'main' into module/wifi

-a

@@ -1,3 +0,0 @@
-
-#omz revision: d2b7f557cceaddb16ba89bbf8200d8a8df35c4d8
-#omz fpath: /home/zach/.oh-my-zsh/plugins/colored-man-pages /home/zach/.oh-my-zsh/plugins/universalarchive /home/zach/.oh-my-zsh/plugins/tldr /home/zach/.oh-my-zsh/plugins/extract /home/zach/.oh-my-zsh/plugins/copypath /home/zach/.oh-my-zsh/plugins/cp /home/zach/.oh-my-zsh/plugins/conda-env /home/zach/.oh-my-zsh/plugins/command-not-found /home/zach/.oh-my-zsh/plugins/dirhistory /home/zach/.oh-my-zsh/plugins/copybuffer /home/zach/.oh-my-zsh/plugins/copyfile /home/zach/.oh-my-zsh/custom/plugins/fast-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-autosuggestions /home/zach/.oh-my-zsh/plugins/archlinux /home/zach/.oh-my-zsh/plugins/web-search /home/zach/.oh-my-zsh/plugins/sudo /home/zach/.oh-my-zsh/plugins/git /home/zach/.oh-my-zsh/functions /home/zach/.oh-my-zsh/completions /home/zach/.oh-my-zsh/custom/functions /home/zach/.oh-my-zsh/custom/completions /home/zach/tools/ripgrep/complete /home/linuxbrew/.linuxbrew/share/zsh/site-functions /home/zach/.oh-my-zsh/plugins/colored-man-pages /home/zach/.oh-my-zsh/plugins/universalarchive /home/zach/.oh-my-zsh/plugins/tldr /home/zach/.oh-my-zsh/plugins/extract /home/zach/.oh-my-zsh/plugins/copypath /home/zach/.oh-my-zsh/plugins/cp /home/zach/.oh-my-zsh/plugins/conda-env /home/zach/.oh-my-zsh/plugins/command-not-found /home/zach/.oh-my-zsh/plugins/dirhistory /home/zach/.oh-my-zsh/plugins/copybuffer /home/zach/.oh-my-zsh/plugins/copyfile /home/zach/.oh-my-zsh/custom/plugins/fast-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-autosuggestions /home/zach/.oh-my-zsh/plugins/archlinux /home/zach/.oh-my-zsh/plugins/web-search /home/zach/.oh-my-zsh/plugins/sudo /home/zach/.oh-my-zsh/plugins/git /home/zach/.oh-my-zsh/functions /home/zach/.oh-my-zsh/completions /home/zach/.oh-my-zsh/custom/functions /home/zach/.oh-my-zsh/custom/completions /home/zach/.oh-my-zsh/cache/completions /home/zach/tools/ripgrep/complete /home/linuxbrew/.linuxbrew/share/zsh/site-functions /usr/local/share/zsh/site-functions /usr/share/zsh/site-functions /usr/share/zsh/functions/Calendar /usr/share/zsh/functions/Chpwd /usr/share/zsh/functions/Completion /usr/share/zsh/functions/Completion/Base /usr/share/zsh/functions/Completion/Linux /usr/share/zsh/functions/Completion/Unix /usr/share/zsh/functions/Completion/X /usr/share/zsh/functions/Completion/Zsh /usr/share/zsh/functions/Exceptions /usr/share/zsh/functions/MIME /usr/share/zsh/functions/Math /usr/share/zsh/functions/Misc /usr/share/zsh/functions/Newuser /usr/share/zsh/functions/Prompts /usr/share/zsh/functions/TCP /usr/share/zsh/functions/VCS_Info /usr/share/zsh/functions/VCS_Info/Backends /usr/share/zsh/functions/Zftp /usr/share/zsh/functions/Zle /home/zach/.zfunc

CMakeLists.txt

@@ -50,7 +50,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(QT_NO_PRIVATE_MODULE_WARNING ON)
 set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")

Components/ButtonBase.qml

@@ -16,7 +16,7 @@ CustomRect {
 	property color activeOnColor
 	property bool checked
 	property real checkedRadius: Tokens.rounding.medium
-	property real defaultRadius: Tokens.rounding.large
+	property real defaultRadius: Math.min(width, height) / 2
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property bool fillWidth

Components/CircularIndicator.qml

@@ -34,6 +34,7 @@ BusyIndicator {
 		anchors.fill: parent
 		bgColor: root.bgColor
 		fgColor: root.fgColor
+		hasEndIndicator: false
 		padding: root.padding
 		rotation: manager.rotation
 		startAngle: manager.startFraction * 360
@@ -53,6 +54,7 @@ BusyIndicator {
 		Anim {
 			duration: manager.completeEndDuration * Tokens.anim.durations.scale
 			properties: "opacity,internalStrokeWidth"
+			type: Anim.DefaultEffects
 		}
 	}
 

Components/ClipRect.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import Quickshell
 import ZShell.Components
 
 Item {
@@ -20,7 +19,7 @@ Item {
 	}
 
 	ShaderEffectSource {
-		id: src
+		id: source
 
 		hideSource: true
 		sourceItem: contentItem
@@ -28,7 +27,7 @@ Item {
 
 	RoundedMask {
 		anchors.fill: parent
-		source: src
+		source: source
 		topLeftRadius: root.topLeftRadius
 		topRightRadius: root.topRightRadius
 		bottomRightRadius: root.bottomRightRadius

Components/CustomProgressBar.qml

@@ -99,7 +99,6 @@ ProgressBar {
 			}
 
 			Line {
-				id: dot
 				property real implicitSize
 
 				anchors.right: parent.right
@@ -125,7 +124,8 @@ ProgressBar {
 				anchors.left: parent.left
 
 				Behavior on implicitWidth {
-					Anim {}
+					Anim {
+					}
 				}
 
 				Component.onCompleted: implicitWidth = Qt.binding(() => parent.width * root.visualPosition)
@@ -222,7 +222,8 @@ 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
 import ZShell.Components
-import ZShell.Config
+import ZShell
 import qs.Components
+import ZShell.Config
 import qs.Services
 
 Slider {
@@ -28,7 +28,7 @@ Slider {
 
 	signal interaction(v: real)
 
-	implicitHeight: ZUtils.snap(12, root)
+	implicitHeight: 12
 	implicitWidth: 200
 
 	contentItem: Item {
@@ -123,7 +123,7 @@ Slider {
 				bottomRightRadius: Tokens.rounding.extraSmall / 2
 				color: root.fgColor
 				implicitHeight: root.height
-				implicitWidth: ZUtils.snap(root.filledWidth, root)
+				implicitWidth: root.filledWidth
 				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: ZUtils.snap(root.filledWidth, root)
-				lineWidth: ZUtils.snap(root.height * 0.7, root)
+				implicitWidth: root.filledWidth
+				lineWidth: root.height * 0.7
 				startX: x
 
 				Behavior on color {

Components/CustomTextField.qml

@@ -150,6 +150,7 @@ TextFieldBase {
 
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
+				font.pointSize: Tokens.font.size.larger
 				text: root.leadingIcon
 				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}

Components/IconButton.qml

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

Components/IconTextButton.qml

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

Components/LineGraph.qml

@@ -1,8 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtCanvas2D
-import ZShell
 
 Item {
 	id: root
@@ -38,62 +36,54 @@ Item {
 	property real fillAlpha: 0.15
 	property real lineWidth: 2
 	property real markerDotRadius: 4
-	property real labelFontSize: 8
+	property real labelFontSize: 10
 
-	Canvas2D {
+	Canvas {
 		id: canvas
 
 		anchors.fill: parent
-
-		alphaBlending: true
-		fillColor: "transparent"
+		renderStrategy: Canvas.Immediate
 
 		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);
 
-			const dpr = ZUtils.dprFor(canvas);
-			for (let i = 0; i < pts.length - 1; i++) {
-				const p1 = pts[i];
-				const p2 = pts[i + 1];
-				const [c1x, c1y, c2x, c2y] = segmentControls(pts, i);
+			if (root.curveSmoothing && pts.length > 2) {
+				const k = 1 / 6;
+				const n = pts.length;
 
-				const firstCol = Math.ceil(p1.x * dpr) + 1;
-				const lastCol = Math.floor(p2.x * dpr) - 1;
-				for (let col = firstCol; col <= lastCol; ++col) {
-					const x = col / dpr;
-					ctx.lineTo(x, bezierY(p1, c1x, c1y, c2x, c2y, p2, x));
+				for (let i = 0; i < n - 1; i++) {
+					const p0 = pts[Math.max(i - 1, 0)];
+					const p1 = pts[i];
+					const p2 = pts[i + 1];
+					const p3 = pts[Math.min(i + 2, n - 1)];
+
+					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);
 			}
 		}
 
-		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;
-		}
-
+		// Control points for segment i (pts[i] -> pts[i+1]), matching strokeCurve
 		function segmentControls(pts, i) {
 			const p0 = pts[Math.max(i - 1, 0)];
 			const p1 = pts[i];
@@ -119,6 +109,7 @@ 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++) {
@@ -147,16 +138,10 @@ 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
-			};
-		}
-
-		function cutPoint(pts, targetX) {
-			return pointAtX(pts, targetX);
+			return { x: targetX, y };
 		}
 
+		// Part of the curve left/right of a cut x, including the cut point
 		function cutLeft(pts, targetX) {
 			if (targetX <= pts[0].x)
 				return [];
@@ -173,7 +158,7 @@ Item {
 
 			const left = pts.slice(0, j + 1);
 			if (targetX > pts[j].x)
-				left.push(cutPoint(pts, targetX));
+				left.push(pointAtX(pts, targetX));
 			return left;
 		}
 
@@ -199,20 +184,17 @@ 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 * 5;
-			const padRight = 0;
-			const padTop = 0;
-			const padBottom = root.labelFontSize + 14;
+			const padLeft = root.labelFontSize * 3.4;
+			const padRight = 2;
+			const padTop = 2;
+			const padBottom = root.labelFontSize + 8;
 			const plot = {
 				x: padLeft,
 				y: padTop,
@@ -222,6 +204,8 @@ 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);
@@ -295,17 +279,11 @@ 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;
 
-			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;
-
+			// 1. Grid lines
 			ctx.strokeStyle = Qt.alpha(root.gridColor, root.gridAlpha);
-			ctx.lineWidth = gridW;
+			ctx.lineWidth = 1;
 
 			if (root.verticalLineStep > 0) {
 				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
@@ -314,7 +292,7 @@ Item {
 					if (i === root.xSteps && !root.lastXLine)
 						continue;
 
-					const x = snapLine(xAt(i), 1);
+					const x = crisp(xAt(i));
 					ctx.beginPath();
 					ctx.moveTo(x, plot.y);
 					ctx.lineTo(x, H);
@@ -322,11 +300,12 @@ 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 = snapLine(yAt(v), 1);
+					const y = crisp(yAt(v));
 					ctx.beginPath();
 					ctx.moveTo(0, y);
 					ctx.lineTo(plot.x + plot.w, y);
@@ -334,8 +313,9 @@ Item {
 				}
 			}
 
+			// 2. Labels
 			ctx.fillStyle = Qt.alpha(root.labelColor, root.labelAlpha);
-			ctx.font = root.labelFontSize + "pt 'sans-serif'";
+			ctx.font = root.labelFontSize + "px sans-serif";
 
 			ctx.textAlign = "left";
 			ctx.textBaseline = "top";
@@ -348,7 +328,7 @@ Item {
 
 					const text = root.xLabel(i);
 					if (text)
-						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 8);
+						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 4);
 				}
 			}
 
@@ -361,6 +341,7 @@ Item {
 				}
 			}
 
+			// 3. Curve, split into segments at null gaps
 			const segments = [];
 			let current = null;
 			for (let i = 0; i < series.length; i++) {
@@ -371,7 +352,7 @@ Item {
 					continue;
 				}
 				const pt = {
-					x: snapV(xAt(i)),
+					x: xAt(i),
 					y: yAt(series[i])
 				};
 				if (!current)
@@ -388,6 +369,8 @@ 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)
@@ -399,6 +382,7 @@ 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);
@@ -406,6 +390,7 @@ 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) {
@@ -413,32 +398,24 @@ Item {
 						continue;
 
 					ctx.strokeStyle = root.lineColor;
-					ctx.lineWidth = ZUtils.snap(root.lineWidth, root);
+					ctx.lineWidth = root.lineWidth;
 					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 = gridW;
-				const lineX = snapLine(x, 1);
-				let dashY = plot.y;
-				let dashOn = true;
-
-				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;
-				}
+				ctx.lineWidth = 1;
+				ctx.beginPath();
+				ctx.moveTo(crisp(x), plot.y);
+				ctx.lineTo(crisp(x), H);
+				ctx.stroke();
+				ctx.setLineDash([]);
 
 				const i0 = Math.floor(root.markerX);
 				const v0 = series[i0];
@@ -453,7 +430,7 @@ Item {
 				if (y != null) {
 					ctx.fillStyle = root.markerColor;
 					ctx.beginPath();
-					ctx.circle(snapV(x), y, root.markerDotRadius);
+					ctx.arc(x, y, root.markerDotRadius, 0, Math.PI * 2);
 					ctx.fill();
 				}
 			}

Components/Menu.qml

@@ -4,7 +4,6 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import ZShell.Config
-import ZShell.Components
 import qs.Drawers
 import qs.Services
 
@@ -35,7 +34,7 @@ MouseArea {
 	cursorShape: expanded ? Qt.ArrowCursor : undefined
 	enabled: expanded
 	hoverEnabled: expanded
-	layer.enabled: false
+	layer.enabled: opacity < 1
 	opacity: expanded ? 1 : 0
 	parent: {
 		const win = QsWindow.window;
@@ -102,7 +101,8 @@ MouseArea {
 			yScale: root.expanded ? 1 : 0.1
 
 			Behavior on yScale {
-				Anim {}
+				Anim {
+				}
 			}
 		}
 
@@ -111,14 +111,12 @@ MouseArea {
 			color: Colors.palette.m3surfaceContainerLow
 			radius: parent.radius
 
-			SnapLayout {
+			ColumnLayout {
 				id: column
 
 				anchors.fill: parent
 				anchors.margins: Tokens.padding.extraSmall
-
 				spacing: Tokens.spacing.extraSmall
-				orientation: Qt.Vertical
 
 				Repeater {
 					id: repeater
@@ -139,7 +137,8 @@ MouseArea {
 						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
-							Anim {}
+							Anim {
+							}
 						}
 
 						StateLayer {
@@ -154,12 +153,11 @@ MouseArea {
 							}
 						}
 
-						SnapLayout {
+						RowLayout {
 							id: menuOptionRow
 
 							anchors.fill: parent
 							anchors.margins: Tokens.padding.medium
-
 							spacing: Tokens.spacing.small
 
 							MaterialIcon {

Components/SplitButton.qml

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

Components/Toast/ToastItem.qml

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

Drawers/Exclusions.qml

@@ -43,6 +43,13 @@ Scope {
 		hasBar: root.geometry.barOnBottom
 	}
 
+	Timer {
+		interval: 5000
+		running: true
+
+		onTriggered: console.log("top height:", top.exclusiveZone, "left width:", left.exclusiveZone, "right width:", right.exclusiveZone, "bottom height:", bottom.exclusiveZone)
+	}
+
 	component ExclusionZone: CustomWindow {
 		property bool hasBar
 

Drawers/Panels.qml

@@ -1,7 +1,5 @@
 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
@@ -16,6 +14,7 @@ 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
@@ -75,10 +74,7 @@ Item {
 
 		anchors.right: parent.right
 		anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
-
-		y: ZUtils.snap((parent.height - implicitHeight) / 2, root)
-
-		// anchors.verticalCenter: parent.verticalCenter
+		anchors.verticalCenter: parent.verticalCenter
 		clip: sidebar.visible
 		implicitHeight: osd.implicitHeight
 		implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
@@ -86,7 +82,8 @@ Item {
 		Osd.Wrapper {
 			id: osd
 
-			anchors.fill: parent
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
 			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
@@ -132,9 +129,8 @@ 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

Drawers/Windows.qml

@@ -11,6 +11,7 @@ import ZShell.Blobs
 import qs.Daemons
 import qs.Components
 import qs.Modules.Bar
+import qs.Modules.Bar.Popouts.Network as N
 import ZShell.Config
 import qs.Helpers
 import qs.Drawers

Greeter/Center.qml

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

Greeter/Content.qml

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

Greeter/InputField.qml

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

Greeter/UserDock.qml

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

Helpers/Icons.qml

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

Helpers/Network/Network.qml

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

Helpers/Network/NetworkDivider.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import ZShell.Config
+import qs.Services
+import qs.Modules.Settings.Common
+import qs.Modules.Bar.Popouts.Network
+import qs.Components
+import qs.Helpers
+
+CustomText {
+	required property var modelData
+
+	bottomPadding: Tokens.spacing.extraSmall
+	color: Colors.palette.m3onSurfaceVariant
+	font.pointSize: Tokens.font.size.smaller
+	text: {
+		if (modelData.type === "known") {
+			const count = Network.knownNetworks.filter(n => !n.connected).length;
+
+			return qsTr("%1 known network%2").arg(count).arg(count === 1 ? "" : "s");
+		}
+
+		if (modelData.type === "unknown") {
+			const count = Network.unknownNetworks.filter(n => !n.connected).length;
+
+			return qsTr("%1 network%2 available").arg(count).arg(count === 1 ? "" : "s");
+		}
+
+		return qsTr("object unknown");
+	}
+	topPadding: Tokens.spacing.small
+}

Helpers/Network/NetworkItem.qml

@@ -0,0 +1,118 @@
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Modules.Settings.Common
+import qs.Modules.Bar.Popouts.Network
+import qs.Components
+import qs.Helpers
+import qs.Helpers.Network
+import qs.Services
+
+ConnectedRect {
+	id: networkItem
+
+	readonly property int connectedCount: Network.connectedNetworks.length
+	readonly property bool connecting: Network.connectingNetwork === modelData
+	property int horizontalPadding: Tokens.padding.largeIncreased
+	readonly property bool inConnectedGroup: index < connectedCount
+	// sectioning first / last item in list reminder
+	// if index === network.connectedNetworks.length - 1
+	// if index === network.connectedNetworks.length - 1 + network.knownNetworks.length - 2
+	// if index === network.connectedNetworks.length - 1 + network.knownNetworks.length
+	// list.model.values.length - 1
+	required property int index
+	readonly property bool isSecure: Network.isSecure(modelData.security)
+	required property ListView list
+	required property var modelData
+	property int verticalPadding: Tokens.padding.smaller
+
+	Layout.fillWidth: true
+	first: !inConnectedGroup && index === connectedCount + 1
+	implicitHeight: rowLayout.implicitHeight + verticalPadding * 2
+	last: inConnectedGroup ? index === connectedCount - 1 : index === (list?.count ?? -1)
+	radius: Tokens.rounding.small
+
+	RowLayout {
+		id: rowLayout
+
+		Layout.preferredHeight: visible ? rowLayout.implicitHeight + Tokens.padding.smaller * 2 : 0
+		anchors.fill: parent
+		anchors.leftMargin: networkItem.horizontalPadding
+		anchors.rightMargin: networkItem.horizontalPadding
+
+		Column {
+			id: column
+
+			Layout.fillWidth: true
+
+			CustomText {
+				Layout.fillWidth: true
+				Layout.leftMargin: Tokens.spacing.extraSmall
+				Layout.rightMargin: Tokens.spacing.extraSmall
+				color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurface
+				elide: Text.ElideRight
+				text: networkItem.modelData.name ? networkItem.modelData.name : qsTr("Unknown Network")
+			}
+
+			CustomText {
+				id: subtext
+
+				anchors.left: parent.left
+				anchors.right: parent.right
+				color: Colors.palette.m3outline
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.small
+				text: networkItem.modelData.connected ? qsTr("Connected: %1 strength").arg(Math.round(networkItem.modelData.signalStrength * 100) + "%") : qsTr("%1 strength").arg(Math.round(networkItem.modelData.signalStrength * 100) + "%")
+			}
+		}
+
+		Item {
+			Layout.alignment: Qt.AlignRight
+			implicitHeight: icon.height
+			implicitWidth: icon.width
+
+			MaterialIcon {
+				id: icon
+
+				color: networkItem.modelData.active ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+				font.pointSize: Tokens.font.size.large
+				opacity: networkItem.connecting ? 0 : 1
+				text: Icons.getNetworkIcon(networkItem.modelData.signalStrength * 100, networkItem.isSecure)
+
+				Behavior on opacity {
+					Anim {
+					}
+				}
+			}
+
+			Loader {
+				active: opacity > 0
+				anchors.fill: parent
+				opacity: networkItem.connecting ? 1 : 0
+
+				Behavior on opacity {
+					Anim {
+					}
+				}
+				sourceComponent: CircularIndicator {
+					bgColor: "transparent"
+					running: true
+				}
+			}
+		}
+	}
+
+	StateLayer {
+		color: networkItem.modelData.active ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+
+		onClicked: {
+			if (networkItem.isSecure && !networkItem.known) {
+				PopupManager.requestOpen(Qt.resolvedUrl("../../Modules/Bar/Popouts/Network/PSKOverlay.qml"), {
+					network: networkItem.modelData
+				});
+			} else {
+				Network.requestConnect(networkItem.modelData);
+			}
+		}
+	}
+}

Helpers/Network/Toggle.qml

@@ -0,0 +1,74 @@
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Services
+import qs.Components
+import qs.Modules.Settings.Common
+
+CustomSwitch {
+	id: toggleItem
+
+	readonly property alias bg: bg
+	property alias first: bg.first
+	property alias last: bg.last
+	property string subtext
+
+	Layout.fillWidth: true
+	cLayer: 2
+	horizontalPadding: Tokens.padding.largeIncreased
+	implicitHeight: Math.max(implicitContentHeight, implicitIndicatorHeight) + verticalPadding * 2
+	implicitWidth: implicitContentWidth + implicitIndicatorWidth + horizontalPadding * 2
+	indicator.anchors.right: right
+	indicator.anchors.rightMargin: toggleItem.horizontalPadding
+	indicator.anchors.verticalCenter: verticalCenter
+	verticalPadding: Tokens.padding.normal
+
+	background: ConnectedRect {
+		id: bg
+
+		StateLayer {
+			id: stateLayer
+
+			manualPressOverride: toggleItem.pressed
+		}
+	}
+	contentItem: Item {
+		anchors.left: parent.left
+		anchors.leftMargin: toggleItem.horizontalPadding
+		anchors.right: toggleItem.indicator.left
+		anchors.rightMargin: Tokens.spacing.normal
+		implicitHeight: column.implicitHeight
+		implicitWidth: column.implicitWidth
+
+		ColumnLayout {
+			id: column
+
+			anchors.left: parent.left
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
+			spacing: 0
+
+			CustomText {
+				id: label
+
+				Layout.fillWidth: true
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.smaller
+				text: toggleItem.text
+			}
+
+			CustomText {
+				id: subtext
+
+				Layout.fillWidth: true
+				color: Colors.palette.m3outline
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.small
+				text: toggleItem.subtext
+				visible: toggleItem.subtext
+			}
+		}
+	}
+
+	onPressed: stateLayer.press(stateLayer.mouseX, stateLayer.mouseY)
+}

Helpers/Picker/AnnotationToolbar.qml

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

Helpers/Wallpapers.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Io
 import QtQuick
 import ZShell.Models
-import ZShell.Wallpaper
+import ZShell.Internal
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -16,48 +16,24 @@ Searcher {
 	id: root
 
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
+	property alias crops: adapter.monitorCrops
 	readonly property string current: showPreview ? previewPath : actualCurrent
-	readonly property string currentThumbnail: thumbnailFor(current)
-	readonly property bool currentIsVideo: isVideoPath(current)
+	property alias monitorCrops: monitorCrops
 	property bool pendingPreviewClear
 	property bool previewColorLock
 	property string previewPath
 	property bool recentlyChanged
 	property bool showPreview: false
-	property int cropVersion: 0
 
-	function getCategoryFor(w: WallpaperEntry): string {
+	function getCategoryFor(w: FileSystemEntry): string {
 		let category = w.parentDir.slice(Paths.wallsdir.length + 1);
 		if (category.includes("/"))
 			category = category.slice(0, category.indexOf("/"));
 		return category;
 	}
 
-	readonly property var videoExts: ["mp4", "mkv", "webm", "avi", "mov", "wmv", "flv", "m4v", "mpg", "mpeg", "3gp", "ogv", "ts", "vob"]
-
-	function isVideoPath(path: string): bool {
-		if (!path)
-			return false;
-		const dot = path.lastIndexOf(".");
-		if (dot < 0)
-			return false;
-		return videoExts.includes(path.slice(dot + 1).toLowerCase());
-	}
-
-	function thumbnailFor(path: string): string {
-		if (!path)
-			return "";
-
-		for (const entry of root.list) {
-			if (entry.path === path)
-				return entry.thumbnailPath || path;
-		}
-
-		return path;
-	}
-
 	function getCrop(screen: string): var {
-		return wallpapers.crop(root.current, screen);
+		return root.crops[screen];
 	}
 
 	function preview(path: string): void {
@@ -74,18 +50,19 @@ Searcher {
 		else if (zoom > 5.0)
 			zoom = 5.0;
 
-		wallpapers.setCrop(root.current, screen, {
+		root.crops[screen] = {
 			x: rect.x,
 			y: rect.y,
 			width: rect.width,
 			height: rect.height,
 			zoom: zoom
-		});
+		};
 	}
 
 	function setWallpaper(path: string): void {
 		actualCurrent = path;
 		WallpaperPath.currentWallpaperPath = path;
+		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 1, 1), 1.0));
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
 		if (Config.colors.schemeGen)
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.colors.mode}`]);
@@ -119,13 +96,38 @@ Searcher {
 		target: "wallpaper"
 	}
 
-	WallpaperDb {
+	FileView {
+		id: monitorCrops
+
+		path: `${Paths.state}/wallpaper-crops.json`
+		watchChanges: true
+
+		onAdapterUpdated: cropWriteDelay.restart()
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property var monitorCrops: ({})
+		}
+	}
+
+	Timer {
+		id: cropWriteDelay
+
+		interval: 100
+		repeat: false
+		running: false
+
+		onTriggered: monitorCrops.writeAdapter()
+	}
+
+	FileSystemModel {
 		id: wallpapers
 
-		dbPath: `${Paths.state}/wallpapers.sqlite`
-		cacheSize: wallpaper.largestBufferSize
-		requireHardwareCodec: true
+		filter: FileSystemModel.Images
 		path: Config.general.wallpaperPath
+		recursive: true
 	}
 
 	Process {
@@ -144,100 +146,36 @@ Searcher {
 	WallpaperService {
 		id: wallpaper
 
-		dbPath: wallpapers.dbPath
 		path: root.current
 	}
 
-	Connections {
-		target: wallpapers
-
-		function onCacheStored(path: string): void {
-			if (path === root.current)
-				wallpaper.invalidateCache();
-		}
-
-		function onCropsChanged(path: string): void {
-			if (path === root.current)
-				root.cropVersion++;
-		}
-	}
-
 	Variants {
-		id: screenVariants
 		model: Quickshell.screens
 
 		WallpaperObject {
-			id: obj
+			readonly property var crops: root.getCrop(modelData.name)
 			required property var modelData
 
-			// Crop animation only for edits, never for wallpaper swaps.
-			property bool animateCrop: false
-
+			cropHeight: crops?.height ?? 1.0
+			cropWidth: crops?.width ?? 1.0
+			cropX: crops?.x ?? 0.0
+			cropY: crops?.y ?? 0.0
 			screen: modelData.name
 			service: wallpaper
-
-			// Apply the wallpaper's own crop. Driven off the service's pathChanged
-			// (which fires after applyPath has snapshotted the outgoing frame with
-			// the outgoing crop) and off crop edits, never as a reactive binding on
-			// the wallpaper path — so a swap applies the incoming crop atomically
-			// after the base is captured.
-			function seedCrop(): void {
-				// Load the current wallpaper's crop without pushing: the service
-				// already read it from the database. This only seeds the values so
-				// a later edit animates from the right starting point.
-				obj.syncCrop(root.getCrop(modelData.name));
-			}
-
-			// Apply an edited crop: assign via the setters so the Behaviors animate
-			// the numbers and push each intermediate value to the service.
-			function editCrop(): void {
-				const c = root.getCrop(modelData.name);
-				obj.cropX = c?.x ?? 0.0;
-				obj.cropY = c?.y ?? 0.0;
-				obj.cropWidth = c?.width ?? 1.0;
-				obj.cropHeight = c?.height ?? 1.0;
-				obj.zoom = c?.zoom ?? 1.0;
-			}
-
-			Component.onCompleted: seedCrop()
-			onScreenChanged: seedCrop()
+			zoom: crops?.zoom ?? 1.0
 
 			Behavior on cropHeight {
-				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropWidth {
-				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropX {
-				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropY {
-				enabled: obj.animateCrop
 				Anim {}
 			}
 		}
 	}
-
-	Connections {
-		target: wallpaper
-		function onPathChanged(): void {
-			for (const obj of screenVariants.instances) {
-				obj.animateCrop = false;
-				obj.seedCrop();
-			}
-		}
-	}
-
-	Connections {
-		target: root
-		function onCropVersionChanged(): void {
-			for (const obj of screenVariants.instances) {
-				obj.animateCrop = true;
-				obj.editCrop();
-			}
-		}
-	}
 }

Modules/Bar/Bar.qml

@@ -4,12 +4,11 @@ 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
 
-SnapLayout {
+GridLayout {
 	id: root
 
 	required property bool fullscreen
@@ -75,47 +74,9 @@ SnapLayout {
 		return ch?.entryId ?? "";
 	}
 
-	readonly property var sectionRects: {
-		const count = repeater.count; // dependency: re-run when items are added/removed
-		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
+	columnSpacing: Tokens.spacing.small
+	columns: horizontal ? -1 : 1
+	rowSpacing: Tokens.spacing.small
 
 	Repeater {
 		id: repeater
@@ -245,14 +206,6 @@ SnapLayout {
 				}
 			}
 
-			DelegateChoice {
-				roleValue: "network"
-
-				delegate: EntryWrapper {
-					NetworkWidget {}
-				}
-			}
-
 			DelegateChoice {
 				roleValue: "media"
 
@@ -267,26 +220,16 @@ SnapLayout {
 	}
 
 	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
-		required property var modelData
-
 		default property Item item
+		required property var modelData
 
 		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.spacing + Tokens.spacing.extraSmall : 0
+		Layout.leftMargin: root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && root.horizontal) ? -root.rowSpacing + Tokens.spacing.extraSmall : 0
 		Layout.rightMargin: root.horizontal && index === repeater.count - 1 ? root.vPadding : 0
-		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.spacing + Tokens.spacing.extraSmall : 0
+		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.columnSpacing + Tokens.spacing.extraSmall : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0
 		implicitWidth: item?.implicitWidth ?? 0

Modules/Bar/BarLoader.qml

@@ -9,7 +9,6 @@ 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,7 +4,6 @@ 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
@@ -44,11 +43,9 @@ WidgetBase {
 			timeTokens: timeTokens
 		};
 	}
-	required property SnapLayout loader
+	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property int roundedWidth: Math.round(timeText.implicitWidth)
-	readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
-	readonly property real size: horizontal ? evenWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
+	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
 	required property ScreenState screenState
 
 	implicitHeight: horizontal ? baseSize : size
@@ -70,8 +67,7 @@ WidgetBase {
 		}
 	}
 
-	SnapLayout {
-orientation: Qt.Vertical
+	ColumnLayout {
 		id: verticalColumn
 
 		anchors.centerIn: parent

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -24,7 +24,7 @@ Row {
 		color: Battery.getColors(root.percentage, root.devState).bg
 		height: root.batHeight
 		radius: root.radius
-		width: root.batWidth - 1
+		width: root.batWidth
 
 		CustomText {
 			color: Battery.getColors(root.percentage, root.devState).fg

Modules/Bar/Components/MediaWidget.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Modules.Bar.Components.Common
@@ -14,7 +13,7 @@ WidgetBase {
 	readonly property int textWidth: Math.min(metrics.width, 200)
 
 	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.small * 2
-	implicitWidth: horizontal ? (layout.implicitWidth % 2 === 0 ? layout.implicitWidth : layout.implicitWidth + 1) + Tokens.padding.small * 2 : baseSize
+	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {

Modules/Bar/Components/NetworkWidget.qml

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

Modules/Bar/Components/Resource.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import Quickshell
 import qs.Components
 import ZShell.Config
@@ -13,6 +12,7 @@ GridLayout {
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
+	readonly property real dpr: (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1
 	required property bool horizontal
 	property string icon
 	required property color iconColor
@@ -23,12 +23,17 @@ GridLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
+	function snap(v) {
+		return Math.round(v * dpr) / dpr;
+	}
+
 	columnSpacing: Tokens.spacing.medium
 	columns: horizontal ? -1 : 1
 	percentage: 0
 
 	Behavior on animatedPercentage {
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: animatedPercentage = percentage
@@ -54,7 +59,7 @@ GridLayout {
 		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.extraSmall : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-		radius: Tokens.rounding.full
+		radius: Math.min(width, height) / 2
 
 		Item {
 			id: clipper
@@ -64,20 +69,18 @@ GridLayout {
 			anchors.left: root.horizontal ? undefined : parent.left
 			anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
 			clip: true
-			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
-			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
+			height: root.horizontal ? root.snap(root.percentage * track.height) : track.height * 2
+			width: root.horizontal ? track.width * 2 : root.snap(root.percentage * track.width)
 
 			CustomRect {
 				anchors.bottom: root.horizontal ? parent.bottom : undefined
 				anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
 				anchors.left: root.horizontal ? undefined : parent.left
 				anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
-
 				color: root.mainColor
+				height: track.height
 				radius: track.radius
-
-				implicitHeight: track.height
-				implicitWidth: track.width
+				width: track.width
 			}
 		}
 	}

Modules/Bar/Components/Resources.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import ZShell.Services
 import qs.Services
@@ -34,7 +33,6 @@ WidgetBase {
 		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
 		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
 		columnSpacing: Tokens.spacing.small
-		rowSpacing: 0
 		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {
@@ -53,7 +51,6 @@ WidgetBase {
 			Layout.alignment: Qt.AlignVCenter
 			Layout.fillHeight: root.horizontal
 			Layout.fillWidth: !root.horizontal
-
 			horizontal: root.horizontal
 			icon: "memory"
 			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface

Modules/Bar/Components/StatusIcons.qml

@@ -4,7 +4,6 @@ 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
@@ -32,7 +31,7 @@ WidgetBase {
 		return -1;
 	}
 	readonly property real size: horizontal ? grid.implicitWidth + grid.anchors.leftMargin + grid.anchors.rightMargin : grid.implicitHeight + grid.anchors.bottomMargin + grid.anchors.topMargin
-	readonly property int spacing: Tokens.spacing.extraSmall
+	readonly property int spacing: Tokens.spacing.medium / 2
 
 	// Entries that can shrink to nothing, spacing included
 	function collapsed(entry: var): bool {
@@ -52,15 +51,17 @@ WidgetBase {
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 
-	SnapLayout {
+	GridLayout {
 		id: grid
 
 		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.medium
@@ -68,8 +69,7 @@ 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
-		orientation: root.horizontal ? Qt.Horizontal : Qt.Vertical
-		spacing: root.horizontal ? Tokens.spacing.extraSmall : -2
+		columns: root.horizontal ? -1 : 1
 
 		Repeater {
 			model: ScriptModel {
@@ -105,13 +105,36 @@ WidgetBase {
 					}
 				}
 
+				DelegateChoice {
+					roleValue: "bluetooth"
+
+					delegate: EntryWrapper {
+						name: "bluetooth"
+
+						BluetoothWidget {
+						}
+					}
+				}
+
+				DelegateChoice {
+					roleValue: "network"
+
+					delegate: EntryWrapper {
+						name: "network"
+
+						NetworkWidget {
+						}
+					}
+				}
+
 				DelegateChoice {
 					roleValue: "power"
 
 					delegate: EntryWrapper {
 						name: "upower"
 
-						UPowerWidget {}
+						UPowerWidget {
+						}
 					}
 				}
 			}
@@ -134,8 +157,8 @@ WidgetBase {
 		Layout.rightMargin: root.horizontal ? Math.round(rightGap) : 0
 		Layout.topMargin: root.horizontal ? 0 : Math.round(leftGap)
 		children: item
-		implicitHeight: item?.height ?? item?.implicitHeight ?? 0
-		implicitWidth: item?.width ?? item?.implicitWidth ?? 0
+		implicitHeight: item?.implicitHeight ?? 0
+		implicitWidth: item?.implicitWidth ?? 0
 
 		Behavior on leftGap {
 			Anim {

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -1,13 +1,12 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import qs.Daemons
 import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: speaker
 
 	required property bool horizontal
 
@@ -16,8 +15,6 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.muted ? "volume_off" : "volume_up"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/StatusIcons/BluetoothWidget.qml

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

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -1,13 +1,12 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import qs.Daemons
 import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: mic
 
 	required property bool horizontal
 
@@ -16,8 +15,6 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.sourceMuted ? "mic_off" : "mic"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/StatusIcons/NetworkWidget.qml

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

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -1,7 +1,6 @@
 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,11 +2,10 @@ 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 {
@@ -16,7 +15,7 @@ Item {
 	readonly property real dpr: Hypr.monitorFor(loader?.screen).scale
 	required property int ind
 	required property SystemTrayItem item
-	required property SnapLayout loader
+	required property GridLayout loader
 	required property Wrapper popouts
 
 	function resolveIcon(app: string, icon: string): string {
@@ -80,7 +79,6 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
-		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Bar/Components/TrayIcons.qml

@@ -4,7 +4,6 @@ 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
@@ -16,7 +15,7 @@ WidgetBase {
 
 	readonly property alias items: repeater
 	readonly property alias layout: sysGrid
-	required property SnapLayout loader
+	required property GridLayout loader
 	readonly property int padding: Tokens.padding.extraSmall
 	required property Wrapper popouts
 	readonly property real size: horizontal ? sysGrid.implicitWidth + sysGrid.anchors.leftMargin + sysGrid.anchors.rightMargin : sysGrid.implicitHeight + sysGrid.anchors.topMargin + sysGrid.anchors.bottomMargin
@@ -29,7 +28,7 @@ WidgetBase {
 	radius: Tokens.rounding.full
 	topRightRadius: horizontal ? Tokens.rounding.small / 2 : Tokens.rounding.full
 
-	SnapLayout {
+	GridLayout {
 		id: sysGrid
 
 		anchors.bottomMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
@@ -37,8 +36,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
-		orientation: root.horizontal ? Qt.Horizontal : Qt.Vertical
-		spacing: root.horizontal ? Tokens.spacing.extraSmall : -2
+		columns: root.horizontal ? -1 : 1
+		rowSpacing: -2
 
 		Repeater {
 			id: repeater

Modules/Bar/Components/UpdatesWidget.qml

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

Modules/Bar/Components/Workspaces.qml

@@ -12,14 +12,13 @@ import qs.Services
 Item {
 	id: root
 
-	property real activeWorkspaceMargin: Tokens.padding.extraSmall / 2
-	readonly property int spacing: Tokens.spacing.extraSmall / 2
+	property real activeWorkspaceMargin: Math.ceil(Tokens.padding.medium / 4)
 	readonly property int effectiveActiveWorkspaceId: monitor?.activeWorkspace?.id ?? 1
 	required property bool horizontal
 	readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)
 	required property ShellScreen screen
 	readonly property real shortSize: Math.max(Config.bar.height, Tokens.sizes.bar.innerSize)
-	readonly property real size: (workspaceButtonWidth * workspacesShown) + (spacing * Math.max(0, workspacesShown - 1)) + activeWorkspaceMargin * 2
+	readonly property real size: (workspaceButtonWidth * workspacesShown) + activeWorkspaceMargin * 2
 	property int workspaceButtonWidth: (horizontal ? bgRect.implicitHeight : bgRect.implicitWidth) - root.activeWorkspaceMargin * 2
 	property int workspaceIndexInGroup: (effectiveActiveWorkspaceId - 1) % root.workspacesShown
 	readonly property list<var> workspaces: Hyprland.workspaces.values.filter(w => w.monitor === root.monitor)
@@ -60,17 +59,15 @@ Item {
 
 			anchors.fill: parent
 			anchors.margins: root.activeWorkspaceMargin
-			columnSpacing: root.spacing
+			columnSpacing: 0
 			columns: root.horizontal ? root.workspacesShown : 1
-			rowSpacing: root.spacing
+			rowSpacing: 0
 			rows: root.horizontal ? 1 : root.workspacesShown
-			layer.enabled: true
-			layer.mipmap: true
 
 			Repeater {
 				model: root.workspaces
 
-				CustomRect {
+				Button {
 					id: button
 
 					required property int index
@@ -78,19 +75,27 @@ Item {
 
 					implicitHeight: indicator.indicatorThickness
 					implicitWidth: indicator.indicatorThickness
-					radius: Tokens.rounding.full
+					width: root.workspaceButtonWidth
 
-					CustomText {
-						anchors.centerIn: parent
-						color: Colors.palette.m3onSecondaryContainer
-						text: button.modelData?.name ?? ""
+					background: Item {
+						id: workspaceButtonBackground
+
+						implicitHeight: root.workspaceButtonWidth
+						implicitWidth: root.workspaceButtonWidth
+
+						CustomText {
+							anchors.centerIn: parent
+							color: Colors.palette.m3onSecondaryContainer
+							elide: Text.ElideRight
+							horizontalAlignment: Text.AlignHCenter
+							text: button.modelData?.name ?? ""
+							verticalAlignment: Text.AlignVCenter
+						}
 					}
 
-					StateLayer {
-						onPressed: {
-							const ws = button.modelData.name;
-							Hyprland.dispatch(Hyprland.usingLua ? `hl.dsp.focus({ workspace= "${ws}"})` : `workspace ${ws}`);
-						}
+					onPressed: {
+						const ws = button.modelData.name;
+						Hyprland.dispatch(Hyprland.usingLua ? `hl.dsp.focus({ workspace= "${ws}"})` : `workspace ${ws}`);
 					}
 				}
 			}
@@ -99,10 +104,8 @@ Item {
 		CustomRect {
 			id: indicator
 
-			readonly property real step: root.workspaceButtonWidth + root.spacing
-
-			property real indicatorLength: (Math.abs(idxPair.idx1 - idxPair.idx2) + 1) * root.workspaceButtonWidth + Math.abs(idxPair.idx1 - idxPair.idx2) * root.spacing
-			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * step + root.activeWorkspaceMargin
+			property real indicatorLength: (Math.abs(idxPair.idx1 - idxPair.idx2) + 1) * root.workspaceButtonWidth
+			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * root.workspaceButtonWidth + root.activeWorkspaceMargin
 			property real indicatorThickness: root.workspaceButtonWidth
 
 			anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
@@ -126,10 +129,9 @@ Item {
 				implicitHeight: grid.height
 				implicitWidth: grid.width
 				source: grid
-				autoPaddingEnabled: false
 				sourceColor: Colors.palette.m3onSurface
-				x: root.horizontal ? -indicator.x + root.activeWorkspaceMargin : 0
-				y: root.horizontal ? 0 : -indicator.y + root.activeWorkspaceMargin
+				x: root.horizontal ? -indicator.x + 3 : 0
+				y: root.horizontal ? 0 : -indicator.y + 3
 			}
 		}
 	}

Modules/Bar/Popouts/AudioPopout.qml

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

Modules/Bar/Popouts/BluetoothPopout.qml

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

Modules/Bar/Popouts/Content.qml

@@ -82,6 +82,13 @@ Item {
 			}
 		}
 
+		Popout {
+			name: "bluetooth"
+
+			sourceComponent: BluetoothPopout {
+			}
+		}
+
 		Popout {
 			name: "updates"
 

Modules/Bar/Popouts/Network/NetworkOverlay.qml

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

Modules/Bar/Popouts/Network/PSKOverlay.qml

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

Modules/Bar/Popouts/Network/PopupManager.qml

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

Modules/Bar/Popouts/NetworkPopout.qml

@@ -1,38 +1,142 @@
 pragma ComponentBehavior: Bound
 
-import Quickshell
-import Quickshell.Networking
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import ZShell.Components
-import qs.Components
 import ZShell.Config
-import qs.Modules
-import qs.Helpers as Helpers
+import qs.Services
+import qs.Modules.Settings.Common
+import qs.Modules.Bar.Popouts.Network
+import qs.Components
+import qs.Helpers.Network
 
-Item {
+CustomClippingRect {
 	id: root
 
 	required property var wrapper
 
-	SnapLayout {
-orientation: Qt.Vertical
-		id: layout
+	anchors.horizontalCenter: parent.horizontalCenter
+	implicitHeight: networkPopContent.height + networkPopContent.anchors.margins * 2
+	implicitWidth: 500 + 8 * 2
+	radius: (20 - Tokens.padding.small) * Tokens.rounding.scale
 
-		spacing: 8
+	Component.onCompleted: Network.active = true
+	Component.onDestruction: Network.active = false
 
-		Repeater {
-			model: Helpers.Network.devices
+	ColumnLayout {
+		id: networkPopContent
 
-			CustomRadioButton {
-				id: network
+		anchors.left: parent.left
+		anchors.margins: Tokens.padding.large
+		anchors.right: parent.right
+		anchors.top: parent.top
+		spacing: Tokens.spacing.extraSmall / 2
 
-				required property NetworkDevice modelData
+		CustomText {
+			Layout.preferredHeight: visible ? implicitHeight : 0
+			Layout.rightMargin: Tokens.padding.extraSmall
+			font.pointSize: Tokens.font.size.large
+			text: qsTr("Wifi")
+		}
 
-				checked: Helpers.Network.activeDevice?.name === modelData.name
-				text: modelData.description
-				visible: modelData.name !== "lo"
+		Toggle {
+			Layout.preferredHeight: visible ? implicitHeight : 0
+			checked: Network.wifiEnabled
+			first: true
+			last: Network.connectedNetworks.length === 0
+			subtext: qsTr("Toggle WiFi device state")
+			text: checked ? qsTr("Enabled") : qsTr("Disabled")
+
+			onToggled: Network.setWifi(checked)
+		}
+
+		ListView {
+			id: rows
+
+			Layout.fillWidth: true
+			Layout.preferredHeight: contentHeight
+			interactive: false
+			section.property: "connected"
+			spacing: Tokens.spacing.extraSmall / 2
+
+			add: Transition {
+				Anim {
+					from: 0
+					property: "opacity"
+					to: 1
+				}
+			}
+			delegate: DelegateChooser {
+				role: "isDivider"
+
+				DelegateChoice {
+					roleValue: true
+
+					delegate: NetworkDivider {
+					}
+				}
+
+				DelegateChoice {
+					delegate: NetworkItem {
+						list: rows
+						width: rows.width
+					}
+				}
+			}
+			displaced: Transition {
+				Anim {
+					easing.type: Easing.OutCubic
+					property: "y"
+				}
+			}
+			model: ScriptModel {
+				values: {
+					const byStrengthName = (a, b) => b.signalStrength - a.signalStrength || a.name.localeCompare(b.name);
+					const cNetworks = [...Network.connectedNetworks];
+					const kNetworks = [...Network.knownNetworks];
+					const uNetworks = [...Network.unknownNetworks];
+
+					return [...cNetworks.sort(byStrengthName), ...(kNetworks.length > 0 ? [
+								{
+									isDivider: true,
+									type: "known"
+								},
+								...kNetworks.sort(byStrengthName)] : []), ...(uNetworks.length > 0 ? [
+								{
+									isDivider: true,
+									type: "unknown"
+								},
+								...uNetworks.sort(byStrengthName)] : [])];
+				}
+			}
+			move: Transition {
+				Anim {
+					easing.type: Easing.OutCubic
+					property: "y"
+				}
+			}
+			remove: Transition {
+				Anim {
+					property: "opacity"
+					to: 0
+				}
+			}
+			section.delegate: Rectangle {
+				required property string section
+
+				color: "transparent"
+				height: childrenRect.height
+				width: ListView.view.width
+
+				CustomText {
+					text: parent.section
+				}
 			}
 		}
 	}
+
+	NetworkOverlay {
+		anchors.fill: parent
+	}
 }

Modules/Bar/Popouts/TrayMenuPopout.qml

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

Modules/Bar/Popouts/UPowerPopout.qml

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

Modules/Bar/Popouts/UpdatesPopout.qml

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

Modules/Clipboard/Content.qml

@@ -4,7 +4,6 @@ import Quickshell
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import ZShell.Components
 import qs.Components
 import qs.Helpers
 import ZShell.Config
@@ -55,7 +54,7 @@ Item {
 		}
 	}
 
-	CustomRect {
+	ClipRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -65,7 +64,6 @@ Item {
 		color: Colors.tPalette.m3surfaceContainer
 		implicitWidth: ClipHistory.previewIsImage ? Math.max(Math.min(imagePreview.sourceSize.width + Tokens.padding.large * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth) : Math.max(Math.min(textPreviewColumn.width + textPreviewColumn.anchors.margins * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth)
 		radius: 25
-		clip: true
 
 		Behavior on implicitWidth {
 			Anim {}
@@ -112,7 +110,7 @@ Item {
 					Repeater {
 						model: lineRow.modelData.text.split("\t").slice(1)
 
-						SnapLayout {
+						RowLayout {
 							height: lineText.height
 							width: lineText.height + Tokens.spacing.extraSmall
 
@@ -226,16 +224,15 @@ Item {
 					}
 				}
 
-				SnapLayout {
+				RowLayout {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					Item {
+					ClipRect {
 						id: textRect
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
-						clip: true
 
 						Item {
 							id: textWrapper

Modules/Dashboard/Content.qml

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

Modules/Dashboard/Dash.qml

@@ -1,82 +1,104 @@
 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
 
-SnapLayout {
-orientation: Qt.Vertical
+GridLayout {
 	id: root
 
 	readonly property bool dashboardVisible: screenState.dashboard
 	required property int radius
 	required property ScreenState screenState
 
-	spacing: ZUtils.snap(Tokens.spacing.small, root)
+	columnSpacing: Tokens.spacing.small
+	rowSpacing: Tokens.spacing.small
 
-	height: ZUtils.snap(implicitHeight, root)
-	width: ZUtils.snap(implicitWidth, root)
+	ParallelAnimation {
+		id: openAnim
 
-	SnapLayout {
-		Layout.fillWidth: true
-		spacing: parent.spacing
-
-		Rect {
-			id: weatherRect
-			Layout.fillHeight: true
-			Layout.preferredWidth: ZUtils.snap(Tokens.sizes.dashboard.weatherWidth, root)
-			radius: root.radius
-
-			Weather {}
+		Anim {
+			property: "opacity"
+			target: root
+			to: 1
 		}
 
-		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
-			}
+		Anim {
+			property: "scale"
+			target: root
+			to: 1
 		}
 	}
 
-	SnapLayout {
-		Layout.fillWidth: true
-		spacing: parent.spacing
+	ParallelAnimation {
+		id: closeAnim
 
-		Rect {
-			id: calendarRect
-			Layout.fillWidth: true
-			Layout.fillHeight: true
-			implicitHeight: ZUtils.snap(calendar.implicitHeight, root)
-			radius: root.radius
-
-			Calendar {
-				id: calendar
-
-				screenState: root.screenState
-			}
+		Anim {
+			property: "opacity"
+			target: root
+			to: 0
 		}
 
-		Rect {
-			id: resourcesRect
-			Layout.fillHeight: true
-			implicitWidth: ZUtils.snap(resources.implicitWidth, root)
-			radius: root.radius
+		Anim {
+			property: "scale"
+			target: root
+			to: 0.9
+		}
+	}
 
-			Resources {
-				id: resources
-			}
+	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
+		Layout.row: 1
+		radius: root.radius
+
+		Calendar {
+			id: calendar
+
+			screenState: root.screenState
+		}
+	}
+
+	Rect {
+		Layout.column: 3
+		Layout.columnSpan: 2
+		Layout.fillHeight: true
+		Layout.preferredWidth: resources.implicitWidth
+		Layout.row: 1
+		radius: root.radius
+
+		Resources {
+			id: resources
 		}
 	}
 

Modules/Dashboard/Dash/Calendar.qml

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

Modules/Dashboard/Dash/Resources.qml

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

Modules/Dashboard/Media.qml

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

Modules/Dashboard/Media/Details.qml

@@ -1,14 +1,13 @@
 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
 
-Item {
+ColumnLayout {
 	id: root
 
 	readonly property bool hasUnknownLength: (Players.active?.length ?? 0) > 2147483647
@@ -26,187 +25,46 @@ Item {
 		return `${mins}:${secs}`;
 	}
 
-	implicitHeight: ZUtils.snap(layout.implicitHeight, root)
-	implicitWidth: layout.implicitWidth
+	spacing: Tokens.spacing.extraSmall
 
-	SnapLayout {
-orientation: Qt.Vertical
-		id: layout
-		anchors.left: parent.left
-		anchors.right: parent.right
-		y: ZUtils.snap((parent.height - implicitHeight) / 2, root)
+	Timer {
+		running: Players.active?.isPlaying ?? false
+		interval: Config.dashboard.mediaUpdateInterval
+		triggeredOnStart: true
+		repeat: true
+		onTriggered: Players.active?.positionChanged()
+	}
 
-		spacing: ZUtils.snap(Tokens.spacing.extraSmall, root)
+	CustomText {
+		Layout.fillWidth: true
+		text: Players.active?.trackTitle ?? ""
+		font: Tokens.font.title.large
+		elide: Text.ElideRight
+		animate: true
+	}
 
-		Timer {
-			running: Players.active?.isPlaying ?? false
-			interval: Config.dashboard.mediaUpdateInterval
-			triggeredOnStart: true
-			repeat: true
-			onTriggered: Players.active?.positionChanged()
-		}
+	CustomText {
+		Layout.fillWidth: true
+		text: Players.active?.trackArtist || qsTr("Unknown artist")
+		color: Colors.palette.m3onSurfaceVariant
+		font: Tokens.font.title.medium
+		elide: Text.ElideRight
+		animate: true
+	}
 
-		CustomText {
-			id: title
-			Layout.fillWidth: true
-			Layout.preferredHeight: ZUtils.snapCeil(implicitHeight, root)
-			text: Players.active?.trackTitle ?? ""
-			font: Tokens.font.title.large
-			elide: Text.ElideRight
-			animate: true
-		}
+	CustomText {
+		Layout.fillWidth: true
+		text: Players.active?.trackAlbum || qsTr("Unknown album")
+		color: Colors.palette.m3secondary
+		font: Tokens.font.title.medium
+		elide: Text.ElideRight
+		animate: true
+	}
 
-		CustomText {
-			id: artist
-			Layout.fillWidth: true
-			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)
-			}
-		}
+	RowLayout {
+		Layout.topMargin: Tokens.spacing.extraLargeIncreased
+		Layout.fillWidth: true
+		spacing: Tokens.spacing.small
 
 		TextMetrics {
 			id: timeMetrics
@@ -214,5 +72,123 @@ orientation: Qt.Vertical
 			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,7 +3,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Effects
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import ZShell.Services
 import qs.Components
@@ -158,8 +157,7 @@ Item {
 		active: opacity > 0
 		opacity: 0
 
-		sourceComponent: SnapLayout {
-orientation: Qt.Vertical
+		sourceComponent: ColumnLayout {
 			spacing: Tokens.spacing.large
 
 			CustomRect {
@@ -200,8 +198,7 @@ orientation: Qt.Vertical
 		active: opacity > 0
 		opacity: 0
 
-		sourceComponent: SnapLayout {
-orientation: Qt.Vertical
+		sourceComponent: ColumnLayout {
 			spacing: Tokens.spacing.small
 
 			MaterialIcon {

Modules/Dashboard/Media/LyricsAndSelector.qml

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

Modules/Dashboard/Media/LyricsInfo.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell
 import ZShell.Blobs
 import ZShell.Config
@@ -142,8 +141,7 @@ Item {
 				}
 			]
 
-			SnapLayout {
-orientation: Qt.Vertical
+			ColumnLayout {
 				id: layout
 
 				anchors.centerIn: parent

Modules/Dashboard/Processes/ProcessesHeader.qml

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

Modules/Dashboard/Processes/SystemInfo.qml

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

Modules/Dashboard/Tabs.qml

@@ -4,8 +4,6 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Templates
 import Quickshell
-import ZShell
-import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -18,17 +16,9 @@ Item {
 	required property var tabs
 
 	readonly property alias count: bar.count
-	readonly property int tabIndicatorSpacing: ZUtils.snap(Tokens.spacing.small, root)
+	readonly property int tabIndicatorSpacing: Tokens.spacing.small
 
-	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)
+	implicitHeight: bar.implicitHeight + bar.anchors.topMargin + indicator.implicitHeight + indicator.anchors.topMargin + separator.implicitHeight
 
 	TabBar {
 		id: bar
@@ -41,11 +31,9 @@ Item {
 		currentIndex: root.screenState.dashboardTab
 		onCurrentIndexChanged: root.screenState.dashboardTab = currentIndex
 
-		topPadding: 0
-		bottomPadding: 0
-		implicitHeight: implicitContentHeight
+		implicitHeight: contentHeight
 		background: null
-		contentItem: SnapLayout {
+		contentItem: RowLayout {
 			spacing: 0
 
 			Repeater {
@@ -128,13 +116,10 @@ Item {
 		readonly property bool current: TabBar.tabBar.currentItem === this
 
 		Layout.fillWidth: true
-		Layout.fillHeight: true
-		Layout.preferredWidth: 1
+		Layout.preferredWidth: 1 // Uniform width across all tabs
 		implicitWidth: implicitContentWidth
 		implicitHeight: implicitContentHeight
 		background: null
-		topPadding: 0
-		bottomPadding: 0
 
 		contentItem: CustomMouseArea {
 			id: mouse
@@ -146,8 +131,8 @@ Item {
 					root.screenState.dashboardTab = Math.max(root.screenState.dashboardTab - 1, 0);
 			}
 
-			implicitWidth: Math.max(icon.implicitWidth, label.implicitWidth)
-			implicitHeight: snapLayout.implicitHeight
+			implicitWidth: Math.max(icon.width, label.width)
+			implicitHeight: icon.height + label.height
 
 			hoverEnabled: true
 			cursorShape: Qt.PointingHandCursor
@@ -161,49 +146,39 @@ Item {
 				anchors.left: parent.left
 				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
-				anchors.alignWhenCentered: false
-				implicitHeight: ZUtils.snap(parent.height + Tokens.sizes.dashboard.tabIndicatorSpacing * 2, stateLayer)
+				implicitHeight: parent.height + root.tabIndicatorSpacing * 2
 
 				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
+					}
 				}
 			}
 
-			SnapLayout {
-				id: snapLayout
-				anchors.fill: parent
-				spacing: 0
-				orientation: Qt.Vertical
+			CustomText {
+				id: label
 
-				MaterialIcon {
-					id: icon
+				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.bottom: parent.bottom
 
-					text: tab.iconName
-					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
-				}
+				text: tab.text
+				color: tab.current ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
 			}
 		}
 	}

Modules/Dashboard/Weather/Graphs.qml

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

Modules/Dashboard/WeatherTab.qml

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

Modules/DesktopIcons/BackgroundContextMenu.qml

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

Modules/DesktopIcons/DesktopIconContextMenu.qml

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

Modules/Dock/Parts/DockAppButton.qml

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

Modules/Dock/Parts/DockSeparator.qml

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

Modules/Launcher/AppList.qml

@@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
-import ZShell
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -53,7 +52,7 @@ CustomListView {
 
 	highlightFollowsCurrentItem: false
 	highlightRangeMode: ListView.ApplyRange
-	implicitHeight: (Tokens.sizes.launcher.itemHeight + spacing) * Math.min(Config.launcher.maxAppsShown, count) - spacing
+	implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxAppsShown, count) - spacing
 	orientation: Qt.Vertical
 	preferredHighlightBegin: 0
 	preferredHighlightEnd: height
@@ -98,7 +97,6 @@ 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: Tokens.sizes.launcher.wallpaperWidth
+	focalWidth: Config.launcher.sizes.wallpaperWidth
 	glideDuration: 250
 	glideEasingType: Easing.OutCubic
 	implicitHeight: tileHeight + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.small
@@ -41,7 +41,8 @@ CarouselView {
 	tileHeight: focalWidth / 16 * 9
 
 	delegate: Component {
-		WallpaperTile {}
+		WallpaperTile {
+		}
 	}
 
 	Component.onDestruction: Wallpapers.stopPreview()

Modules/Launcher/Content.qml

@@ -2,18 +2,17 @@ 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: ZUtils.snap(Tokens.padding.medium / 2, root)
+	readonly property int padding: Tokens.padding.largeIncreased / 4
 	required property var panels
 	readonly property int rounding: Tokens.rounding.largeIncreased
 	required property ScreenState screenState

Modules/Launcher/ContentList.qml

@@ -2,12 +2,11 @@ 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 {
@@ -72,7 +71,7 @@ Item {
 			PropertyChanges {
 				appList.active: true
 				root.implicitHeight: Math.min(root.maxHeight, appList.implicitHeight > 0 ? appList.implicitHeight : empty.implicitHeight)
-				root.implicitWidth: Tokens.sizes.launcher.itemWidth
+				root.implicitWidth: Config.launcher.sizes.itemWidth
 			}
 
 			AnchorChanges {
@@ -84,8 +83,8 @@ Item {
 			name: "wallpapers"
 
 			PropertyChanges {
-				root.implicitHeight: Tokens.sizes.launcher.wallpaperHeight
-				root.implicitWidth: Math.max(Tokens.sizes.launcher.itemWidth * 1.2, wallpaperList.implicitWidth)
+				root.implicitHeight: Config.launcher.sizes.wallpaperHeight
+				root.implicitWidth: Math.max(Config.launcher.sizes.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: Tokens.sizes.launcher.itemHeight
+	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
 		radius: Tokens.rounding.medium

Modules/Launcher/Items/AppItem.qml

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

Modules/Launcher/Items/WallpaperTile.qml

@@ -1,5 +1,3 @@
-pragma ComponentBehavior: Bound
-
 import Quickshell
 import QtQuick
 import ZShell.Config
@@ -11,7 +9,7 @@ Item {
 	id: root
 
 	required property bool isCurrent
-	required property var modelData
+	required property var modelData // FileSystemEntry-like {path, relativePath}
 	required property real tileHeight
 	required property real tileWidth
 	required property ScreenState screenState
@@ -31,75 +29,25 @@ Item {
 		radius: Tokens.rounding.small
 		y: Tokens.padding.large
 
-		Loader {
-			active: opacity > 0
+		MaterialIcon {
 			anchors.centerIn: parent
-			opacity: img.status === Image.Ready ? 0 : 1
-
-			Behavior on opacity {
-				Anim {}
-			}
-			sourceComponent: CustomRect {
-				color: Colors.palette.m3primaryContainer
-				implicitHeight: loadingIndicator.implicitSize + Tokens.padding.large * 2
-				implicitWidth: loadingIndicator.implicitSize + Tokens.padding.large * 2
-				radius: Tokens.rounding.full
-
-				LoadingIndicator {
-					id: loadingIndicator
-
-					anchors.centerIn: parent
-					containsIcon: true
-					implicitSize: Math.min(image.width, image.height) * 0.3
-				}
-			}
+			color: Colors.tPalette.m3outline
+			fontStyle: Tokens.font.icon.builders.extraLarge.scale(2).weight(Font.DemiBold).build()
+			text: "image"
 		}
 
-		Image {
-			id: img
+		CachingImage {
 			anchors.bottom: parent.bottom
 			anchors.horizontalCenter: parent.horizontalCenter
 			anchors.top: parent.top
-			asynchronous: true
+			cache: true
 			fillMode: Image.PreserveAspectCrop
 			height: root.tileHeight
-			source: root.modelData ? root.modelData.thumbnailPath : ""
+			path: root.modelData ? root.modelData.path : ""
 			smooth: root.isCurrent
 			sourceSize.height: root.tileHeight
 			sourceSize.width: root.tileHeight * (16 / 9)
 			width: root.tileHeight * (16 / 9)
-
-			opacity: status === Image.Ready ? 1 : 0
-			Behavior on opacity {
-				Anim {
-					type: Anim.SlowEffects
-				}
-			}
-
-			Loader {
-				opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
-				active: opacity > 0
-				anchors.centerIn: parent
-				Behavior on opacity {
-					Anim {
-						type: Anim.SlowEffects
-					}
-				}
-
-				sourceComponent: CustomRect {
-					implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
-					implicitHeight: implicitWidth
-					radius: Tokens.rounding.full
-					color: Colors.tPalette.m3surface
-
-					MaterialIcon {
-						id: videoIcon
-						anchors.centerIn: parent
-						text: "video_library"
-						fontStyle: Tokens.font.icon.extraLarge
-					}
-				}
-			}
 		}
 
 		StateLayer {

Modules/Lock/Center.qml

@@ -2,15 +2,14 @@ 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
 
-SnapLayout {
+ColumnLayout {
 	id: root
 
 	readonly property real centerScale: Math.min(1, (lock.screen?.height ?? 1440) / 1440)
@@ -20,13 +19,10 @@ SnapLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
-
-	orientation: Qt.Vertical
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	SnapLayout {
+	RowLayout {
 		Layout.alignment: Qt.AlignHCenter
-
 		spacing: Tokens.spacing.small
 
 		CustomText {
@@ -113,12 +109,11 @@ SnapLayout {
 			}
 		}
 
-		SnapLayout {
+		RowLayout {
 			id: input
 
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.extraSmall
-
 			spacing: Tokens.spacing.medium
 
 			Item {

Modules/Lock/Content.qml

@@ -1,31 +1,28 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
-import ZShell.Config
 import qs.Components
 import qs.Helpers
+import ZShell.Config
 import qs.Services
 
-Item {
+ClipRect {
 	id: root
 
 	required property var lock
 
 	implicitHeight: layout.implicitHeight
 	implicitWidth: layout.implicitWidth
+	radius: Tokens.rounding.largeIncreased
 
-	SnapLayout {
+	RowLayout {
 		id: layout
 
 		anchors.fill: parent
-
 		spacing: Tokens.spacing.largeIncreased * 2
 
-		SnapLayout {
+		ColumnLayout {
 			Layout.fillWidth: true
-
 			spacing: Tokens.spacing.medium
-			orientation: Qt.Vertical
 
 			WeatherInfo {
 				id: weather
@@ -53,10 +50,22 @@ Item {
 			lock: root.lock
 		}
 
-		NotifDock {
+		ColumnLayout {
 			Layout.fillWidth: true
-			Layout.fillHeight: true
-			lock: root.lock
+			spacing: Tokens.spacing.medium
+
+			CustomRect {
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+				bottomRightRadius: Tokens.rounding.largeIncreased
+				color: Colors.tPalette.m3surfaceContainer
+				radius: Tokens.rounding.small
+				topRightRadius: Tokens.rounding.largeIncreased
+
+				NotifDock {
+					lock: root.lock
+				}
+			}
 		}
 	}
 }

Modules/Lock/InputField.qml

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

Modules/Lock/LockSurface.qml

@@ -221,9 +221,9 @@ WlSessionLockSurface {
 
 			anchors.fill: parent
 			color: Colors.palette.m3surface
+			layer.enabled: true
 			opacity: Colors.transparency.enabled ? Colors.transparency.base : 1
 			radius: lockContent.radius
-			layer.enabled: true
 
 			layer.effect: MultiEffect {
 				blurMax: 15

Modules/Lock/Media.qml

@@ -7,57 +7,50 @@ import qs.Components
 import qs.Helpers
 import qs.Services
 
-Item {
+ClipRect {
 	id: root
 
 	required property var lock
 
+	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	radius: Tokens.rounding.small
+
+	FadeImage {
+		id: image
 
-	ClipRect {
 		anchors.fill: parent
+		asynchronous: true
+		fillMode: Image.PreserveAspectCrop
+		layer.enabled: true
+		opacity: status === Image.Ready ? 1 : 0
+		source: Players.getArtUrl(Players.active)
+		sourceSize: {
+			const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
+			return Qt.size(width * dpr, height * dpr);
+		}
 
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.small
-		bottomLeftRadius: Tokens.rounding.largeIncreased
-
-		FadeImage {
-			id: image
+		Behavior on opacity {
+			Anim {
+				type: Anim.StandardExtraLarge
+			}
+		}
 
+		CustomRect {
 			anchors.fill: parent
-			asynchronous: true
-			fillMode: Image.PreserveAspectCrop
-			opacity: status === Image.Ready ? 1 : 0
-			source: Players.getArtUrl(Players.active)
-			sourceSize: {
-				const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
-				return Qt.size(width * dpr, height * dpr);
-			}
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.StandardExtraLarge
-				}
-			}
-
-			CustomRect {
-				anchors.fill: parent
-				color: Colors.palette.m3surface
-				opacity: 0.7
-			}
+			color: Colors.palette.m3surface
+			opacity: 0.7
 		}
 	}
 
-	SnapLayout {
+	ColumnLayout {
 		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
@@ -84,7 +77,7 @@ Item {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
-				enabled: Players.active?.canGoPrevious ?? false
+				enabled: Players.active?.canGoPrevious
 				icon: "skip_previous"
 				isRound: true
 				shapeMorph: true
@@ -95,7 +88,7 @@ Item {
 
 			IconButton {
 				checked: Players.active?.isPlaying ?? false
-				enabled: Players.active?.canTogglePlaying ?? false
+				enabled: Players.active?.canTogglePlaying
 				icon: Players.active?.isPlaying ? "pause" : "play_arrow"
 				implicitWidth: implicitHeight + Tokens.padding.largeIncreased * 2
 				isRound: true
@@ -105,7 +98,7 @@ Item {
 			}
 
 			IconButton {
-				enabled: Players.active?.canGoNext ?? false
+				enabled: Players.active?.canGoNext
 				icon: "skip_next"
 				isRound: true
 				shapeMorph: true

Modules/Lock/NotifDock.qml

@@ -4,121 +4,133 @@ 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
 
-CustomRect {
+ColumnLayout {
 	id: root
 
 	required property var lock
 
-	bottomRightRadius: Tokens.rounding.largeIncreased
-	color: Colors.tPalette.m3surfaceContainer
-	radius: Tokens.rounding.small
-	topRightRadius: Tokens.rounding.largeIncreased
+	anchors.fill: parent
+	anchors.margins: Tokens.padding.large
+	spacing: Tokens.spacing.small
 
-	SnapLayout {
-		anchors.fill: parent
-		anchors.margins: Tokens.padding.large
+	CustomText {
+		Layout.fillWidth: true
+		color: Colors.palette.m3outline
+		elide: Text.ElideRight
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
+		text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
+	}
 
-		orientation: Qt.Vertical
-		spacing: Tokens.spacing.small
+	ClipRect {
+		id: clipRect
 
-		CustomText {
-			Layout.fillWidth: true
-			color: Colors.palette.m3outline
-			elide: Text.ElideRight
-			font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
-			text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
-		}
+		Layout.fillHeight: true
+		Layout.fillWidth: true
+		color: "transparent"
+		radius: Tokens.rounding.small
 
-		Item {
-			Layout.fillHeight: true
-			Layout.fillWidth: true
+		Loader {
+			active: opacity > 0
+			anchors.centerIn: parent
+			opacity: NotifServer.list.length > 0 ? 0 : 1
 
-			Loader {
-				active: opacity > 0
-				anchors.centerIn: parent
-				opacity: NotifServer.list.length > 0 ? 0 : 1
+			Behavior on opacity {
+				Anim {
+					duration: Tokens.anim.durations.extraLarge
+				}
+			}
+			sourceComponent: ColumnLayout {
+				spacing: Tokens.spacing.largeIncreased
 
-				Behavior on opacity {
-					Anim {
-						duration: Tokens.anim.durations.extraLarge
+				Image {
+					asynchronous: true
+					fillMode: Image.PreserveAspectFit
+					layer.enabled: true
+					source: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/dino.png`)
+					sourceSize.width: clipRect.width * 0.8
+
+					layer.effect: Coloriser {
+						brightness: 1
+						colorizationColor: Colors.palette.m3outlineVariant
 					}
 				}
-				sourceComponent: CustomText {
+
+				CustomText {
+					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
 					font: Tokens.font.headline.builders.small.width(90).build()
 					text: qsTr("No Notifications")
 				}
 			}
+		}
 
-			CustomListView {
-				anchors.fill: parent
-				clip: true
-				spacing: Tokens.spacing.small
+		CustomListView {
+			anchors.fill: parent
+			clip: true
+			spacing: Tokens.spacing.small
 
-				add: Transition {
-					Anim {
-						from: 0
-						property: "opacity"
-						to: 1
-					}
-
-					Anim {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
-						easing: Tokens.anim.expressiveDefaultSpatial
-						from: 0
-						property: "scale"
-						to: 1
-					}
+			add: Transition {
+				Anim {
+					from: 0
+					property: "opacity"
+					to: 1
 				}
-				delegate: NotifGroup {}
-				displaced: Transition {
-					Anim {
-						properties: "opacity,scale"
-						to: 1
-					}
 
-					Anim {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
-						easing: Tokens.anim.expressiveDefaultSpatial
-						property: "y"
-					}
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					from: 0
+					property: "scale"
+					to: 1
 				}
-				model: ScriptModel {
-					values: {
-						const list = NotifServer.notClosed.map(n => [n.appName, null]);
-						return [...new Map(list).keys()];
-					}
+			}
+			delegate: NotifGroup {}
+			displaced: Transition {
+				Anim {
+					properties: "opacity,scale"
+					to: 1
 				}
-				move: Transition {
-					Anim {
-						properties: "opacity,scale"
-						to: 1
-					}
 
-					Anim {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
-						easing: Tokens.anim.expressiveDefaultSpatial
-						property: "y"
-					}
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					property: "y"
+				}
+			}
+			model: ScriptModel {
+				values: {
+					const list = NotifServer.notClosed.map(n => [n.appName, null]);
+					return [...new Map(list).keys()];
+				}
+			}
+			move: Transition {
+				Anim {
+					properties: "opacity,scale"
+					to: 1
 				}
-				remove: Transition {
-					Anim {
-						property: "opacity"
-						to: 0
-					}
 
-					Anim {
-						property: "scale"
-						to: 0.6
-					}
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					property: "y"
+				}
+			}
+			remove: Transition {
+				Anim {
+					property: "opacity"
+					to: 0
+				}
+
+				Anim {
+					property: "scale"
+					to: 0.6
 				}
 			}
 		}

Modules/Lock/NotifGroup.qml

@@ -5,11 +5,10 @@ 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
 
@@ -37,14 +36,13 @@ CustomRect {
 		}
 	}
 
-	SnapLayout {
+	RowLayout {
 		id: content
 
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
 		anchors.top: parent.top
-
 		spacing: Tokens.spacing.medium
 
 		Item {
@@ -120,18 +118,15 @@ CustomRect {
 			}
 		}
 
-		SnapLayout {
+		ColumnLayout {
 			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)
-			orientation: Qt.Vertical
 
-			SnapLayout {
+			RowLayout {
 				Layout.bottomMargin: -parent.spacing
 				Layout.fillWidth: true
-
 				spacing: Tokens.spacing.small
 
 				CustomText {
@@ -172,11 +167,10 @@ CustomRect {
 						}
 					}
 
-					SnapLayout {
+					RowLayout {
 						id: expandBtn
 
 						anchors.centerIn: parent
-
 						spacing: Tokens.spacing.small / 2
 
 						CustomText {
@@ -267,10 +261,7 @@ CustomRect {
 				Behavior on opacity {
 					Anim {}
 				}
-				sourceComponent: SnapLayout {
-					orientation: Qt.Vertical
-					spacing: Tokens.spacing.extraSmall
-
+				sourceComponent: ColumnLayout {
 					Repeater {
 						model: ScriptModel {
 							values: root.notifs.slice(Config.notifs.groupPreviewNum)

Modules/Lock/Resources.qml

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

Modules/Lock/Weather/BriefInfo.qml

@@ -1,13 +1,11 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Helpers
 import qs.Services
 
-SnapLayout {
-orientation: Qt.Vertical
+ColumnLayout {
 	id: root
 
 	required property int rootHeight
@@ -18,11 +16,11 @@ orientation: Qt.Vertical
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.large
+		font: Tokens.font.title.large
 		text: Weather.description
 	}
 
-	SnapLayout {
+	RowLayout {
 		Layout.alignment: Qt.AlignHCenter
 		spacing: Tokens.spacing.small
 
@@ -31,7 +29,7 @@ orientation: Qt.Vertical
 
 			animate: true
 			color: Colors.palette.m3primary
-			font: Tokens.font.title.large
+			font: Tokens.font.body.large
 			text: Weather.temp
 		}
 
@@ -39,7 +37,6 @@ orientation: Qt.Vertical
 			animate: true
 			color: Colors.palette.m3secondary
 			text: Weather.icon
-			fontStyle: Tokens.font.icon.large
 		}
 	}
 
@@ -56,7 +53,7 @@ orientation: Qt.Vertical
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.medium
+		font: Tokens.font.body.normal
 		text: {
 			const today = Weather.forecast[0];
 			return qsTr("High %1 • Low %2").arg(Weather.formatTemp(today?.maxTempC)).arg(Weather.formatTemp(today?.minTempC));

Modules/Lock/Weather/Forecast.qml

@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import M3Shapes
 import ZShell
 import qs.Components
@@ -15,7 +14,7 @@ CustomRect {
 	implicitHeight: header.anchors.margins + header.implicitHeight + Tokens.spacing.small + layout.implicitHeight + layout.anchors.bottomMargin
 	radius: Tokens.rounding.small
 
-	SnapLayout {
+	RowLayout {
 		id: header
 
 		anchors.left: parent.left
@@ -37,7 +36,7 @@ CustomRect {
 		}
 	}
 
-	CustomListView {
+	VerticalFadeListView {
 		id: layout
 
 		anchors.bottom: parent.bottom
@@ -46,21 +45,13 @@ CustomRect {
 		anchors.margins: Tokens.padding.large
 		anchors.right: parent.right
 		implicitHeight: contentItem.childrenRect.height
-		currentIndex: Weather.currentHourIndex
-		// highlightFollowsCurrentItem: true
-		// preferredHighlightEnd: currentItem.implicitWidth
-		// preferredHighlightBegin: 0
-		// highlightRangeMode: ListView.ApplyRange
-		clip: true
-		model: Weather.hourlyForecast.slice(Weather.currentHourIndex - 1)
+		model: Weather.hourlyForecast
 		orientation: VerticalFadeListView.Horizontal
 		spacing: Tokens.spacing.medium
 
-		delegate: SnapLayout {
-orientation: Qt.Vertical
+		delegate: ColumnLayout {
 			id: hour
 
-			readonly property bool current: ListView.view.currentItem === this
 			readonly property var cond: modelData
 			required property int index
 			required property var modelData
@@ -69,7 +60,7 @@ orientation: Qt.Vertical
 
 			MaterialShape {
 				Layout.alignment: Qt.AlignHCenter
-				color: Qt.alpha(Colors.palette.m3primary, hour.current ? 1 : 0)
+				color: Qt.alpha(Colors.palette.m3primary, hour.index === Weather.currentHourIndex ? 1 : 0)
 				implicitSize: temp.implicitHeight + Tokens.padding.small * 2
 				shape: MaterialShape.Cookie4Sided
 
@@ -81,7 +72,7 @@ orientation: Qt.Vertical
 					id: temp
 
 					anchors.centerIn: parent
-					color: hour.current ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+					color: hour.index === Weather.currentHourIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 					font: Tokens.font.body.medium
 					text: Weather.formatTemp(hour.cond.tempC).slice(0, -1) // Remove C/F
 				}
@@ -105,7 +96,7 @@ orientation: Qt.Vertical
 				Layout.topMargin: Tokens.spacing.extraSmall
 				color: Colors.palette.m3onSurfaceVariant
 				font: Tokens.font.body.small
-				text: hour.current ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
+				text: hour.index === 0 ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
 			}
 		}
 	}

Modules/Lock/WeatherInfo.qml

@@ -19,7 +19,6 @@ CustomRect {
 		return base + brief.anchors.topMargin;
 	}
 	radius: Tokens.rounding.small
-	topLeftRadius: Tokens.rounding.largeIncreased
 
 	Timer {
 		interval: 900000 // 15 minutes
@@ -49,6 +48,7 @@ CustomRect {
 		anchors.right: parent.right
 		asynchronous: true
 
-		sourceComponent: Forecast {}
+		sourceComponent: Forecast {
+		}
 	}
 }

Modules/Notifications/Content.qml

@@ -28,10 +28,7 @@ Item {
 		for (let i = 0; i < count; i++)
 			height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0;
 
-		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
-			return 0;
-
-		if (screenState.dashboard && (panels.dashboard.x + panels.dashboard.width >= panels.notifications.x))
+		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || screenState.dashboard)
 			return 0;
 
 		if (screenState.osd) {

Modules/Osd/Content.qml

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

Modules/Osd/Wrapper.qml

@@ -2,10 +2,9 @@ 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 {
@@ -31,8 +30,8 @@ Item {
 	}
 
 	anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale
-	implicitHeight: ZUtils.snap(content.implicitHeight, root)
-	implicitWidth: ZUtils.snap(content.implicitWidth, root)
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth
 	opacity: 1 - offsetScale
 	visible: offsetScale < 1
 
@@ -99,7 +98,8 @@ Item {
 		id: content
 
 		active: root.shouldBeActive || root.visible
-		anchors.fill: parent
+		anchors.left: parent.left
+		anchors.verticalCenter: parent.verticalCenter
 
 		sourceComponent: Content {
 			brightness: root.brightness