fix: changesMade bool now binding for robustness

fix: show bar on hover
fix: normalize zoom slider to linear scale
2026-09-30 13:58:35 +02:00 · 2026-09-30 00:57:29 +02:00 · 2026-09-30 00:50:31 +02:00 · 2026-09-30 00:41:01 +02:00 · 2026-09-29 00:02:14 +02:00 · 2026-09-28 15:48:13 +02:00
395 changed files with 7268 additions and 21096 deletions
@@ -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
@@ -1,5 +0,0 @@
-CompileFlags:
-  Remove:
-    # GCC-only flags from the system's default spec that clang/clangd cannot
-    # parse. They appear in compile_commands.json but are not set by the project.
-    - -mno-direct-extern-access
@@ -38,6 +38,7 @@ body:
      attributes:
          label: OS
          options:
+              - NixOS
              - Arch
              - Debian / Ubuntu
              - Fedora
@@ -30,7 +30,6 @@ body:
        - Refactor / style
        - CI / build / tooling
        - Documentation
-        - Other (Describe in description box with header "Issue type")
    validations:
      required: true

@@ -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")
@@ -62,12 +61,10 @@ set(CMAKE_INSTALL_MESSAGE NEVER)

 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
-	-Wnull-dereference -Wdouble-promotion
-	-Wformat=2 -Wfloat-equal
+	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
+	-Wformat=2 -Wfloat-equal -Woverloaded-virtual
 	-Wsign-conversion -Wredundant-decls -Wswitch
 	-Wunreachable-code
-	$<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
-	$<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
 )


@@ -191,11 +188,4 @@ if("m3shapes" IN_LIST ENABLE_MODULES)
 	if(TARGET m3shapesplugin)
 		set_target_properties(m3shapesplugin PROPERTIES INSTALL_RPATH "$ORIGIN")
 	endif()
-
-	# Silence warnings that come from m3shapes files we do not manage.
-	foreach(m3shapes_target m3shapes_core m3shapes_morph m3shapes_shapes m3shapes m3shapesplugin)
-		if(TARGET ${m3shapes_target})
-			target_compile_options(${m3shapes_target} PRIVATE -Wno-shadow -Wno-float-equal)
-		endif()
-	endforeach()
 endif()
@@ -20,7 +20,7 @@ BusyIndicator {
 	property int animState
 	property color bgColor: Colors.palette.m3secondaryContainer
 	property color fgColor: Colors.palette.m3primary
-	property real implicitSize: Tokens.font.body.medium.pointSize * 3
+	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
 	property real strokeWidth: Tokens.padding.extraSmall * 0.8
@@ -1,42 +0,0 @@
-import QtQuick
-import Quickshell
-import ZShell.Components
-
-Item {
-	id: root
-
-	property real radius
-	property real topLeftRadius: radius
-	property real topRightRadius: radius
-	property real bottomRightRadius: radius
-	property real bottomLeftRadius: radius
-	property color color: "transparent"
-	default property alias contentData: contentItem.data
-
-	Item {
-		id: contentItem
-
-		anchors.fill: parent
-	}
-
-	ShaderEffectSource {
-		id: src
-
-		hideSource: true
-		sourceItem: contentItem
-	}
-
-	RoundedMask {
-		anchors.fill: parent
-		source: src
-		topLeftRadius: root.topLeftRadius
-		topRightRadius: root.topRightRadius
-		bottomRightRadius: root.bottomRightRadius
-		bottomLeftRadius: root.bottomLeftRadius
-		color: root.color
-	}
-
-	Behavior on color {
-		CAnim {}
-	}
-}
@@ -30,7 +30,6 @@ Flickable {

 		onTriggered: {
 			root.doneFakeFlick = false;
-			root.returnToBounds();
 		}
 	}
 }
