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 {}
+	}
+}

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
-	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;
-		}
+	ClipRect {
 		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 {
-			Anim {}
-		}
-		Behavior on opacity {
-			Anim {
-				type: Anim.DefaultEffects
+		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
 
-		MouseArea {
-			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
-			cursorShape: Qt.PointingHandCursor
-			hoverEnabled: true
+			Behavior on implicitHeight {
+				Anim {}
+			}
+			Behavior on opacity {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
+
+			MouseArea {
+				acceptedButtons: Qt.NoButton
+				anchors.fill: parent
+				cursorShape: Qt.PointingHandCursor
+				hoverEnabled: true
+			}
 		}
 	}
 }

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
-	anchors.right: parent.right
-	anchors.top: parent.top
-	implicitWidth: handle.implicitWidth
-	radius: Tokens.rounding.full
-
-	CustomRect {
-		id: handle
-
+	ClipRect {
+		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		color: Colors.palette.m3secondary
-		implicitHeight: track.scrollBar.height * track.scrollBar.effectiveSize
-		implicitWidth: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
-		opacity: {
-			if (!track.scrollBar.enabled)
-				return 0;
-			if (track.scrollBar.size === 1)
-				return 0;
-			if (track.mouseArea.pressed)
-				return 1;
-			if (track.mouseArea.containsMouse)
-				return 0.8;
-			if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
-				return 0.6;
-			return 0;
-		}
+		anchors.top: parent.top
 		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 {
-			Anim {}
-		}
-		Behavior on opacity {
-			Anim {
-				type: Anim.DefaultEffects
+		CustomRect {
+			id: handle
+
+			anchors.right: parent.right
+			color: Colors.palette.m3secondary
+			implicitHeight: track.scrollBar.height * track.scrollBar.effectiveSize
+			implicitWidth: track.mouseArea.pressed || track.mouseArea.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+			opacity: {
+				if (!track.scrollBar.enabled)
+					return 0;
+				if (track.scrollBar.size === 1)
+					return 0;
+				if (track.mouseArea.pressed)
+					return 1;
+				if (track.mouseArea.containsMouse)
+					return 0.8;
+				if (track.scrollBar.policy === CustomScrollBar.AlwaysOn || track.scrollBar.shouldBeActive)
+					return 0.6;
+				return 0;
 			}
-		}
+			radius: Tokens.rounding.full
+			y: track.scrollBar.reversed ? track.scrollBar.height * (1 + track.scrollBar.nonAnimY) * track.scrollBar.travelScale : track.scrollBar.height * track.scrollBar.nonAnimY * track.scrollBar.travelScale
 
-		MouseArea {
-			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
-			cursorShape: Qt.PointingHandCursor
-			hoverEnabled: true
+			Behavior on implicitWidth {
+				Anim {}
+			}
+			Behavior on opacity {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
+
+			MouseArea {
+				acceptedButtons: Qt.NoButton
+				anchors.fill: parent
+				cursorShape: Qt.PointingHandCursor
+				hoverEnabled: true
+			}
 		}
 	}
 }

Drawers/Exclusions.qml

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

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.Notifications.Sidebar.Utils as Utils
+import qs.Modules.Sidebar as Sidebar
+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)

Greeter/Center.qml

@@ -27,27 +27,21 @@ ColumnLayout {
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: Time.hourStr
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3primary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: ":"
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			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.family: Config.appearance.font.family.mono
-		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
+		font: Tokens.font.title.builders.medium.weight(Font.DemiBold).build()
 		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.pointSize: Tokens.font.size.normal
-		font.weight: 600
+		font: Tokens.font.body.large
 		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.pointSize: Tokens.font.size.small
+			font: Tokens.font.mono.medium
 			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.pointSize: Tokens.font.size.normal
+	font: Tokens.font.body.small
 	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
-	color: Colors.palette.m3onSurface
-	cursorVisible: !readOnly
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.smaller
-	placeholderTextColor: Colors.palette.m3outline
-	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
+	enum TextFieldType {
+		Outlined,
+		Filled
+	}
 
-	Behavior on color {
-		CAnim {
+	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
+	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
+	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
+	readonly property real smallFontScale: smallFontSize / font.pointSize
+	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
+	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
+	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
+
+	property int horizontalPadding: Tokens.padding.large
+	property int verticalPadding: Tokens.padding.large
+
+	property int radius: Tokens.rounding.small
+
+	property string supportingText
+	property string trailingIcon
+	property int smallFontSize: Tokens.font.label.small.pointSize
+
+	property int type: CustomTextField.Outlined
+	property var validate // Regex or function
+	property bool emptyIsValid: true
+	property string errorText
+	property bool isError
+	property string leadingIcon
+
+	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
+	leftPadding: horizontalPadding + leadingOffset
+	rightPadding: horizontalPadding + trailingOffset
+	topPadding: verticalPadding + filledOffset
+
+	background: Loader {
+		anchors.bottomMargin: root.supportingTextOffset
+		anchors.fill: parent
+		sourceComponent: root.type === CustomTextField.Filled ? filledComp : outlineComp
+
+		StateLayer {
+			id: stateLayer
+
+			cursorShape: Qt.IBeamCursor
+			enabled: !root.activeFocus
+			manualPressOverride: tapHandler.pressed
+			radius: root.type === CustomTextField.Outlined ? root.clampedRadius : 0
+			topLeftRadius: root.clampedRadius
+			topRightRadius: root.clampedRadius
+
+			onClicked: root.focus = true
 		}
 	}
-	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
-		implicitWidth: 2
-		radius: Tokens.rounding.medium
+	Item {
+		id: contentWrapper
 
-		Behavior on opacity {
-			Anim {
-				duration: Tokens.anim.durations.small
-			}
-		}
+		anchors.bottomMargin: root.supportingTextOffset
+		anchors.fill: parent
 
-		Connections {
-			function onCursorPositionChanged(): void {
-				if (root.activeFocus && root.cursorVisible) {
-					cursor.opacity = 1;
-					cursor.disableBlink = true;
-					enableBlink.restart();
+		CustomText {
+			id: placeholder
+
+			anchors.left: parent.left
+			anchors.leftMargin: root.leftPadding
+			anchors.topMargin: Tokens.padding.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : root.text ? Colors.palette.m3outline : root.placeholderTextColor)
+			font.family: root.font.family
+			font.pointSize: root.font.pointSize
+			font.variableAxes: root.font.variableAxes
+			font.weight: root.font.weight
+			renderType: Text.QtRendering
+			text: root.placeholderText
+
+			states: [
+				State {
+					name: "smallOutlined"
+					when: root.type === CustomTextField.Outlined && (root.activeFocus || root.text)
+
+					PropertyChanges {
+						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding
+						placeholder.scale: root.smallFontScale
+					}
+
+					AnchorChanges {
+						anchors.verticalCenter: contentWrapper.top
+						target: placeholder
+					}
+				},
+				State {
+					name: "smallFilled"
+					when: root.type === CustomTextField.Filled && (root.activeFocus || root.text)
+
+					PropertyChanges {
+						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding + root.leadingOffset
+						placeholder.scale: root.smallFontScale
+					}
+
+					AnchorChanges {
+						anchors.top: contentWrapper.top
+						anchors.verticalCenter: undefined
+						target: placeholder
+					}
+				}
+			]
+			transitions: Transition {
+				Anim {
+					properties: "scale,leftMargin"
+					type: Anim.DefaultEffects
+				}
+
+				AnchorAnim {
+					duration: Tokens.anim.durations.expressiveDefaultEffects
+					easing: Tokens.anim.expressiveDefaultEffects
 				}
 			}
-
-			target: root
 		}
 
-		Timer {
-			id: enableBlink
+		Loader {
+			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 {
-			interval: 500
-			repeat: true
-			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-			triggeredOnStart: true
+		Loader {
+			id: trailingIconLoader
 
-			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 {
-			cursor.opacity: 0
-			when: !root.activeFocus || !root.cursorVisible
+			sourceComponent: MaterialIcon {
+				color: Colors.palette.m3onSurfaceVariant
+				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
-	property int grade: Colors.light ? 0 : -25
+	id: root
 
-	font.family: "Material Symbols Rounded"
-	font.pointSize: Tokens.font.size.larger
-	font.variableAxes: ({
-			FILL: fill.toFixed(1),
-			GRAD: grade,
-			opsz: fontInfo.pixelSize,
-			wght: fontInfo.weight
-		})
+	property real fill: 0
+	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()
 }

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
-	enabled: !disabled
+	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
+	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 {
-			Layout.fillWidth: true
-			color: Colors.tPalette.m3surfaceContainer
-			implicitHeight: weather.implicitHeight
-			radius: Tokens.rounding.small
-			topLeftRadius: Tokens.rounding.largeIncreased
-
-			WeatherInfo {
-				id: weather
-
-				rootHeight: root.height
-			}
-		}
-
-		CustomClippingRect {
-			Layout.fillHeight: true
-			Layout.fillWidth: true
-			bottomLeftRadius: Tokens.rounding.largeIncreased
-			color: Colors.tPalette.m3surfaceContainer
-			radius: Tokens.rounding.small
-
-			UserDock {
-				greeter: root.greeter
-			}
+		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 {
-			Layout.fillHeight: true
-			Layout.fillWidth: true
-			bottomRightRadius: Tokens.rounding.largeIncreased
-			color: Colors.tPalette.m3surfaceContainer
-			radius: Tokens.rounding.small
-			topRightRadius: Tokens.rounding.largeIncreased
-
-			SessionDock {
-				greeter: root.greeter
-			}
+		SessionDock {
+			greeter: root.greeter
 		}
 	}
 }

Greeter/GreeterSurface.qml

@@ -134,8 +134,7 @@ Scope {
 					id: lockIcon
 
 					anchors.centerIn: parent
-					font.bold: true
-					font.pointSize: Tokens.font.size.extraLarge * 4
+					fontStyle: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
 					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.pointSize: Tokens.font.size.normal
+		font: Tokens.font.mono.medium
 		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.pointSize: Tokens.font.size.normal
+		font: Tokens.font.mono.medium
 		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.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		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.pointSize: Tokens.font.size.large
-					font.weight: 500
+					font: Tokens.font.headline.builders.small.width(90).build()
 					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.weight: 600
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
 							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.pointSize: Tokens.font.size.small
+							font: Tokens.font.mono.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.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		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.pointSize: Tokens.font.size.large
-					font.weight: 500
+					font: Tokens.font.headline.builders.small.width(90).build()
 					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.weight: 600
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
 							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()
-	}
-}

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/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

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 {
-				id: sourcePeakFill
+			ClipRect {
+				anchors.fill: parent
+				radius: parent.radius
 
-				anchors.bottom: parent.bottom
-				anchors.left: parent.left
-				anchors.top: parent.top
-				color: Qt.alpha(Colors.palette.m3primary, 0.15)
-				implicitWidth: parent.width * sourcePeak.peak
+				CustomRect {
+					id: sourcePeakFill
 
-				Behavior on implicitWidth {
-					Anim {
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.top: parent.top
+					color: Qt.alpha(Colors.palette.m3primary, 0.15)
+					implicitWidth: parent.width * sourcePeak.peak
+
+					Behavior on implicitWidth {
+						Anim {}
 					}
 				}
 			}
@@ -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 {
-					id: peakFill
+				ClipRect {
+					anchors.fill: parent
+					radius: parent.radius
 
-					anchors.bottom: parent.bottom
-					anchors.left: parent.left
-					anchors.top: parent.top
-					color: Qt.alpha(Colors.palette.m3primary, 0.15)
-					implicitWidth: parent.width * peak.peak
+					CustomRect {
+						id: peakFill
 
-					Behavior on implicitWidth {
-						Anim {
+						anchors.bottom: parent.bottom
+						anchors.left: parent.left
+						anchors.top: parent.top
+						color: Qt.alpha(Colors.palette.m3primary, 0.15)
+						implicitWidth: parent.width * peak.peak
+
+						Behavior on implicitWidth {
+							Anim {}
 						}
 					}
 				}
@@ -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
@@ -73,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 {
+	ClipRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -228,7 +228,7 @@ Item {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					CustomClippingRect {
+					ClipRect {
 						id: textRect
 
 						Layout.fillHeight: true

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

@@ -19,7 +19,7 @@ Item {
 	implicitHeight: tileHeight + Tokens.padding.large * 2
 	implicitWidth: tileWidth
 
-	CustomClippingRect {
+	ClipRect {
 		id: image
 
 		anchors.horizontalCenter: parent.horizontalCenter

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,7 +5,7 @@ import qs.Helpers
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+ClipRect {
 	id: root
 
 	required property var lock

Modules/Lock/Media.qml

@@ -2,12 +2,12 @@ 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 {
+ClipRect {
 	id: root
 
 	required property var lock

Modules/Lock/NotifDock.qml

@@ -24,12 +24,11 @@ ColumnLayout {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
-		font.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
 	}
 
-	ClippingRectangle {
+	ClipRect {
 		id: clipRect
 
 		Layout.fillHeight: true

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/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
 
@@ -27,7 +28,7 @@ Item {
 		for (let i = 0; i < count; i++)
 			height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0;
 
-		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
+		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || screenState.dashboard)
 			return 0;
 
 		if (screenState.osd) {
@@ -36,25 +37,20 @@ Item {
 				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"
-		radius: Tokens.rounding.large - root.padding
+		clip: true
+		// 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/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 {
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.top: parent.top
-		color: Qt.alpha(root.accent, 0.05)
-		implicitWidth: parent.width * root.usage
+	ClipRect {
+		anchors.fill: parent
+		radius: parent.radius
 
-		Behavior on implicitWidth {
-			Anim {}
+		CustomRect {
+			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/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

Modules/Settings/Common/WallpaperCropper.qml

@@ -100,16 +100,13 @@ Item {
 	visible: opacity > 0
 
 	Behavior on opacity {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on scale {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on y {
-		Anim {
-		}
+		Anim {}
 	}
 
 	Component.onCompleted: {
@@ -120,9 +117,8 @@ Item {
 		Qt.callLater(syncCropToScreen);
 	}
 
-	ButtonRow {
-		id: screenSelector
-
+	Loader {
+		id: selectorLoader
 		anchors.bottom: imageSlot.top
 		anchors.bottomMargin: Tokens.spacing.medium
 		anchors.left: parent.left
@@ -130,25 +126,32 @@ Item {
 		anchors.right: parent.right
 		anchors.rightMargin: Tokens.padding.extraLarge * 2
 		anchors.top: parent.top
-		spacing: Tokens.spacing.small
 
-		Repeater {
-			model: wrapper.screens
+		active: wrapper.screens.length > 1
 
-			delegate: TextButton {
-				required property int index
-				readonly property bool isCurrent: wrapper.selectedScreenIndex === index
-				required property var modelData
+		sourceComponent: ButtonRow {
+			id: screenSelector
 
-				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
+			spacing: Tokens.spacing.small
 
-				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)
+				}
 			}
 		}
 	}
@@ -222,9 +225,9 @@ 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
@@ -357,8 +360,7 @@ Item {
 						width: Math.round(baseWidth / zoom)
 
 						Behavior on color {
-							CAnim {
-							}
+							CAnim {}
 						}
 
 						Component.onCompleted: {

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

@@ -2,8 +2,9 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
-import qs.Components
 import ZShell.Config
+import ZShell.Components
+import qs.Components
 
 Item {
 	id: root
@@ -27,21 +28,17 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
-		anchors.fill: parent
+	Loader {
+		id: content
 
-		Loader {
-			id: content
+		active: root.shouldBeActive || root.visible
+		anchors.bottom: parent.bottom
+		anchors.horizontalCenter: parent.horizontalCenter
 
-			active: root.shouldBeActive || root.visible
-			anchors.bottom: parent.bottom
-			anchors.horizontalCenter: parent.horizontalCenter
-
-			sourceComponent: Content {
-				sState.animatingContainer: content.opacity < 1
-				sState.currentPageIdx: ["wallpaper"].indexOf(root.queuedMode)
-				sState.screen: root.screen
-			}
+		sourceComponent: Content {
+			sState.animatingContainer: content.opacity < 1
+			sState.currentPageIdx: ["wallpaper"].indexOf(root.queuedMode)
+			sState.screen: root.screen
 		}
 	}
 }

Modules/Sidebar/Chat/ChatContent.qml

@@ -3,10 +3,11 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
+import ZShell.Services
 import ZShell.Components
 import ZShell.Config
 import ZShell.Llm
-import qs.Modules.Notifications.Sidebar.Chat.Content
+import qs.Modules.Sidebar.Chat.Content
 import qs.Components
 import qs.Services
 
@@ -90,7 +91,9 @@ Item {
 	signal requestClose
 
 	readonly property bool atNewestEnd: !listLoader.item || listLoader.item.contentY < 4
+	readonly property bool importing: importIds.length > 0
 
+	property var importIds: []
 	property var pendingAttachments: []
 
 	function attachFiles(): void {
@@ -436,7 +439,7 @@ Item {
 			width: attachments.cellWidth
 			height: width
 			opacity: modelData ? 1 : 0
-			CustomClippingRect {
+			ClipRect {
 				anchors.fill: parent
 				anchors.margins: Tokens.spacing.extraSmall
 
@@ -541,7 +544,7 @@ Item {
 		bg.border.color: Colors.palette.m3outlineVariant
 		bg.color: Colors.tPalette.m3surfaceContainerLowest
 		fastGlow: LlmClient.busy
-		glow.opacity: input.activeFocus && (!LlmClient.busy || ChatState.isWindow)
+		glow.opacity: !ChatState.narrowSidebarExpanded ? (input.activeFocus && (!LlmClient.busy || ChatState.isWindow) ? 1 : 0) : 0
 		font: Tokens.font.body.small
 		implicitHeight: Math.min(root.height / 5, contentHeight + topPadding + bottomPadding)
 		focus: true
@@ -578,4 +581,52 @@ Item {
 				root.send(text);
 		}
 	}
+
+	Connections {
+		target: DropImporter
+
+		function onImportFinished(id: int, paths: var, errors: var): void {
+			if (!root.importIds.includes(id))
+				return;
+			root.importIds = root.importIds.filter(i => i !== id);
+
+			if (paths.length > 0) {
+				const added = root.chatData.addAttachments(paths);
+				root.pendingAttachments = root.pendingAttachments.concat(added);
+			}
+			for (const e of errors)
+				console.warn("Drop import:", e);
+		}
+	}
+
+	DropArea {
+		id: dropArea
+
+		anchors.fill: parent
+
+		onEntered: drag => {
+			drag.accepted = drag.hasUrls || drag.hasText || drag.hasHtml || drag.formats.some(f => f.startsWith("image/"));
+		}
+
+		onDropped: drop => {
+			const formats = drop.formats;
+			const urls = drop.hasUrls ? drop.urls : [];
+			const text = drop.hasText ? drop.text : "";
+			const html = drop.hasHtml ? drop.html : "";
+
+			const imgFormat = formats.find(f => f.startsWith("image/"));
+			const raw = imgFormat ? drop.getDataAsArrayBuffer(imgFormat) : new ArrayBuffer(0);
+
+			switch (DropImporter.decide(urls, text, html, raw.byteLength > 0)) {
+			case DropImporter.Attach:
+				root.importIds = [...root.importIds, DropImporter.importAttachments(urls, html, raw)];
+				break;
+			case DropImporter.InsertText:
+				input.insert(input.cursorPosition, text || urls.map(u => u.toString()).join("\n"));
+				root.focusInput();
+				break;
+			}
+			drop.acceptProposedAction();
+		}
+	}
 }

Modules/Sidebar/Chat/ChatDelegate.qml

@@ -6,7 +6,7 @@ import qs.Effects
 import qs.Components
 import qs.Services
 
-CustomClippingRect {
+CustomRect {
 	id: root
 
 	property bool expanded: false
@@ -91,6 +91,50 @@ CustomClippingRect {
 
 		opacity: root.slim ? 0 : 1
 
+		state: titleText.readOnly ? "static" : "editing"
+
+		states: [
+			State {
+				name: "static"
+				PropertyChanges {
+					staticText.opacity: 1
+				}
+				PropertyChanges {
+					titleText.opacity: 0
+				}
+			},
+			State {
+				name: "editing"
+				PropertyChanges {
+					staticText.opacity: 0
+				}
+				PropertyChanges {
+					titleText.opacity: 1
+				}
+			}
+		]
+
+		transitions: [
+			// Going static: titleText fades out (animated), staticText snaps in
+			Transition {
+				to: "static"
+				Anim {
+					target: titleText
+					property: "opacity"
+					type: Anim.SlowEffects
+				}
+			},
+			// Going editing: staticText fades out (animated), titleText snaps in
+			Transition {
+				to: "editing"
+				Anim {
+					target: staticText
+					property: "opacity"
+					type: Anim.SlowEffects
+				}
+			}
+		]
+
 		Behavior on opacity {
 			Anim {
 				type: Anim.DefaultEffects
@@ -106,7 +150,7 @@ CustomClippingRect {
 			color: Colors.layer(Colors.palette.m3surfaceContainerHighest, 1)
 			implicitHeight: titleText.implicitHeight + Tokens.padding.extraSmall * 2
 			radius: Tokens.rounding.full
-			implicitWidth: titleText.implicitWidth + Tokens.padding.large * 2
+			implicitWidth: titleText.width + Tokens.padding.large * 2
 			opacity: titleText.readOnly ? 0 : 1
 
 			Behavior on opacity {
@@ -122,11 +166,6 @@ CustomClippingRect {
 			anchors.right: parent.right
 			implicitHeight: titleText.implicitHeight + Tokens.padding.small * 2
 
-			layer.enabled: true
-			layer.effect: OpacityMask {
-				maskSource: fadeMask
-			}
-
 			TextFieldBase {
 				id: titleText
 
@@ -134,10 +173,12 @@ CustomClippingRect {
 				anchors.leftMargin: readOnly ? 0 : Tokens.padding.large
 				anchors.top: parent.top
 				anchors.topMargin: readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
+				width: Math.min(implicitWidth, parent.width - Tokens.padding.large * 2)
 				font: Tokens.font.body.medium
 				text: root.modelData.title || qsTr("New chat")
 				readOnly: true
 				color: Colors.palette.m3onSurface
+				opacity: 0
 
 				Behavior on anchors.leftMargin {
 					Anim {}
@@ -146,6 +187,11 @@ CustomClippingRect {
 					Anim {}
 				}
 
+				function cancelTitleEdit(): void {
+					text = root.modelData.title;
+					readOnly = true;
+				}
+
 				onEditingFinished: root.modelData.title = text
 				onReadOnlyChanged: {
 					if (!readOnly) {
@@ -156,27 +202,24 @@ CustomClippingRect {
 					}
 				}
 			}
-		}
 
-		CustomRect {
-			id: fadeMask
+			CustomText {
+				id: staticText
 
-			anchors.fill: titleWrapper
+				anchors.left: parent.left
+				anchors.leftMargin: titleText.readOnly ? 0 : Tokens.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: titleText.readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
+				anchors.right: parent.right
+				font: titleText.font
+				text: titleText.text
+				elide: CustomText.ElideRight
 
-			layer.enabled: true
-			visible: false
-
-			gradient: Gradient {
-				orientation: Gradient.Horizontal
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0)
-					position: 0.85
+				Behavior on anchors.leftMargin {
+					Anim {}
 				}
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 0)
-					position: 1.0
+				Behavior on anchors.topMargin {
+					Anim {}
 				}
 			}
 		}
@@ -323,7 +366,13 @@ CustomClippingRect {
 			inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 3)
 			inactiveOnColor: Colors.palette.m3onSurfaceVariant
 
-			onClicked: root.remove(root.modelData)
+			onClicked: {
+				if (!titleText.readOnly) {
+					titleText.cancelTitleEdit();
+					return;
+				}
+				root.remove(root.modelData);
+			}
 		}
 
 		IconButton {
@@ -366,7 +415,10 @@ CustomClippingRect {
 		}
 
 		StateLayer {
-			onClicked: root.expanded = !root.expanded
+			onClicked: {
+				root.expanded = !root.expanded;
+				titleText.readOnly = true;
+			}
 		}
 
 		MaterialIcon {

Modules/Sidebar/Chat/ChatList.qml

@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Layouts
 import ZShell.Llm
 import ZShell.Config
-import qs.Modules.Notifications.Sidebar.Chat.Content
+import qs.Modules.Sidebar.Chat.Content
 import qs.Services
 import qs.Components
 
@@ -140,7 +140,7 @@ Item {
 		label.transform: Rotation {
 			origin.y: fabRoot.label.height / 2
 			origin.x: fabRoot.label.width / 2
-			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded && !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
+			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded || !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
 
 			Behavior on angle {
 				Anim {}
@@ -148,8 +148,9 @@ Item {
 		}
 
 		onClicked: {
-			if (root.slim && !ChatState.narrowSidebarExpanded) {
+			if ((root.slim && !ChatState.narrowSidebarExpanded) || ChatState.shrinkSidebarOverride) {
 				root.requestExpand();
+				ChatState.shrinkSidebarOverride = false;
 				return;
 			}
 
@@ -183,9 +184,13 @@ Item {
 					name: "pop out in window"
 					icon: "open_in_new"
 				}
+				ListElement {
+					name: "shrink sidebar"
+					icon: "left_panel_close"
+				}
 			}
 
-			CustomClippingRect {
+			CustomRect {
 				id: fabMenuItem
 
 				required property var modelData
@@ -196,7 +201,19 @@ Item {
 
 				radius: sLayer.pressed ? Tokens.rounding.small : implicitHeight / 2
 				color: Colors.palette.m3primaryContainer
-				visible: !(modelData.name === "pop out in window" && ChatState.isWindow)
+				visible: {
+					const n = modelData.name;
+					const w = ChatState.isWindow;
+					const wide = ChatState.isWide;
+
+					if (n === "pop out in window" && w)
+						return false;
+					if (n === "shrink sidebar" && (!w || !wide))
+						return false;
+					else
+						return true;
+				}
+				clip: true
 
 				Behavior on radius {
 					Anim {
@@ -296,6 +313,8 @@ Item {
 							root.newChatRequest();
 						else if (name === "pop out in window")
 							Detach.create();
+						else if (name === "shrink sidebar")
+							ChatState.shrinkSidebarOverride = true;
 
 						ChatState.fabExpanded = false;
 					}

Modules/Sidebar/Chat/ChatPanel.qml

@@ -6,7 +6,7 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell
 import qs.Helpers
-import qs.Modules.Notifications.Sidebar
+import qs.Modules.Sidebar
 import qs.Components
 import qs.Services
 

Modules/Sidebar/Chat/ChatState.qml

@@ -19,7 +19,7 @@ Singleton {
 	property bool settledSlim: false
 	property bool settledWide: false
 	property bool narrowSidebarExpanded: false
-	property bool windowIsWide: false
+	property bool shrinkSidebarOverride: false
 	property ShellScreen screen
 	property bool sidebarVisible: ShellState.forActive().sidebar
 
@@ -28,6 +28,9 @@ Singleton {
 		root.currentIdx = -1;
 	}
 
+	onIsWideChanged: if (isWide)
+		narrowSidebarExpanded = false
+
 	onSidebarVisibleChanged: if (!sidebarVisible)
 		fabExpanded = false
 }

Modules/Sidebar/Chat/Content/ApprovalPrompt.qml

@@ -337,7 +337,7 @@ Item {
 										}
 									}
 
-									CustomClippingRect {
+									ClipRect {
 										id: expandedTool
 
 										anchors.top: collapsedRow.bottom

Modules/Sidebar/Chat/Content/ChatHost.qml

@@ -3,7 +3,7 @@ import ZShell.Llm
 import ZShell.Config
 import qs.Components
 import qs.Services
-import qs.Modules.Notifications.Sidebar.Chat
+import qs.Modules.Sidebar.Chat
 
 Item {
 	id: root

Modules/Sidebar/Chat/Content/CodeBlockView.qml

@@ -220,9 +220,8 @@ CustomRect {
 
 			Layout.alignment: Qt.AlignVCenter
 			color: root.codeHeaderColor
-			font: Tokens.font.label.small
+			font: Tokens.font.label.builders.small.capitalization(Font.Capitalize).build()
 			text: CodeIcons.name(root.language)
-			visible: root.language.length > 0
 		}
 
 		Item {
@@ -252,7 +251,7 @@ CustomRect {
 		}
 	}
 
-	CustomClippingRect {
+	CustomRect {
 		id: codeRect
 
 		anchors.left: parent.left
@@ -265,6 +264,7 @@ CustomRect {
 		implicitWidth: codeText.implicitWidth + codeFlick.anchors.margins * 2
 		implicitHeight: codeText.implicitHeight + codeFlick.anchors.margins * 2
 		color: CodeColors.active.bg
+		clip: true
 
 		Flickable {
 			id: codeFlick
@@ -272,6 +272,9 @@ CustomRect {
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.small
 
+			boundsBehavior: Flickable.StopAtBounds
+			contentWidth: codeText.implicitWidth
+
 			CustomScrollBar.horizontal: CustomScrollBar {
 				flickable: codeFlick
 				parent: codeFlick.parent
@@ -280,16 +283,13 @@ CustomRect {
 				anchors.right: parent.right
 			}
 
-			TextAreaBase.flickable: TextAreaBase {
+			CustomText {
 				id: codeText
 
 				color: CodeColors.active.normal
-				layer.enabled: true
-				clip: false
 				font: Tokens.font.mono.small
-				textFormat: root.colored ? Text.RichText : Text.PlainText
+				textFormat: Text.RichText
 				text: root.colored ? root.html : root.plainForDisplay(root.code)
-				readOnly: true
 			}
 		}
 	}

Modules/Sidebar/Chat/Content/ContentBubble.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import ZShell.Llm
 import ZShell.Config
-import qs.Modules.Notifications.Sidebar.Chat
+import qs.Modules.Sidebar.Chat
 import qs.Components
 import qs.Services
 
@@ -24,7 +24,7 @@ Item {
 
 	implicitHeight: bubble.implicitHeight + (actionsRow.shouldBeActive ? actionsRow.implicitHeight + actionsRow.anchors.topMargin : 0)
 
-	CustomClippingRect {
+	CustomRect {
 		id: bubble
 
 		property real liveTargetWidth: root.isUser ? Math.min(msgText.implicitWidth + Tokens.padding.medium * 2, root.contentMaxWidth) : root.contentMaxWidth
@@ -37,8 +37,7 @@ Item {
 		implicitWidth: layoutFrozen ? frozenWidth : layoutWidth
 		implicitHeight: root.isUser ? msgText.contentHeight + Tokens.padding.medium * 2 : markdown.implicitHeight + markdown.anchors.topMargin * 2
 		anchors.right: root.isUser ? parent.right : undefined
-		layer.enabled: false
-		layer.smooth: true
+		clip: true
 
 		transform: Scale {
 			id: stretchScale

Modules/Sidebar/Chat/Content/MessageDelegate.qml

@@ -6,7 +6,7 @@ import Quickshell
 import ZShell.Components
 import ZShell.Config
 import ZShell.Llm
-import qs.Modules.Notifications.Sidebar.Chat
+import qs.Modules.Sidebar.Chat
 import qs.Components
 import qs.Services
 
@@ -223,12 +223,13 @@ MouseArea {
 			height: width
 			opacity: modelData ? 1 : 0
 
-			CustomClippingRect {
+			CustomRect {
 				anchors.fill: parent
 				anchors.margins: Tokens.spacing.extraSmall
 
 				radius: Tokens.rounding.medium
 				color: Colors.tPalette.m3surfaceContainer
+				clip: true
 
 				FadeImage {
 					id: attImage

Modules/Sidebar/Chat/Content/ModelsContainer.qml

@@ -6,7 +6,7 @@ import ZShell.Config
 import ZShell.Components
 import ZShell.Llm
 import ZShell.Blobs
-import qs.Modules.Notifications.Sidebar.Chat
+import qs.Modules.Sidebar.Chat
 import qs.Components
 import qs.Services
 

Modules/Sidebar/Chat/Content/ProcessBlock.qml

@@ -125,7 +125,7 @@ Item {
 		current: root.current
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		id: expandedRect
 
 		anchors.left: parent.left

Modules/Sidebar/Chat/SidebarView.qml

@@ -8,7 +8,7 @@ import ZShell.Blobs
 import ZShell.Config
 import ZShell.Llm
 import qs.Components
-import qs.Modules.Notifications.Sidebar.Chat.Content
+import qs.Modules.Sidebar.Chat.Content
 import qs.Services
 
 Item {
@@ -21,12 +21,8 @@ Item {
 	property bool chatOpen: ChatState.chatSession !== null
 
 	readonly property bool isWide: root.width >= root.breakpoint
-
-	readonly property bool showList: isWide || !chatOpen
-	readonly property bool showContent: !isWide && chatOpen
-
-	function openConversation(conv: ChatSession, index: int): void {
-	}
+	readonly property bool wideExpandedSidebar: isWide && !ChatState.shrinkSidebarOverride
+	readonly property bool narrowExpandedSidebar: !isWide && ChatState.narrowSidebarExpanded
 
 	BlobGroup {
 		id: blobGroup
@@ -54,9 +50,9 @@ Item {
 		anchors.left: parent.left
 		anchors.bottom: parent.bottom
 		anchors.margins: Tokens.padding.medium
-		implicitWidth: root.isWide || ChatState.narrowSidebarExpanded ? Config.sidebar.sizes.width : root.iconSize
+		implicitWidth: root.wideExpandedSidebar || root.narrowExpandedSidebar ? Config.sidebar.sizes.width : root.iconSize
 		highlight: true
-		slim: !root.isWide && !ChatState.narrowSidebarExpanded
+		slim: !root.wideExpandedSidebar && !root.narrowExpandedSidebar
 		z: 1
 
 		Behavior on implicitWidth {
@@ -86,13 +82,13 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
+	Item {
 		anchors.fill: parent
 		anchors.leftMargin: invertedRect.borderLeft
 		anchors.topMargin: invertedRect.borderTop
 		anchors.bottomMargin: invertedRect.borderBottom
 		anchors.rightMargin: invertedRect.borderRight
-		radius: invertedRect.radius
+		clip: true
 
 		children: [contentArea, dim]
 	}
@@ -100,9 +96,10 @@ Item {
 	CustomRect {
 		id: dim
 		anchors.fill: parent
+		radius: invertedRect.radius
 
 		color: Colors.palette.m3shadow
-		opacity: ChatState.narrowSidebarExpanded && !root.isWide ? 0.3 : 0
+		opacity: root.narrowExpandedSidebar ? 0.3 : 0
 		z: 1
 
 		Behavior on opacity {
@@ -155,7 +152,7 @@ Item {
 			id: dimArea
 			anchors.fill: parent
 			preventStealing: true
-			enabled: !root.isWide && ChatState.narrowSidebarExpanded
+			enabled: root.narrowExpandedSidebar
 			cursorShape: undefined
 
 			onClicked: {
@@ -175,12 +172,6 @@ Item {
 		}
 	}
 
-	Binding {
-		target: ChatState
-		property: "windowIsWide"
-		value: root.showList
-	}
-
 	Binding {
 		target: ChatState
 		property: "isWide"

Modules/Sidebar/Content.qml

@@ -5,7 +5,7 @@ import ZShell.Llm
 import QtQuick
 import QtQuick.Layouts
 import qs.Components
-import qs.Modules.Notifications.Sidebar.Chat
+import qs.Modules.Sidebar.Chat
 import qs.Services
 
 Item {

Modules/Sidebar/NotifActionList.qml

@@ -17,76 +17,6 @@ Item {
 
 	Layout.fillWidth: true
 	implicitHeight: flickable.contentHeight
-	layer.enabled: true
-	layer.smooth: true
-
-	layer.effect: Mask {
-		maskSource: gradientMask
-	}
-
-	Item {
-		id: gradientMask
-
-		anchors.fill: parent
-		layer.enabled: true
-		visible: false
-
-		Rectangle {
-			anchors.fill: parent
-
-			gradient: Gradient {
-				orientation: Gradient.Horizontal
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 0)
-					position: 0
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 0.1
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 0.9
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 0)
-					position: 1
-				}
-			}
-		}
-
-		Rectangle {
-			anchors.bottom: parent.bottom
-			anchors.left: parent.left
-			anchors.top: parent.top
-			implicitWidth: parent.width / 2
-			opacity: flickable.contentX > 0 ? 0 : 1
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
-		}
-
-		Rectangle {
-			anchors.bottom: parent.bottom
-			anchors.right: parent.right
-			anchors.top: parent.top
-			implicitWidth: parent.width / 2
-			opacity: flickable.contentX < flickable.contentWidth - parent.width ? 0 : 1
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
-		}
-	}
 
 	CustomFlickable {
 		id: flickable

Modules/Sidebar/NotifDock.qml

@@ -63,7 +63,7 @@ Item {
 		}
 	}
 
-	ClippingRectangle {
+	Item {
 		id: clipRect
 
 		anchors.bottom: parent.bottom
@@ -71,8 +71,6 @@ Item {
 		anchors.right: parent.right
 		anchors.top: title.bottom
 		anchors.topMargin: 10
-		color: "transparent"
-		radius: 6
 
 		Loader {
 			active: opacity > 0

Modules/Sidebar/NotifGroup.qml

@@ -112,7 +112,7 @@ CustomRect {
 				}
 			}
 
-			CustomClippingRect {
+			ClipRect {
 				anchors.fill: parent
 				color: root.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHigh, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Modules/Sidebar/Utils/Content.qml

@@ -3,7 +3,7 @@ import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
 import qs.Components
-import qs.Modules.Notifications.Sidebar.Utils.Cards
+import qs.Modules.Sidebar.Utils.Cards
 
 Item {
 	id: root

Plugins/ZShell/Blobs/blobinvertedrect.cpp

@@ -5,6 +5,7 @@
 #include <qsggeometry.h>
 #include <qsgnode.h>
 
+#include <algorithm>
 #include <cstring>
 
 BlobInvertedRect::BlobInvertedRect(QQuickItem* parent) : BlobShape(parent) {}
@@ -129,6 +130,10 @@ QSGNode* BlobInvertedRect::updatePaintNode(
 		material->m_invertedInner,
 		m_cachedInvertedInner,
 		sizeof(m_cachedInvertedInner));
+	memcpy(
+		material->m_invertedOuterRadii,
+		m_cachedInvertedOuterRadii,
+		sizeof(m_cachedInvertedOuterRadii));
 
 	const int count =
 		static_cast<int>(qMin(m_cachedRects.size(), qsizetype(16)));
@@ -173,6 +178,64 @@ void BlobInvertedRect::setBorderBottom(qreal v) {
 	if (m_group) m_group->markDirty();
 }
 
+void BlobInvertedRect::setOuterRadius(qreal v) {
+	if (qFuzzyCompare(m_outerRadius, v)) return;
+	m_outerRadius = v;
+	emit outerRadiusChanged();
+	if (m_group) m_group->markDirty();
+}
+
+void BlobInvertedRect::setOuterTopLeftRadius(qreal v) {
+	if (qFuzzyCompare(m_outerTopLeftRadius, v)) return;
+	m_outerTopLeftRadius = v;
+	emit outerTopLeftRadiusChanged();
+	if (m_group) m_group->markDirty();
+}
+
+void BlobInvertedRect::setOuterTopRightRadius(qreal v) {
+	if (qFuzzyCompare(m_outerTopRightRadius, v)) return;
+	m_outerTopRightRadius = v;
+	emit outerTopRightRadiusChanged();
+	if (m_group) m_group->markDirty();
+}
+
+void BlobInvertedRect::setOuterBottomLeftRadius(qreal v) {
+	if (qFuzzyCompare(m_outerBottomLeftRadius, v)) return;
+	m_outerBottomLeftRadius = v;
+	emit outerBottomLeftRadiusChanged();
+	if (m_group) m_group->markDirty();
+}
+
+void BlobInvertedRect::setOuterBottomRightRadius(qreal v) {
+	if (qFuzzyCompare(m_outerBottomRightRadius, v)) return;
+	m_outerBottomRightRadius = v;
+	emit outerBottomRightRadiusChanged();
+	if (m_group) m_group->markDirty();
+}
+
+void BlobInvertedRect::outerCornerRadii(float out[4]) const {
+	const auto maxR = static_cast<float>(std::min(width(), height())) * 0.5f;
+	const auto base = std::min(static_cast<float>(m_outerRadius), maxR);
+	out[0] = std::min(
+		m_outerTopRightRadius >= 0 ? static_cast<float>(m_outerTopRightRadius)
+								  : base,
+		maxR);
+	out[1] = std::min(
+		m_outerBottomRightRadius >= 0
+			? static_cast<float>(m_outerBottomRightRadius)
+			: base,
+		maxR);
+	out[2] = std::min(
+		m_outerBottomLeftRadius >= 0
+			? static_cast<float>(m_outerBottomLeftRadius)
+			: base,
+		maxR);
+	out[3] = std::min(
+		m_outerTopLeftRadius >= 0 ? static_cast<float>(m_outerTopLeftRadius)
+								  : base,
+		maxR);
+}
+
 void BlobInvertedRect::registerWithGroup() {
 	if (m_group) m_group->setInvertedRect(this);
 }

Plugins/ZShell/Blobs/blobinvertedrect.hpp

@@ -19,6 +19,21 @@ class BlobInvertedRect : public BlobShape {
 	Q_PROPERTY(
 		qreal borderBottom READ borderBottom WRITE setBorderBottom NOTIFY
 			borderBottomChanged)
+	Q_PROPERTY(
+		qreal outerRadius READ outerRadius WRITE setOuterRadius NOTIFY
+			outerRadiusChanged)
+	Q_PROPERTY(
+		qreal outerTopLeftRadius READ outerTopLeftRadius WRITE
+			setOuterTopLeftRadius NOTIFY outerTopLeftRadiusChanged)
+	Q_PROPERTY(
+		qreal outerTopRightRadius READ outerTopRightRadius WRITE
+			setOuterTopRightRadius NOTIFY outerTopRightRadiusChanged)
+	Q_PROPERTY(
+		qreal outerBottomLeftRadius READ outerBottomLeftRadius WRITE
+			setOuterBottomLeftRadius NOTIFY outerBottomLeftRadiusChanged)
+	Q_PROPERTY(
+		qreal outerBottomRightRadius READ outerBottomRightRadius WRITE
+			setOuterBottomRightRadius NOTIFY outerBottomRightRadiusChanged)
 
 	public:
 	explicit BlobInvertedRect(QQuickItem* parent = nullptr);
@@ -40,15 +55,47 @@ class BlobInvertedRect : public BlobShape {
 
 	void setBorderBottom(qreal v);
 
+	[[nodiscard]] qreal outerRadius() const { return m_outerRadius; }
+
+	void setOuterRadius(qreal v);
+
+	// Per-corner outer radii. -1 falls back to outerRadius (mirrors BlobRect).
+	[[nodiscard]] qreal outerTopLeftRadius() const { return m_outerTopLeftRadius; }
+
+	void setOuterTopLeftRadius(qreal v);
+
+	[[nodiscard]] qreal outerTopRightRadius() const { return m_outerTopRightRadius; }
+
+	void setOuterTopRightRadius(qreal v);
+
+	[[nodiscard]] qreal outerBottomLeftRadius() const {
+		return m_outerBottomLeftRadius;
+	}
+
+	void setOuterBottomLeftRadius(qreal v);
+
+	[[nodiscard]] qreal outerBottomRightRadius() const {
+		return m_outerBottomRightRadius;
+	}
+
+	void setOuterBottomRightRadius(qreal v);
+
 	signals:
 	void borderLeftChanged();
 	void borderRightChanged();
 	void borderTopChanged();
 	void borderBottomChanged();
+	void outerRadiusChanged();
+	void outerTopLeftRadiusChanged();
+	void outerTopRightRadiusChanged();
+	void outerBottomLeftRadiusChanged();
+	void outerBottomRightRadiusChanged();
 
 	protected:
 	[[nodiscard]] bool isInvertedRect() const override { return true; }
 
+	void outerCornerRadii(float out[4]) const override;
+
 	QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) override;
 
 	void registerWithGroup() override;
@@ -59,4 +106,10 @@ class BlobInvertedRect : public BlobShape {
 	qreal m_borderRight = 0;
 	qreal m_borderTop = 0;
 	qreal m_borderBottom = 0;
+
+	qreal m_outerRadius = 0;
+	qreal m_outerTopLeftRadius = -1;
+	qreal m_outerTopRightRadius = -1;
+	qreal m_outerBottomLeftRadius = -1;
+	qreal m_outerBottomRightRadius = -1;
 };

Plugins/ZShell/Blobs/blobmaterial.cpp

@@ -33,7 +33,7 @@ bool BlobMaterialShader::updateUniformData(
 	Q_UNUSED(oldMaterial);
 	auto* mat = static_cast<BlobMaterial*>(newMaterial);
 	QByteArray* buf = state.uniformData();
-	Q_ASSERT(buf->size() >= 1472);
+	Q_ASSERT(buf->size() >= 1488);
 
 	if (state.isMatrixDirty()) {
 		const QMatrix4x4 m = state.combinedMatrix();
@@ -105,5 +105,8 @@ bool BlobMaterialShader::updateUniformData(
 	memcpy(buf->data() + 1440, &mat->m_shadowRadius, 4);
 	memcpy(buf->data() + 1456, mat->m_shadowColor, 16);
 
+	// Outer edge corner radii, after shadowColor, at 1472.
+	memcpy(buf->data() + 1472, mat->m_invertedOuterRadii, 16);
+
 	return true;
 }

Plugins/ZShell/Blobs/blobmaterial.hpp

@@ -43,6 +43,9 @@ class BlobMaterial : public QSGMaterial {
 	// puts these after rectData.
 	float m_shadowRadius = 0.0f;
 	float m_shadowColor[4] = {0.0f, 0.0f, 0.0f, 0.5f};
+	// Outer-edge corner radii (tr, br, bl, tl). Matches the uniform block, which
+	// puts this after shadowColor.
+	float m_invertedOuterRadii[4] = {};
 	BlobRectData m_rects[16] = {};
 };
 

Plugins/ZShell/Blobs/blobshape.cpp

@@ -240,6 +240,8 @@ void BlobShape::updatePolish() {
 	m_cachedInvertedRadius = 0;
 	memset(m_cachedInvertedOuter, 0, sizeof(m_cachedInvertedOuter));
 	memset(m_cachedInvertedInner, 0, sizeof(m_cachedInvertedInner));
+	memset(
+		m_cachedInvertedOuterRadii, 0, sizeof(m_cachedInvertedOuterRadii));
 
 	auto* inv = m_group->invertedRect();
 	if (inv) {
@@ -290,6 +292,9 @@ void BlobShape::updatePolish() {
 			m_cachedInvertedInner[1] = innerCY;
 			m_cachedInvertedInner[2] = innerHW;
 			m_cachedInvertedInner[3] = innerHH;
+
+			static_cast<BlobShape*>(inv)->outerCornerRadii(
+				m_cachedInvertedOuterRadii);
 		}
 	}
 
@@ -417,6 +422,10 @@ QSGNode* BlobShape::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) {
 		material->m_invertedInner,
 		m_cachedInvertedInner,
 		sizeof(m_cachedInvertedInner));
+	memcpy(
+		material->m_invertedOuterRadii,
+		m_cachedInvertedOuterRadii,
+		sizeof(m_cachedInvertedOuterRadii));
 
 	const int count =
 		static_cast<int>(qMin(m_cachedRects.size(), qsizetype(16)));

Plugins/ZShell/Blobs/blobshape.hpp

@@ -61,6 +61,16 @@ class BlobShape : public QQuickItem {
 
 	virtual void cornerRadii(float out[4]) const;
 
+	// Outer-edge corner radii. Only the inverted rect draws an outer frame edge,
+	// so the base has no outer rounding and returns zeros. Subclasses that expose
+	// outer corner properties override this (order: tr, br, bl, tl).
+	virtual void outerCornerRadii(float out[4]) const {
+		out[0] = 0;
+		out[1] = 0;
+		out[2] = 0;
+		out[3] = 0;
+	}
+
 	virtual void updatePhysics() {}
 
 	virtual void registerWithGroup();
@@ -88,4 +98,5 @@ class BlobShape : public QQuickItem {
 	float m_cachedInvertedRadius = 0;
 	float m_cachedInvertedOuter[4] = {};
 	float m_cachedInvertedInner[4] = {};
+	float m_cachedInvertedOuterRadii[4] = {};
 };