Merge pull request 'feat: video wallpapers' (#163) from feat/video-wallpaper into main

Reviewed-on: #163

-a

@@ -0,0 +1,3 @@
+
+#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

.clangd

@@ -0,0 +1,5 @@
+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

.gitea/ISSUE_TEMPLATE/bug.yaml

@@ -38,7 +38,6 @@ body:
       attributes:
           label: OS
           options:
-              - NixOS
               - Arch
               - Debian / Ubuntu
               - Fedora

.gitea/PULL_REQUEST_TEMPLATE.yaml

@@ -30,6 +30,7 @@ body:
         - Refactor / style
         - CI / build / tooling
         - Documentation
+        - Other (Describe in description box with header "Issue type")
     validations:
       required: true
 

CMakeLists.txt

@@ -50,6 +50,7 @@ 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")
@@ -61,10 +62,12 @@ set(CMAKE_INSTALL_MESSAGE NEVER)
 
 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
-	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
+	-Wnull-dereference -Wdouble-promotion
-	-Wformat=2 -Wfloat-equal -Woverloaded-virtual
+	-Wformat=2 -Wfloat-equal
 	-Wsign-conversion -Wredundant-decls -Wswitch
 	-Wunreachable-code
+	$<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
+	$<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
 )
 
 
@@ -188,4 +191,11 @@ 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()

Components/ClipRect.qml

@@ -0,0 +1,42 @@
+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 {}
+	}
+}

Components/CustomText.qml