@@ -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
@@ -27,7 +27,6 @@ ScrollBar {
 	property bool inverted

 	enabled: !ShellState.forActive().isDrawing
-
 	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
 	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0

@@ -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 {
@@ -16,12 +16,11 @@ Text {
 	color: Colors.palette.m3onSurface
 	font: Tokens.font.body.small
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.QtRendering
+	renderType: Text.NativeRendering
 	textFormat: Text.PlainText

 	Behavior on color {
-		CAnim {
-		}
+		CAnim {}
 	}
 	Behavior on text {
 		enabled: root.animate
@@ -33,8 +32,7 @@ Text {
 				type: Anim.FastEffects
 			}

-			PropertyAction {
-			}
+			PropertyAction {}

 			TAnim {
 				target: root
@@ -2,57 +2,55 @@ import QtQuick
 import ZShell.Config
 import qs.Services

-Item {
+CustomClippingRect {
 	id: track

 	required property var scrollBar
 	required property var mouseArea

-	ClipRect {
-		radius: Tokens.rounding.full
-		anchors.left: parent.left
-		anchors.right: parent.right
+	anchors.left: parent.left
+	anchors.right: parent.right
+	anchors.bottom: parent.bottom
+	implicitHeight: handle.implicitHeight
+	radius: Tokens.rounding.full
+
+	CustomRect {
+		id: handle
+
 		anchors.bottom: parent.bottom
-		implicitHeight: handle.implicitHeight
-
-		CustomRect {
-			id: handle
-
-			anchors.bottom: parent.bottom
-			color: Colors.palette.m3secondary
-			implicitWidth: track.scrollBar.width * track.scrollBar.effectiveSize
-			implicitHeight: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
-			opacity: {
-				if (!track.scrollBar.enabled)
-					return 0;
-				if (track.scrollBar.size === 1)
-					return 0;
-				if (track.mouseArea.pressed)
-					return 1;
-				if (track.mouseArea.containsMouse)
-					return 0.8;
-				if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
-					return 0.6;
+		color: Colors.palette.m3secondary
+		implicitWidth: track.scrollBar.width * track.scrollBar.effectiveSize
+		implicitHeight: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+		opacity: {
+			if (!track.scrollBar.enabled)
 				return 0;
-			}
-			radius: Tokens.rounding.full
-			x: track.scrollBar.reversed ? track.scrollBar.width * (1 + track.scrollBar.nonAnimY) * track.scrollBar.travelScale : track.scrollBar.width * track.scrollBar.nonAnimY * track.scrollBar.travelScale
+			if (track.scrollBar.size === 1)
+				return 0;
+			if (track.mouseArea.pressed)
+				return 1;
+			if (track.mouseArea.containsMouse)
+				return 0.8;
+			if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
+				return 0.6;
+			return 0;
+		}
+		radius: Tokens.rounding.full
+		x: track.scrollBar.reversed ? track.scrollBar.width * (1 + track.scrollBar.nonAnimY) * track.scrollBar.travelScale : track.scrollBar.width * track.scrollBar.nonAnimY * track.scrollBar.travelScale

-			Behavior on implicitHeight {
-				Anim {}
-			}
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
+		Behavior on implicitHeight {
+			Anim {}
+		}
+		Behavior on opacity {
+			Anim {
+				type: Anim.DefaultEffects
 			}
+		}

-			MouseArea {
-				acceptedButtons: Qt.NoButton
-				anchors.fill: parent
-				cursorShape: Qt.PointingHandCursor
-				hoverEnabled: true
-			}
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+			hoverEnabled: true
 		}
 	}
 }
@@ -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;
@@ -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 {
@@ -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();
 				}
 			}
@@ -9,6 +9,5 @@ CustomText {
 	property int grade: Colors.light ? 0 : -25
 	property font fontStyle: Tokens.font.icon.small

-	renderType: Text.NativeRendering
 	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
 }
@@ -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
@@ -126,7 +124,7 @@ MouseArea {
 					model: root.items

 					CustomRect {
-						id: menuItem
+						id: item

 						readonly property bool active: modelData === root?.active
 						required property int index
@@ -139,52 +137,51 @@ MouseArea {
 						radius: menu.radius - column.anchors.margins

 						Behavior on radius {
-							Anim {}
+							Anim {
+							}
 						}

 						StateLayer {
-							color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+							color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
 							enabled: root.expanded

 							onClicked: {
-								root.itemSelected(menuItem.modelData);
-								root.active = menuItem.modelData;
-								menuItem.modelData.clicked();
+								root.itemSelected(item.modelData);
+								root.active = item.modelData;
+								item.modelData.clicked();
 								root.expanded = false;
 							}
 						}

-						SnapLayout {
+						RowLayout {
 							id: menuOptionRow

 							anchors.fill: parent
 							anchors.margins: Tokens.padding.medium
-
 							spacing: Tokens.spacing.small

 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-								text: menuItem.modelData?.icon ?? ""
-								visible: text !== ""
+								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+								text: item.modelData?.icon ?? ""
 							}

 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
-								text: menuItem.modelData?.text ?? ""
+								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+								text: item.modelData?.text ?? ""
 							}

 							Loader {
 								Layout.alignment: Qt.AlignVCenter
-								active: menuItem.modelData?.trailingIcon.length > 0
+								active: item.modelData?.trailingIcon.length > 0
 								asynchronous: true
 								visible: active

 								sourceComponent: MaterialIcon {
-									color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-									text: menuItem.modelData.trailingIcon
+									color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+									text: item.modelData.trailingIcon
 								}
 							}
 						}
@@ -19,11 +19,11 @@ PersistentProperties {
 	property bool sidebar

 	// Dashboard state
-	property int dashboardTab: 0
+	property int dashboardTab
 	property date dashboardDate: new Date()

 	// Sidebar state
-	property int sidebarTab: 0
+	property int sidebarTab
 	property list<string> expandedNotifs: []

 	// Utilities state
@@ -34,7 +34,4 @@ PersistentProperties {
 	// Drawing state
 	property color penColor: "white"
 	property int penWidth: 4
-
-	// Screenshot state
-	property bool screenshot
 }
@@ -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
@@ -12,7 +12,7 @@ TextField {
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: TextField.QtRendering
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter
@@ -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
@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound

 import QtQuick
-import Quickshell
 import qs.Effects

 CustomFlickable {
@@ -10,7 +9,6 @@ CustomFlickable {
 	property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
 	property real fadeAmount: 0.1
 	property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-	readonly property real dpr: Math.ceil((QsWindow.window as QsWindow)?.devicePixelRatio ?? 1)

 	function fadeShouldBeActive(isStart: bool): bool {
 		// When content is smaller than flickable size, hide fade when rebound starts
@@ -30,7 +28,6 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
-	layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask

@@ -6,9 +6,14 @@ Item {
 	id: track

 	required property var scrollBar
-	required property var mouseArea
+	required property CustomMouseArea mouseArea

-	ClipRect {
+	anchors.bottom: parent.bottom
+	anchors.right: parent.right
+	anchors.top: parent.top
+	implicitWidth: Tokens.padding.extraSmall * 2
+
+	CustomClippingRect {
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
 		anchors.top: parent.top
@@ -18,10 +23,10 @@ Item {
 		CustomRect {
 			id: handle

-			anchors.right: parent.right
 			color: Colors.palette.m3secondary
 			implicitHeight: track.scrollBar.height * track.scrollBar.effectiveSize
 			implicitWidth: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+			anchors.right: parent.right
 			opacity: {
 				if (!track.scrollBar.enabled)
 					return 0;
@@ -4,16 +4,12 @@ import Quickshell
 import QtQuick
 import ZShell.Internal
 import qs.Components
-import qs.Services

 Item {
 	id: root

 	readonly property alias content: contentLoader.item
-
 	required property ScreenState screenState
-	property rect holeRect
-	property real holeRadius: 0

 	Loader {
 		id: contentLoader
@@ -22,9 +18,6 @@ Item {
 		anchors.fill: parent

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

@@ -52,6 +59,7 @@ Scope {
 		name: "Bar-Exclusion"
 		screen: root.screen

-		mask: Region {}
+		mask: Region {
+		}
 	}
 }
@@ -1,33 +1,25 @@
 import Quickshell
 import QtQuick
 import ZShell.Config
-import ZShell.Internal
 import qs.Components
 import qs.Helpers
 import qs.Modules.Bar.Popouts

-CustomMouseArea {
+Item {
 	id: root

-	required property Drawing drawing
-	required property DrawingInput input
-
 	required property Item bar
 	required property real borderThickness
+	property bool dashboardShortcutActive
+	required property Drawing drawing
 	required property EdgeGeometry geometry
-
+	property bool osdShortcutActive
 	required property Panels panels
 	required property Wrapper popouts
-
 	required property ShellScreen screen
-	required property ScreenState screenState
-
-	property bool dashboardShortcutActive
-	property point dragStart
-	property bool osdShortcutActive
-	property bool setInitialPoint: false
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
+	required property ScreenState screenState

 	function inBottomPanel(panel: Item, x: real, y: real): bool {
 		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
@@ -64,116 +56,124 @@ CustomMouseArea {
 		return x >= panelX && x <= panelX + panel.width;
 	}

-	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
 	anchors.fill: parent
-	hoverEnabled: true

-	onContainsMouseChanged: {
-		if (!containsMouse) {
-			if (!osdShortcutActive) {
-				screenState.osd = false;
-				panels.osd.hovered = false;
+	DragHandler {
+		id: singleHandler
+
+		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
+		dragThreshold: 0
+		enabled: !root.screenState.isDrawing
+		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
+		maximumPointCount: 1
+		minimumPointCount: 1
+		target: null
+
+		onActiveChanged: {
+			if (!active)
+				root.singleGestureTriggered = false;
+		}
+		onCentroidChanged: {
+			const x = centroid.position.x;
+			const y = centroid.position.y;
+			const pressX = centroid.pressPosition.x;
+			const pressY = centroid.pressPosition.y;
+			const dragX = x - pressX;
+			const dragY = y - pressY;
+
+			if (pressY >= root.screen.height - Config.bar.border && pressX > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+				root.screenState.launcher = true;
+
+			if (root.singleGestureTriggered)
+				return;
+
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, pressX, pressY);
+
+			if (inDashboard && root.withinPanelWidth(root.panels.dashboardWrapper, x, y)) {
+				if (dragY > Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = true;
+					root.singleGestureTriggered = true;
+				} else if (dragY < -Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = false;
+					root.singleGestureTriggered = true;
+				}
 			}

-			if (!popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
-				popouts.hasCurrent = false;
+			if (root.geometry.insetTop(root.borderThickness) > pressY && (Config.dashboard.showOnHover || !inDashboard)) {
+				if (dragY > 20) {
+					root.screenState.settings = true;
+					root.singleGestureTriggered = true;
+				} else if (dragY < -20) {
+					root.screenState.settings = false;
+					root.singleGestureTriggered = true;
+				}
 			}

-			if (Config.bar.autoHide || bar.fullscreen)
-				bar.isHovered = false;
+			if (pressY > root.screen.height - root.geometry.insetBottom(root.borderThickness) && pressX < root.screen.width / 5 && dragY < -50)
+				root.screenState.clipboard = true;

-			if (screenState.dashboard && Config.dashboard.showOnHover)
-				screenState.dashboard = false;
+			if (!Config.dock.hoverToReveal && pressY > root.screen.height - root.geometry.insetTop(root.borderThickness) && pressX > root.screen.width / 5 && !root.screenState.launcher)
+				if (dragY < -10) {
+					root.screenState.dock = true;
+					root.singleGestureTriggered = true;
+				}
+
+			if (pressX > root.screen.width - Config.bar.border && pressY < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
+				root.screenState.sidebar = true;
+				root.singleGestureTriggered = true;
+			}
+
+			if (pressX >= root.screen.width - Config.bar.border && pressY > (root.screen.height / 2) && dragX < -20) {
+				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
+
+			if (pressX <= Config.bar.border && dragX > 20) {
+				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
 		}
 	}
-	onPositionChanged: event => {
-		const x = event.x;
-		const y = event.y;
-		const dragX = x - dragStart.x;
-		const dragY = y - dragStart.y;

-		if (screenState.isDrawing && !inLeftPanel(panels.drawing, x, y)) {
-			input.z = 2;
-			panels.drawing.collapse();
-		}
+	PointHandler {
+		id: drawingHandler

-		if (root.bar.fullscreen && !root.bar.isHovered)
-			unhideTimer.start();
+		property bool setInitialPoint: false

-		if (pressed && dragStart.y >= screen.height - Config.bar.border && dragStart.x > screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-			screenState.launcher = true;
+		acceptedButtons: Qt.LeftButton | Qt.RightButton
+		enabled: root.screenState.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)

-		const entryAt = bar.entryAt(geometry.axisPos(x, y));
-		const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboardWrapper, x, y) && (!entryAt || entryAt === "activeWindow");
-
-		if (!dashboardShortcutActive) {
-			screenState.dashboard = showDashboard;
-		} else if (showDashboard) {
-			dashboardShortcutActive = false;
-		}
-
-		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && withinPanelWidth(panels.dashboardWrapper, x, y)) {
-			if (dragY > Config.dashboard.dragThreshold)
-				screenState.dashboard = true;
-			else if (dragY < -Config.dashboard.dragThreshold)
-				screenState.dashboard = false;
-		}
-
-		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
-			if (dragY > 20) {
-				screenState.settings = true;
-			} else if (dragY < -20) {
-				screenState.settings = false;
+		onActiveChanged: {
+			if (!active) {
+				setInitialPoint = false;
+				root.drawing.content.endStroke();
+			} else {
+				root.panels.drawing.collapse();
 			}
 		}
+		onPointChanged: {
+			if (!active)
+				return;
+			const x = point.position.x;
+			const y = point.position.y;
+			const origX = point.pressPosition.x;
+			const origY = point.pressPosition.y;

-		if (pressed && dragStart.y > screen.height - geometry.insetBottom(borderThickness) && dragStart.x < screen.width / 5 && dragY < -50)
-			screenState.clipboard = true;
-
-		if (pressed && !Config.dock.hoverToReveal && dragStart.y > screen.height - geometry.insetTop(borderThickness) && dragStart.x > screen.width / 5 && !screenState.launcher)
-			if (dragY < -10)
-				screenState.dock = true;
-
-		if (pressed && dragStart.x > screen.width - Config.bar.border && dragStart.y < (screen.height / 2) && dragX < -Config.sidebar.dragThreshold)
-			screenState.sidebar = true;
-
-		if (pressed && dragStart.x >= screen.width - Config.bar.border && dragStart.y > (screen.height / 2) && dragX < -20)
-			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
-
-		if (pressed && dragStart.x <= Config.bar.border && dragX > 20)
-			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
-
-		if (!screenState.bar && Config.bar.autoHide && geometry.barContains(x, y, true))
-			bar.isHovered = true;
-
-		if (panels.sidebar.offsetScale === 1) {
-			const showOsd = inRightPanel(panels.osdWrapper, x, y);
-
-			if (showOsd) {
-				osdShortcutActive = false;
-				panels.osd.hovered = true;
+			if (point.pressedButtons & Qt.RightButton) {
+				root.drawing.content.clear();
+				return;
 			}
-		} else {
-			const outOfSidebar = x < width - panels.sidebar.width * (1 - panels.sidebar.offsetScale);
-			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
+			if (x === 0 && y === 0 && origX === 0 && origY === 0)
+				return;

-			if (!osdShortcutActive) {
-				screenState.osd = showOsd;
-				panels.osd.hovered = showOsd;
-			} else if (showOsd) {
-				osdShortcutActive = false;
-				panels.osd.hovered = true;
+			if (!setInitialPoint) {
+				setInitialPoint = true;
+				root.drawing.content.beginStroke(origX, origY);
+				return;
 			}
+
+			root.drawing.content.appendPoint(x, y);
 		}
-
-		if (Config.dock.enable && Config.dock.hoverToReveal && !screenState.dock && !screenState.launcher && inBottomPanel(panels.dock, x, y))
-			screenState.dock = true;
-
-		if (geometry.barContains(x, y))
-			bar.checkPopout(geometry.axisPos(x, y));
-	}
-	onPressed: event => {
-		dragStart = Qt.point(event.x, event.y);
 	}

 	Timer {
@@ -184,20 +184,98 @@ CustomMouseArea {
 		running: false

 		onTriggered: {
-			if (root.containsMouse)
+			if (hoverHandler.hovered)
 				root.bar.isHovered = true;
 		}
 	}

+	HoverHandler {
+		id: hoverHandler
+
+		cursorShape: root.screenState.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
+
+		onHoveredChanged: {
+			if (!hovered) {
+				if (!root.osdShortcutActive) {
+					root.screenState.osd = false;
+					root.panels.osd.hovered = false;
+				}
+
+				if (!root.popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
+					root.popouts.hasCurrent = false;
+				}
+
+				if (Config.bar.autoHide || root.bar.fullscreen)
+					root.bar.isHovered = false;
+
+				if (root.screenState.dashboard && Config.dashboard.showOnHover)
+					root.screenState.dashboard = false;
+			}
+		}
+		onPointChanged: {
+			const x = point.position.x;
+			const y = point.position.y;
+
+			if (root.screenState.isDrawing) {
+				if (root.inLeftPanel(root.panels.drawing, x, y) && !(drawingHandler.point.pressedButtons & Qt.LeftButton)) {
+					root.panels.drawing.expand();
+					root.drawing.content.hideHover();
+					return;
+				}
+
+				root.drawing.content.showHover(x, y);
+				return;
+			}
+
+			if (!root.screenState.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
+				root.bar.isHovered = true;
+
+			if (root.bar.fullscreen && !root.bar.isHovered)
+				unhideTimer.start();
+
+			if (root.panels.sidebar.offsetScale === 1) {
+				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
+
+				if (showOsd) {
+					root.osdShortcutActive = false;
+					root.panels.osd.hovered = true;
+				}
+			} else {
+				const outOfSidebar = x < root.width - root.panels.sidebar.width * (1 - root.panels.sidebar.offsetScale);
+				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
+
+				if (!root.osdShortcutActive) {
+					root.screenState.osd = showOsd;
+					root.panels.osd.hovered = showOsd;
+				} else if (showOsd) {
+					root.osdShortcutActive = false;
+					root.panels.osd.hovered = true;
+				}
+			}
+
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.screenState.dock && !root.screenState.launcher && root.inBottomPanel(root.panels.dock, x, y))
+				root.screenState.dock = true;
+
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, x, y);
+
+			if (Config.dashboard.showOnHover)
+				root.screenState.dashboard = inDashboard;
+
+			if (root.geometry.barContains(x, y))
+				root.bar.checkPopout(root.geometry.axisPos(x, y));
+		}
+	}
+
 	Connections {
-		function onDashboardChanged(): void {
+		function onDashboardChanged() {
 			if (root.screenState.dashboard) {
-				const inDashboardArea = root.inTopPanel(root.panels.dashboardWrapper, root.mouseX, root.mouseY);
+				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
+				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
+					root.screenState.launcher = false;

-				root.screenState.launcher = false;
 				root.screenState.settings = false;
 				root.screenState.sidebar = false;
 				root.screenState.resources = false;
@@ -207,15 +285,12 @@ CustomMouseArea {
 			}
 		}

-		function onIsDrawingChanged(): void {
-			if (root.screenState.isDrawing) {
-				root.drawing.content.showHover();
-			} else {
-				root.drawing.content.clear();
-			}
+		function onIsDrawingChanged() {
+			if (!root.screenState.isDrawing)
+				root.drawing.clear();
 		}

-		function onLauncherChanged(): void {
+		function onLauncherChanged() {
 			if (!root.screenState.launcher) {
 				root.dashboardShortcutActive = false;
 				root.osdShortcutActive = false;
@@ -230,13 +305,16 @@ CustomMouseArea {
 			}

 			if (root.screenState.launcher) {
-				root.screenState.dashboard = false;
+				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
+					root.screenState.dashboard = false;
+				}
+
 				root.screenState.dock = false;
 				root.screenState.settings = false;
 			}
 		}

-		function onOsdChanged(): void {
+		function onOsdChanged() {
 			if (root.screenState.osd) {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 				if (!inOsdArea) {
@@ -247,7 +325,7 @@ CustomMouseArea {
 			}
 		}

-		function onResourcesChanged(): void {
+		function onResourcesChanged() {
 			if (root.screenState.resources) {
 				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
 					root.popouts.hasCurrent = false;
@@ -257,7 +335,7 @@ CustomMouseArea {
 			}
 		}

-		function onSettingsChanged(): void {
+		function onSettingsChanged() {
 			if (root.screenState.settings) {
 				root.screenState.resources = false;
 				root.screenState.dashboard = false;
@@ -267,10 +345,9 @@ CustomMouseArea {
 			}
 		}

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

+	required property Item bar
+	required property real borderThickness
 	readonly property alias clipboard: clipboard
 	readonly property alias dashboard: dashboard
 	readonly property alias dashboardWrapper: dashboardWrapper
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
+	required property var drawingItem
+	required property EdgeGeometry geometry
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
@@ -33,17 +36,12 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
+	required property ShellScreen screen
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
-
-	required property Item bar
-	required property real borderThickness
-	required property var drawingItem
-	required property EdgeGeometry geometry
-	required property ShellScreen screen
 	required property ScreenState screenState

 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
@@ -75,10 +73,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,10 +81,11 @@ 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
+			screenState: root.screenState
 		}
 	}

@@ -125,16 +121,15 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
-		screenState: root.screenState
 		sidebarPanel: sidebar
+		screenState: root.screenState
 	}

 	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
@@ -145,8 +140,8 @@ Item {

 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		screenState: root.screenState
 		sidebar: sidebar
+		screenState: root.screenState
 	}

 	Item {
@@ -155,10 +150,8 @@ Item {
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1

 		anchors.top: parent.top
-
-		x: ZUtils.snap((parent.width - implicitWidth) / 2, dashboardWrapper)
-
-		clip: offsetScale > 0
+		anchors.horizontalCenter: parent.horizontalCenter
+		clip: true
 		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
 		implicitWidth: dashboard.implicitWidth

@@ -196,11 +189,8 @@ Item {
 		Settings.Wrapper {
 			id: settings

-			x: ZUtils.snap((parent.width - implicitWidth) / 2, settings)
-			y: ZUtils.snap((parent.height - implicitHeight) / 2 - (implicitHeight + 5 + (parent.height - implicitHeight) / 2) * offsetScale, settings)
-
-			// anchors.centerIn: parent
-			// anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
+			anchors.centerIn: parent
+			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
 			screenState: root.screenState
@@ -52,14 +52,15 @@ CustomWindow {
 	property var root: Quickshell.shellDir
 	readonly property ScreenState screenState: ShellState.forScreen(screen)
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.5 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
+	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface

 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar || screenState.isDrawing ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
-	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
+	contentItem.focus: true
+	mask: screenState.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"

 	Behavior on fsTransitionProg {
@@ -142,6 +143,7 @@ CustomWindow {
 	HyprlandFocusGrab {
 		id: focusGrab

+		windows: [root]
 		active: {
 			const s = root.screenState;
 			const c = Config;
@@ -158,7 +160,6 @@ CustomWindow {
 				return true;
 			return false;
 		}
-		windows: [root]

 		onCleared: {
 			root.screenState.launcher = false;
@@ -184,19 +185,23 @@ CustomWindow {
 		id: surface

 		anchors.fill: parent
+		layer.enabled: true
 		opacity: root.surfaceColor.a

-		BlobGroup2 {
+		layer.effect: MultiEffect {
+			blurMax: 32
+			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
+			shadowEnabled: true
+		}
+
+		BlobGroup {
 			id: blobGroup

-			anchors.fill: parent
 			color: root.surfaceColor
-			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
-			shadowRadius: 18
 			smoothing: Config.bar.smoothing
 		}

-		BlobInvertedRect2 {
+		BlobInvertedRect {
 			anchors.fill: parent
 			anchors.margins: -50
 			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
@@ -246,7 +251,6 @@ CustomWindow {
 		PanelBg {
 			id: osdBg

-			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -258,7 +262,6 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg

-			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
 			radius: Tokens.rounding.large
 		}
@@ -293,16 +296,13 @@ CustomWindow {
 		PanelBg {
 			id: resourcesBg

-			property real extraExtent: 0.2
-
-			atRestOverride: panels.resources.offsetScale < 0.99
 			deformAmount: 0.05
-			implicitHeight: panels.resources.height * (1 + extraExtent)
-			implicitWidth: panels.resources.width * (1 + extraExtent)
+			implicitHeight: panels.resources.height
+			implicitWidth: panels.resources.width
 			panel: panels.resourcesWrapper
 			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
-			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness) - panels.resources.width * extraExtent
-			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness) - panels.resources.height * extraExtent
+			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
+			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
 		}

 		PanelBg {
@@ -332,46 +332,47 @@ CustomWindow {
 		PanelBg {
 			id: clipboardBg

-			property real extraExtent: 0.2
-
 			deformAmount: 0.03
-			implicitHeight: panels.clipboard.height * (1 + extraExtent)
-			implicitWidth: panels.clipboard.width * (1 + extraExtent)
 			panel: panels.clipboard
 			radius: 29
-			x: panels.clipboard.x + geometry.insetLeft(root.borderThickness) - panels.clipboard.width * extraExtent
-			y: panels.clipboard.y + geometry.insetTop(root.borderThickness)
 		}
 	}

 	Drawing {
 		id: drawing

-		readonly property int extraWidth: drawingBg.radius * 2
-
 		anchors.fill: parent
-		holeRect: Qt.rect(root.borderThickness + panels.drawing.x - extraWidth, panels.drawing.y + bar.implicitHeight, panels.drawing.implicitWidth + extraWidth, panels.drawing.implicitHeight)
-		holeRadius: drawingBg.radius
+		layer.enabled: true
 		screenState: root.screenState
 		z: 2
-	}

-	LazyLoader {
-		id: lazyLoader
-
-		activeAsync: root.screenState.isDrawing
-
-		component: DrawingInput {
-			borderThickness: root.borderLayoutThickness
-			drawing: drawing
-			panels: panels
-			screenState: root.screenState
-			geometry: geometry
-			parent: root.contentItem
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskInverted: true
+			maskSource: maskSource
 		}
 	}

-	Interactions {
+	Item {
+		id: maskSource
+
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false
+
+		CustomRect {
+			readonly property int extraWidth: radius
+
+			color: "white"
+			implicitHeight: panels.drawing.height
+			implicitWidth: panels.drawing.width + extraWidth
+			radius: drawingBg.radius
+			x: -extraWidth + root.borderThickness + panels.drawing.x
+			y: panels.drawing.y + bar.implicitHeight
+		}
+	}
+
+	Interactions2 {
 		id: interactions

 		anchors.fill: parent
@@ -384,8 +385,6 @@ CustomWindow {
 		popouts: panels.popouts
 		screen: root.screen
 		screenState: root.screenState
-		input: lazyLoader.item
-		z: 1

 		Panels {
 			id: panels
@@ -450,29 +449,10 @@ CustomWindow {
 		}
 	}

-	LazyLoader {
-		id: loader
-
-		property bool closing: !root.screenState.screenshot
-
-		onClosingChanged: if (!closing)
-			activeAsync = true
-
-		Picker {
-			loader: loader
-			parent: root.contentItem
-			screen: root.screen
-			screenState: root.screenState
-			z: 4
-		}
-	}
-
-	component PanelBg: BlobRect2 {
+	component PanelBg: BlobRect {
 		property real deformAmount: 0.15
 		required property Item panel

-		atRestOverride: panel?.offsetScale < 0.99 ?? false
-		damping: 28.3
 		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
 		group: blobGroup
 		implicitHeight: panel.height
@@ -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,32 +18,36 @@ 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 {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
+			font.bold: true
+			font.family: Config.appearance.font.family.clock
+			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: Time.hourStr
 		}

 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3primary
-			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
+			font.bold: true
+			font.family: Config.appearance.font.family.clock
+			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: ":"
 		}

 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
+			font.bold: true
+			font.family: Config.appearance.font.family.clock
+			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: Time.minuteStr
 		}
 	}
@@ -53,11 +56,13 @@ SnapLayout {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: -Tokens.padding.large * 2
 		color: Colors.palette.m3tertiary
-		font: Tokens.font.title.builders.medium.weight(Font.DemiBold).build()
+		font.bold: true
+		font.family: Config.appearance.font.family.mono
+		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
 		text: Time.format("dddd, d MMMM yyyy")
 	}

-	ClipRect {
+	CustomClippingRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
@@ -68,7 +73,7 @@ SnapLayout {
 		MaterialIcon {
 			anchors.centerIn: parent
 			color: Colors.palette.m3onSurfaceVariant
-			fontStyle: Tokens.font.icon.size(root.centerWidth / 4).build()
+			font.pointSize: Math.floor(root.centerWidth / 4)
 			text: "person"
 		}

@@ -83,7 +88,9 @@ SnapLayout {
 	CustomText {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.large
+		font.family: Config.appearance.font.family.mono
+		font.pointSize: Tokens.font.size.normal
+		font.weight: 600
 		text: root.greeter.username
 		visible: text.length > 0
 	}
@@ -119,7 +126,7 @@ SnapLayout {
 			}
 		}

-		SnapLayout {
+		RowLayout {
 			id: input

 			anchors.fill: parent
@@ -148,7 +155,8 @@ SnapLayout {
 					}

 					Behavior on opacity {
-						Anim {}
+						Anim {
+						}
 					}
 				}

@@ -183,6 +191,7 @@ SnapLayout {

 					anchors.centerIn: parent
 					color: root.greeter.buffer && !root.greeter.launching ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+					font.weight: 500
 					text: root.greeter.launching ? "hourglass_top" : "arrow_forward"
 				}
 			}
@@ -195,7 +204,8 @@ SnapLayout {
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)

 		Behavior on implicitHeight {
-			Anim {}
+			Anim {
+			}
 		}

 		CustomText {
@@ -235,10 +245,12 @@ SnapLayout {
 			wrapMode: Text.WrapAtWordBoundaryOrAnywhere

 			Behavior on opacity {
-				Anim {}
+				Anim {
+				}
 			}
 			Behavior on scale {
-				Anim {}
+				Anim {
+				}
 			}

 			onMsgChanged: {
@@ -280,7 +292,8 @@ SnapLayout {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: isError ? Colors.palette.m3error : Colors.palette.m3primary
-			font: Tokens.font.mono.medium
+			font.family: Config.appearance.font.family.mono
+			font.pointSize: Tokens.font.size.small
 			horizontalAlignment: Qt.AlignHCenter
 			opacity: 0
 			scale: 0.7
@@ -20,7 +20,7 @@ BusyIndicator {
 	property int animState
 	property color bgColor: Colors.palette.m3secondaryContainer
 	property color fgColor: Colors.palette.m3primary
-	property real implicitSize: Tokens.font.body.medium.pointSize * 3
+	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
 	property real strokeWidth: Tokens.padding.extraSmall * 0.8
@@ -1,41 +0,0 @@
-import QtQuick
-import ZShell.Components
-
-Item {
-	id: root
-
-	property real radius
-	property real topLeftRadius: radius
-	property real topRightRadius: radius
-	property real bottomRightRadius: radius
-	property real bottomLeftRadius: radius
-	property color color: "transparent"
-	default property alias contentData: contentItem.data
-
-	Item {
-		id: contentItem
-
-		anchors.fill: parent
-	}
-
-	ShaderEffectSource {
-		id: source
-
-		hideSource: true
-		sourceItem: contentItem
-	}
-
-	RoundedMask {
-		anchors.fill: parent
-		source: source
-		topLeftRadius: root.topLeftRadius
-		topRightRadius: root.topRightRadius
-		bottomRightRadius: root.bottomRightRadius
-		bottomLeftRadius: root.bottomLeftRadius
-		color: root.color
-	}
-
-	Behavior on color {
-		CAnim {}
-	}
-}
@@ -1,36 +1,13 @@
 import QtQuick
-import qs.Services

 Flickable {
 	id: root

-	property bool doneFakeFlick
-
-	interactive: !ShellState.forActive().isDrawing
 	maximumFlickVelocity: 3000

 	rebound: Transition {
-		onRunningChanged: {
-			if (!running && !root.doneFakeFlick) {
-				root.doneFakeFlick = true;
-				root.flick(1, 1);
-				root.flick(-1, -1);
-				Qt.callLater(() => root.cancelFlick());
-			}
-		}
-
 		Anim {
 			properties: "x,y"
 		}
 	}
-
-	Timer {
-		interval: 10
-		running: root.doneFakeFlick
-
-		onTriggered: {
-			root.doneFakeFlick = false;
-			root.returnToBounds();
-		}
-	}
 }
@@ -1,36 +1,13 @@
 import QtQuick
-import qs.Services

 ListView {
 	id: root

-	property bool doneFakeFlick
-
-	interactive: !ShellState.forActive()?.isDrawing
 	maximumFlickVelocity: 3000

 	rebound: Transition {
-		// onRunningChanged: {
-		// 	if (!running && !root.doneFakeFlick) {
-		// 		root.doneFakeFlick = true;
-		// 		root.flick(1, 1);
-		// 		root.flick(-1, -1);
-		// 		Qt.callLater(() => root.cancelFlick());
-		// 	}
-		// }
-
 		Anim {
 			properties: "x,y"
-			type: Anim.DefaultEffects
 		}
 	}
-
-	// Timer {
-	// 	interval: 10
-	// 	running: root.doneFakeFlick
-	//
-	// 	onTriggered: {
-	// 		root.doneFakeFlick = false;
-	// 	}
-	// }
 }
@@ -4,7 +4,6 @@ MouseArea {
 	property int scrollAccumulatedY: 0

 	function onWheel(event: WheelEvent): void {
-		event.accepted = false;
 	}

 	onWheel: event => {
@@ -6,6 +6,7 @@ Rectangle {
 	color: "transparent"

 	Behavior on color {
-		CAnim {}
+		CAnim {
+		}
 	}
 }
@@ -14,9 +14,10 @@ Text {
 	property real animateTo: 1

 	color: Colors.palette.m3onSurface
-	font: Tokens.font.body.small
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.normal
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.QtRendering
+	renderType: Text.NativeRendering
 	textFormat: Text.PlainText

 	Behavior on color {
@@ -27,25 +28,22 @@ Text {
 		enabled: root.animate

 		SequentialAnimation {
-			TAnim {
-				target: root
+			Anim {
 				to: root.animateFrom
-				type: Anim.FastEffects
 			}

 			PropertyAction {
 			}

-			TAnim {
-				target: root
+			Anim {
 				to: root.animateTo
-				type: Anim.DefaultEffects
 			}
 		}
 	}

-	component TAnim: Anim {
+	component Anim: NumberAnimation {
 		duration: root.animateDuration / 2
+		easing.type: Easing.BezierSpline
 		properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
 		property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
 		target: root
@@ -1,305 +1,76 @@
 pragma ComponentBehavior: Bound

 import QtQuick
-import QtQuick.Shapes
+import QtQuick.Controls
 import ZShell.Config
 import qs.Services

-TextFieldBase {
+TextField {
 	id: root

-	enum TextFieldType {
-		Outlined,
-		Filled
-	}
+	background: null
+	color: Colors.palette.m3onSurface
+	cursorVisible: !readOnly
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.smaller
+	placeholderTextColor: Colors.palette.m3outline
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering

-	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
-	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
-	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
-	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
-	readonly property real smallFontScale: smallFontSize / font.pointSize
-	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
-	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
-	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
-
-	property int horizontalPadding: Tokens.padding.large
-	property int verticalPadding: Tokens.padding.large
-
-	property int radius: Tokens.rounding.small
-
-	property string supportingText
-	property string trailingIcon
-	property int smallFontSize: Tokens.font.label.small.pointSize
-
-	property int type: CustomTextField.Outlined
-	property var validate // Regex or function
-	property bool emptyIsValid: true
-	property string errorText
-	property bool isError
-	property string leadingIcon
-
-	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
-	leftPadding: horizontalPadding + leadingOffset
-	rightPadding: horizontalPadding + trailingOffset
-	topPadding: verticalPadding + filledOffset
-
-	background: Loader {
-		anchors.bottomMargin: root.supportingTextOffset
-		anchors.fill: parent
-		sourceComponent: root.type === CustomTextField.Filled ? filledComp : outlineComp
-
-		StateLayer {
-			id: stateLayer
-
-			cursorShape: Qt.IBeamCursor
-			enabled: !root.activeFocus
-			manualPressOverride: tapHandler.pressed
-			radius: root.type === CustomTextField.Outlined ? root.clampedRadius : 0
-			topLeftRadius: root.clampedRadius
-			topRightRadius: root.clampedRadius
-
-			onClicked: root.focus = true
+	Behavior on color {
+		CAnim {
 		}
 	}
+	cursorDelegate: CustomRect {
+		id: cursor

-	onEditingFinished: {
-		if (!valid)
-			isError = true;
-	}
-	onPressed: {
-		if (stateLayer.enabled)
-			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
-	}
-	onTextEdited: {
-		if (isError)
-			isError = false;
-	}
+		property bool disableBlink

-	Item {
-		id: contentWrapper
+		color: Colors.palette.m3primary
+		implicitWidth: 2
+		radius: Tokens.rounding.medium

-		anchors.bottomMargin: root.supportingTextOffset
-		anchors.fill: parent
-
-		CustomText {
-			id: placeholder
-
-			anchors.left: parent.left
-			anchors.leftMargin: root.leftPadding
-			anchors.topMargin: Tokens.padding.extraSmall
-			anchors.verticalCenter: parent.verticalCenter
-			color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : root.text ? Colors.palette.m3outline : root.placeholderTextColor)
-			font.family: root.font.family
-			font.pointSize: root.font.pointSize
-			font.variableAxes: root.font.variableAxes
-			font.weight: root.font.weight
-			renderType: Text.QtRendering
-			text: root.placeholderText
-
-			states: [
-				State {
-					name: "smallOutlined"
-					when: root.type === CustomTextField.Outlined && (root.activeFocus || root.text)
-
-					PropertyChanges {
-						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding
-						placeholder.scale: root.smallFontScale
-					}
-
-					AnchorChanges {
-						anchors.verticalCenter: contentWrapper.top
-						target: placeholder
-					}
-				},
-				State {
-					name: "smallFilled"
-					when: root.type === CustomTextField.Filled && (root.activeFocus || root.text)
-
-					PropertyChanges {
-						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding + root.leadingOffset
-						placeholder.scale: root.smallFontScale
-					}
-
-					AnchorChanges {
-						anchors.top: contentWrapper.top
-						anchors.verticalCenter: undefined
-						target: placeholder
-					}
-				}
-			]
-			transitions: Transition {
-				Anim {
-					properties: "scale,leftMargin"
-					type: Anim.DefaultEffects
-				}
-
-				AnchorAnim {
-					duration: Tokens.anim.durations.expressiveDefaultEffects
-					easing: Tokens.anim.expressiveDefaultEffects
-				}
+		Behavior on opacity {
+			Anim {
+				duration: Tokens.anim.durations.small
 			}
 		}

-		Loader {
-			id: leadingIconLoader
-
-			active: root.leadingIcon
-			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.small
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.leadingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-
-		Loader {
-			id: trailingIconLoader
-
-			active: root.trailingIcon
-			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.small
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.trailingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-	}
-
-	Loader {
-		id: supportingTextLoader
-
-		active: root.effectiveSupportingText
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.leftMargin: root.horizontalPadding
-
-		sourceComponent: CustomText {
-			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font: Tokens.font.label.small
-			text: root.effectiveSupportingText
-		}
-	}
-
-	TapHandler {
-		id: tapHandler
-	}
-
-	Component {
-		id: outlineComp
-
-		Shape {
-			id: bg
-
-			asynchronous: true
-			preferredRendererType: Shape.CurveRenderer
-
-			ShapePath {
-				id: path
-
-				readonly property real inset: strokeWidth / 2
-				readonly property real outlineGap: placeholder.width * root.smallFontScale + Tokens.spacing.small * 2
-				property real outlineGapScale: root.activeFocus || root.text ? 1 : 0
-
-				capStyle: ShapePath.RoundCap
-				fillColor: "transparent"
-				startX: path.inset + root.horizontalPadding - root.clampedRadius + path.outlineGap * (1 - path.outlineGapScale) / 2 + path.outlineGap * path.outlineGapScale
-				startY: path.inset
-				strokeColor: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				strokeWidth: root.activeFocus ? 2 : 1
-
-				Behavior on outlineGapScale {
-					Anim {
-						type: Anim.DefaultEffects
-					}
-				}
-				Behavior on strokeColor {
-					CAnim {}
-				}
-				Behavior on strokeWidth {
-					Anim {}
-				}
-
-				PathLine {
-					x: bg.width - path.inset - root.clampedRadius
-					y: path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathLine {
-					x: bg.width - path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset - root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathLine {
-					x: path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset + root.clampedRadius
-					y: path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.horizontalPadding - root.clampedRadius / 2 + path.outlineGap * (1 - path.outlineGapScale) / 2
-					y: path.inset
+		Connections {
+			function onCursorPositionChanged(): void {
+				if (root.activeFocus && root.cursorVisible) {
+					cursor.opacity = 1;
+					cursor.disableBlink = true;
+					enableBlink.restart();
 				}
 			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 100
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
 		}
 	}
-
-	Component {
-		id: filledComp
-
-		CustomRect {
-			color: root.activeFocus ? Colors.tPalette.m3surfaceContainerHighest : Colors.tPalette.m3surfaceContainerHigh
-			topLeftRadius: root.clampedRadius
-			topRightRadius: root.clampedRadius
-
-			CustomRect {
-				anchors.bottom: parent.bottom
-				anchors.left: parent.left
-				anchors.right: parent.right
-				color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				implicitHeight: root.activeFocus ? 2 : 1
-
-				Behavior on implicitHeight {
-					Anim {}
-				}
-			}
+	Behavior on placeholderTextColor {
+		CAnim {
 		}
 	}
 }
@@ -1,16 +1,15 @@
 import QtQuick
-import QtQuick.Controls
 import ZShell.Config
 import qs.Services

 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.colSecondaryContainer
+	selectionColor: Colors.tPalette.m3onSecondaryContainer

 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Config.appearance?.font.size.normal ?? 15
+		pixelSize: Tokens?.font.size.normal ?? 15
 	}
 }
@@ -1,79 +0,0 @@
-import QtQuick
-import Quickshell
-import ZShell.Config
-
-Image {
-	id: root
-
-	property int fadeInAnim: Anim.DefaultEffects
-	property int fadeInLargeAnim: Anim.StandardLarge
-	property int fadeOutAnim: Anim.FastEffects
-	property bool fadingOut
-	property bool hadPrevious
-	property bool preventInit
-
-	function maybeStartInAnim(): void {
-		if (!preventInit && !opacityInAnim.running && status === Image.Ready) {
-			opacityInAnim.type = hadPrevious ? fadeInAnim : fadeInLargeAnim;
-			opacityInAnim.start();
-		}
-	}
-
-	asynchronous: true
-	fillMode: Image.PreserveAspectCrop
-	opacity: 0
-	retainWhileLoading: true
-	sourceSize: {
-		const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
-		return Qt.size(width * dpr, height * dpr);
-	}
-
-	Anim on opacity {
-		id: opacityInAnim
-
-		running: false
-		to: 1
-	}
-	Behavior on source {
-		SequentialAnimation {
-			ScriptAction {
-				script: opacityInAnim.stop()
-			}
-
-			PropertyAction {
-				property: "fadingOut"
-				target: root
-				value: true
-			}
-
-			Anim {
-				property: "opacity"
-				target: root
-				to: 0
-				type: root.fadeOutAnim
-			}
-
-			PropertyAction {
-				property: "fadingOut"
-				target: root
-				value: false
-			}
-
-			PropertyAction {
-				property: "hadPrevious"
-				target: root
-				value: root.source
-			}
-
-			PropertyAction {
-			}
-
-			ScriptAction {
-				script: root.maybeStartInAnim()
-			}
-		}
-	}
-
-	onPreventInitChanged: maybeStartInAnim()
-	onStatusChanged: maybeStartInAnim()
-}
@@ -1,115 +0,0 @@
-import QtQuick
-import Quickshell
-import M3Shapes
-import ZShell.Config
-import qs.Services
-
-MaterialShape {
-	id: root
-
-	property bool animated: true
-	property real cRotation
-	property bool containsIcon
-	property real dampingRatio: 0.6
-	property real lRotation
-	property int morphAnimRotation: 60
-	property real morphScale: 0.14
-	property alias rotateAnimDuration: rotateAnim.duration
-	property int shapeIndex
-	property list<int> shapes: {
-		if (containsIcon)
-			return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-		return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pentagon, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-	}
-	readonly property real springDuration: {
-		const wn = Math.sqrt(stiffness);
-		const r = -dampingRatio * wn;
-		const c = 1 / Math.sqrt(1 - dampingRatio * dampingRatio);
-		return Math.log(visibilityThreshold / c) / r;
-	}
-	readonly property real springMaxVelocity: {
-		const wn = Math.sqrt(stiffness);
-		const factor = Math.exp(-z * Math.acos(z) / Math.sqrt(1 - z * z));
-		return wn * factor;
-	}
-	property bool springSettled: true
-	property real stiffness: 180
-	property real thisLRotation
-	property real visibilityThreshold: 0.075
-
-	function spring(t: real): var {
-		const wn = Math.sqrt(stiffness);
-		const za = dampingRatio * wn;
-
-		const wd = wn * Math.sqrt(1 - dampingRatio * dampingRatio);
-		const r = za / wd;
-		const pos = 1 - Math.exp(-za * t) * (Math.cos(wd * t) + r * Math.sin(wd * t));
-		const vel = Math.exp(-za * t) * (wn * wn / wd) * Math.sin(wd * t);
-
-		return [pos, vel];
-	}
-
-	color: Colors.palette.m3primary
-	implicitSize: 38
-	toShape: shapes[0]
-
-	RotationAnimation on cRotation {
-		id: rotateAnim
-
-		duration: 4666
-		easing.type: Easing.Linear
-		from: 0
-		loops: Animation.Infinite
-		running: root.animated
-		to: 360
-	}
-	Behavior on color {
-		CAnim {
-		}
-	}
-
-	ElapsedTimer {
-		id: timer
-	}
-
-	FrameAnimation {
-		running: root.animated && !root.springSettled
-
-		onTriggered: {
-			const t = timer.elapsed();
-
-			if (t >= root.springDuration) {
-				root.springSettled = true;
-			} else {
-				const [pos, vel] = root.spring(t);
-				root.morphProgress = Math.min(1, pos); // Overshooting the morph looks weird
-				root.thisLRotation = pos * root.morphAnimRotation;
-				root.scale = 1 + vel * root.morphScale / root.springMaxVelocity;
-			}
-		}
-	}
-
-	Timer {
-		interval: 650
-		repeat: true
-		running: root.animated
-		triggeredOnStart: true
-
-		onTriggered: {
-			root.beginBatchUpdate();
-			root.fromShape = root.toShape;
-			root.shapeIndex = (root.shapeIndex + 1) % root.shapes.length;
-			root.toShape = root.shapes[root.shapeIndex];
-			root.morphProgress = 0;
-
-			root.rotation = root.rotation;
-			root.lRotation = (root.lRotation + root.thisLRotation) % 360;
-			root.thisLRotation = 0;
-			root.rotation = Qt.binding(() => root.cRotation + root.lRotation + root.thisLRotation);
-
-			root.springSettled = false;
-			timer.restart();
-			root.endBatchUpdate();
-		}
-	}
-}
@@ -1,14 +1,16 @@
-import QtQuick
 import ZShell.Config
 import qs.Services

 CustomText {
-	id: root
-
-	property real fill: 0
+	property real fill
 	property int grade: Colors.light ? 0 : -25
-	property font fontStyle: Tokens.font.icon.small

-	renderType: Text.NativeRendering
-	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
+	font.family: "Material Symbols Rounded"
+	font.pointSize: Tokens.font.size.larger
+	font.variableAxes: ({
+			FILL: fill.toFixed(1),
+			GRAD: grade,
+			opsz: fontInfo.pixelSize,
+			wght: fontInfo.weight
+		})
 }
@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
+import ZShell.Components
+import qs.Helpers
 import ZShell.Config
 import qs.Services

@@ -11,6 +13,7 @@ MouseArea {
 	property alias bottomRightRadius: base.bottomRightRadius
 	property real circleRadius
 	property alias color: base.color
+	property bool disabled
 	readonly property real endRadius: {
 		const d1 = distSq(0, 0);
 		const d2 = distSq(width, 0);
@@ -19,7 +22,6 @@ MouseArea {
 		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
 	}
 	property real endRadiusAtPress
-	property bool manualHoverOverride
 	property bool manualPressOverride
 	property real pressX: width / 2
 	property real pressY: height / 2
@@ -27,7 +29,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
+	property real stateOpacity: containsMouse ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius

@@ -50,8 +52,8 @@ MouseArea {
 	}

 	anchors.fill: parent
-	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled
+	cursorShape: disabled ? undefined : Qt.PointingHandCursor
+	enabled: !disabled
 	hoverEnabled: true

 	Behavior on stateOpacity {
@@ -98,13 +100,13 @@ MouseArea {
 		id: base

 		anchors.fill: parent
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		color: Colors.palette.m3onSurface
 		opacity: root.stateOpacity
 		// Pick up radius from parent if it has one (parent can be anything with radius props)
 		// qmllint disable missing-property
 		radius: root.parent?.radius ?? 0
-		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
-		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
 		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
 		// qmllint enable missing-property
@@ -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
@@ -14,16 +13,34 @@ SnapLayout {

 	spacing: Tokens.spacing.largeIncreased * 2

-	CustomRect {
-		Layout.fillHeight: true
+	ColumnLayout {
 		Layout.fillWidth: true
-		topLeftRadius: Tokens.rounding.largeIncreased
-		bottomLeftRadius: Tokens.rounding.largeIncreased
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.small
+		spacing: Tokens.spacing.medium

-		UserDock {
-			greeter: root.greeter
+		CustomRect {
+			Layout.fillWidth: true
+			color: Colors.tPalette.m3surfaceContainer
+			implicitHeight: weather.implicitHeight
+			radius: Tokens.rounding.small
+			topLeftRadius: Tokens.rounding.largeIncreased
+
+			WeatherInfo {
+				id: weather
+
+				rootHeight: root.height
+			}
+		}
+
+		CustomClippingRect {
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			bottomLeftRadius: Tokens.rounding.largeIncreased
+			color: Colors.tPalette.m3surfaceContainer
+			radius: Tokens.rounding.small
+
+			UserDock {
+				greeter: root.greeter
+			}
 		}
 	}

@@ -32,16 +49,21 @@ SnapLayout {
 		screenHeight: root.screenHeight
 	}

-	CustomRect {
-		Layout.fillHeight: true
+	ColumnLayout {
 		Layout.fillWidth: true
-		bottomRightRadius: Tokens.rounding.largeIncreased
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.small
-		topRightRadius: Tokens.rounding.largeIncreased
+		spacing: Tokens.spacing.medium

-		SessionDock {
-			greeter: root.greeter
+		CustomRect {
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			bottomRightRadius: Tokens.rounding.largeIncreased
+			color: Colors.tPalette.m3surfaceContainer
+			radius: Tokens.rounding.small
+			topRightRadius: Tokens.rounding.largeIncreased
+
+			SessionDock {
+				greeter: root.greeter
+			}
 		}
 	}
 }
@@ -134,7 +134,8 @@ Scope {
 					id: lockIcon

 					anchors.centerIn: parent
-					fontStyle: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
+					font.bold: true
+					font.pointSize: Tokens.font.size.extraLarge * 4
 					text: "lock"
 				}

@@ -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
@@ -40,7 +39,8 @@ Item {
 		anchors.centerIn: parent
 		animate: true
 		color: root.greeter.launching ? Colors.palette.m3secondary : Colors.palette.m3outline
-		font: Tokens.font.mono.medium
+		font.family: Config.appearance.font.family.mono
+		font.pointSize: Tokens.font.size.normal
 		opacity: root.buffer ? 0 : 1
 		text: {
 			if (root.greeter.launching)
@@ -51,7 +51,8 @@ Item {
 		}

 		Behavior on opacity {
-			Anim {}
+			Anim {
+			}
 		}
 	}

@@ -63,13 +64,15 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		color: Colors.palette.m3onSurface
 		elide: Text.ElideLeft
-		font: Tokens.font.mono.medium
+		font.family: Config.appearance.font.family.mono
+		font.pointSize: Tokens.font.size.normal
 		horizontalAlignment: Qt.AlignHCenter
 		opacity: root.greeter.echoResponse && root.buffer ? 1 : 0
 		text: root.buffer

 		Behavior on opacity {
-			Anim {}
+			Anim {
+			}
 		}
 	}

@@ -86,7 +89,7 @@ Item {

 		anchors.centerIn: parent
 		anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0
-		implicitHeight: Tokens.font.body.medium
+		implicitHeight: Tokens.font.size.normal
 		implicitWidth: fullWidth
 		interactive: false
 		opacity: root.greeter.echoResponse ? 0 : 1
@@ -104,7 +107,8 @@ Item {
 			scale: 0

 			Behavior on opacity {
-				Anim {}
+				Anim {
+				}
 			}
 			Behavior on scale {
 				Anim {
@@ -152,13 +156,15 @@ Item {
 		Behavior on implicitWidth {
 			id: imWidthBehavior

-			Anim {}
+			Anim {
+			}
 		}
 		model: ScriptModel {
 			values: root.buffer.split("")
 		}
 		Behavior on opacity {
-			Anim {}
+			Anim {
+			}
 		}
 	}
 }
@@ -3,32 +3,32 @@ 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
+	spacing: Tokens.spacing.small

 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
+		font.family: Config.appearance.font.family.mono
+		font.weight: 500
 		text: root.greeter.sessions.length > 0 ? qsTr("%1 session%2").arg(root.greeter.sessions.length).arg(root.greeter.sessions.length === 1 ? "" : "s") : qsTr("Sessions")
 	}

-	Item {
+	CustomClippingRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
+		color: "transparent"
+		radius: Tokens.rounding.small

 		Loader {
 			active: opacity > 0
@@ -40,21 +40,22 @@ SnapLayout {
 					duration: Tokens.anim.durations.extraLarge
 				}
 			}
-			sourceComponent: SnapLayout {
+			sourceComponent: ColumnLayout {
 				spacing: Tokens.spacing.largeIncreased
-				orientation: Qt.Vertical

 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					fontStyle: Tokens.font.icon.large
+					font.pointSize: Tokens.font.size.extraLarge * 2
 					text: "desktop_windows"
 				}

 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font: Tokens.font.headline.builders.small.width(90).build()
+					font.family: Config.appearance.font.family.mono
+					font.pointSize: Tokens.font.size.large
+					font.weight: 500
 					text: qsTr("No Sessions Found")
 				}
 			}
@@ -67,7 +68,6 @@ SnapLayout {
 			clip: true
 			currentIndex: root.greeter.sessionIndex
 			highlightFollowsCurrentItem: false
-			boundsBehavior: ListView.StopAtBounds
 			model: root.greeter.sessions
 			spacing: Tokens.spacing.small

@@ -80,7 +80,7 @@ SnapLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.large
+				radius: Tokens.rounding.medium - Tokens.padding.small

 				StateLayer {
 					onClicked: {
@@ -88,7 +88,7 @@ SnapLayout {
 					}
 				}

-				SnapLayout {
+				RowLayout {
 					id: row

 					anchors.fill: parent
@@ -97,21 +97,20 @@ SnapLayout {

 					MaterialIcon {
 						color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
-						fontStyle: Tokens.font.icon.extraLarge
+						font.pointSize: Tokens.font.size.extraLarge
 						text: modelData.kind === "x11" ? "tv" : "desktop_windows"
 					}

-					SnapLayout {
+					ColumnLayout {
 						Layout.fillWidth: true
-
 						spacing: Tokens.spacing.small / 2
-						orientation: Qt.Vertical

 						CustomText {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
+							font.pointSize: Tokens.font.size.normal
+							font.weight: 600
 							text: modelData.name
 						}

@@ -119,7 +118,8 @@ SnapLayout {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimaryFixedVariant : Colors.palette.m3onSurfaceVariant
 							elide: Text.ElideRight
-							font: Tokens.font.mono.small
+							font.family: Config.appearance.font.family.mono
+							font.pointSize: Tokens.font.size.small
 							text: modelData.kind
 						}
 					}
@@ -129,7 +129,7 @@ SnapLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: sessions.currentItem?.implicitHeight ?? 0
 				implicitWidth: sessions.width
-				radius: Tokens.rounding.large
+				radius: Tokens.rounding.medium - Tokens.padding.small
 				y: sessions.currentItem?.y ?? 0

 				Behavior on y {
@@ -3,33 +3,33 @@ 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
+	spacing: Tokens.spacing.small

 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
+		font.family: Config.appearance.font.family.mono
+		font.weight: 500
 		text: root.greeter.users.length > 0 ? qsTr("%1 user%2").arg(root.greeter.users.length).arg(root.greeter.users.length === 1 ? "" : "s") : qsTr("Users")
 	}

-	Item {
+	CustomClippingRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
+		color: "transparent"
+		radius: Tokens.rounding.small

 		Loader {
 			active: opacity > 0
@@ -41,22 +41,23 @@ SnapLayout {
 					duration: Tokens.anim.durations.extraLarge
 				}
 			}
-			sourceComponent: SnapLayout {
+			sourceComponent: ColumnLayout {
 				spacing: Tokens.spacing.largeIncreased
-				orientation: Qt.Vertical

 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
 					fill: 1
-					fontStyle: Tokens.font.icon.large
+					font.pointSize: Tokens.font.size.extraLarge * 2
 					text: "account_circle"
 				}

 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font: Tokens.font.headline.builders.small.width(90).build()
+					font.family: Config.appearance.font.family.mono
+					font.pointSize: Tokens.font.size.large
+					font.weight: 500
 					text: qsTr("No Users Found")
 				}
 			}
@@ -69,7 +70,6 @@ SnapLayout {
 			clip: true
 			currentIndex: root.greeter.selectedUser ? root.greeter.users.indexOf(root.greeter.selectedUser) : -1
 			highlightFollowsCurrentItem: false
-			boundsBehavior: ListView.StopAtBounds
 			model: root.greeter.users
 			spacing: Tokens.spacing.small

@@ -82,7 +82,7 @@ SnapLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.large
+				radius: Tokens.rounding.medium - Tokens.padding.small

 				StateLayer {
 					onClicked: {
@@ -90,14 +90,14 @@ SnapLayout {
 					}
 				}

-				SnapLayout {
+				RowLayout {
 					id: row

 					anchors.fill: parent
 					anchors.margins: Tokens.padding.small
 					spacing: Tokens.spacing.medium

-					ClipRect {
+					CustomClippingRect {
 						Layout.preferredHeight: 50
 						Layout.preferredWidth: 50
 						radius: Tokens.rounding.full
@@ -106,7 +106,7 @@ SnapLayout {
 							anchors.centerIn: parent
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
 							fill: 1
-							fontStyle: Tokens.font.icon.extraLarge
+							font.pointSize: Tokens.font.size.extraLarge
 							text: modelData.kind === "x11" ? "tv" : "account_circle"
 						}

@@ -116,17 +116,16 @@ SnapLayout {
 						}
 					}

-					SnapLayout {
+					ColumnLayout {
 						Layout.fillWidth: true
-
 						spacing: Tokens.spacing.small / 2
-						orientation: Qt.Vertical

 						CustomText {
 							Layout.fillWidth: true
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
+							font.pointSize: Tokens.font.size.normal
+							font.weight: 600
 							text: modelData.username
 						}
 					}
@@ -136,7 +135,7 @@ SnapLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: users.currentItem?.implicitHeight ?? 0
 				implicitWidth: users.width
-				radius: Tokens.rounding.large
+				radius: Tokens.rounding.medium - Tokens.padding.small
 				y: users.currentItem?.y ?? 0

 				Behavior on y {
@@ -0,0 +1,171 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Components
+import qs.Helpers
+import qs.Services
+
+ColumnLayout {
+	id: root
+
+	required property int rootHeight
+
+	anchors.left: parent.left
+	anchors.margins: Tokens.padding.large * 2
+	anchors.right: parent.right
+	spacing: Tokens.spacing.small
+
+	Loader {
+		Layout.alignment: Qt.AlignHCenter
+		Layout.bottomMargin: -Tokens.padding.large
+		Layout.topMargin: Tokens.padding.large * 2
+		active: root.rootHeight > 610
+		visible: active
+
+		sourceComponent: CustomText {
+			color: Colors.palette.m3primary
+			font.pointSize: Tokens.font.size.extraLarge
+			font.weight: 500
+			text: qsTr("Weather")
+		}
+	}
+
+	RowLayout {
+		Layout.fillWidth: true
+		spacing: Tokens.spacing.largeIncreased
+
+		MaterialIcon {
+			animate: true
+			color: Colors.palette.m3secondary
+			font.pointSize: Tokens.font.size.extraLarge * 2.5
+			text: Weather.icon
+		}
+
+		ColumnLayout {
+			spacing: Tokens.spacing.small
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: Colors.palette.m3secondary
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.large
+				font.weight: 500
+				text: Weather.description
+			}
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: Colors.palette.m3onSurfaceVariant
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.normal
+				text: qsTr("Humidity: %1%").arg(Weather.humidity)
+			}
+		}
+
+		Loader {
+			Layout.rightMargin: Tokens.padding.small
+			active: root.width > 400
+			visible: active
+
+			sourceComponent: ColumnLayout {
+				spacing: Tokens.spacing.small
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: Colors.palette.m3primary
+					elide: Text.ElideLeft
+					font.pointSize: Tokens.font.size.extraLarge
+					font.weight: 500
+					horizontalAlignment: Text.AlignRight
+					text: Weather.temp
+				}
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: Colors.palette.m3outline
+					elide: Text.ElideLeft
+					font.pointSize: Tokens.font.size.smaller
+					horizontalAlignment: Text.AlignRight
+					text: qsTr("Feels like: %1").arg(Weather.feelsLike)
+				}
+			}
+		}
+	}
+
+	Loader {
+		id: forecastLoader
+
+		Layout.bottomMargin: Tokens.padding.large * 2
+		Layout.fillWidth: true
+		Layout.topMargin: Tokens.spacing.small
+		active: root.rootHeight > 820
+		visible: active
+
+		sourceComponent: RowLayout {
+			spacing: Tokens.spacing.largeIncreased
+
+			Repeater {
+				model: {
+					const forecast = Weather.hourlyForecast;
+					const count = root.width < 320 ? 3 : root.width < 400 ? 4 : 5;
+					if (!forecast)
+						return Array.from({
+							length: count
+						}, () => null);
+
+					const start = Math.max(0, Weather.currentHourIndex);
+					return forecast.slice(start, start + count);
+				}
+
+				ColumnLayout {
+					id: forecastHour
+
+					required property var modelData
+
+					Layout.fillWidth: true
+					spacing: Tokens.spacing.small
+
+					CustomText {
+						Layout.fillWidth: true
+						color: Colors.palette.m3outline
+						font.pointSize: Tokens.font.size.larger
+						horizontalAlignment: Text.AlignHCenter
+						text: {
+							const hour = forecastHour.modelData?.hour ?? 0;
+							return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
+						}
+					}
+
+					MaterialIcon {
+						Layout.alignment: Qt.AlignHCenter
+						font.pointSize: Tokens.font.size.extraLarge * 1.5
+						font.weight: 500
+						text: forecastHour.modelData?.icon ?? "cloud_alert"
+					}
+
+					CustomText {
+						Layout.alignment: Qt.AlignHCenter
+						color: Colors.palette.m3secondary
+						font.pointSize: Tokens.font.size.larger
+						text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
+					}
+				}
+			}
+		}
+	}
+
+	Timer {
+		interval: 900000 // 15 minutes
+		repeat: true
+		running: true
+		triggeredOnStart: true
+
+		onTriggered: Weather.reload()
+	}
+}
@@ -0,0 +1,88 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Hyprland
+import ZShell
+import qs.Components
+
+Scope {
+	LazyLoader {
+		id: root
+
+		property bool closing
+		property bool freeze
+
+		Variants {
+			model: Quickshell.screens
+
+			PanelWindow {
+				id: win
+
+				required property ShellScreen modelData
+
+				WlrLayershell.exclusionMode: ExclusionMode.Ignore
+				WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive
+				WlrLayershell.layer: WlrLayer.Overlay
+				WlrLayershell.namespace: "areapicker"
+				color: "transparent"
+				mask: root.closing ? empty : null
+				screen: modelData
+
+				anchors {
+					bottom: true
+					left: true
+					right: true
+					top: true
+				}
+
+				Region {
+					id: empty
+
+				}
+
+				Picker {
+					loader: root
+					screen: win.modelData
+				}
+			}
+		}
+	}
+
+	IpcHandler {
+		function open(): void {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+
+		function openFreeze(): void {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+
+		target: "picker"
+	}
+
+	CustomShortcut {
+		name: "screenshot"
+
+		onPressed: {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+
+	CustomShortcut {
+		name: "screenshotFreeze"
+
+		onPressed: {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+}
@@ -23,7 +23,7 @@ Singleton {

 	function toggleNightLight(): void {
 		service.manualToggle = true;
-		service.toggle(true);
+		service.toggle();
 	}

 	NightlightManager {
@@ -41,7 +41,6 @@ Item {
 	property real rsy: Math.min(sy, ey)
 	readonly property real scaleRatio: Hypr.monitorFor(screen).scale
 	required property ShellScreen screen
-	required property ScreenState screenState
 	property real sh: Math.abs(sy - ey)
 	readonly property color shadowColor: Hypr.options.decoration.shadow?.color ?? "black"
 	readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
@@ -98,6 +97,10 @@ Item {
 		const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
 		const postCmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : null;

+		overlay.visible = border.visible = false;
+		handles.visible = false;
+		toolbar.visible = false;
+
 		ZShellIo.saveItem(captureLayer, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => {
 			const finalize = finalPath => {
 				if (copyToClipboard) {
@@ -126,22 +129,22 @@ Item {
 	Behavior on rsx {
 		enabled: !selectArea.pressed && root.mode === "select"

-		Anim {}
+		ExAnim {}
 	}
 	Behavior on rsy {
 		enabled: !selectArea.pressed && root.mode === "select"

-		Anim {}
+		ExAnim {}
 	}
 	Behavior on sh {
 		enabled: !selectArea.pressed && root.mode === "select"

-		Anim {}
+		ExAnim {}
 	}
 	Behavior on sw {
 		enabled: !selectArea.pressed && root.mode === "select"

-		Anim {}
+		ExAnim {}
 	}
 	Behavior on opacity {
 		Anim {
@@ -151,7 +154,7 @@ Item {

 	Component.onCompleted: {
 		Hypr.extras.refreshOptions();
-		root.forceActiveFocus();
+		screencopy.active = true;

 		opacity = 1;

@@ -216,63 +219,13 @@ Item {
 		onReleased: root.enterEditMode()
 	}

-	Connections {
-		function onClosingChanged(): void {
-			if (root.loader.closing)
-				closeAnim.start();
-			else {
-				closeAnim.stop();
-				returnAnim.start();
-			}
-		}
-
-		target: root.loader
-	}
-
-	ParallelAnimation {
-		id: returnAnim
-
-		Anim {
-			duration: 300
-			property: "opacity"
-			target: root
-			to: 1
-		}
-
-		Anim {
-			property: "rsx"
-			target: root
-			to: Math.min(root.sx, root.ex)
-		}
-
-		Anim {
-			property: "rsy"
-			target: root
-			to: Math.min(root.sy, root.ey)
-		}
-
-		Anim {
-			property: "sw"
-			target: root
-			to: Math.abs(root.sx - root.ex)
-		}
-
-		Anim {
-			property: "sh"
-			target: root
-			to: Math.abs(root.sy - root.ey)
-		}
-	}
-
 	SequentialAnimation {
 		id: closeAnim

-		ScriptAction {
-			script: {
-				const states = ShellState.allStates();
-				for (const s of states)
-					s.screenshot = false;
-			}
+		PropertyAction {
+			property: "closing"
+			target: root.loader
+			value: true
 		}

 		ParallelAnimation {
@@ -283,19 +236,19 @@ Item {
 				to: 0
 			}

-			Anim {
+			ExAnim {
 				properties: "rsx,rsy"
 				target: root
 				to: 0
 			}

-			Anim {
+			ExAnim {
 				property: "sw"
 				target: root
 				to: root.screen.width
 			}

-			Anim {
+			ExAnim {
 				property: "sh"
 				target: root
 				to: root.screen.height
@@ -314,12 +267,17 @@ Item {

 		anchors.fill: parent

-		ScreencopyView {
+		Loader {
 			id: screencopy

+			active: false
 			anchors.fill: parent
-			captureSource: root.screen
-			paintCursor: false
+			asynchronous: true
+
+			sourceComponent: ScreencopyView {
+				captureSource: root.screen
+				paintCursor: false
+			}
 		}

 		AnnotationCanvas {
@@ -328,7 +286,6 @@ Item {
 			anchors.fill: parent
 			inkColor: root.inkColor
 			layer.enabled: true
-			selection: selectionRect
 			tool: root.mode === "edit" && root.tool !== "move" ? root.tool : "none"

 			layer.effect: MultiEffect {
@@ -340,14 +297,15 @@ Item {
 		}
 	}

-	CustomRect {
+	Rectangle {
 		id: overlay

 		anchors.fill: parent
 		color: "white"
 		layer.enabled: true
 		opacity: 0.3
-		visible: screencopy.hasContent
+		radius: root.realRounding
+		visible: screencopy.item?.hasContent ?? false

 		layer.effect: MultiEffect {
 			maskEnabled: true
@@ -376,15 +334,16 @@ Item {
 		}
 	}

-	CustomRect {
+	Rectangle {
 		id: border

 		border.color: Colors.palette.m3primary
 		border.width: root.realBorderWidth
+		color: "transparent"
 		implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
 		implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
 		radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
-		visible: screencopy.hasContent
+		visible: screencopy.item?.hasContent ?? false
 		x: selectionRect.x - root.realBorderWidth
 		y: selectionRect.y - root.realBorderWidth

@@ -396,24 +355,17 @@ Item {
 	SelectionHandles {
 		id: handles

-		border: root.realBorderWidth
 		selH: root.sh
 		selW: root.sw
 		selX: root.rsx
 		selY: root.rsy
-		selection: selectionRect
-		tool: root.tool
 		visible: root.mode === "edit" && root.tool === "move"

 		onBoundsChanged: (x, y, w, h) => {
-			let nx = Math.max(0, x);
-			let ny = Math.max(0, y);
-			let nw = Math.min(w, root.screen.width - nx);
-			let nh = Math.min(h, root.screen.height - ny);
-			root.sx = nx;
-			root.sy = ny;
-			root.ex = nx + nw;
-			root.ey = ny + nh;
+			root.sx = x;
+			root.sy = y;
+			root.ex = x + w;
+			root.ey = y + h;
 		}
 		onMoveBy: (dx, dy) => {
 			const w = root.sw, h = root.sh;
@@ -444,4 +396,6 @@ Item {
 		onToolSelected: t => root.tool = t
 		onUndoRequested: annotations.undo()
 	}
+
+	component ExAnim: Anim {}
 }
@@ -8,13 +8,13 @@ Item {

 	property color inkColor: "#ff3b30"
 	property real inkWidth: 4
-	required property Rectangle selection
 	property string tool: "none"

 	signal changed

 	function clearAll() {
-		canvas.clear();
+		committedCanvas.clear();
+		previewCanvas.clear();
 		changed();
 	}

@@ -54,85 +54,90 @@ Item {
 	}

 	function undo() {
-		canvas.undoLastGroup();
+		committedCanvas.undoLastGroup();
 		changed();
 	}

 	anchors.fill: parent
-	enabled: tool !== "none"

 	StrokeCanvas {
-		id: canvas
+		id: committedCanvas

 		anchors.fill: parent
 		penColor: root.inkColor
 		penWidth: root.inkWidth
 	}

-	MouseArea {
+	StrokeCanvas {
+		id: previewCanvas
+
+		anchors.fill: parent
+		penColor: root.inkColor
+		penWidth: root.inkWidth
+	}
+
+	PointHandler {
 		id: drawHandler

 		property real startX
 		property real startY
+		property bool started: false

 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		anchors.fill: parent
-		cursorShape: undefined
-		enabled: root.enabled
+		enabled: root.tool !== "none"

-		onPositionChanged: e => {
-			const x = e.x;
-			const y = e.y;
-
-			if (!pressed)
+		onActiveChanged: {
+			if (active)
 				return;

 			if (root.tool === "pen") {
-				canvas.appendPoint(x, y);
+				committedCanvas.endStroke();
+			} else if (started) {
+				const pts = root.sampleShape(root.tool, startX, startY, point.position.x, point.position.y);
+				if (pts.length > 0) {
+					committedCanvas.beginStroke(pts[0][0], pts[0][1], true);
+					for (let i = 1; i < pts.length; i++)
+						committedCanvas.appendPoint(pts[i][0], pts[i][1]);
+					committedCanvas.endStroke();
+				}
+				previewCanvas.clear();
+			}
+			started = false;
+			root.changed();
+		}
+		onPointChanged: {
+			if (!active)
+				return;
+
+			if (point.pressedButtons & Qt.RightButton) {
+				root.clearAll();
 				return;
 			}

-			const pts = root.sampleShape(root.tool, startX, startY, x, y);
-			if (pts.length > 0) {
-				canvas.beginStroke(pts[0][0], pts[0][1], true);
-				for (let i = 1; i < pts.length; i++)
-					canvas.appendPoint(pts[i][0], pts[i][1]);
-			}
-		}
-		onPressed: e => {
-			if (e.button & Qt.LeftButton) {
-				startX = e.x;
-				startY = e.y;
-				canvas.beginStroke(e.x, e.y);
-			} else if (e.button & Qt.RightButton) {
-				root.clearAll();
-			}
-		}
-		onPressedChanged: if (!pressed)
-			canvas.endStroke()
-	}
-
-	HoverHandler {
-		cursorShape: {
-			if (root.tool === "none")
-				return undefined;
-
 			const x = point.position.x;
 			const y = point.position.y;
-			const withinXWidth = x > root.selection.x && x < root.selection.x + root.selection.implicitWidth;
-			const withinYHeight = y > root.selection.y && y < root.selection.y + root.selection.implicitHeight;

-			if (withinXWidth && withinYHeight) {
-				if (!drawHandler.pressed)
-					canvas.showHover(x, y);
-				else
-					canvas.showHover(drawHandler.mouseX, drawHandler.mouseY);
-				return Qt.BlankCursor;
-			} else {
-				canvas.hideHover();
-				return undefined;
+			if (root.tool === "pen") {
+				if (!started) {
+					started = true;
+					committedCanvas.beginStroke(x, y);
+					return;
+				}
+				committedCanvas.appendPoint(x, y);
+				return;
+			}
+
+			if (!started) {
+				started = true;
+				startX = point.pressPosition.x;
+				startY = point.pressPosition.y;
+			}
+			const pts = root.sampleShape(root.tool, startX, startY, x, y);
+			if (pts.length > 0) {
+				previewCanvas.beginStroke(pts[0][0], pts[0][1], true);
+				for (let i = 1; i < pts.length; i++)
+					previewCanvas.appendPoint(pts[i][0], pts[i][1]);
 			}
 		}
-		enabled: root.enabled
 	}
 }
@@ -53,7 +53,7 @@ CustomRect {
 	radius: Tokens.rounding.full
 	width: row.implicitWidth + Tokens.padding.small * 2

-	SnapLayout {
+	RowLayout {
 		id: row

 		anchors.centerIn: parent
@@ -1,23 +1,18 @@
 pragma ComponentBehavior: Bound

 import QtQuick
-import ZShell.Internal
-import qs.Services

 Item {
 	id: root

-	required property int border
-	property color handleBorder: Colors.palette.m3primary
-	property color handleFill: Colors.palette.m3onPrimary
+	property color handleBorder: "#3584e4"
+	property color handleFill: "white"
 	property real hs: 12
 	property real minSize: 24
 	required property real selH
 	required property real selW
 	required property real selX
 	required property real selY
-	required property Rectangle selection
-	required property string tool

 	signal boundsChanged(x: real, y: real, w: real, h: real)
 	signal dragFinished
@@ -28,16 +23,12 @@ Item {
 	x: selX
 	y: selY

-	Component.onDestruction: Cursor.clearOverride()
-
 	DragHandler {
 		id: moveHandler

 		property real accumX: 0
 		property real accumY: 0

-		cursorShape: undefined
-		dragThreshold: 0
 		target: null

 		onActiveChanged: {
@@ -54,63 +45,51 @@ Item {
 		}
 	}

-	HoverHandler {
-		cursorShape: {
-			if (root.tool !== "move")
-				return undefined;
-
-			if ((moveHandler.centroid.pressedButtons & Qt.LeftButton) && moveHandler.active)
-				return Qt.ClosedHandCursor;
-			else
-				return Qt.OpenHandCursor;
-		}
-	}
-
 	Handle {
 		edge: "tl"
-		x: -(root.hs + root.border) / 2
-		y: -(root.hs + root.border) / 2
+		x: -root.hs / 2
+		y: -root.hs / 2
 	}

 	Handle {
 		edge: "t"
 		x: root.width / 2 - root.hs / 2
-		y: -(root.hs + root.border) / 2
+		y: -root.hs / 2
 	}

 	Handle {
 		edge: "tr"
-		x: root.width - root.hs / 2 + root.border / 2
-		y: -(root.hs + root.border) / 2
+		x: root.width - root.hs / 2
+		y: -root.hs / 2
 	}

 	Handle {
 		edge: "r"
-		x: root.width - root.hs / 2 + root.border / 2
+		x: root.width - root.hs / 2
 		y: root.height / 2 - root.hs / 2
 	}

 	Handle {
 		edge: "br"
-		x: root.width - root.hs / 2 + root.border / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		x: root.width - root.hs / 2
+		y: root.height - root.hs / 2
 	}

 	Handle {
 		edge: "b"
 		x: root.width / 2 - root.hs / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		y: root.height - root.hs / 2
 	}

 	Handle {
 		edge: "bl"
-		x: -(root.hs + root.border) / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		x: -root.hs / 2
+		y: root.height - root.hs / 2
 	}

 	Handle {
 		edge: "l"
-		x: -(root.hs + root.border) / 2
+		x: -root.hs / 2
 		y: root.height / 2 - root.hs / 2
 	}

@@ -128,8 +107,6 @@ Item {
 		z: 10

 		HoverHandler {
-			id: hover
-
 			cursorShape: {
 				switch (handle.edge) {
 				case "tl":
@@ -155,7 +132,6 @@ Item {
 			property real startX
 			property real startY

-			dragThreshold: 0
 			grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.TakeOverForbidden
 			target: null

@@ -165,10 +141,8 @@ Item {
 					startY = root.y;
 					startW = root.width;
 					startH = root.height;
-					Cursor.setOverride(hover.cursorShape);
 				} else {
 					root.dragFinished();
-					Cursor.clearOverride();
 				}
 			}
 			onTranslationChanged: {
@@ -5,9 +5,7 @@ import Quickshell
 import Quickshell.Io
 import QtQuick
 import ZShell.Models
-import ZShell.Wallpaper
 import ZShell.Config
-import qs.Components
 import qs.Services
 import qs.Helpers
 import qs.Paths
@@ -16,48 +14,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 +48,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 +94,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 {
@@ -140,104 +140,4 @@ 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
-			required property var modelData
-
-			// Crop animation only for edits, never for wallpaper swaps.
-			property bool animateCrop: false
-
-			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()
-
-			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();
-			}
-		}
-	}
 }
@@ -4,13 +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
-import ZShell

-SnapLayout {
+GridLayout {
 	id: root

 	required property bool fullscreen
@@ -19,12 +17,12 @@ SnapLayout {
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
-	required property ScreenState screenState
 	readonly property int vPadding: 6
+	required property ScreenState screenState

 	function axisCenterOf(item: Item): real {
 		const c = item.mapToItem(root, item.implicitWidth / 2, item.implicitHeight / 2);
-		return horizontal ? ZUtils.snap(c.x, item) : ZUtils.snap(c.y, item);
+		return horizontal ? c.x : c.y;
 	}

 	function checkPopout(pos: real): void {
@@ -76,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
@@ -268,26 +228,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
@@ -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
@@ -0,0 +1,49 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Effects
+import ZShell.Config
+import qs.Components
+import qs.Services
+
+Item {
+	id: root
+
+	required property Item bar
+	required property ScreenState screenState
+
+	anchors.fill: parent
+
+	CustomRect {
+		anchors.fill: parent
+		anchors.margins: -1
+		color: Colors.palette.m3surface
+		layer.enabled: true
+
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskInverted: true
+			maskSource: mask
+			maskSpreadAtMin: 1
+			maskThresholdMin: 0.5
+		}
+	}
+
+	Item {
+		id: mask
+
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false
+
+		Rectangle {
+			anchors.fill: parent
+			anchors.margins: Config.bar.border + 1
+			anchors.topMargin: root.bar.implicitHeight + 1
+			radius: Config.bar.border > 0 ? Config.bar.rounding : 0
+			topLeftRadius: Config.bar.rounding
+			topRightRadius: Config.bar.rounding
+		}
+	}
+}
@@ -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
@@ -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
@@ -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 {
@@ -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
@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
-import Quickshell
+import QtQuick.Shapes
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -48,37 +47,27 @@ GridLayout {
 		text: root.icon
 	}

-	CustomRect {
-		id: track
-
+	CustomClippingRect {
 		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

-		Item {
-			id: clipper
+		CustomRect {
+			id: fill

-			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
-			clip: true
-			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
-			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
+			anchors.bottom: parent.bottom
+			anchors.left: parent.left
+			anchors.right: root.horizontal ? parent.right : undefined
+			anchors.top: root.horizontal ? undefined : parent.top
+			color: root.mainColor
+			implicitHeight: root.horizontal ? Math.ceil(root.percentage * parent.height) : 0
+			implicitWidth: root.horizontal ? 0 : Math.ceil(root.percentage * parent.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
-				radius: track.radius
-
-				implicitHeight: track.height
-				implicitWidth: track.width
-			}
+			// Behavior on implicitHeight {
+			// 	Anim {
+			// 	}
+			// }
 		}
 	}
 }
@@ -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
@@ -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 {
@@ -111,7 +111,8 @@ WidgetBase {
 					delegate: EntryWrapper {
 						name: "upower"

-						UPowerWidget {}
+						UPowerWidget {
+						}
 					}
 				}
 			}
@@ -134,8 +135,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 {
@@ -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 {}
@@ -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 {}
@@ -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
@@ -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,11 +15,11 @@ 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 {
-		if (app === "discord_status_icon_1" && Config.bar.tray.replaceIcons) {
+		if (app === "chrome_status_icon_1") {
 			return Quickshell.iconPath("discord-tray");
 		} else if (app === "AyuGramDesktop") {
 			if (icon === Quickshell.iconPath("com.ayugram.desktop-attention-symbolic"))
@@ -51,8 +50,6 @@ Item {
 		radius: Tokens.rounding.full

 		StateLayer {
-			id: layer
-
 			acceptedButtons: Qt.LeftButton | Qt.RightButton
 			anchors.fill: parent
 			color: icon.layer.enabled && root.current ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
@@ -80,7 +77,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
@@ -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
@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import qs.Components
 import qs.Modules.Bar.Components.Common
@@ -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
@@ -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
 			}
 		}
 	}
@@ -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
@@ -34,7 +33,8 @@ Item {
 		y: parent.y

 		Behavior on implicitHeight {
-			Anim {}
+			Anim {
+			}
 		}
 	}

@@ -47,8 +47,7 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 	}

-	component VolumesTab: SnapLayout {
-orientation: Qt.Vertical
+	component VolumesTab: ColumnLayout {
 		spacing: 12

 		CustomRect {
@@ -58,15 +57,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 +82,7 @@ orientation: Qt.Vertical
 					}
 				}

-				SnapLayout {
+				RowLayout {
 					spacing: Tokens.spacing.largeIncreased

 					CustomMouseArea {
@@ -103,7 +101,8 @@ orientation: Qt.Vertical
 							value: Audio.volume

 							Behavior on value {
-								Anim {}
+								Anim {
+								}
 							}

 							onInteraction: value => Audio.setVolume(value)
@@ -124,7 +123,7 @@ orientation: Qt.Vertical
 			}
 		}

-		CustomRect {
+		CustomClippingRect {
 			Layout.fillWidth: true
 			Layout.preferredHeight: 65 + Tokens.spacing.small * 2
 			Layout.topMargin: root.topMargin
@@ -137,34 +136,29 @@ orientation: Qt.Vertical
 				node: Audio.source
 			}

-			ClipRect {
-				anchors.fill: parent
-				radius: parent.radius
+			CustomRect {
+				id: sourcePeakFill

-				CustomRect {
-					id: sourcePeakFill
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.top: parent.top
+				color: Qt.alpha(Colors.palette.m3primary, 0.15)
+				implicitWidth: parent.width * sourcePeak.peak

-					anchors.bottom: parent.bottom
-					anchors.left: parent.left
-					anchors.top: parent.top
-					color: Qt.alpha(Colors.palette.m3primary, 0.15)
-					implicitWidth: parent.width * sourcePeak.peak
-
-					Behavior on implicitWidth {
-						Anim {}
+				Behavior on implicitWidth {
+					Anim {
 					}
 				}
 			}

-			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 +176,7 @@ orientation: Qt.Vertical
 					}
 				}

-				SnapLayout {
+				RowLayout {
 					spacing: Tokens.spacing.largeIncreased

 					CustomMouseArea {
@@ -201,7 +195,8 @@ orientation: Qt.Vertical
 							value: Audio.sourceVolume

 							Behavior on value {
-								Anim {}
+								Anim {
+								}
 							}

 							onInteraction: value => Audio.setSourceVolume(value)
@@ -235,7 +230,7 @@ orientation: Qt.Vertical

 			model: Audio.streams.filter(s => s.isSink)

-			CustomRect {
+			CustomClippingRect {
 				id: appBox

 				required property int index
@@ -253,21 +248,17 @@ orientation: Qt.Vertical
 					node: appBox.modelData
 				}

-				ClipRect {
-					anchors.fill: parent
-					radius: parent.radius
+				CustomRect {
+					id: peakFill

-					CustomRect {
-						id: peakFill
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.top: parent.top
+					color: Qt.alpha(Colors.palette.m3primary, 0.15)
+					implicitWidth: parent.width * peak.peak

-						anchors.bottom: parent.bottom
-						anchors.left: parent.left
-						anchors.top: parent.top
-						color: Qt.alpha(Colors.palette.m3primary, 0.15)
-						implicitWidth: parent.width * peak.peak
-
-						Behavior on implicitWidth {
-							Anim {}
+					Behavior on implicitWidth {
+						Anim {
 						}
 					}
 				}
@@ -280,15 +271,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 +297,7 @@ orientation: Qt.Vertical
 						}
 					}

-					SnapLayout {
+					RowLayout {
 						spacing: Tokens.spacing.largeIncreased

 						CustomMouseArea {
@@ -326,7 +316,8 @@ orientation: Qt.Vertical
 								value: appBox.modelData.audio.volume

 								Behavior on value {
-									Anim {}
+									Anim {
+									}
 								}

 								onInteraction: value => Audio.setStreamVolume(appBox.modelData, value)
@@ -4,7 +4,6 @@ import QtQuick
 import Quickshell
 import qs.Components
 import ZShell.Config
-import ZShell

 Item {
 	id: root
@@ -37,7 +36,7 @@ Item {
 		const diff = parent.width - Math.floor(off + content.nonAnimWidth);
 		if (diff < 0)
 			return off + diff;
-		return ZUtils.snap(Math.max(off, 0), root);
+		return Math.floor(Math.max(off, 0));
 	}
 	y: {
 		if (horizontal)
@@ -47,11 +46,12 @@ Item {
 		const diff = parent.height - Math.floor(off + content.nonAnimHeight);
 		if (diff < 0)
 			return off + diff;
-		return ZUtils.snap(Math.max(off, 0), root);
+		return Math.max(off, 0);
 	}

 	Behavior on offsetScale {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on x {
 		enabled: !root.horizontal || root.offsetScale < 1
@@ -4,7 +4,6 @@ import Quickshell
 import Quickshell.Networking
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import qs.Components
 import ZShell.Config
 import qs.Modules
@@ -15,8 +14,7 @@ Item {

 	required property var wrapper

-	SnapLayout {
-orientation: Qt.Vertical
+	ColumnLayout {
 		id: layout

 		spacing: 8
@@ -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
@@ -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
@@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound

 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import Quickshell
 import ZShell.Config
 import qs.Components
@@ -10,7 +9,7 @@ import qs.Modules
 import qs.Helpers
 import qs.Services

-CustomRect {
+CustomClippingRect {
 	id: root

 	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
@@ -37,8 +36,8 @@ CustomRect {
 			MaterialIcon {
 				id: noUpdatesIcon

-				anchors.centerIn: parent
-				anchors.verticalCenterOffset: -noUpdatesText.implicitHeight
+				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.top: parent.top
 				color: Colors.tPalette.m3onSurfaceVariant
 				fontStyle: Tokens.font.icon.builders.large.size(48).weight(Font.DemiBold).build()
 				horizontalAlignment: Text.AlignHCenter
@@ -46,8 +45,6 @@ CustomRect {
 			}

 			CustomText {
-				id: noUpdatesText
-
 				anchors.horizontalCenter: parent.horizontalCenter
 				anchors.top: noUpdatesIcon.bottom
 				color: Colors.tPalette.m3onSurfaceVariant
@@ -74,7 +71,6 @@ CustomRect {
 			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 			implicitWidth: contentWidth
 			spacing: Tokens.spacing.medium
-			clip: true

 			delegate: CustomRect {
 				id: update
@@ -87,7 +83,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 +93,7 @@ CustomRect {
 						text: "package_2"
 					}

-					SnapLayout {
-orientation: Qt.Vertical
+					ColumnLayout {
 						Layout.fillWidth: true

 						CustomText {
@@ -116,7 +111,7 @@ orientation: Qt.Vertical
 						}
 					}

-					SnapLayout {
+					RowLayout {
 						Layout.fillHeight: true
 						Layout.preferredWidth: 300

@@ -1,8 +1,9 @@
 import Quickshell
+import Quickshell.Wayland
+import Quickshell.Hyprland
 import QtQuick
 import qs.Components
 import ZShell.Config
-import ZShell

 Item {
 	id: root
@@ -27,8 +28,8 @@ Item {
 		detachedMode = "";
 	}

-	implicitHeight: ZUtils.snap(nonAnimHeight, root)
-	implicitWidth: ZUtils.snap(nonAnimWidth, root)
+	implicitHeight: nonAnimHeight
+	implicitWidth: nonAnimWidth

 	Behavior on implicitHeight {
 		enabled: root.offsetScale < 1
@@ -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
@@ -26,7 +25,7 @@ Item {
 		searchField.forceActiveFocus();
 	}

-	ClipRect {
+	CustomClippingRect {
 		id: search

 		anchors.left: parent.left
@@ -55,7 +54,7 @@ Item {
 		}
 	}

-	CustomRect {
+	CustomClippingRect {
 		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 {
+					CustomClippingRect {
 						id: textRect

 						Layout.fillHeight: true
 						Layout.fillWidth: true
-						clip: true

 						Item {
 							id: textWrapper
@@ -1,9 +1,9 @@
 pragma ComponentBehavior: Bound

 import Quickshell
+import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell.Config
 import ZShell
 import qs.Components
@@ -11,6 +11,11 @@ import qs.Components
 Item {
 	id: root

+	readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
+	readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
+
+	required property ScreenState screenState
+
 	readonly property var dashboardTabs: {
 		const allTabs = [
 			{
@@ -40,12 +45,9 @@ 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)
-	required property ScreenState screenState

-	implicitHeight: nonAnimHeight
 	implicitWidth: nonAnimWidth
+	implicitHeight: nonAnimHeight

 	Behavior on implicitHeight {
 		Anim {
@@ -61,14 +63,15 @@ Item {
 	Tabs {
 		id: tabs

-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
 		anchors.top: parent.top
-		anchors.topMargin: ZUtils.clamp(anchors.margins - Config.bar.border, 0, anchors.margins)
+		anchors.left: parent.left
+		anchors.right: parent.right
+
 		nonAnimWidth: view.implicitWidth
 		screenState: root.screenState
 		tabs: root.dashboardTabs
+		anchors.topMargin: ZUtils.clamp(anchors.margins - Config.bar.border, 0, anchors.margins)
+		anchors.margins: Tokens.padding.small
 	}

 	Item {
@@ -76,15 +79,15 @@ Item {

 		property int radius: Tokens.rounding.extraLarge - anchors.margins

-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
 		anchors.top: tabs.bottom
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.bottom: parent.bottom
 		anchors.topMargin: Tokens.spacing.small
-		clip: view.currentIndex !== 3 || (!view.currentItem?.settled ?? true)
+		anchors.margins: Tokens.padding.small
+		clip: true

-		Item {
+		Flickable {
 			id: view

 			readonly property int currentIndex: root.screenState.dashboardTab
@@ -94,50 +97,64 @@ Item {
 			}

 			anchors.fill: parent
-			implicitHeight: currentItem?.height ?? currentItem?.implicitHeight ?? 0
-			implicitWidth: currentItem?.width ?? currentItem?.implicitWidth ?? 0

-			Repeater {
-				id: repeater
+			implicitWidth: currentItem?.implicitWidth ?? 0
+			implicitHeight: currentItem?.implicitHeight ?? 0

-				delegate: Loader {
-					id: paneLoader
+			contentX: currentItem?.x ?? 0
+			contentWidth: row.implicitWidth
+			contentHeight: row.implicitHeight

-					required property int index
-					required property var modelData
+			interactive: false

-					readonly property real targetX: index < view.currentIndex ? -view.implicitWidth : index > view.currentIndex ? view.implicitWidth : 0
-					readonly property bool settled: x === targetX
+			onContentXChanged: {
+				if (!moving || !currentItem)
+					return;

-					active: index === view.currentIndex || opacity > 0
-					opacity: index === view.currentIndex ? 1 : 0
-					sourceComponent: modelData.component
-					visible: opacity > 0
-					x: targetX
-					y: 0
+				const x = contentX - currentItem.x;
+				if (x > currentItem.implicitWidth / 2)
+					root.screenState.dashboardTab = Math.min(root.screenState.dashboardTab + 1, tabs.count - 1);
+				else if (x < -currentItem.implicitWidth / 2)
+					root.screenState.dashboardTab = Math.max(root.screenState.dashboardTab - 1, 0);
+			}

-					Behavior on opacity {
-						Anim {
-							type: Anim.DefaultEffects
-						}
+			RowLayout {
+				id: row
+
+				Repeater {
+					id: repeater
+
+					model: ScriptModel {
+						values: root.dashboardTabs
 					}
-					Behavior on x {
-						Anim {
-							type: Anim.DefaultEffects
-						}
+
+					delegate: Loader {
+						id: paneLoader
+
+						required property int index
+						required property var modelData
+
+						Layout.alignment: Qt.AlignTop
+
+						sourceComponent: modelData.component
+
+						Component.onCompleted: active = Qt.binding(() => {
+							if (index === view.currentIndex)
+								return true;
+							const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
+							const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
+							return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
+						})
 					}
 				}
-				model: ScriptModel {
-					values: root.dashboardTabs
-				}
 			}

 			Component {
 				id: dashComponent

 				Dash {
-					radius: viewWrapper.radius
 					screenState: root.screenState
+					radius: viewWrapper.radius
 				}
 			}

@@ -153,8 +170,8 @@ Item {
 				id: mediaComponent

 				Media {
-					radius: viewWrapper.radius
 					screenState: root.screenState
+					radius: viewWrapper.radius
 				}
 			}

@@ -165,6 +182,12 @@ Item {
 					radius: viewWrapper.radius
 				}
 			}
+
+			Behavior on contentX {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
 		}
 	}
 }
@@ -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
 		}
 	}

@@ -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
@@ -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 {
@@ -14,7 +14,7 @@ Row {
 	padding: 20
 	spacing: 12

-	ClipRect {
+	CustomClippingRect {
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		implicitHeight: info.implicitHeight
 		implicitWidth: info.implicitHeight
@@ -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,10 +13,10 @@ Item {
 	property ScreenState screenState
 	required property int radius

-	implicitWidth: ZUtils.snap(1000, root)
-	implicitHeight: ZUtils.snap(320, root)
+	implicitWidth: 1000
+	implicitHeight: 320

-	ClipRect {
+	CustomClippingRect {
 		anchors.fill: parent
 		radius: root.radius

@@ -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 {
@@ -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)
+		}
 	}
 }
@@ -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 {
@@ -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
@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import ZShell
 import ZShell.Blobs
 import ZShell.Config
@@ -17,7 +16,7 @@ Item {
 	implicitWidth: btn.implicitWidth * 0.9
 	implicitHeight: btn.implicitHeight * 0.9

-	BlobGroup2 {
+	BlobGroup {
 		id: blobGroup

 		color: Colors.palette.m3surfaceContainerHighest
@@ -29,7 +28,7 @@ Item {
 		}
 	}

-	BlobRect2 {
+	BlobRect {
 		id: btnRect

 		anchors.fill: parent
@@ -42,7 +41,7 @@ Item {
 		}
 	}

-	BlobRect2 {
+	BlobRect {
 		id: rect

 		anchors.right: parent.right
@@ -142,9 +141,8 @@ Item {
 				}
 			]

-			SnapLayout {
+			ColumnLayout {
 				id: layout
-				orientation: Qt.Vertical

 				anchors.centerIn: parent
 				spacing: Tokens.spacing.extraSmall
@@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound

 import QtQuick
 import QtQuick.Layouts
-import ZShell.Components
 import Quickshell
 import ZShell.Config
 import ZShell.Internal
@@ -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
@@ -47,7 +46,7 @@ CustomListView {
 			anchors.bottom: parent.bottom
 			spacing: Tokens.spacing.extraSmall / 2

-			ClipRect {
+			CustomClippingRect {
 				id: iconClip

 				Layout.fillHeight: true
@@ -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
@@ -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
 			}
 		}
 	}
@@ -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 {
--- a/Show More
+++ b/Show More