@@ -16,11 +16,12 @@ Text {
 	color: Colors.palette.m3onSurface
 	font: Tokens.font.body.small
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.NativeRendering
+	renderType: Text.QtRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {
-		CAnim {}
+		CAnim {
+		}
 	}
 	Behavior on text {
 		enabled: root.animate
@@ -32,7 +33,8 @@ Text {
 				type: Anim.FastEffects
 			}
 
-			PropertyAction {}
+			PropertyAction {
+			}
 
 			TAnim {
 				target: root

Components/HorizontalScrollBarTrack.qml

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

Components/MaterialIcon.qml

@@ -9,5 +9,6 @@ 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()
 }

Components/Menu.qml

@@ -34,7 +34,7 @@ MouseArea {
 	cursorShape: expanded ? Qt.ArrowCursor : undefined
 	enabled: expanded
 	hoverEnabled: expanded
-	layer.enabled: opacity < 1
+	layer.enabled: false
 	opacity: expanded ? 1 : 0
 	parent: {
 		const win = QsWindow.window;
@@ -101,8 +101,7 @@ MouseArea {
 			yScale: root.expanded ? 1 : 0.1
 
 			Behavior on yScale {
-				Anim {
+				Anim {}
-				}
 			}
 		}
 
@@ -124,7 +123,7 @@ MouseArea {
 					model: root.items
 
 					CustomRect {
-						id: item
+						id: menuItem
 
 						readonly property bool active: modelData === root?.active
 						required property int index
@@ -137,18 +136,17 @@ MouseArea {
 						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
-							Anim {
+							Anim {}
-							}
 						}
 
 						StateLayer {
-							color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+							color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
 							enabled: root.expanded
 
 							onClicked: {
-								root.itemSelected(item.modelData);
+								root.itemSelected(menuItem.modelData);
-								root.active = item.modelData;
+								root.active = menuItem.modelData;
-								item.modelData.clicked();
+								menuItem.modelData.clicked();
 								root.expanded = false;
 							}
 						}
@@ -162,26 +160,27 @@ MouseArea {
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-								text: item.modelData?.icon ?? ""
+								text: menuItem.modelData?.icon ?? ""
+								visible: text !== ""
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
-								text: item.modelData?.text ?? ""
+								text: menuItem.modelData?.text ?? ""
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
-								active: item.modelData?.trailingIcon.length > 0
+								active: menuItem.modelData?.trailingIcon.length > 0
 								asynchronous: true
 								visible: active
 
 								sourceComponent: MaterialIcon {
-									color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+									color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-									text: item.modelData.trailingIcon
+									text: menuItem.modelData.trailingIcon
 								}
 							}
 						}

Components/ScreenState.qml

@@ -34,4 +34,7 @@ PersistentProperties {
 	// Drawing state
 	property color penColor: "white"
 	property int penWidth: 4
+
+	// Screenshot state
+	property bool screenshot
 }

Components/TextFieldBase.qml

@@ -12,7 +12,7 @@ TextField {
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
+	renderType: TextField.QtRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter

Components/VerticalFadeFlickable.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import Quickshell
 import qs.Effects
 
 CustomFlickable {
@@ -9,6 +10,7 @@ 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
@@ -28,6 +30,7 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
+	layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask
 

Components/VerticalScrollBarTrack.qml

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

Drawers/Exclusions.qml

@@ -43,13 +43,6 @@ 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
 
@@ -59,7 +52,6 @@ Scope {
 		name: "Bar-Exclusion"
 		screen: root.screen
 
-		mask: Region {
+		mask: Region {}
-		}
 	}
 }

Drawers/Interactions2.qml

@@ -11,19 +11,18 @@ CustomMouseArea {
 
 	required property Item bar
 	required property real borderThickness
-	required property ScreenState screenState
+	property bool dashboardShortcutActive
+	property point dragStart
 	required property Drawing drawing
 	required property EdgeGeometry geometry
+	property bool osdShortcutActive
 	required property Panels panels
 	required property Wrapper popouts
 	required property ShellScreen screen
-
+	required property ScreenState screenState
-	property bool dashboardShortcutActive
+	property bool setInitialPoint: false
-	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));
@@ -60,39 +59,10 @@ CustomMouseArea {
 		return x >= panelX && x <= panelX + panel.width;
 	}
 
-	anchors.fill: parent
 	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
+	anchors.fill: parent
 	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) {
@@ -111,7 +81,6 @@ CustomMouseArea {
 				screenState.dashboard = false;
 		}
 	}
-
 	onPositionChanged: event => {
 		const x = event.x;
 		const y = event.y;
@@ -144,7 +113,8 @@ CustomMouseArea {
 		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);
+		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;
@@ -159,7 +129,7 @@ CustomMouseArea {
 				screenState.dashboard = false;
 		}
 
-		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && (Config.dashboard.showOnHover || !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y))) {
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
 			if (dragY > 20) {
 				screenState.settings = true;
 			} else if (dragY < -20) {
@@ -212,6 +182,33 @@ CustomMouseArea {
 		if (geometry.barContains(x, y))
 			bar.checkPopout(geometry.axisPos(x, y));
 	}
+	onPressed: event => {
+		dragStart = Qt.point(event.x, event.y);
+
+		if (screenState.isDrawing) {
+			if (event.button & Qt.RightButton) {
+				drawing.content.clear();
+				return;
+			}
+
+			if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+				drawing.content.beginStroke(event.x, event.y);
+		}
+	}
+	onPressedChanged: {
+		if (!pressed) {
+			if (screenState.isDrawing) {
+				setInitialPoint = false;
+				drawing.content.endStroke();
+				if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+					drawing.content.showHover(mouseX, mouseY);
+			}
+		} else {
+			if (screenState.isDrawing) {
+				panels.drawing.collapse();
+			}
+		}
+	}
 
 	Timer {
 		id: unhideTimer

Drawers/Panels.qml

@@ -3,8 +3,8 @@ import QtQuick
 import qs.Components
 import qs.Modules.Bar.Popouts as Popouts
 import qs.Modules.Notifications as Notifications
-import qs.Modules.Notifications.Sidebar as Sidebar
+import qs.Modules.Sidebar as Sidebar
-import qs.Modules.Notifications.Sidebar.Utils as Utils
+import qs.Modules.Sidebar.Utils as Utils
 import qs.Modules.Dashboard as Dashboard
 import qs.Modules.Osd as Osd
 import qs.Components.Toast as Toasts
@@ -19,15 +19,11 @@ 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
@@ -36,14 +32,19 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
-	required property ShellScreen screen
-	required property ScreenState screenState
 	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)
 	anchors.fill: parent
 	anchors.leftMargin: geometry.insetLeft(borderThickness)
@@ -151,7 +152,7 @@ Item {
 
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		clip: true
+		clip: offsetScale > 0
 		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
 		implicitWidth: dashboard.implicitWidth
 

Drawers/Windows.qml

@@ -52,15 +52,14 @@ CustomWindow {
 	property var root: Quickshell.shellDir
 	readonly property ScreenState screenState: ShellState.forScreen(screen)
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
+	readonly property real shadowOpacity: 0.5 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : 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"
-	contentItem.focus: true
+	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
-	mask: screenState.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
@@ -143,7 +142,6 @@ CustomWindow {
 	HyprlandFocusGrab {
 		id: focusGrab
 
-		windows: [root]
 		active: {
 			const s = root.screenState;
 			const c = Config;
@@ -160,6 +158,7 @@ CustomWindow {
 				return true;
 			return false;
 		}
+		windows: [root]
 
 		onCleared: {
 			root.screenState.launcher = false;
@@ -185,23 +184,19 @@ CustomWindow {
 		id: surface
 
 		anchors.fill: parent
-		layer.enabled: true
 		opacity: root.surfaceColor.a
 
-		layer.effect: MultiEffect {
+		BlobGroup2 {
-			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
 		}
 
-		BlobInvertedRect {
+		BlobInvertedRect2 {
 			anchors.fill: parent
 			anchors.margins: -50
 			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
@@ -251,6 +246,7 @@ CustomWindow {
 		PanelBg {
 			id: osdBg
 
+			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -262,6 +258,7 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg
 
+			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
 			radius: Tokens.rounding.large
 		}
@@ -296,13 +293,16 @@ CustomWindow {
 		PanelBg {
 			id: resourcesBg
 
+			property real extraExtent: 0.2
+
+			atRestOverride: panels.resources.offsetScale < 0.99
 			deformAmount: 0.05
-			implicitHeight: panels.resources.height
+			implicitHeight: panels.resources.height * (1 + extraExtent)
-			implicitWidth: panels.resources.width
+			implicitWidth: panels.resources.width * (1 + extraExtent)
 			panel: panels.resourcesWrapper
 			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
-			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
+			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)
+			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness) - panels.resources.height * extraExtent
 		}
 
 		PanelBg {
@@ -332,9 +332,15 @@ 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)
 		}
 	}
 
@@ -342,34 +348,8 @@ CustomWindow {
 		id: drawing
 
 		anchors.fill: parent
-		layer.enabled: true
 		screenState: root.screenState
 		z: 2
-
-		layer.effect: MultiEffect {
-			maskEnabled: true
-			maskInverted: true
-			maskSource: maskSource
-		}
-	}
-
-	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 {
@@ -449,10 +429,28 @@ CustomWindow {
 		}
 	}
 
-	component PanelBg: BlobRect {
+	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
+		}
+	}
+
+	component PanelBg: BlobRect2 {
 		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

Greeter/Center.qml

@@ -27,27 +27,21 @@ ColumnLayout {
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
-			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.bold: true
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
-			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.bold: true
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
 			text: Time.minuteStr
 		}
 	}
@@ -56,13 +50,11 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: -Tokens.padding.large * 2
 		color: Colors.palette.m3tertiary
-		font.bold: true
+		font: Tokens.font.title.builders.medium.weight(Font.DemiBold).build()
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
@@ -73,7 +65,7 @@ ColumnLayout {
 		MaterialIcon {
 			anchors.centerIn: parent
 			color: Colors.palette.m3onSurfaceVariant
-			font.pointSize: Math.floor(root.centerWidth / 4)
+			fontStyle: Tokens.font.icon.size(root.centerWidth / 4).build()
 			text: "person"
 		}
 
@@ -88,9 +80,7 @@ ColumnLayout {
 	CustomText {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.palette.m3onSurfaceVariant
-		font.family: Config.appearance.font.family.mono
+		font: Tokens.font.body.large
-		font.pointSize: Tokens.font.size.normal
-		font.weight: 600
 		text: root.greeter.username
 		visible: text.length > 0
 	}
@@ -155,8 +145,7 @@ ColumnLayout {
 					}
 
 					Behavior on opacity {
-						Anim {
+						Anim {}
-						}
 					}
 				}
 
@@ -191,7 +180,6 @@ ColumnLayout {
 
 					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"
 				}
 			}
@@ -204,8 +192,7 @@ ColumnLayout {
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
 
 		Behavior on implicitHeight {
-			Anim {
+			Anim {}
-			}
 		}
 
 		CustomText {
@@ -245,12 +232,10 @@ ColumnLayout {
 			wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
 			Behavior on opacity {
-				Anim {
+				Anim {}
-				}
 			}
 			Behavior on scale {
-				Anim {
+				Anim {}
-				}
 			}
 
 			onMsgChanged: {
@@ -292,8 +277,7 @@ ColumnLayout {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: isError ? Colors.palette.m3error : Colors.palette.m3primary
-			font.family: Config.appearance.font.family.mono
+			font: Tokens.font.mono.medium
-			font.pointSize: Tokens.font.size.small
 			horizontalAlignment: Qt.AlignHCenter
 			opacity: 0
 			scale: 0.7

Greeter/Components/CircularIndicator.qml

@@ -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.size.normal * 3
+	property real implicitSize: Tokens.font.body.medium.pointSize * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
 	property real strokeWidth: Tokens.padding.extraSmall * 0.8

Greeter/Components/ClipRect.qml

@@ -0,0 +1,41 @@
+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 {}
+	}
+}

Greeter/Components/CustomFlickable.qml

@@ -1,13 +1,36 @@
 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();
+		}
+	}
 }

Greeter/Components/CustomListView.qml

@@ -1,13 +1,36 @@
 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;
+	// 	}
+	// }
 }

Greeter/Components/CustomMouseArea.qml

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

Greeter/Components/CustomRect.qml

@@ -6,7 +6,6 @@ Rectangle {
 	color: "transparent"
 
 	Behavior on color {
-		CAnim {
+		CAnim {}
-		}
 	}
 }

Greeter/Components/CustomText.qml

@@ -14,10 +14,9 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font.family: Config.appearance.font.family.sans
+	font: Tokens.font.body.small
-	font.pointSize: Tokens.font.size.normal
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.NativeRendering
+	renderType: Text.QtRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {
@@ -28,22 +27,25 @@ Text {
 		enabled: root.animate
 
 		SequentialAnimation {
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateFrom
+				type: Anim.FastEffects
 			}
 
 			PropertyAction {
 			}
 
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateTo
+				type: Anim.DefaultEffects
 			}
 		}
 	}
 
-	component Anim: NumberAnimation {
+	component TAnim: Anim {
 		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

Greeter/Components/CustomTextField.qml

@@ -1,76 +1,305 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Shapes
 import ZShell.Config
 import qs.Services
 
-TextField {
+TextFieldBase {
 	id: root
 
-	background: null
+	enum TextFieldType {
-	color: Colors.palette.m3onSurface
+		Outlined,
-	cursorVisible: !readOnly
+		Filled
-	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
 
-	Behavior on color {
+	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
-		CAnim {
+	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
 		}
 	}
-	cursorDelegate: CustomRect {
-		id: cursor
 
-		property bool disableBlink
+	onEditingFinished: {
+		if (!valid)
+			isError = true;
+	}
+	onPressed: {
+		if (stateLayer.enabled)
+			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
+	}
+	onTextEdited: {
+		if (isError)
+			isError = false;
+	}
 
-		color: Colors.palette.m3primary
+	Item {
-		implicitWidth: 2
+		id: contentWrapper
-		radius: Tokens.rounding.medium
 
-		Behavior on opacity {
+		anchors.bottomMargin: root.supportingTextOffset
-			Anim {
+		anchors.fill: parent
-				duration: Tokens.anim.durations.small
-			}
-		}
 
-		Connections {
+		CustomText {
-			function onCursorPositionChanged(): void {
+			id: placeholder
-				if (root.activeFocus && root.cursorVisible) {
+
-					cursor.opacity = 1;
+			anchors.left: parent.left
-					cursor.disableBlink = true;
+			anchors.leftMargin: root.leftPadding
-					enableBlink.restart();
+			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
 				}
 			}
-
-			target: root
 		}
 
-		Timer {
+		Loader {
-			id: enableBlink
+			id: leadingIconLoader
 
-			interval: 100
+			active: root.leadingIcon
+			anchors.left: parent.left
+			anchors.leftMargin: Tokens.padding.small
+			anchors.verticalCenter: parent.verticalCenter
 
-			onTriggered: cursor.disableBlink = false
+			sourceComponent: MaterialIcon {
+				color: Colors.palette.m3onSurfaceVariant
+				text: root.leadingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
+			}
 		}
 
-		Timer {
+		Loader {
-			interval: 500
+			id: trailingIconLoader
-			repeat: true
-			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-			triggeredOnStart: true
 
-			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+			active: root.trailingIcon
-		}
+			anchors.right: parent.right
+			anchors.rightMargin: Tokens.padding.small
+			anchors.verticalCenter: parent.verticalCenter
 
-		Binding {
+			sourceComponent: MaterialIcon {
-			cursor.opacity: 0
+				color: Colors.palette.m3onSurfaceVariant
-			when: !root.activeFocus || !root.cursorVisible
+				text: root.trailingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
+			}
 		}
 	}
-	Behavior on placeholderTextColor {
+
-		CAnim {
+	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
+				}
+			}
+		}
+	}
+
+	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 {}
+				}
+			}
 		}
 	}
 }

Greeter/Components/CustomTextInput.qml

@@ -1,15 +1,16 @@
 import QtQuick
+import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.m3onSecondaryContainer
+	selectionColor: Colors.tPalette.colSecondaryContainer
 
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Tokens?.font.size.normal ?? 15
+		pixelSize: Config.appearance?.font.size.normal ?? 15
 	}
 }

Greeter/Components/FadeImage.qml

@@ -0,0 +1,79 @@
+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()
+}

Greeter/Components/LoadingIndicator.qml

@@ -0,0 +1,115 @@
+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();
+		}
+	}
+}

Greeter/Components/MaterialIcon.qml

@@ -1,16 +1,14 @@
+import QtQuick
 import ZShell.Config
 import qs.Services
 
 CustomText {
-	property real fill
+	id: root
-	property int grade: Colors.light ? 0 : -25
 
-	font.family: "Material Symbols Rounded"
+	property real fill: 0
-	font.pointSize: Tokens.font.size.larger
+	property int grade: Colors.light ? 0 : -25
-	font.variableAxes: ({
+	property font fontStyle: Tokens.font.icon.small
-			FILL: fill.toFixed(1),
+
-			GRAD: grade,
+	renderType: Text.NativeRendering
-			opsz: fontInfo.pixelSize,
+	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
-			wght: fontInfo.weight
-		})
 }

Greeter/Components/StateLayer.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
-import ZShell.Components
-import qs.Helpers
 import ZShell.Config
 import qs.Services
 
@@ -13,7 +11,6 @@ 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);
@@ -22,6 +19,7 @@ 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
@@ -29,7 +27,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse ? 0.08 : 0
+	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius
 
@@ -52,8 +50,8 @@ MouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: disabled ? undefined : Qt.PointingHandCursor
+	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: !disabled
+	enabled: parent.enabled
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -100,13 +98,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

Greeter/Content.qml

@@ -13,34 +13,16 @@ RowLayout {
 
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	ColumnLayout {
+	CustomRect {
+		Layout.fillHeight: true
 		Layout.fillWidth: true
-		spacing: Tokens.spacing.medium
+		topLeftRadius: Tokens.rounding.largeIncreased
+		bottomLeftRadius: Tokens.rounding.largeIncreased
+		color: Colors.tPalette.m3surfaceContainer
+		radius: Tokens.rounding.small
 
-		CustomRect {
+		UserDock {
-			Layout.fillWidth: true
+			greeter: root.greeter
-			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
-			}
 		}
 	}
 
@@ -49,21 +31,16 @@ RowLayout {
 		screenHeight: root.screenHeight
 	}
 
-	ColumnLayout {
+	CustomRect {
+		Layout.fillHeight: true
 		Layout.fillWidth: true
-		spacing: Tokens.spacing.medium
+		bottomRightRadius: Tokens.rounding.largeIncreased
+		color: Colors.tPalette.m3surfaceContainer
+		radius: Tokens.rounding.small
+		topRightRadius: Tokens.rounding.largeIncreased
 
-		CustomRect {
+		SessionDock {
-			Layout.fillHeight: true
+			greeter: root.greeter
-			Layout.fillWidth: true
-			bottomRightRadius: Tokens.rounding.largeIncreased
-			color: Colors.tPalette.m3surfaceContainer
-			radius: Tokens.rounding.small
-			topRightRadius: Tokens.rounding.largeIncreased
-
-			SessionDock {
-				greeter: root.greeter
-			}
 		}
 	}
 }

Greeter/GreeterSurface.qml

@@ -134,8 +134,7 @@ Scope {
 					id: lockIcon
 
 					anchors.centerIn: parent
-					font.bold: true
+					fontStyle: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
-					font.pointSize: Tokens.font.size.extraLarge * 4
 					text: "lock"
 				}
 

Greeter/InputField.qml

@@ -39,8 +39,7 @@ Item {
 		anchors.centerIn: parent
 		animate: true
 		color: root.greeter.launching ? Colors.palette.m3secondary : Colors.palette.m3outline
-		font.family: Config.appearance.font.family.mono
+		font: Tokens.font.mono.medium
-		font.pointSize: Tokens.font.size.normal
 		opacity: root.buffer ? 0 : 1
 		text: {
 			if (root.greeter.launching)
@@ -51,8 +50,7 @@ Item {
 		}
 
 		Behavior on opacity {
-			Anim {
+			Anim {}
-			}
 		}
 	}
 
@@ -64,15 +62,13 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		color: Colors.palette.m3onSurface
 		elide: Text.ElideLeft
-		font.family: Config.appearance.font.family.mono
+		font: Tokens.font.mono.medium
-		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 {}
-			}
 		}
 	}
 
@@ -89,7 +85,7 @@ Item {
 
 		anchors.centerIn: parent
 		anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0
-		implicitHeight: Tokens.font.size.normal
+		implicitHeight: Tokens.font.body.medium
 		implicitWidth: fullWidth
 		interactive: false
 		opacity: root.greeter.echoResponse ? 0 : 1
@@ -107,8 +103,7 @@ Item {
 			scale: 0
 
 			Behavior on opacity {
-				Anim {
+				Anim {}
-				}
 			}
 			Behavior on scale {
 				Anim {
@@ -156,15 +151,13 @@ Item {
 		Behavior on implicitWidth {
 			id: imWidthBehavior
 
-			Anim {
+			Anim {}
-			}
 		}
 		model: ScriptModel {
 			values: root.buffer.split("")
 		}
 		Behavior on opacity {
-			Anim {
+			Anim {}
-			}
 		}
 	}
 }

Greeter/SessionDock.qml

@@ -13,22 +13,19 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.small
+	spacing: Tokens.spacing.large
 
 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
-		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")
 	}
 
-	CustomClippingRect {
+	Item {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 		Loader {
 			active: opacity > 0
@@ -46,16 +43,14 @@ ColumnLayout {
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.pointSize: Tokens.font.size.extraLarge * 2
+					fontStyle: Tokens.font.icon.large
 					text: "desktop_windows"
 				}
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.family: Config.appearance.font.family.mono
+					font: Tokens.font.headline.builders.small.width(90).build()
-					font.pointSize: Tokens.font.size.large
-					font.weight: 500
 					text: qsTr("No Sessions Found")
 				}
 			}
@@ -68,6 +63,7 @@ ColumnLayout {
 			clip: true
 			currentIndex: root.greeter.sessionIndex
 			highlightFollowsCurrentItem: false
+			boundsBehavior: ListView.StopAtBounds
 			model: root.greeter.sessions
 			spacing: Tokens.spacing.small
 
@@ -80,7 +76,7 @@ ColumnLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 
 				StateLayer {
 					onClicked: {
@@ -97,7 +93,7 @@ ColumnLayout {
 
 					MaterialIcon {
 						color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
-						font.pointSize: Tokens.font.size.extraLarge
+						fontStyle: Tokens.font.icon.extraLarge
 						text: modelData.kind === "x11" ? "tv" : "desktop_windows"
 					}
 
@@ -109,8 +105,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font.pointSize: Tokens.font.size.normal
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
-							font.weight: 600
 							text: modelData.name
 						}
 
@@ -118,8 +113,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimaryFixedVariant : Colors.palette.m3onSurfaceVariant
 							elide: Text.ElideRight
-							font.family: Config.appearance.font.family.mono
+							font: Tokens.font.mono.small
-							font.pointSize: Tokens.font.size.small
 							text: modelData.kind
 						}
 					}
@@ -129,7 +123,7 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: sessions.currentItem?.implicitHeight ?? 0
 				implicitWidth: sessions.width
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 				y: sessions.currentItem?.y ?? 0
 
 				Behavior on y {

Greeter/UserDock.qml

@@ -14,22 +14,19 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.small
+	spacing: Tokens.spacing.large
 
 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
-		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")
 	}
 
-	CustomClippingRect {
+	Item {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 		Loader {
 			active: opacity > 0
@@ -48,16 +45,14 @@ ColumnLayout {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
 					fill: 1
-					font.pointSize: Tokens.font.size.extraLarge * 2
+					fontStyle: Tokens.font.icon.large
 					text: "account_circle"
 				}
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.family: Config.appearance.font.family.mono
+					font: Tokens.font.headline.builders.small.width(90).build()
-					font.pointSize: Tokens.font.size.large
-					font.weight: 500
 					text: qsTr("No Users Found")
 				}
 			}
@@ -70,6 +65,7 @@ ColumnLayout {
 			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 +78,7 @@ ColumnLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 
 				StateLayer {
 					onClicked: {
@@ -97,7 +93,7 @@ ColumnLayout {
 					anchors.margins: Tokens.padding.small
 					spacing: Tokens.spacing.medium
 
-					CustomClippingRect {
+					ClipRect {
 						Layout.preferredHeight: 50
 						Layout.preferredWidth: 50
 						radius: Tokens.rounding.full
@@ -106,7 +102,7 @@ ColumnLayout {
 							anchors.centerIn: parent
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
 							fill: 1
-							font.pointSize: Tokens.font.size.extraLarge
+							fontStyle: Tokens.font.icon.extraLarge
 							text: modelData.kind === "x11" ? "tv" : "account_circle"
 						}
 
@@ -124,8 +120,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font.pointSize: Tokens.font.size.normal
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
-							font.weight: 600
 							text: modelData.username
 						}
 					}
@@ -135,7 +130,7 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: users.currentItem?.implicitHeight ?? 0
 				implicitWidth: users.width
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 				y: users.currentItem?.y ?? 0
 
 				Behavior on y {

Greeter/WeatherInfo.qml

@@ -1,171 +0,0 @@
-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()
-	}
-}

Helpers/AreaPicker.qml

@@ -1,88 +0,0 @@
-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;
-		}
-	}
-}

Helpers/Nightlight.qml

@@ -23,7 +23,7 @@ Singleton {
 
 	function toggleNightLight(): void {
 		service.manualToggle = true;
-		service.toggle();
+		service.toggle(true);
 	}
 
 	NightlightManager {

Helpers/Picker.qml

@@ -41,6 +41,7 @@ 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
@@ -97,10 +98,6 @@ 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) {
@@ -129,22 +126,22 @@ Item {
 	Behavior on rsx {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {}
+		Anim {}
 	}
 	Behavior on rsy {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {}
+		Anim {}
 	}
 	Behavior on sh {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {}
+		Anim {}
 	}
 	Behavior on sw {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		ExAnim {}
+		Anim {}
 	}
 	Behavior on opacity {
 		Anim {
@@ -154,7 +151,7 @@ Item {
 
 	Component.onCompleted: {
 		Hypr.extras.refreshOptions();
-		screencopy.active = true;
+		root.forceActiveFocus();
 
 		opacity = 1;
 
@@ -219,13 +216,63 @@ 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
 
-		PropertyAction {
+		ScriptAction {
-			property: "closing"
+			script: {
-			target: root.loader
+				const states = ShellState.allStates();
-			value: true
+				for (const s of states)
+					s.screenshot = false;
+			}
 		}
 
 		ParallelAnimation {
@@ -236,19 +283,19 @@ Item {
 				to: 0
 			}
 
-			ExAnim {
+			Anim {
 				properties: "rsx,rsy"
 				target: root
 				to: 0
 			}
 
-			ExAnim {
+			Anim {
 				property: "sw"
 				target: root
 				to: root.screen.width
 			}
 
-			ExAnim {
+			Anim {
 				property: "sh"
 				target: root
 				to: root.screen.height
@@ -267,17 +314,12 @@ Item {
 
 		anchors.fill: parent
 
-		Loader {
+		ScreencopyView {
 			id: screencopy
 
-			active: false
 			anchors.fill: parent
-			asynchronous: true
+			captureSource: root.screen
-
+			paintCursor: false
-			sourceComponent: ScreencopyView {
-				captureSource: root.screen
-				paintCursor: false
-			}
 		}
 
 		AnnotationCanvas {
@@ -286,6 +328,7 @@ 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 {
@@ -297,15 +340,14 @@ Item {
 		}
 	}
 
-	Rectangle {
+	CustomRect {
 		id: overlay
 
 		anchors.fill: parent
 		color: "white"
 		layer.enabled: true
 		opacity: 0.3
-		radius: root.realRounding
+		visible: screencopy.hasContent
-		visible: screencopy.item?.hasContent ?? false
 
 		layer.effect: MultiEffect {
 			maskEnabled: true
@@ -334,16 +376,15 @@ Item {
 		}
 	}
 
-	Rectangle {
+	CustomRect {
 		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.item?.hasContent ?? false
+		visible: screencopy.hasContent
 		x: selectionRect.x - root.realBorderWidth
 		y: selectionRect.y - root.realBorderWidth
 
@@ -355,17 +396,24 @@ 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) => {
-			root.sx = x;
+			let nx = Math.max(0, x);
-			root.sy = y;
+			let ny = Math.max(0, y);
-			root.ex = x + w;
+			let nw = Math.min(w, root.screen.width - nx);
-			root.ey = y + h;
+			let nh = Math.min(h, root.screen.height - ny);
+			root.sx = nx;
+			root.sy = ny;
+			root.ex = nx + nw;
+			root.ey = ny + nh;
 		}
 		onMoveBy: (dx, dy) => {
 			const w = root.sw, h = root.sh;
@@ -396,6 +444,4 @@ Item {
 		onToolSelected: t => root.tool = t
 		onUndoRequested: annotations.undo()
 	}
-
-	component ExAnim: Anim {}
 }

Helpers/Picker/AnnotationCanvas.qml

@@ -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() {
-		committedCanvas.clear();
+		canvas.clear();
-		previewCanvas.clear();
 		changed();
 	}
 
@@ -54,90 +54,85 @@ Item {
 	}
 
 	function undo() {
-		committedCanvas.undoLastGroup();
+		canvas.undoLastGroup();
 		changed();
 	}
 
 	anchors.fill: parent
+	enabled: tool !== "none"
 
 	StrokeCanvas {
-		id: committedCanvas
+		id: canvas
 
 		anchors.fill: parent
 		penColor: root.inkColor
 		penWidth: root.inkWidth
 	}
 
-	StrokeCanvas {
+	MouseArea {
-		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
-		enabled: root.tool !== "none"
+		anchors.fill: parent
+		cursorShape: undefined
+		enabled: root.enabled
 
-		onActiveChanged: {
+		onPositionChanged: e => {
-			if (active)
+			const x = e.x;
+			const y = e.y;
+
+			if (!pressed)
 				return;
 
 			if (root.tool === "pen") {
-				committedCanvas.endStroke();
+				canvas.appendPoint(x, y);
-			} 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) {
+			const pts = root.sampleShape(root.tool, startX, startY, x, y);
-				root.clearAll();
+			if (pts.length > 0) {
-				return;
+				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 (root.tool === "pen") {
+			if (withinXWidth && withinYHeight) {
-				if (!started) {
+				if (!drawHandler.pressed)
-					started = true;
+					canvas.showHover(x, y);
-					committedCanvas.beginStroke(x, y);
+				else
-					return;
+					canvas.showHover(drawHandler.mouseX, drawHandler.mouseY);
-				}
+				return Qt.BlankCursor;
-				committedCanvas.appendPoint(x, y);
+			} else {
-				return;
+				canvas.hideHover();
-			}
+				return undefined;
-
-			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
 	}
 }

Helpers/Picker/SelectionHandles.qml

@@ -1,18 +1,23 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import ZShell.Internal
+import qs.Services
 
 Item {
 	id: root
 
-	property color handleBorder: "#3584e4"
+	required property int border
-	property color handleFill: "white"
+	property color handleBorder: Colors.palette.m3primary
+	property color handleFill: Colors.palette.m3onPrimary
 	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
@@ -23,12 +28,16 @@ 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: {
@@ -45,51 +54,63 @@ 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 / 2
+		x: -(root.hs + root.border) / 2
-		y: -root.hs / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "t"
 		x: root.width / 2 - root.hs / 2
-		y: -root.hs / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "tr"
-		x: root.width - root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
-		y: -root.hs / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "r"
-		x: root.width - root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
 	Handle {
 		edge: "br"
-		x: root.width - root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
-		y: root.height - root.hs / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "b"
 		x: root.width / 2 - root.hs / 2
-		y: root.height - root.hs / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "bl"
-		x: -root.hs / 2
+		x: -(root.hs + root.border) / 2
-		y: root.height - root.hs / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "l"
-		x: -root.hs / 2
+		x: -(root.hs + root.border) / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
@@ -107,6 +128,8 @@ Item {
 		z: 10
 
 		HoverHandler {
+			id: hover
+
 			cursorShape: {
 				switch (handle.edge) {
 				case "tl":
@@ -132,6 +155,7 @@ Item {
 			property real startX
 			property real startY
 
+			dragThreshold: 0
 			grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.TakeOverForbidden
 			target: null
 
@@ -141,8 +165,10 @@ Item {
 					startY = root.y;
 					startW = root.width;
 					startH = root.height;
+					Cursor.setOverride(hover.cursorShape);
 				} else {
 					root.dragFinished();
+					Cursor.clearOverride();
 				}
 			}
 			onTranslationChanged: {

Helpers/Wallpapers.qml

@@ -5,7 +5,9 @@ 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
@@ -14,24 +16,48 @@ Searcher {
 	id: root
 
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
-	property alias crops: adapter.monitorCrops
 	readonly property string current: showPreview ? previewPath : actualCurrent
-	property alias monitorCrops: monitorCrops
+	readonly property string currentThumbnail: thumbnailFor(current)
+	readonly property bool currentIsVideo: isVideoPath(current)
 	property bool pendingPreviewClear
 	property bool previewColorLock
 	property string previewPath
 	property bool recentlyChanged
 	property bool showPreview: false
+	property int cropVersion: 0
 
-	function getCategoryFor(w: FileSystemEntry): string {
+	function getCategoryFor(w: WallpaperEntry): 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 root.crops[screen];
+		return wallpapers.crop(root.current, screen);
 	}
 
 	function preview(path: string): void {
@@ -48,19 +74,18 @@ Searcher {
 		else if (zoom > 5.0)
 			zoom = 5.0;
 
-		root.crops[screen] = {
+		wallpapers.setCrop(root.current, 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}`]);
@@ -94,38 +119,13 @@ Searcher {
 		target: "wallpaper"
 	}
 
-	FileView {
+	WallpaperDb {
-		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
 
-		filter: FileSystemModel.Images
+		dbPath: `${Paths.state}/wallpapers.sqlite`
+		cacheSize: wallpaper.largestBufferSize
+		requireHardwareCodec: true
 		path: Config.general.wallpaperPath
-		recursive: true
 	}
 
 	Process {
@@ -140,4 +140,104 @@ 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();
+			}
+		}
+	}
 }

Modules/Bar/Bar.qml

@@ -17,12 +17,12 @@ GridLayout {
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
-	readonly property int vPadding: 6
 	required property ScreenState screenState
+	readonly property int vPadding: 6
 
 	function axisCenterOf(item: Item): real {
 		const c = item.mapToItem(root, item.implicitWidth / 2, item.implicitHeight / 2);
-		return horizontal ? c.x : c.y;
+		return horizontal ? Math.floor(c.x) : Math.floor(c.y);
 	}
 
 	function checkPopout(pos: real): void {

Modules/Bar/Border.qml

@@ -1,49 +0,0 @@
-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
-		}
-	}
-}

Modules/Bar/Components/Clock.qml

@@ -45,7 +45,9 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
+	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
 	required property ScreenState screenState
 
 	implicitHeight: horizontal ? baseSize : size

Modules/Bar/Components/Common/BatteryIcon.qml

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

Modules/Bar/Components/MediaWidget.qml

@@ -13,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 + Tokens.padding.small * 2 : baseSize
+	implicitWidth: horizontal ? (layout.implicitWidth % 2 === 0 ? layout.implicitWidth : layout.implicitWidth + 1) + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {

Modules/Bar/Components/Resource.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Shapes
+import Quickshell
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -47,27 +47,37 @@ GridLayout {
 		text: root.icon
 	}
 
-	CustomClippingRect {
+	CustomRect {
+		id: track
+
 		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
 
-		CustomRect {
+		Item {
-			id: fill
+			id: clipper
 
-			anchors.bottom: parent.bottom
+			anchors.bottom: root.horizontal ? parent.bottom : undefined
-			anchors.left: parent.left
+			anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
-			anchors.right: root.horizontal ? parent.right : undefined
+			anchors.left: root.horizontal ? undefined : parent.left
-			anchors.top: root.horizontal ? undefined : parent.top
+			anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
-			color: root.mainColor
+			clip: true
-			implicitHeight: root.horizontal ? Math.ceil(root.percentage * parent.height) : 0
+			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
-			implicitWidth: root.horizontal ? 0 : Math.ceil(root.percentage * parent.width)
+			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
 
-			// Behavior on implicitHeight {
+			CustomRect {
-			// 	Anim {
+				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
+			}
 		}
 	}
 }

Modules/Bar/Components/Resources.qml

@@ -33,6 +33,7 @@ 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 {
@@ -51,6 +52,7 @@ WidgetBase {
 			Layout.alignment: Qt.AlignVCenter
 			Layout.fillHeight: root.horizontal
 			Layout.fillWidth: !root.horizontal
+
 			horizontal: root.horizontal
 			icon: "memory"
 			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface

Modules/Bar/Components/StatusIcons.qml

@@ -31,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.medium / 2
+	readonly property int spacing: Tokens.spacing.extraSmall
 
 	// Entries that can shrink to nothing, spacing included
 	function collapsed(entry: var): bool {
@@ -51,14 +51,12 @@ WidgetBase {
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
 
-		Anim {
+		Anim {}
-		}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
-		Anim {
+		Anim {}
-		}
 	}
 
 	GridLayout {
@@ -70,6 +68,8 @@ WidgetBase {
 		anchors.rightMargin: root.horizontal ? Tokens.padding.extraSmall : 0
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
+		columnSpacing: root.spacing
+		rowSpacing: root.spacing
 
 		Repeater {
 			model: ScriptModel {
@@ -111,8 +111,7 @@ WidgetBase {
 					delegate: EntryWrapper {
 						name: "upower"
 
-						UPowerWidget {
+						UPowerWidget {}
-						}
 					}
 				}
 			}
@@ -135,8 +134,8 @@ WidgetBase {
 		Layout.rightMargin: root.horizontal ? Math.round(rightGap) : 0
 		Layout.topMargin: root.horizontal ? 0 : Math.round(leftGap)
 		children: item
-		implicitHeight: item?.implicitHeight ?? 0
+		implicitHeight: item?.height ?? item?.implicitHeight ?? 0
-		implicitWidth: item?.implicitWidth ?? 0
+		implicitWidth: item?.width ?? item?.implicitWidth ?? 0
 
 		Behavior on leftGap {
 			Anim {

Modules/Bar/Components/StatusIcons/AudioWidget.qml

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

Modules/Bar/Components/StatusIcons/MicWidget.qml

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

Modules/Bar/Components/Tray/TrayItem.qml

@@ -19,7 +19,7 @@ Item {
 	required property Wrapper popouts
 
 	function resolveIcon(app: string, icon: string): string {
-		if (app === "chrome_status_icon_1") {
+		if (app === "discord_status_icon_1" && Config.bar.tray.replaceIcons) {
 			return Quickshell.iconPath("discord-tray");
 		} else if (app === "AyuGramDesktop") {
 			if (icon === Quickshell.iconPath("com.ayugram.desktop-attention-symbolic"))
@@ -50,6 +50,8 @@ 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
@@ -77,6 +79,7 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
+		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Bar/Components/TrayIcons.qml

@@ -38,6 +38,7 @@ WidgetBase {
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 		rowSpacing: -2
+		columnSpacing: Tokens.spacing.extraSmall
 
 		Repeater {
 			id: repeater

Modules/Bar/Components/Workspaces.qml

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

Modules/Bar/Popouts/AudioPopout.qml

@@ -33,8 +33,7 @@ Item {
 		y: parent.y
 
 		Behavior on implicitHeight {
-			Anim {
+			Anim {}
-			}
 		}
 	}
 
@@ -101,8 +100,7 @@ Item {
 							value: Audio.volume
 
 							Behavior on value {
-								Anim {
+								Anim {}
-								}
 							}
 
 							onInteraction: value => Audio.setVolume(value)
@@ -123,7 +121,7 @@ Item {
 			}
 		}
 
-		CustomClippingRect {
+		CustomRect {
 			Layout.fillWidth: true
 			Layout.preferredHeight: 65 + Tokens.spacing.small * 2
 			Layout.topMargin: root.topMargin
@@ -136,17 +134,21 @@ Item {
 				node: Audio.source
 			}
 
-			CustomRect {
+			ClipRect {
-				id: sourcePeakFill
+				anchors.fill: parent
+				radius: parent.radius
 
-				anchors.bottom: parent.bottom
+				CustomRect {
-				anchors.left: parent.left
+					id: sourcePeakFill
-				anchors.top: parent.top
-				color: Qt.alpha(Colors.palette.m3primary, 0.15)
-				implicitWidth: parent.width * sourcePeak.peak
 
-				Behavior on implicitWidth {
+					anchors.bottom: parent.bottom
-					Anim {
+					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 {}
 					}
 				}
 			}
@@ -195,8 +197,7 @@ Item {
 							value: Audio.sourceVolume
 
 							Behavior on value {
-								Anim {
+								Anim {}
-								}
 							}
 
 							onInteraction: value => Audio.setSourceVolume(value)
@@ -230,7 +231,7 @@ Item {
 
 			model: Audio.streams.filter(s => s.isSink)
 
-			CustomClippingRect {
+			CustomRect {
 				id: appBox
 
 				required property int index
@@ -248,17 +249,21 @@ Item {
 					node: appBox.modelData
 				}
 
-				CustomRect {
+				ClipRect {
-					id: peakFill
+					anchors.fill: parent
+					radius: parent.radius
 
-					anchors.bottom: parent.bottom
+					CustomRect {
-					anchors.left: parent.left
+						id: peakFill
-					anchors.top: parent.top
-					color: Qt.alpha(Colors.palette.m3primary, 0.15)
-					implicitWidth: parent.width * peak.peak
 
-					Behavior on implicitWidth {
+						anchors.bottom: parent.bottom
-						Anim {
+						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 {}
 						}
 					}
 				}
@@ -316,8 +321,7 @@ Item {
 								value: appBox.modelData.audio.volume
 
 								Behavior on value {
-									Anim {
+									Anim {}
-									}
 								}
 
 								onInteraction: value => Audio.setStreamVolume(appBox.modelData, value)

Modules/Bar/Popouts/UpdatesPopout.qml

@@ -9,7 +9,7 @@ import qs.Modules
 import qs.Helpers
 import qs.Services
 
-CustomClippingRect {
+CustomRect {
 	id: root
 
 	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
@@ -36,8 +36,8 @@ CustomClippingRect {
 			MaterialIcon {
 				id: noUpdatesIcon
 
-				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.centerIn: parent
-				anchors.top: parent.top
+				anchors.verticalCenterOffset: -noUpdatesText.implicitHeight
 				color: Colors.tPalette.m3onSurfaceVariant
 				fontStyle: Tokens.font.icon.builders.large.size(48).weight(Font.DemiBold).build()
 				horizontalAlignment: Text.AlignHCenter
@@ -45,6 +45,8 @@ CustomClippingRect {
 			}
 
 			CustomText {
+				id: noUpdatesText
+
 				anchors.horizontalCenter: parent.horizontalCenter
 				anchors.top: noUpdatesIcon.bottom
 				color: Colors.tPalette.m3onSurfaceVariant
@@ -71,6 +73,7 @@ CustomClippingRect {
 			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 			implicitWidth: contentWidth
 			spacing: Tokens.spacing.medium
+			clip: true
 
 			delegate: CustomRect {
 				id: update

Modules/Bar/Popouts/Wrapper.qml

@@ -1,6 +1,4 @@
 import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
 import QtQuick
 import qs.Components
 import ZShell.Config

Modules/Clipboard/Content.qml

@@ -25,7 +25,7 @@ Item {
 		searchField.forceActiveFocus();
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		id: search
 
 		anchors.left: parent.left
@@ -54,7 +54,7 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
+	CustomRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -64,6 +64,7 @@ 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 {}
@@ -228,11 +229,12 @@ Item {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					CustomClippingRect {
+					Item {
 						id: textRect
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
+						clip: true
 
 						Item {
 							id: textWrapper

Modules/Dashboard/Content.qml

@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
@@ -11,11 +10,6 @@ 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 = [
 			{
@@ -45,9 +39,12 @@ Item {
 		];
 		return allTabs.filter(tab => tab.enabled);
 	}
+	readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
+	readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
+	required property ScreenState screenState
 
-	implicitWidth: nonAnimWidth
 	implicitHeight: nonAnimHeight
+	implicitWidth: nonAnimWidth
 
 	Behavior on implicitHeight {
 		Anim {
@@ -63,15 +60,14 @@ Item {
 	Tabs {
 		id: tabs
 
-		anchors.top: parent.top
 		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)
 		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 {
@@ -79,15 +75,15 @@ Item {
 
 		property int radius: Tokens.rounding.extraLarge - anchors.margins
 
-		anchors.top: tabs.bottom
-		anchors.left: parent.left
-		anchors.right: parent.right
 		anchors.bottom: parent.bottom
-		anchors.topMargin: Tokens.spacing.small
+		anchors.left: parent.left
 		anchors.margins: Tokens.padding.small
-		clip: true
+		anchors.right: parent.right
+		anchors.top: tabs.bottom
+		anchors.topMargin: Tokens.spacing.small
+		clip: view.currentIndex !== 3 || (!view.currentItem?.settled ?? true)
 
-		Flickable {
+		Item {
 			id: view
 
 			readonly property int currentIndex: root.screenState.dashboardTab
@@ -97,64 +93,50 @@ Item {
 			}
 
 			anchors.fill: parent
-
-			implicitWidth: currentItem?.implicitWidth ?? 0
 			implicitHeight: currentItem?.implicitHeight ?? 0
+			implicitWidth: currentItem?.implicitWidth ?? 0
 
-			contentX: currentItem?.x ?? 0
+			Repeater {
-			contentWidth: row.implicitWidth
+				id: repeater
-			contentHeight: row.implicitHeight
 
-			interactive: false
+				delegate: Loader {
+					id: paneLoader
 
-			onContentXChanged: {
+					required property int index
-				if (!moving || !currentItem)
+					required property var modelData
-					return;
 
-				const x = contentX - currentItem.x;
+					readonly property real targetX: index < view.currentIndex ? -view.implicitWidth : index > view.currentIndex ? view.implicitWidth : 0
-				if (x > currentItem.implicitWidth / 2)
+					readonly property bool settled: x === targetX
-					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);
-			}
 
-			RowLayout {
+					active: index === view.currentIndex || opacity > 0
-				id: row
+					opacity: index === view.currentIndex ? 1 : 0
+					sourceComponent: modelData.component
+					visible: opacity > 0
+					x: targetX
+					y: 0
 
-				Repeater {
+					Behavior on opacity {
-					id: repeater
+						Anim {
-
+							type: Anim.DefaultEffects
-					model: ScriptModel {
+						}
-						values: root.dashboardTabs
 					}
-
+					Behavior on x {
-					delegate: Loader {
+						Anim {
-						id: paneLoader
+							type: Anim.DefaultEffects
-
+						}
-						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 {
-					screenState: root.screenState
 					radius: viewWrapper.radius
+					screenState: root.screenState
 				}
 			}
 
@@ -170,8 +152,8 @@ Item {
 				id: mediaComponent
 
 				Media {
-					screenState: root.screenState
 					radius: viewWrapper.radius
+					screenState: root.screenState
 				}
 			}
 
@@ -182,12 +164,6 @@ Item {
 					radius: viewWrapper.radius
 				}
 			}
-
-			Behavior on contentX {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
 		}
 	}
 }

Modules/Dashboard/Dash/User.qml

@@ -14,7 +14,7 @@ Row {
 	padding: 20
 	spacing: 12
 
-	CustomClippingRect {
+	ClipRect {
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		implicitHeight: info.implicitHeight
 		implicitWidth: info.implicitHeight

Modules/Dashboard/Media.qml

@@ -16,7 +16,7 @@ Item {
 	implicitWidth: 1000
 	implicitHeight: 320
 
-	CustomClippingRect {
+	ClipRect {
 		anchors.fill: parent
 		radius: root.radius
 

Modules/Dashboard/Processes/ProcessesList.qml

@@ -46,7 +46,7 @@ CustomListView {
 			anchors.bottom: parent.bottom
 			spacing: Tokens.spacing.extraSmall / 2
 
-			CustomClippingRect {
+			ClipRect {
 				id: iconClip
 
 				Layout.fillHeight: true

Modules/DesktopIcons/BackgroundContextMenu.qml

@@ -25,7 +25,7 @@ Item {
 		onClicked: root.close()
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		id: popupBackground
 		readonly property real padding: 4
 

Modules/DesktopIcons/DesktopIconContextMenu.qml

@@ -40,7 +40,7 @@ Item {
 	visible: false
 	z: 999
 
-	CustomClippingRect {
+	ClipRect {
 		id: popupBackground
 
 		readonly property real padding: Tokens.padding.extraSmall

Modules/Launcher/Items/WallpaperTile.qml

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

Modules/Lock/Center.qml

@@ -55,7 +55,7 @@ ColumnLayout {
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer

Modules/Lock/Content.qml

@@ -5,14 +5,13 @@ import qs.Helpers
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: root
 
 	required property var lock
 
 	implicitHeight: layout.implicitHeight
 	implicitWidth: layout.implicitWidth
-	radius: Tokens.rounding.largeIncreased
 
 	RowLayout {
 		id: layout
@@ -50,22 +49,10 @@ CustomClippingRect {
 			lock: root.lock
 		}
 
-		ColumnLayout {
+		NotifDock {
+			Layout.fillHeight: true
 			Layout.fillWidth: true
-			spacing: Tokens.spacing.medium
+			lock: root.lock
-
-			CustomRect {
-				Layout.fillHeight: true
-				Layout.fillWidth: true
-				bottomRightRadius: Tokens.rounding.largeIncreased
-				color: Colors.tPalette.m3surfaceContainer
-				radius: Tokens.rounding.small
-				topRightRadius: Tokens.rounding.largeIncreased
-
-				NotifDock {
-					lock: root.lock
-				}
-			}
 		}
 	}
 }

Modules/Lock/LockSurface.qml

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

Modules/Lock/Media.qml

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

Modules/Lock/NotifDock.qml

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

Modules/Lock/NotifGroup.qml

@@ -85,7 +85,7 @@ CustomRect {
 				}
 			}
 
-			ClippingRectangle {
+			ClipRect {
 				anchors.fill: parent
 				color: root.urgency === "critical" ? Colors.palette.m3error : root.urgency === "low" ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Modules/Lock/UserImage.qml

@@ -1,12 +1,13 @@
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
+import qs.Components
 import qs.Paths
 
 Item {
 	id: root
 
-	ClippingRectangle {
+	ClipRect {
 		anchors.fill: parent
 		radius: Tokens.rounding.full
 

Modules/Lock/Weather/BriefInfo.qml

@@ -16,7 +16,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.title.large
+		font: Tokens.font.body.large
 		text: Weather.description
 	}
 
@@ -29,7 +29,7 @@ ColumnLayout {
 
 			animate: true
 			color: Colors.palette.m3primary
-			font: Tokens.font.body.large
+			font: Tokens.font.title.large
 			text: Weather.temp
 		}
 
@@ -37,6 +37,7 @@ ColumnLayout {
 			animate: true
 			color: Colors.palette.m3secondary
 			text: Weather.icon
+			fontStyle: Tokens.font.icon.large
 		}
 	}
 
@@ -53,7 +54,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.normal
+		font: Tokens.font.body.medium
 		text: {
 			const today = Weather.forecast[0];
 			return qsTr("High %1 • Low %2").arg(Weather.formatTemp(today?.maxTempC)).arg(Weather.formatTemp(today?.minTempC));

Modules/Lock/Weather/Forecast.qml

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

Modules/Lock/WeatherInfo.qml

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

Modules/Notifications/Content.qml

@@ -3,8 +3,9 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
-import qs.Components
 import ZShell.Config
+import ZShell.Components
+import qs.Components
 import qs.Daemons
 import qs.Helpers
 
@@ -30,31 +31,29 @@ Item {
 		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
 			return 0;
 
+		if (screenState.dashboard && (panels.dashboard.x + panels.dashboard.width >= panels.notifications.x))
+			return 0;
+
 		if (screenState.osd) {
 			const h = panels.osd.y - Tokens.spacing.small * 2 - padding * 2;
 			if (height > h)
 				height = h;
 		}
 
-		if (screenState.session) {
-			const h = panels.session.y - Tokens.spacing.small * 2 - padding * 2;
-			if (height > h)
-				height = h;
-		}
-
 		return Math.min(((QsWindow.window as QsWindow)?.screen?.height ?? 0) - 1 * 2, height + padding * 2);
 	}
+
 	implicitWidth: Config.notifs.sizes.width + padding * 2
 
 	Behavior on implicitHeight {
 		Anim {}
 	}
 
-	ClippingWrapperRectangle {
+	Item {
 		anchors.fill: parent
 		anchors.margins: root.padding
-		color: "transparent"
+		clip: true
-		radius: Tokens.rounding.large - root.padding
+		// radius: Tokens.rounding.large - root.padding
 
 		CustomListView {
 			id: list

Modules/Notifications/Notification.qml

@@ -108,7 +108,7 @@ CustomRect {
 				visible: root.hasImage || root.hasAppIcon
 				width: Config.notifs.sizes.image
 
-				sourceComponent: CustomClippingRect {
+				sourceComponent: ClipRect {
 					color: root.modelData.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 2) : Colors.palette.m3secondaryContainer
 					implicitHeight: Config.notifs.sizes.image
 					implicitWidth: Config.notifs.sizes.image

Modules/Notifications/Sidebar/Chat/Content/EmptyBackground.qml

@@ -1,32 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Components
-import qs.Services
-
-ColumnLayout {
-    id: root
-
-    spacing: Tokens.spacing.small
-
-    Item {
-        Layout.fillHeight: true
-    }
-
-    MaterialIcon {
-        Layout.alignment: Qt.AlignHCenter
-        color: Colors.tPalette.m3outlineVariant
-        font.pointSize: 36
-        text: "chat"
-    }
-
-    CustomText {
-        Layout.alignment: Qt.AlignHCenter
-        color: Colors.tPalette.m3onSurfaceVariant
-        text: qsTr("Send a message to get started")
-    }
-
-    Item {
-        Layout.fillHeight: true
-    }
-}

Modules/Notifications/Sidebar/Chat/Content/ProcessBlock.qml

@@ -1,619 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Blobs
-import ZShell.Config
-import ZShell.Components
-import ZShell.Llm
-import qs.Components
-import qs.Services
-
-Item {
-	id: root
-
-	required property int index
-	required property var modelData
-	required property var blocks
-	readonly property var segments: modelData.segments
-	required property Item rootParent
-	required property ChatGeneration current
-	readonly property bool isActive: index === blocks.length - 1
-	property bool expanded: false
-	readonly property LlmSegment lastSegment: root.segments[root.segments.length - 1]
-	readonly property real totalElapsedMs: root.segments.reduce((sum, s) => sum + (s.elapsedMs ?? 0), 0)
-	readonly property bool pendingApproval: current.toolApprovalPending && segments.filter(s => s.type === LlmSegment.Type.ToolCall).some(s => current.pendingToolCalls.includes(s))
-
-	implicitHeight: {
-		const expand = expandedRect.implicitHeight + layout.implicitHeight + expandedRect.anchors.topMargin;
-		const collapsed = layout.implicitHeight;
-		const approval = layout.implicitHeight + approvalPrompt.implicitHeight + approvalPrompt.anchors.topMargin;
-
-		if (expanded)
-			return expand;
-		else if (pendingApproval)
-			return approval;
-		else
-			return collapsed;
-	}
-
-	onCurrentChanged: expanded = false
-
-	Behavior on implicitHeight {
-		Anim {
-			type: Anim.DefaultEffects
-		}
-	}
-
-	RowLayout {
-		id: layout
-
-		anchors.top: parent.top
-		anchors.left: parent.left
-		anchors.right: parent.right
-
-		Item {
-			implicitHeight: expandBtn.implicitHeight
-			implicitWidth: expandBtn.implicitWidth
-
-			LoadingIndicator {
-				id: spinnerReasoning
-
-				implicitSize: collapsedText.implicitHeight
-				anchors.centerIn: parent
-				opacity: root.isActive ? 1 : 0
-				visible: opacity > 0
-
-				Behavior on opacity {
-					Anim {}
-				}
-			}
-
-			IconButton {
-				id: expandBtn
-
-				font: Tokens.font.icon.medium
-				icon: "keyboard_arrow_down"
-				inactiveOnColor: hovered ? Colors.palette.m3onSurface : Colors.palette.m3outline
-				anchors.centerIn: parent
-				opacity: root.isActive ? 0 : 1
-				enabled: opacity > 0
-				rotation: root.expanded ? 180 : 0
-				type: IconButton.Text
-
-				Behavior on rotation {
-					Anim {}
-				}
-
-				onClicked: root.expanded = !root.expanded
-			}
-		}
-
-		CustomText {
-			id: collapsedText
-
-			color: Colors.palette.m3outline
-			font: Tokens.font.label.small
-			Layout.fillWidth: true
-			Layout.leftMargin: Tokens.spacing.medium
-			text: {
-				if (root.isActive) {
-					if (root.pendingApproval)
-						return qsTr("Waiting for approval...");
-
-					if (root.lastSegment.type === LlmSegment.Type.ToolCall)
-						return qsTr("Using %1...").arg(root.lastSegment.name);
-					return qsTr("Thinking...");
-				}
-				return qsTr("Worked for %1s").arg((root.totalElapsedMs / 1000).toFixed(1));
-			}
-
-			Behavior on opacity {
-				Anim {}
-			}
-		}
-	}
-
-	Item {
-		id: approvalPrompt
-		anchors.top: layout.bottom
-		anchors.topMargin: Tokens.spacing.small
-		anchors.left: parent.left
-		anchors.right: parent.right
-		implicitHeight: approvalLayout.implicitHeight + approvalLayout.anchors.margins * 2
-		visible: root.pendingApproval
-
-		CustomRect {
-			id: approvalBg
-
-			anchors.fill: parent
-			radius: Tokens.rounding.medium
-			color: Colors.palette.m3surface
-			border.width: 1
-			border.color: Colors.palette.m3outlineVariant
-
-			ColumnLayout {
-				id: approvalLayout
-				anchors.fill: parent
-				anchors.margins: Tokens.padding.medium
-				spacing: Tokens.spacing.small
-
-				CustomText {
-					id: requestHeader
-					text: qsTr("Tool call request")
-					font: Tokens.font.headline.medium
-					color: Colors.palette.m3onSurface
-				}
-
-				Item {
-					id: toolsBg
-
-					property bool open: false
-					property Item rootParent: root.rootParent
-					property int maxHeight: rootParent.height - Tokens.padding.medium * 2
-					property int openHeight: Math.min(toolsContent.item?.implicitHeight, maxHeight)
-					property int openWidth: toolsBg.rootParent.width - Tokens.padding.medium * 2
-					property real openHeightProg: openHeight / maxHeight
-					property int collapsedY: 0
-
-					implicitHeight: toolList.implicitHeight + toolList.anchors.margins * 2
-					z: open || dialogTransition.running ? 2 : 0
-					Layout.fillWidth: true
-
-					function reparentWrapper(): void {
-						const newParent = open ? toolsBg.rootParent : toolsBg;
-						const c = toolsWrapper.parent.mapToItem(newParent, toolsWrapper.x + toolsWrapper.width / 2, toolsWrapper.y + toolsWrapper.height / 2);
-						toolsBg.collapsedY = toolsWrapper.y;
-						toolsWrapper.parent = newParent;
-						toolsWrapper.x = c.x - toolsWrapper.width / 2;
-						toolsWrapper.y = c.y - toolsWrapper.height / 2;
-					}
-
-					onOpenChanged: {
-						if (open)
-							toolsBg.rootParent.interactive = false;
-						else
-							toolsBg.rootParent.interactive = true;
-					}
-
-					BlobGroup {
-						id: blobGroup
-
-						color: toolsBg.open ? Colors.palette.m3surfaceContainerHighest : Colors.tPalette.m3primaryContainer
-
-						Behavior on color {
-							CAnim {}
-						}
-					}
-
-					MouseArea {
-						id: backdrop
-
-						anchors.fill: parent
-						enabled: false
-						hoverEnabled: enabled
-						preventStealing: true
-						parent: toolsBg.open ? toolsBg.rootParent : toolsBg
-
-						onClicked: toolsBg.open = false
-					}
-
-					Item {
-						id: toolsWrapper
-
-						width: toolsBg.width
-						height: toolBox.implicitHeight
-						rotation: parent === toolsBg.rootParent ? 180 : 0
-						z: 1
-
-						states: State {
-							name: "open"
-							when: toolsBg.open
-
-							PropertyChanges {
-								backdrop.enabled: true
-								toolsBackground.bottomLeftRadius: Tokens.rounding.largeIncreased
-								toolsBackground.bottomRightRadius: Tokens.rounding.largeIncreased
-								toolsBackground.topRightRadius: Tokens.rounding.largeIncreased
-								toolsBackground.topLeftRadius: Tokens.rounding.largeIncreased
-								toolsContent.opacity: 1
-								toolsWrapper.height: toolsBg.openHeight
-								toolsWrapper.width: toolsBg.openWidth
-								toolsWrapper.x: (toolsBg.rootParent.width - toolsBg.openWidth) / 2
-								toolsWrapper.y: (confirmationRow.implicitHeight + Tokens.spacing.small + Tokens.padding.medium) * (1 - toolsBg.openHeightProg) + Tokens.padding.medium
-								elevation.opacity: 1
-								toolBox.opacity: 0
-							}
-						}
-						transitions: Transition {
-							id: dialogTransition
-
-							SequentialAnimation {
-								ScriptAction {
-									script: toolsBg.reparentWrapper()
-								}
-
-								Anim {
-									properties: "x,y"
-								}
-							}
-
-							PropertyAction {
-								property: "enabled"
-							}
-
-							Anim {
-								properties: "opacity,topLeftRadius,topRightRadius,bottomLeftRadius,bottomRightRadius"
-								type: Anim.DefaultEffects
-							}
-
-							Anim {
-								properties: "width,height"
-							}
-						}
-
-						Elevation {
-							id: elevation
-
-							anchors.fill: parent
-							bottomLeftRadius: toolsBackground.bottomLeftRadius
-							bottomRightRadius: toolsBackground.bottomRightRadius
-							level: 4
-							opacity: 0
-							radius: toolsBackground.radius
-
-							transform: Matrix4x4 {
-								matrix: toolsBackground.deformMatrix
-							}
-						}
-
-						BlobRect {
-							id: toolsBackground
-
-							anchors.fill: parent
-							bottomLeftRadius: toolsBg.open ? Tokens.rounding.largeIncreased : Tokens.rounding.small
-							bottomRightRadius: toolsBg.open ? Tokens.rounding.largeIncreased : Tokens.rounding.small
-							topRightRadius: toolsBg.open ? Tokens.rounding.largeIncreased : Tokens.rounding.small
-							topLeftRadius: toolsBg.open ? Tokens.rounding.largeIncreased : Tokens.rounding.small
-							deformScale: 0
-							group: blobGroup
-							opacity: blobGroup.color.a * (root.enabled ? 1 : 0.5)
-						}
-
-						CustomRect {
-							id: toolBox
-							anchors.left: parent.left
-							anchors.right: parent.right
-							height: Math.min(implicitHeight, parent.height)
-							implicitHeight: toolList.implicitHeight + Tokens.padding.medium * 2
-							radius: Tokens.rounding.small
-
-							StateLayer {
-								onClicked: {
-									toolsBg.open = true;
-								}
-							}
-
-							ColumnLayout {
-								id: toolList
-								anchors.left: parent.left
-								anchors.right: parent.right
-								anchors.verticalCenter: parent.verticalCenter
-								anchors.margins: Tokens.padding.medium
-
-								Repeater {
-									id: repeater
-
-									model: root.current.pendingToolCalls?.slice(0, 4) ?? []
-
-									delegate: RowLayout {
-										id: toolText
-
-										required property LlmSegment modelData
-										required property int index
-
-										spacing: Tokens.spacing.medium
-
-										function toolTarget(seg: LlmSegment): string {
-											var a = null;
-											try {
-												a = JSON.parse(seg.arguments);
-											} catch (e) {}
-											if (a && typeof a === "object") {
-												const v = a.url ?? a.path;
-												if (v !== undefined && v !== null)
-													return String(v);
-											}
-											return String(seg.arguments);
-										}
-
-										MaterialIcon {
-											color: Colors.palette.m3onPrimaryContainer
-											text: toolText.modelData.name === "webfetch" ? "web" : "text_snippet"
-											fill: 1
-										}
-
-										CustomText {
-											color: Colors.palette.m3onPrimaryContainer
-											text: qsTr("%1").arg(toolText.modelData.name)
-										}
-
-										MaterialIcon {
-											color: Colors.palette.m3onPrimaryContainer
-											text: "arrow_right_alt"
-										}
-
-										CustomText {
-											color: Colors.palette.m3onPrimaryContainer
-											text: qsTr("%1").arg(toolText.toolTarget(toolText.modelData))
-										}
-									}
-								}
-
-								CustomText {
-									color: Colors.palette.m3onPrimaryContainer
-									text: qsTr("And %1 more").arg(root.current.pendingToolCalls.slice(4).length)
-									visible: repeater.count < root.current.pendingToolCalls.length
-								}
-							}
-						}
-
-						Loader {
-							id: toolsContent
-
-							active: opacity > 0
-							anchors.fill: parent
-							asynchronous: false
-							opacity: 0
-
-							sourceComponent: MouseArea {
-								onWheel: event => event.accepted = true
-								preventStealing: true
-								implicitHeight: innerLayout.contentHeight + innerLayout.anchors.margins * 2
-
-								VerticalFadeListView {
-									id: innerLayout
-
-									anchors.fill: parent
-									anchors.margins: Tokens.padding.small
-									cacheBuffer: height * 10
-									fadeAmount: 0.1
-									fadeEnabled: interactive
-									spacing: 0
-									clip: true
-									interactive: contentHeight > toolsBg.maxHeight
-
-									model: root.current.pendingToolCalls ?? []
-
-									delegate: Item {
-										id: toolCall
-
-										required property LlmSegment modelData
-										property bool expanded: false
-
-										implicitWidth: CustomListView.view.width
-										implicitHeight: collapsedRow.implicitHeight + collapsedRow.anchors.margins + (expanded ? expandedTool.implicitHeight + expandedTool.anchors.margins + expandedTool.anchors.topMargin : collapsedRow.anchors.margins)
-
-										function toolTarget(seg: LlmSegment): string {
-											var a = null;
-											try {
-												a = JSON.parse(seg.arguments);
-											} catch (e) {}
-											if (a && typeof a === "object") {
-												const v = a.url ?? a.path;
-												if (v !== undefined && v !== null)
-													return String(v);
-											}
-											return String(seg.arguments);
-										}
-
-										Behavior on implicitHeight {
-											Anim {}
-										}
-
-										RowLayout {
-											id: collapsedRow
-
-											anchors.top: parent.top
-											anchors.left: parent.left
-											anchors.right: parent.right
-											anchors.margins: Tokens.padding.medium
-
-											IconButton {
-												id: toolExpandBtn
-
-												font: Tokens.font.icon.medium
-												icon: "keyboard_arrow_down"
-												inactiveOnColor: hovered ? Colors.palette.m3onSurface : Colors.palette.m3outline
-												rotation: toolCall.expanded ? 180 : 0
-												type: IconButton.Text
-
-												Behavior on rotation {
-													Anim {}
-												}
-
-												onClicked: toolCall.expanded = !toolCall.expanded
-											}
-
-											CustomText {
-												id: preview
-
-												Layout.fillWidth: true
-
-												text: toolCall.modelData.name
-											}
-										}
-
-										CustomClippingRect {
-											id: expandedTool
-
-											anchors.top: collapsedRow.bottom
-											anchors.left: parent.left
-											anchors.right: parent.right
-											anchors.bottom: parent.bottom
-											anchors.margins: Tokens.padding.medium
-											anchors.topMargin: Tokens.spacing.medium
-
-											implicitHeight: fullToolCall.implicitHeight + fullToolCall.anchors.margins * 2
-											radius: Tokens.rounding.medium
-											color: Colors.palette.m3surfaceContainerLow
-
-											CustomText {
-												id: fullToolCall
-
-												anchors.fill: parent
-												anchors.margins: Tokens.padding.medium
-
-												text: toolCall.toolTarget(toolCall.modelData)
-												wrapMode: CustomText.WrapAtWordBoundaryOrAnywhere
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-
-				ButtonRow {
-					id: confirmationRow
-					Layout.alignment: Qt.AlignRight
-					spacing: Tokens.spacing.medium
-
-					IconTextButton {
-						icon: "check_circle"
-						text: qsTr("Allow")
-						horizontalPadding: Tokens.padding.large
-						verticalPadding: Tokens.padding.small
-						isRound: true
-						shapeMorph: true
-						onClicked: root.current.approveTools()
-					}
-
-					IconTextButton {
-						icon: "cancel"
-						text: qsTr("Deny")
-						isRound: true
-						shapeMorph: true
-						inactiveColor: Colors.palette.m3error
-						inactiveOnColor: Colors.palette.m3onError
-						horizontalPadding: Tokens.padding.large
-						verticalPadding: Tokens.padding.small
-						onClicked: root.current.denyTools()
-					}
-				}
-			}
-		}
-	}
-
-	CustomClippingRect {
-		id: expandedRect
-
-		anchors.left: parent.left
-		anchors.right: parent.right
-		anchors.top: layout.bottom
-		anchors.bottom: parent.bottom
-		anchors.topMargin: Tokens.spacing.small
-		color: Colors.palette.m3surfaceContainerLow
-		implicitHeight: expandedContent.contentHeight + expandedContent.anchors.margins * 2
-		opacity: root.expanded ? 1 : 0
-		radius: Tokens.rounding.medium
-		visible: opacity > 0
-
-		Behavior on opacity {
-			Anim {}
-		}
-
-		ListView {
-			id: expandedContent
-
-			anchors.fill: parent
-			anchors.margins: Tokens.padding.medium
-			model: root.segments
-			spacing: Tokens.spacing.medium
-
-			delegate: Item {
-				id: segment
-
-				required property LlmSegment modelData
-				required property int index
-
-				implicitWidth: ListView.view.width
-				implicitHeight: header.implicitHeight + content.implicitHeight + content.anchors.topMargin
-
-				RowLayout {
-					id: header
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					spacing: Tokens.spacing.small
-
-					MaterialIcon {
-						text: segment.modelData.type === LlmSegment.Type.Reasoning ? "cognition" : "build"
-						fill: 1
-					}
-
-					CustomText {
-						Layout.fillWidth: true
-						text: segment.modelData.type === LlmSegment.Type.Reasoning ? qsTr("Thought for %1s").arg((segment.modelData.elapsedMs / 1000).toFixed(1)) : qsTr("Used %1 for %2s").arg(segment.modelData.name).arg((segment.modelData.elapsedMs / 1000).toFixed(1))
-					}
-				}
-
-				CustomText {
-					id: content
-
-					function toolTarget(seg: LlmSegment): string {
-						var a = null;
-						try {
-							a = JSON.parse(seg.arguments);
-						} catch (e) {}
-						if (a && typeof a === "object") {
-							const v = a.url ?? a.path;
-							if (v !== undefined && v !== null)
-								return String(v);
-						}
-						return String(seg.arguments);
-					}
-
-					function prettyTool(seg: LlmSegment): string {
-						if (seg.name === "webfetch") {
-							switch (seg.status) {
-							case LlmSegment.Status.Running:
-								return qsTr("Fetching");
-							case LlmSegment.Status.Pending:
-								return qsTr("Pending fetch");
-							case LlmSegment.Status.Success:
-								return qsTr("Fetched");
-							case LlmSegment.Status.Error:
-								return qsTr("Failed to fetch");
-							default:
-								return qsTr("Fetched website");
-							}
-						} else if (seg.name === "readfile") {
-							switch (seg.status) {
-							case LlmSegment.Status.Running:
-								return qsTr("Reading");
-							case LlmSegment.Status.Pending:
-								return qsTr("Pending read");
-							case LlmSegment.Status.Success:
-								return qsTr("Read");
-							case LlmSegment.Status.Error:
-								return qsTr("Failed to read");
-							default:
-								return qsTr("Read file");
-							}
-						}
-					}
-
-					anchors.left: parent.left
-					anchors.leftMargin: Tokens.padding.small
-					anchors.top: header.bottom
-					anchors.topMargin: Tokens.spacing.small
-					anchors.right: parent.right
-					color: Colors.palette.m3outline
-					font: Tokens.font.body.small
-					wrapMode: CustomText.WrapAtWordBoundaryOrAnywhere
-					text: segment.modelData.type === LlmSegment.Type.Reasoning ? segment.modelData.text : qsTr("%1 %2").arg(content.prettyTool(segment.modelData)).arg(content.toolTarget(segment.modelData))
-				}
-			}
-		}
-	}
-}

Modules/Resources/Cards/BatteryTank.qml

@@ -5,7 +5,7 @@ import ZShell.Config
 import qs.Components
 import qs.Services
 
-CustomClippingRect {
+ClipRect {
 	id: root
 
 	property real animPerc: UPower.displayDevice.percentage

Modules/Resources/Cards/HeroCard.qml

@@ -4,7 +4,7 @@ import ZShell.Config
 import qs.Components
 import qs.Services
 
-CustomClippingRect {
+CustomRect {
 	id: root
 
 	required property color accent
@@ -19,15 +19,20 @@ CustomClippingRect {
 	implicitWidth: 450
 	radius: Tokens.rounding.largeIncreased
 
-	CustomRect {
+	ClipRect {
-		anchors.bottom: parent.bottom
+		anchors.fill: parent
-		anchors.left: parent.left
+		radius: parent.radius
-		anchors.top: parent.top
-		color: Qt.alpha(root.accent, 0.05)
-		implicitWidth: parent.width * root.usage
 
-		Behavior on implicitWidth {
+		CustomRect {
-			Anim {}
+			anchors.bottom: parent.bottom
+			anchors.left: parent.left
+			anchors.top: parent.top
+			color: Qt.alpha(root.accent, 0.05)
+			implicitWidth: parent.width * root.usage
+
+			Behavior on implicitWidth {
+				Anim {}
+			}
 		}
 	}
 

Modules/Resources/Cards/MemoryCard.qml

@@ -51,7 +51,8 @@ CustomRect {
 			value: Memory.percentage
 
 			Behavior on clampedVal {
-				Anim {}
+				Anim {
+				}
 			}
 
 			ColumnLayout {

Modules/Resources/Cards/StorageCard.qml

@@ -121,6 +121,6 @@ CustomRect {
 
 		activeIcon: "storage"
 		icon: modelData === Storage.primaryDisk ? "check" : ""
-		text: modelData.mount
+		text: modelData.name
 	}
 }

Modules/ServiceLoader.qml

@@ -0,0 +1,9 @@
+import Quickshell
+import QtQuick
+import qs.Helpers
+
+Scope {
+	Component.onCompleted: {
+		Wallpapers;
+	}
+}

Modules/Settings/Common/ConnectedRect.qml

@@ -17,7 +17,7 @@ CustomRect {
 	bottomLeftRadius: last ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 	bottomRightRadius: last ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 	color: Colors.tPalette.m3surfaceContainer
-	opacity: enabled && parent.enabled ? 1 : 0.5
+	opacity: enabled && (parent?.enabled ?? false) ? 1 : 0.5
 	topLeftRadius: first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 	topRightRadius: first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 

Modules/Settings/Common/DialogRowButton.qml

@@ -141,11 +141,11 @@ Item {
 			anchors.fill: parent
 			bottomLeftRadius: root.last ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 			bottomRightRadius: root.last ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
-			topRightRadius: root.first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
-			topLeftRadius: root.first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 			deformScale: 0
 			group: blobGroup
 			opacity: blobGroup.color.a * (root.enabled ? 1 : 0.5)
+			topLeftRadius: root.first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
+			topRightRadius: root.first ? Tokens.rounding.largeIncreased : Tokens.rounding.extraSmall
 		}
 
 		RowButton {
@@ -154,11 +154,11 @@ Item {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: "transparent"
+			first: root.first
 			height: Math.min(implicitHeight, parent.height)
 			icon: root.icon
-			subtext: root.subtext
 			last: root.last
-			first: root.first
+			subtext: root.subtext
 			text: root.label
 
 			transform: Matrix4x4 {

Modules/Settings/Common/PageBase.qml

@@ -149,7 +149,7 @@ ColumnLayout {
 		}
 	}
 
-	VerticalFadeFlickable {
+	CustomFlickable {
 		id: flickable
 
 		Layout.fillHeight: true
@@ -158,7 +158,8 @@ ColumnLayout {
 
 		bottomMargin: Tokens.padding.extraLarge
 		topMargin: Tokens.padding.large
-		fadeAmount: 0.1
+		clip: true
+		// fadeAmount: 0.1
 
 		contentHeight: root.contentChild?.implicitHeight ?? 0
 		contentItem.children: [root.contentChild]

Modules/Settings/Common/WallItem.qml

@@ -25,7 +25,7 @@ Item {
 		anchors.fill: parent
 		spacing: Tokens.spacing.small
 
-		CustomClippingRect {
+		ClipRect {
 			id: imgWrapper
 
 			Layout.fillWidth: true
@@ -39,8 +39,7 @@ Item {
 				opacity: img.status === Image.Ready ? 0 : 1
 
 				Behavior on opacity {
-					Anim {
+					Anim {}
-					}
 				}
 				sourceComponent: CustomRect {
 					color: Colors.palette.m3primaryContainer
@@ -64,18 +63,43 @@ Item {
 				anchors.fill: parent
 				asynchronous: true
 				fillMode: Image.PreserveAspectCrop
-				opacity: status === Image.Ready ? 1 : 0
 				retainWhileLoading: true
 				sourceSize: {
 					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
 					return Qt.size(width * dpr, height * dpr);
 				}
 
+				opacity: status === Image.Ready ? 1 : 0
 				Behavior on opacity {
 					Anim {
 						type: Anim.SlowEffects
 					}
 				}
+
+				Loader {
+					opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
+					active: opacity > 0
+					anchors.centerIn: parent
+					Behavior on opacity {
+						Anim {
+							type: Anim.SlowEffects
+						}
+					}
+
+					sourceComponent: CustomRect {
+						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
+						implicitHeight: implicitWidth
+						radius: Tokens.rounding.full
+						color: Colors.tPalette.m3surface
+
+						MaterialIcon {
+							id: videoIcon
+							anchors.centerIn: parent
+							text: "video_library"
+							fontStyle: Tokens.font.icon.extraLarge
+						}
+					}
+				}
 			}
 		}
 	}

Modules/Settings/Common/WallpaperCropper.qml

@@ -13,11 +13,14 @@ import qs.Services
 Item {
 	id: wrapper
 
+	readonly property bool isVideo: Wallpapers.currentIsVideo
+	readonly property string currentWallpaper: Wallpapers.current
 	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
 	readonly property real maxZoom: 5.0
-
 	readonly property bool changesMade: {
 		cropRevision;
+		Wallpapers.cropVersion;
+		wrapper.currentWallpaper;
 
 		const r = cropRectLoader.item;
 		if (!r || !currentScreen || scaledImg.status !== Image.Ready)
@@ -28,20 +31,12 @@ Item {
 		return Math.abs(r.x - t.x) > 0.5 || Math.abs(r.y - t.y) > 0.5 || Math.abs(r.zoom - t.zoom) > 0.001;
 	}
 
-	property int cropRevision: 0
 	property int buttonRowHeight: Tokens.padding.large * 3
+	property int cropRevision: 0
 	property var screens: []
 	property int selectedScreenIndex: 0
 	property bool shouldBeActive: true
 
-	function zoomFromSlider(t: real): real {
-		return 1 / (1 - t * (1 - 1 / maxZoom));
-	}
-
-	function sliderFromZoom(zoom: real): real {
-		return (1 - 1 / zoom) / (1 - 1 / maxZoom);
-	}
-
 	function applyCrop(): void {
 		if (!cropRectLoader.item || !currentScreen)
 			return;
@@ -72,6 +67,10 @@ Item {
 			Qt.callLater(syncCropToScreen);
 	}
 
+	function sliderFromZoom(zoom: real): real {
+		return (1 - 1 / zoom) / (1 - 1 / maxZoom);
+	}
+
 	function syncCropToScreen(): void {
 		if (cropRectLoader.item)
 			cropRectLoader.item.restoreFromData();
@@ -94,6 +93,10 @@ Item {
 		cropRect.clampToBounds();
 	}
 
+	function zoomFromSlider(t: real): real {
+		return 1 / (1 - t * (1 - 1 / maxZoom));
+	}
+
 	anchors.left: parent.left
 	anchors.right: parent.right
 	implicitHeight: shouldBeActive ? 430 : 0
@@ -115,13 +118,15 @@ Item {
 		refreshScreens();
 		Qt.callLater(syncCropToScreen);
 	}
+	onCurrentWallpaperChanged: {
+		Qt.callLater(syncCropToScreen);
+	}
 	onSelectedScreenIndexChanged: {
 		Qt.callLater(syncCropToScreen);
 	}
 
-	ButtonRow {
+	Loader {
-		id: screenSelector
+		id: selectorLoader
-
 		anchors.bottom: imageSlot.top
 		anchors.bottomMargin: Tokens.spacing.medium
 		anchors.left: parent.left
@@ -129,25 +134,32 @@ Item {
 		anchors.right: parent.right
 		anchors.rightMargin: Tokens.padding.extraLarge * 2
 		anchors.top: parent.top
-		spacing: Tokens.spacing.small
 
-		Repeater {
+		active: wrapper.screens.length > 1 && !wrapper.isVideo
-			model: wrapper.screens
 
-			delegate: TextButton {
+		sourceComponent: ButtonRow {
-				required property int index
+			id: screenSelector
-				readonly property bool isCurrent: wrapper.selectedScreenIndex === index
-				required property var modelData
 
-				fillWidth: true
+			spacing: Tokens.spacing.small
-				inactiveColor: isCurrent ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3surfaceContainer, 0.7)
-				inactiveOnColor: isCurrent ? Colors.palette.m3onPrimary : Qt.alpha(Colors.palette.m3onSurface, 0.7)
-				isRound: true
-				shapeMorph: true
-				text: modelData.name
-				font: Tokens.font.body.builders.large.weight(Font.DemiBold).build()
 
-				onClicked: wrapper.selectScreen(index)
+			Repeater {
+				model: wrapper.screens
+
+				delegate: TextButton {
+					required property int index
+					readonly property bool isCurrent: wrapper.selectedScreenIndex === index
+					required property var modelData
+
+					fillWidth: true
+					font: Tokens.font.body.builders.large.weight(Font.DemiBold).build()
+					inactiveColor: isCurrent ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3surfaceContainer, 0.7)
+					inactiveOnColor: isCurrent ? Colors.palette.m3onPrimary : Qt.alpha(Colors.palette.m3onSurface, 0.7)
+					isRound: true
+					shapeMorph: true
+					text: modelData.name
+
+					onClicked: wrapper.selectScreen(index)
+				}
 			}
 		}
 	}
@@ -159,6 +171,7 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		implicitHeight: 30
+		enabled: !wrapper.isVideo
 
 		CustomSlider {
 			id: zoomSlider
@@ -180,15 +193,15 @@ Item {
 			spacing: Tokens.spacing.medium
 
 			IconTextButton {
-				isRound: true
+				enabled: wrapper.changesMade
-				icon: "close"
-				text: qsTr("Cancel")
 				font: Tokens.font.body.large
-				shapeMorph: true
 				horizontalPadding: Tokens.padding.large
+				icon: "close"
 				inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 2)
 				inactiveOnColor: Colors.palette.m3onSurfaceVariant
-				enabled: wrapper.changesMade
+				isRound: true
+				shapeMorph: true
+				text: qsTr("Cancel")
 
 				onClicked: {
 					wrapper.syncCropToScreen();
@@ -196,15 +209,15 @@ Item {
 			}
 
 			IconTextButton {
-				isRound: true
+				enabled: wrapper.changesMade
-				icon: "check"
-				text: qsTr("Apply")
 				font: Tokens.font.body.large
-				shapeMorph: true
 				horizontalPadding: Tokens.padding.large
+				icon: "check"
 				inactiveColor: Colors.palette.m3secondary
 				inactiveOnColor: Colors.palette.m3onSecondary
-				enabled: wrapper.changesMade
+				isRound: true
+				shapeMorph: true
+				text: qsTr("Apply")
 
 				onClicked: {
 					wrapper.applyCrop();
@@ -221,48 +234,43 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.top: parent.top
-		anchors.topMargin: wrapper.buttonRowHeight + Tokens.spacing.medium
+		anchors.topMargin: selectorLoader.active ? wrapper.buttonRowHeight + Tokens.spacing.medium : Tokens.spacing.medium
 
-		CustomClippingRect {
+		ClipRect {
 			id: fitBox
 
 			readonly property real aspect: scaledImg.implicitHeight > 0 ? scaledImg.implicitWidth / scaledImg.implicitHeight : 1
-			readonly property real fitW: Math.min(imageSlot.width, imageSlot.height * aspect)
+			readonly property real fitW: imageSlot.height * aspect
 
+			anchors.centerIn: parent
 			implicitHeight: Math.round(fitW / aspect)
 			implicitWidth: Math.round(fitW)
-			x: Math.round((imageSlot.width - width) / 2)
-			y: Math.round((imageSlot.height - height) / 2)
 			radius: Tokens.rounding.largeIncreased
 
 			Loader {
-				anchors.centerIn: parent
-
-				opacity: scaledImg.status === Image.Ready ? 0 : 1
 				active: opacity > 0
+				anchors.centerIn: parent
+				opacity: scaledImg.status === Image.Ready ? 0 : 1
 
+				Behavior on opacity {
+					Anim {
+						type: Anim.DefaultEffects
+					}
+				}
 				sourceComponent: CustomRect {
-					implicitWidth: loadingIndicator.implicitSize + Tokens.padding.large * 2
-					implicitHeight: loadingIndicator.implicitSize + Tokens.padding.large * 2
-
 					color: Colors.palette.m3primaryContainer
+					implicitHeight: loadingIndicator.implicitSize + Tokens.padding.large * 2
+					implicitWidth: loadingIndicator.implicitSize + Tokens.padding.large * 2
 					radius: Tokens.rounding.full
 
 					LoadingIndicator {
 						id: loadingIndicator
 
 						anchors.centerIn: parent
-
 						containsIcon: true
 						implicitSize: Math.min(fitBox.width, fitBox.height) * 0.3
 					}
 				}
-
-				Behavior on opacity {
-					Anim {
-						type: Anim.DefaultEffects
-					}
-				}
 			}
 
 			Image {
@@ -270,26 +278,53 @@ Item {
 
 				anchors.fill: parent
 				asynchronous: true
-				fillMode: Image.Stretch
+				fillMode: Image.PreserveAspectFit
-				source: Wallpapers.current
+				mipmap: true
-				sourceSize: {
-					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
-					return Qt.size(width * dpr, height * dpr);
-				}
-				retainWhileLoading: true
 				opacity: status === Image.Ready ? 1 : 0
+				retainWhileLoading: true
+				smooth: true
+				source: Wallpapers.currentThumbnail
+				sourceSize.height: {
+					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
+					return imageSlot.height * dpr;
+				}
 
 				Behavior on opacity {
 					Anim {
 						type: Anim.SlowEffects
 					}
 				}
+
+				Loader {
+					opacity: wrapper.isVideo && scaledImg.status === Image.Ready ? 1 : 0
+					active: opacity > 0
+					anchors.centerIn: parent
+					Behavior on opacity {
+						Anim {
+							type: Anim.SlowEffects
+						}
+					}
+
+					sourceComponent: CustomRect {
+						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
+						implicitHeight: implicitWidth
+						radius: Tokens.rounding.full
+						color: Colors.tPalette.m3surface
+
+						MaterialIcon {
+							id: videoIcon
+							anchors.centerIn: parent
+							text: "video_library"
+							fontStyle: Tokens.font.icon.extraLarge
+						}
+					}
+				}
 			}
 
 			Loader {
 				id: cropRectLoader
 
-				active: scaledImg.status === Image.Ready
+				active: scaledImg.status === Image.Ready && !wrapper.isVideo
 
 				sourceComponent: Component {
 					CustomRect {
@@ -297,7 +332,6 @@ Item {
 
 						property real aspectRatio: wrapper.currentScreen ? wrapper.currentScreen.width / wrapper.currentScreen.height : 1
 						readonly property real baseHeight: baseWidth / aspectRatio
-
 						readonly property real baseWidth: {
 							let fittedHeight = imageH;
 							let fittedWidth = fittedHeight * aspectRatio;
@@ -309,7 +343,6 @@ Item {
 
 							return fittedWidth;
 						}
-
 						readonly property real imageH: Math.round(fitBox.height)
 						readonly property real imageW: Math.round(fitBox.width)
 						readonly property real imageX: 0
@@ -327,7 +360,13 @@ Item {
 							y = Math.max(imageY, Math.min(y, imageY + imageH - height));
 						}
 
-						// Where the rect should be according to saved data (same rules as a restore).
+						function restoreFromData() {
+							const t = savedTarget();
+							zoom = t.zoom;
+							x = t.x;
+							y = t.y;
+						}
+
 						function savedTarget() {
 							const data = Wallpapers.getCrop(wrapper.currentScreen.name);
 							const hasCrop = data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001);
@@ -349,16 +388,9 @@ Item {
 							};
 						}
 
-						function restoreFromData() {
+						color: zoomSlider.dragging || mouse.pressed ? Qt.alpha(Colors.palette.m3tertiary, 0.3) : "transparent"
-							const t = savedTarget();
-							zoom = t.zoom;
-							x = t.x;
-							y = t.y;
-						}
-
 						height: Math.round(baseHeight / zoom)
 						width: Math.round(baseWidth / zoom)
-						color: zoomSlider.dragging || mouse.pressed ? Qt.alpha(Colors.palette.m3tertiary, 0.3) : "transparent"
 
 						Behavior on color {
 							CAnim {}
@@ -374,21 +406,19 @@ Item {
 			}
 
 			ShaderEffect {
-				anchors.fill: parent
+				property color borderColor: Colors.palette.m3tertiary
-
+				property real borderWidth: 2
+				property real cornerRadius: fitBox.radius
+				property vector4d cropBox: cropRectLoader.item ? Qt.vector4d(snap(cropRectLoader.item.x), snap(cropRectLoader.item.y), snap(cropRectLoader.item.width), snap(cropRectLoader.item.height)) : Qt.vector4d(0, 0, 0, 0)
 				readonly property real dpr: (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1
+				property vector2d itemSize: Qt.vector2d(width, height)
+				property real pixelScale: dpr
 
 				function snap(v: real): real {
 					return Math.round(v * dpr) / dpr;
 				}
 
-				property color borderColor: Colors.palette.m3tertiary
+				anchors.fill: parent
-				property vector4d cropBox: cropRectLoader.item ? Qt.vector4d(snap(cropRectLoader.item.x), snap(cropRectLoader.item.y), snap(cropRectLoader.item.width), snap(cropRectLoader.item.height)) : Qt.vector4d(0, 0, 0, 0)
-				property real borderWidth: 2
-				property real cornerRadius: fitBox.radius
-				property vector2d itemSize: Qt.vector2d(width, height)
-				property real pixelScale: dpr
-
 				fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/crop_sdf.frag.qsb`)
 			}
 
@@ -398,14 +428,6 @@ Item {
 				property real grabX: 0
 				property real grabY: 0
 
-				function insideCropRect(mx, my): bool {
-					const r = cropRectLoader.item;
-					if (!r)
-						return false;
-
-					return mx >= r.x && mx <= r.x + r.width && my >= r.y && my <= r.y + r.height;
-				}
-
 				function beginGrab(mx, my): void {
 					const r = cropRectLoader.item;
 					if (!r)
@@ -422,6 +444,14 @@ Item {
 					}
 				}
 
+				function insideCropRect(mx, my): bool {
+					const r = cropRectLoader.item;
+					if (!r)
+						return false;
+
+					return mx >= r.x && mx <= r.x + r.width && my >= r.y && my <= r.y + r.height;
+				}
+
 				function updateCrop(mx, my): void {
 					if (!cropRectLoader.item)
 						return;
@@ -439,10 +469,10 @@ Item {
 				}
 
 				anchors.fill: parent
+				cursorShape: wrapper.isVideo ? Qt.ArrowCursor : pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
 				hoverEnabled: true
 				preventStealing: true
-
+				enabled: !wrapper.isVideo
-				cursorShape: pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
 
 				onPositionChanged: mouse => {
 					if (pressed) {

Modules/Settings/Content.qml

@@ -6,7 +6,7 @@ import qs.Components
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: root
 
 	property color blobColor: Colors.tPalette.m3surfaceContainerLow
@@ -21,7 +21,6 @@ CustomClippingRect {
 
 	implicitHeight: sState.screen.height * 0.7
 	implicitWidth: implicitHeight * ratio
-	radius: Tokens.rounding.largeIncreased + Tokens.padding.small
 
 	Behavior on blobColor {
 		CAnim {}
@@ -39,6 +38,7 @@ CustomClippingRect {
 	}
 
 	BlobInvertedRect {
+		id: blobRect
 		anchors.fill: parent
 		borderBottom: Tokens.padding.small
 		borderLeft: navPane.width + navPane.anchors.margins * 2
@@ -46,6 +46,8 @@ CustomClippingRect {
 		borderTop: Tokens.padding.small
 		group: blobGroup
 		opacity: root.blobColor.a
+		// outerRadius: 10
+		outerRadius: Tokens.rounding.largeIncreased + Tokens.padding.small
 		radius: Tokens.rounding.largeIncreased
 	}
 
@@ -64,6 +66,7 @@ CustomClippingRect {
 		anchors.bottom: parent.bottom
 		anchors.left: navPane.right
 		anchors.leftMargin: navPane.anchors.margins + anchors.margins
+		anchors.bottomMargin: blobRect.borderBottom
 		anchors.margins: Tokens.padding.extraLarge
 		anchors.right: parent.right
 		anchors.top: parent.top

Modules/Settings/Pages.qml

@@ -38,22 +38,9 @@ Item {
 		id: container
 
 		anchors.fill: parent
-		layer.enabled: opacity < 1
 		objectName: "PageContainer"
 
 		Component.onCompleted: root.loadPage(root.sState.currentPageIdx)
-
-		// CustomRect {
-		// 	anchors.fill: parent
-		// 	color: Qt.alpha(Colors.palette.m3shadow, 0.3)
-		// 	opacity: root.sState.dimmed ? 1 : 0
-		// 	visible: opacity > 0
-		// 	z: 0
-		//
-		// 	Behavior on opacity {
-		// 		Anim {}
-		// 	}
-		// }
 	}
 
 	Connections {

Modules/Settings/Pages/Apps/AllApps.qml

@@ -52,11 +52,11 @@ PageBase {
 					anchors.leftMargin: Tokens.padding.largeIncreased
 					anchors.margins: Tokens.padding.small
 					anchors.rightMargin: Tokens.padding.largeIncreased
-					spacing: Tokens.spacing.small
+					spacing: Tokens.spacing.medium
 
 					IconImage {
 						asynchronous: true
-						implicitSize: Math.round(Tokens.font.icon.large * 1.8)
+						implicitSize: Math.round(Tokens.font.icon.large.pointSize * 1.8)
 						source: Quickshell.iconPath(appItem.modelData.icon, "image-missing")
 					}
 

Modules/Settings/Pages/Panels/Sidebar/SidebarLlm.qml

@@ -88,6 +88,7 @@ PageBase {
 			id: selectScheme
 
 			acceptLabel: qsTr("Confirm")
+			settingAnchor: "panels-sidebar-llm-scheme"
 			enabled: Object.keys(model).length > 0
 			header: qsTr("Select scheme")
 			first: true

Modules/Settings/Pages/ServicesPage.qml

@@ -25,18 +25,6 @@ PageBase {
 			text: qsTr("None")
 		}
 	]
-	readonly property list<string> gpuValues: ["", "NVIDIA", "GENERIC", "None"]
-
-	function gpuKeyToIndex(key: string): int {
-		const u = (key ?? "").trim().toUpperCase();
-		if (u === "")
-			return 0; // Auto
-		if (u === "NVIDIA")
-			return 1;
-		if (u === "GENERIC")
-			return 2;
-		return 3; // None
-	}
 
 	title: qsTr("Services")
 
@@ -211,7 +199,7 @@ PageBase {
 		}
 
 		SelectRow {
-			active: root.gpuItems[root.gpuKeyToIndex(Config.services.gpuType)]
+			active: root.gpuItems[Config.services.gpuType]
 			last: true
 			menuItems: root.gpuItems
 			menuOnTop: true
@@ -219,7 +207,7 @@ PageBase {
 			subtext: Gpu.name ? qsTr("Monitoring: %1").arg(Gpu.name) : qsTr("Override for GPU type")
 			text: qsTr("GPU")
 
-			onSelected: item => Config.services.gpuType = root.gpuValues[root.gpuItems.indexOf(item)]
+			onSelected: item => Config.services.gpuType = root.gpuItems.indexOf(item)
 		}
 	}
 }

Modules/Settings/Pages/Wallpaper/WallpaperSelect.qml

@@ -50,11 +50,12 @@ PageBase {
 				}
 
 				WallItem {
-					required property FileSystemEntry modelData
+					id: wallItem
+					required property WallpaperEntry modelData
 
 					enabled: modelData
 					opacity: modelData ? 1 : 0
-					source: String(modelData?.path ?? "")
+					source: String(modelData?.thumbnailPath ?? "")
 
 					onClicked: {
 						Wallpapers.setWallpaper(modelData.path);

Modules/Settings/Pages/WallpaperPage.qml

@@ -13,6 +13,42 @@ import qs.Services
 PageBase {
 	id: root
 
+	readonly property list<MenuItem> wallTransitions: [
+		MenuItem {
+			text: "Bowtie"
+		},
+		MenuItem {
+			text: "Fade"
+		},
+		MenuItem {
+			text: "LinearBlur"
+		},
+		MenuItem {
+			text: "WindowSlices"
+		},
+		MenuItem {
+			text: "WipeRight"
+		},
+		MenuItem {
+			text: "WipeDown"
+		},
+		MenuItem {
+			text: "TilesWave"
+		},
+		MenuItem {
+			text: "SplitSlideInHorizontal"
+		},
+		MenuItem {
+			text: "Hexagonalize"
+		},
+		MenuItem {
+			text: "DoomMelt"
+		},
+		MenuItem {
+			text: "Random"
+		}
+	]
+
 	title: qsTr("Wallpaper & style")
 
 	ColumnLayout {
@@ -73,6 +109,18 @@ PageBase {
 			onToggled: Config.background.enabled = checked
 		}
 
+		SelectRow {
+			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
+			active: root.wallTransitions[Config.background.wallTransition]
+			menuItems: root.wallTransitions
+			menuOnTop: true
+			settingAnchor: "style-wallpaper-transition"
+			subtext: qsTr("Currently selected: %1").arg(active.text)
+			text: qsTr("Wallpaper transition")
+
+			onSelected: item => Config.background.wallTransition = root.wallTransitions.indexOf(item)
+		}
+
 		ToggleRow {
 			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
 			checked: Colors.transparency.enabled
@@ -199,7 +247,7 @@ PageBase {
 			stepSize: 1
 			subtext: qsTr("How long it takes for the gradual nightlight to finish (s)")
 			text: qsTr("Fade duration")
-			to: 60 * 5
+			to: 60 * 20
 			value: Config.display.nightlight.fadeDuration / 1000
 
 			onMoved: v => Config.display.nightlight.fadeDuration = v * 1000