fix: truncate webfetch content to fit context

-a

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

.clangd

@@ -1,5 +0,0 @@
-CompileFlags:
-  Remove:
-    # GCC-only flags from the system's default spec that clang/clangd cannot
-    # parse. They appear in compile_commands.json but are not set by the project.
-    - -mno-direct-extern-access

.gitea/ISSUE_TEMPLATE/bug.yaml

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

.gitea/PULL_REQUEST_TEMPLATE.yaml

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

.gitignore

@@ -18,6 +18,3 @@ dist/
 network-dev/
 **/zshell.build/
 **/zshell.dist/
-.opencode/
-run-agent.sh
-AGENTS.md

.prettierignore

@@ -1,4 +1,3 @@
 .venv/
 scripts/fzf.js
 scripts/fuzzysort.js
-scripts/settings-indexer.js

CMakeLists.txt

@@ -50,7 +50,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(QT_NO_PRIVATE_MODULE_WARNING ON)
 set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
@@ -62,12 +61,10 @@ set(CMAKE_INSTALL_MESSAGE NEVER)
 
 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
-	-Wnull-dereference -Wdouble-promotion
+	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
-	-Wformat=2 -Wfloat-equal
+	-Wformat=2 -Wfloat-equal -Woverloaded-virtual
 	-Wsign-conversion -Wredundant-decls -Wswitch
 	-Wunreachable-code
-	$<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
-	$<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
 )
 
 
@@ -191,11 +188,4 @@ if("m3shapes" IN_LIST ENABLE_MODULES)
 	if(TARGET m3shapesplugin)
 		set_target_properties(m3shapesplugin PROPERTIES INSTALL_RPATH "$ORIGIN")
 	endif()
-
-	# Silence warnings that come from m3shapes files we do not manage.
-	foreach(m3shapes_target m3shapes_core m3shapes_morph m3shapes_shapes m3shapes m3shapesplugin)
-		if(TARGET ${m3shapes_target})
-			target_compile_options(${m3shapes_target} PRIVATE -Wno-shadow -Wno-float-equal)
-		endif()
-	endforeach()
 endif()

Components/BaseStyledSlider.qml

@@ -80,29 +80,49 @@ Slider {
 
 				property bool moving
 
-				anchors.centerIn: parent
+				function update(): void {
-				anchors.verticalCenterOffset: 1
+					animate = !moving;
-				text: moving ? Math.round(root.value * 100) : root.icon
+					binding.when = moving;
-				color: Colors.palette.m3inverseOnSurface
+					font.pointSize = moving ? Tokens.font.size.small : Tokens.font.size.larger;
-				font: moving ? Tokens.font.body.small : Tokens.font.icon.medium
+					font.family = moving ? Config.appearance.font.family.sans : Config.appearance.font.family.material;
+				}
 
-				Behavior on moving {
+				anchors.centerIn: parent
-					SequentialAnimation {
+				color: Colors.palette.m3inverseOnSurface
-						Anim {
+				text: root.icon
-							target: icon
+
-							property: "scale"
+				onMovingChanged: anim.restart()
-							to: 0.3
+
-							duration: Tokens.anim.durations.small / 2
+				Binding {
-							easing: Tokens.anim.standardAccel
+					id: binding
-						}
+
-						PropertyAction {}
+					property: "text"
-						Anim {
+					target: icon
-							target: icon
+					value: Math.round(root.value * root.multiplier)
-							property: "scale"
+					when: false
-							to: 1
+				}
-							duration: Tokens.anim.durations.normal / 2
+
-							easing: Tokens.anim.standardDecel
+				SequentialAnimation {
-						}
+					id: anim
+
+					Anim {
+						duration: Tokens.anim.durations.normal / 2
+						easing: Tokens.anim.standardAccel
+						property: "scale"
+						target: icon
+						to: 0
+					}
+
+					ScriptAction {
+						script: icon.update()
+					}
+
+					Anim {
+						duration: Tokens.anim.durations.normal / 2
+						easing: Tokens.anim.standardDecel
+						property: "scale"
+						target: icon
+						to: 1
 					}
 				}
 			}
@@ -110,7 +130,7 @@ Slider {
 	}
 	Behavior on value {
 		Anim {
-			type: Anim.StandardLarge
+			duration: Tokens.anim.durations.large
 		}
 	}
 
@@ -118,6 +138,7 @@ Slider {
 	onValueChanged: {
 		if (!initialized) {
 			initialized = true;
+			oldValue = value;
 			return;
 		}
 

Components/ButtonBase.qml

@@ -20,7 +20,11 @@ CustomRect {
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property bool fillWidth
-	property font font: Tokens.font.body.small
+	property font font: ({
+			family: Config.appearance.font.family.sans,
+			pointSize: Tokens.font.size.larger,
+			bold: false
+		})
 	property real horizontalPadding: padding
 	readonly property alias hovered: stateLayer.containsMouse
 	required implicitHeight
@@ -51,7 +55,7 @@ CustomRect {
 		if (internalChecked)
 			return checkedRadius;
 		if (isRound)
-			return implicitHeight / 2 * Math.min(1, Tokens.rounding.scale);
+			return (height || implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale);
 		return defaultRadius;
 	}
 

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

Components/ClipRect.qml

@@ -1,42 +0,0 @@
-import QtQuick
-import Quickshell
-import ZShell.Components
-
-Item {
-	id: root
-
-	property real radius
-	property real topLeftRadius: radius
-	property real topRightRadius: radius
-	property real bottomRightRadius: radius
-	property real bottomLeftRadius: radius
-	property color color: "transparent"
-	default property alias contentData: contentItem.data
-
-	Item {
-		id: contentItem
-
-		anchors.fill: parent
-	}
-
-	ShaderEffectSource {
-		id: src
-
-		hideSource: true
-		sourceItem: contentItem
-	}
-
-	RoundedMask {
-		anchors.fill: parent
-		source: src
-		topLeftRadius: root.topLeftRadius
-		topRightRadius: root.topRightRadius
-		bottomRightRadius: root.bottomRightRadius
-		bottomLeftRadius: root.bottomLeftRadius
-		color: root.color
-	}
-
-	Behavior on color {
-		CAnim {}
-	}
-}

Components/ColorArcPicker.qml

@@ -46,10 +46,10 @@ Item {
 	}
 
 	function syncFromPenColor() {
-		if (!drawing.screenState)
+		if (!drawing.drawingState)
 			return;
 
-		const c = drawing.screenState.penColor;
+		const c = drawing.drawingState.penColor;
 
 		if (c.hsvSaturation > 0) {
 			currentHue = c.hsvHue;
@@ -86,7 +86,7 @@ Item {
 
 		currentHue = relative / arcSweep;
 		lastChromaticHue = currentHue;
-		drawing.screenState.penColor = Qt.hsva(currentHue, drawing.screenState.penColor.hsvSaturation, drawing.screenState.penColor.hsvValue, drawing.screenState.penColor.a);
+		drawing.drawingState.penColor = Qt.hsva(currentHue, drawing.drawingState.penColor.hsvSaturation, drawing.drawingState.penColor.hsvValue, drawing.drawingState.penColor.a);
 	}
 
 	implicitHeight: 180
@@ -112,7 +112,7 @@ Item {
 			root.syncFromPenColor();
 		}
 
-		target: root.drawing.screenState
+		target: root.drawing.drawingState
 	}
 
 	Canvas {
@@ -152,7 +152,7 @@ Item {
 
 	CustomRect {
 		anchors.centerIn: parent
-		color: root.drawing?.screenState.penColor
+		color: root.drawing?.drawingState.penColor
 		implicitHeight: implicitWidth
 		implicitWidth: canvas.height - root.handleSize - Tokens.padding.extraLarge * 2
 		radius: Tokens.rounding.full

Components/CustomFlickable.qml

@@ -1,12 +1,12 @@
 import QtQuick
-import qs.Services
+import qs.Helpers
 
 Flickable {
 	id: root
 
 	property bool doneFakeFlick
 
-	interactive: !ShellState.forActive().isDrawing
+	interactive: !Visibilities.getForActive().isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
@@ -30,7 +30,6 @@ Flickable {
 
 		onTriggered: {
 			root.doneFakeFlick = false;
-			root.returnToBounds();
 		}
 	}
 }

Components/CustomListView.qml

@@ -1,12 +1,12 @@
 import QtQuick
-import qs.Services
+import qs.Helpers
 
 ListView {
 	id: root
 
 	property bool doneFakeFlick
 
-	interactive: !ShellState.forActive()?.isDrawing
+	interactive: !Visibilities.getForActive()?.isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {

Components/CustomRadioButton.qml

@@ -6,7 +6,7 @@ import qs.Services
 RadioButton {
 	id: root
 
-	font: Tokens.font.body.medium
+	font.pointSize: Tokens.font.size.normal
 	implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
 	implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
 
@@ -14,7 +14,7 @@ RadioButton {
 		anchors.left: outerCircle.right
 		anchors.leftMargin: 10
 		anchors.verticalCenter: parent.verticalCenter
-		font: root.font
+		font.pointSize: root.font.pointSize
 		text: root.text
 	}
 	indicator: Rectangle {
@@ -29,7 +29,8 @@ RadioButton {
 		radius: Tokens.rounding.full
 
 		Behavior on border.color {
-			CAnim {}
+			CAnim {
+			}
 		}
 
 		StateLayer {

Components/CustomScrollBar.qml

@@ -2,14 +2,13 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Templates
-import qs.Services
+import qs.Helpers
 import ZShell.Config
 
 ScrollBar {
 	id: root
 
 	required property Flickable flickable
-
 	readonly property bool isHorizontal: flickable && flickable.ScrollBar.horizontal === root
 	readonly property real axisSize: isHorizontal ? flickable.width : flickable.height
 	readonly property real axisContentSize: isHorizontal ? flickable.contentWidth : flickable.contentHeight
@@ -21,13 +20,10 @@ ScrollBar {
 	readonly property real nonAnimY: root.axisContentPos / root.axisContentSize
 	readonly property real rawTravel: Math.max(0, 1 - root.nonAnimHeight)
 	readonly property bool reversed: isHorizontal ? (flickable instanceof ListView && flickable.layoutDirection === Qt.RightToLeft) : (flickable instanceof ListView && flickable.verticalLayoutDirection === ListView.BottomToTop)
+	property bool shouldBeActive
 	readonly property real travelScale: root.rawTravel > 0 ? root.effectiveTravel / root.rawTravel : 0
 
-	property bool shouldBeActive
+	enabled: !Visibilities.getForActive().isDrawing
-	property bool inverted
-
-	enabled: !ShellState.forActive().isDrawing
-
 	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
 	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0
 
@@ -123,7 +119,7 @@ ScrollBar {
 			}
 
 			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
-			var newPos = Math.max(0, Math.min(1 - root.size, root.position + (root.inverted ? -delta : delta)));
+			var newPos = Math.max(0, Math.min(1 - root.size, root.position + delta));
 			root.position = newPos;
 		}
 

Components/CustomSlider.qml

@@ -100,19 +100,15 @@ Slider {
 			anchors.bottom: parent.bottom
 			anchors.top: parent.top
 			color: root.insetColor
-			fontStyle: {
+			font.pixelSize: Tokens.font.size.smaller * 2
-				if (root.height < 96)
-					return Tokens.font.icon.pixelSize(24).build();
-				else
-					return Tokens.font.icon.pixelSize(32).build();
-			}
 			text: root.insetIcon
 			verticalAlignment: Text.AlignVCenter
 			visible: !root.wavy && root.insetIcon !== ""
 			x: Tokens.spacing.extraSmall + dockT * (handle.x + Tokens.spacing.small)
 
 			Behavior on dockT {
-				Anim {}
+				Anim {
+				}
 			}
 		}
 
@@ -142,7 +138,8 @@ Slider {
 				startX: x
 
 				Behavior on color {
-					CAnim {}
+					CAnim {
+					}
 				}
 				Anim on waveProgress {
 					duration: root.waveDuration
@@ -159,7 +156,8 @@ Slider {
 	Behavior on filledWidth {
 		id: widthBehavior
 
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: {

Components/CustomText.qml

@@ -14,9 +14,10 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font: Tokens.font.body.small
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.normal
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.QtRendering
+	renderType: Text.NativeRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {

Components/CustomTextField.qml

@@ -15,33 +15,28 @@ TextFieldBase {
 
 	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
+	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
+	readonly property int horizontalPadding: Tokens.padding.large
 	property bool isError
 	property string leadingIcon
+	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
+	property int radius: Tokens.rounding.small
+	readonly property real smallFontScale: smallFontSize / font.pointSize
+	property int smallFontSize: Tokens.font.size.small
+	property string supportingText
+	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
+	property string trailingIcon
+	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
+	property int type: CustomTextField.Outlined
+	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
+	property var validate // Regex or function
 
-	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
+	bottomPadding: Tokens.padding.large + supportingTextOffset - filledOffset
 	leftPadding: horizontalPadding + leadingOffset
 	rightPadding: horizontalPadding + trailingOffset
-	topPadding: verticalPadding + filledOffset
+	topPadding: Tokens.padding.large + filledOffset
 
 	background: Loader {
 		anchors.bottomMargin: root.supportingTextOffset
@@ -151,7 +146,6 @@ TextFieldBase {
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
 				text: root.leadingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 
@@ -166,7 +160,6 @@ TextFieldBase {
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
 				text: root.trailingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 	}
@@ -181,7 +174,7 @@ TextFieldBase {
 
 		sourceComponent: CustomText {
 			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font: Tokens.font.label.small
+			font.pointSize: Tokens.font.size.small
 			text: root.effectiveSupportingText
 		}
 	}
@@ -219,10 +212,12 @@ TextFieldBase {
 					}
 				}
 				Behavior on strokeColor {
-					CAnim {}
+					CAnim {
+					}
 				}
 				Behavior on strokeWidth {
-					Anim {}
+					Anim {
+					}
 				}
 
 				PathLine {
@@ -297,7 +292,8 @@ TextFieldBase {
 				implicitHeight: root.activeFocus ? 2 : 1
 
 				Behavior on implicitHeight {
-					Anim {}
+					Anim {
+					}
 				}
 			}
 		}

Components/GeminiGlow.qml

@@ -1,42 +0,0 @@
-import QtQuick
-import Quickshell
-
-ShaderEffect {
-	id: root
-
-	property Item target: parent
-
-	property real glowSize: 40
-	property real innerGlow: 0
-	property real lineWidth: 2
-	property real intensity: 1.0
-	property real speed: 1.0
-	property int period: 6000
-	property bool running: true
-
-	property color color1: "#4285F4"
-	property color color2: "#9B72CB"
-	property color color3: "#D96570"
-	property color color4: "#F2A54A"
-
-	readonly property size itemSize: Qt.size(width, height)
-	readonly property size rectSize: target ? Qt.size(target.width, target.height) : Qt.size(0, 0)
-	readonly property real radius: (target as Rectangle).radius ?? 0
-	property real phase: 0
-
-	anchors.fill: target
-	anchors.margins: -glowSize
-	z: -1
-
-	enabled: false
-
-	fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/geminiglow.frag.qsb`)
-
-	FrameAnimation {
-		running: root.running && root.visible
-		onTriggered: {
-			const dt = frameTime * 1000;
-			root.phase = (root.phase + dt * root.speed / root.period) % 1.0;
-		}
-	}
-}

Components/HorizontalScrollBarTrack.qml

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

Components/IconButton.qml

@@ -8,7 +8,6 @@ ButtonBase {
 	property alias icon: label.text
 	readonly property alias label: label
 
-	font: Tokens.font.icon.medium
 	activeColor: type === IconButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondary
 	activeOnColor: type === IconButton.Filled ? Colors.palette.m3onPrimary : type === IconButton.Tonal ? Colors.palette.m3onSecondary : Colors.palette.m3primary
 	implicitHeight: {
@@ -37,7 +36,7 @@ ButtonBase {
 		anchors.verticalCenterOffset: 1
 		color: root.onColor
 		fill: !root.isToggle || root.internalChecked ? 1 : 0
-		fontStyle: root.font
+		font.pointSize: root.font.pointSize
 
 		Behavior on fill {
 			Anim {

Components/IconTextButton.qml

@@ -46,9 +46,10 @@ ButtonBase {
 			Layout.alignment: Qt.AlignVCenter
 			color: root.onColor
 			fill: root.internalChecked ? 1 : 0
-			fontStyle: {
+			font: {
 				const f = Qt.font(root.font);
 				f.pointSize = Math.round(root.font.pointSize * 1.2);
+				f.family = "Material Symbols Rounded";
 				return f;
 			}
 

Components/LineGraph.qml

@@ -1,467 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-
-Item {
-	id: root
-
-	required property list<var> values
-
-	property int xSteps: 24
-	property real yMin: NaN
-	property real yMax: NaN
-	property real yPaddingTop: 0
-	property real yPaddingBottom: 0
-
-	property int verticalLineStep: 0
-	property int horizontalLineStep: 0
-	property bool firstXLine: true
-	property bool lastXLine: false
-	property int minHorizontalLines: 0
-
-	property var xLabel: null
-	property var yLabel: null
-
-	property real smoothing: 0
-	property bool curveSmoothing: true
-	property real markerX: -1
-	property real markerGap: 2 // px gap between line and marker dot edge, each side
-
-	property color lineColor: "white"
-	property color gridColor: "white"
-	property color markerColor: "white"
-	property color labelColor: "white"
-	property real gridAlpha: 0.12
-	property real labelAlpha: 0.6
-	property real fillAlpha: 0.15
-	property real lineWidth: 2
-	property real markerDotRadius: 4
-	property real labelFontSize: 10
-
-	Canvas {
-		id: canvas
-
-		anchors.fill: parent
-		renderStrategy: Canvas.Immediate
-
-		onWidthChanged: requestPaint()
-		onHeightChanged: requestPaint()
-
-		function strokeCurve(ctx, pts) {
-			ctx.beginPath();
-			ctx.moveTo(pts[0].x, pts[0].y);
-
-			if (root.curveSmoothing && pts.length > 2) {
-				const k = 1 / 6;
-				const n = pts.length;
-
-				for (let i = 0; i < n - 1; i++) {
-					const p0 = pts[Math.max(i - 1, 0)];
-					const p1 = pts[i];
-					const p2 = pts[i + 1];
-					const p3 = pts[Math.min(i + 2, n - 1)];
-
-					let c1x = p1.x + (p2.x - p0.x) * k;
-					let c1y = p1.y + (p2.y - p0.y) * k;
-					let c2x = p2.x - (p3.x - p1.x) * k;
-					let c2y = p2.y - (p3.y - p1.y) * k;
-
-					const minY = Math.min(p1.y, p2.y);
-					const maxY = Math.max(p1.y, p2.y);
-					c1y = Math.max(minY, Math.min(maxY, c1y));
-					c2y = Math.max(minY, Math.min(maxY, c2y));
-
-					ctx.bezierCurveTo(c1x, c1y, c2x, c2y, p2.x, p2.y);
-				}
-			} else {
-				for (let i = 0; i < pts.length - 1; i++) {
-					const p0 = pts[i];
-					const p1 = pts[i + 1];
-					const cx = (p0.x + p1.x) * 0.5;
-					ctx.bezierCurveTo(cx, p0.y, cx, p1.y, p1.x, p1.y);
-				}
-			}
-		}
-
-		// Control points for segment i (pts[i] -> pts[i+1]), matching strokeCurve
-		function segmentControls(pts, i) {
-			const p0 = pts[Math.max(i - 1, 0)];
-			const p1 = pts[i];
-			const p2 = pts[i + 1];
-			const p3 = pts[Math.min(i + 2, pts.length - 1)];
-
-			if (root.curveSmoothing && pts.length > 2) {
-				const k = 1 / 6;
-				let c1x = p1.x + (p2.x - p0.x) * k;
-				let c1y = p1.y + (p2.y - p0.y) * k;
-				let c2x = p2.x - (p3.x - p1.x) * k;
-				let c2y = p2.y - (p3.y - p1.y) * k;
-
-				const minY = Math.min(p1.y, p2.y);
-				const maxY = Math.max(p1.y, p2.y);
-				c1y = Math.max(minY, Math.min(maxY, c1y));
-				c2y = Math.max(minY, Math.min(maxY, c2y));
-
-				return [c1x, c1y, c2x, c2y];
-			}
-
-			const cx = (p1.x + p2.x) * 0.5;
-			return [cx, p1.y, cx, p2.y];
-		}
-
-		// Point on the curve at a given x (x is monotonic per segment)
-		function pointAtX(pts, targetX) {
-			let j = pts.length - 2;
-			for (let i = 0; i < pts.length - 1; i++) {
-				if (targetX <= pts[i + 1].x) {
-					j = i;
-					break;
-				}
-			}
-
-			const p1 = pts[j];
-			const p2 = pts[j + 1];
-			const [c1x, c1y, c2x, c2y] = segmentControls(pts, j);
-
-			let tlo = 0;
-			let thi = 1;
-			for (let it = 0; it < 24; it++) {
-				const tm = (tlo + thi) / 2;
-				const u = 1 - tm;
-				const x = u * u * u * p1.x + 3 * u * u * tm * c1x + 3 * u * tm * tm * c2x + tm * tm * tm * p2.x;
-				if (x < targetX)
-					tlo = tm;
-				else
-					thi = tm;
-			}
-
-			const t = (tlo + thi) / 2;
-			const u = 1 - t;
-			const y = u * u * u * p1.y + 3 * u * u * t * c1y + 3 * u * t * t * c2y + t * t * t * p2.y;
-			return { x: targetX, y };
-		}
-
-		// Part of the curve left/right of a cut x, including the cut point
-		function cutLeft(pts, targetX) {
-			if (targetX <= pts[0].x)
-				return [];
-			if (targetX >= pts[pts.length - 1].x)
-				return pts.slice();
-
-			let j = pts.length - 2;
-			for (let i = 0; i < pts.length - 1; i++) {
-				if (targetX <= pts[i + 1].x) {
-					j = i;
-					break;
-				}
-			}
-
-			const left = pts.slice(0, j + 1);
-			if (targetX > pts[j].x)
-				left.push(pointAtX(pts, targetX));
-			return left;
-		}
-
-		function cutRight(pts, targetX) {
-			if (targetX >= pts[pts.length - 1].x)
-				return [];
-			if (targetX <= pts[0].x)
-				return pts.slice();
-
-			let j = pts.length - 2;
-			for (let i = 0; i < pts.length - 1; i++) {
-				if (targetX <= pts[i + 1].x) {
-					j = i;
-					break;
-				}
-			}
-
-			const right = pts.slice(j + 1);
-			if (targetX < pts[j + 1].x)
-				right.unshift(pointAtX(pts, targetX));
-			return right;
-		}
-
-		onPaint: {
-			const ctx = getContext("2d");
-			ctx.reset();
-
-			const W = width;
-			const H = height;
-			if (W < 2 || H < 2)
-				return;
-
-			const padLeft = root.labelFontSize * 3.4;
-			const padRight = 2;
-			const padTop = 2;
-			const padBottom = root.labelFontSize + 8;
-			const plot = {
-				x: padLeft,
-				y: padTop,
-				w: W - padLeft - padRight,
-				h: H - padTop - padBottom
-			};
-			if (plot.w < 2 || plot.h < 2)
-				return;
-
-			// Auto-fit: NaN yMin/yMax derive from the data, snapped to the
-			// horizontal step grid, honoring minHorizontalLines
-			let lo = root.yMin;
-			let hi = root.yMax;
-			const loAuto = Number.isNaN(lo);
-			const hiAuto = Number.isNaN(hi);
-
-			if (loAuto || hiAuto) {
-				let dmin = Infinity;
-				let dmax = -Infinity;
-				for (const v of root.values) {
-					if (v == null)
-						continue;
-					if (v < dmin)
-						dmin = v;
-					if (v > dmax)
-						dmax = v;
-				}
-				if (dmin === Infinity) {
-					dmin = 0;
-					dmax = 1;
-				}
-
-				const step = root.horizontalLineStep;
-				const minSteps = root.minHorizontalLines > 1 ? root.minHorizontalLines - 1 : 0;
-
-				if (step > 0) {
-					if (hiAuto) {
-						const baseLo = loAuto ? Math.floor(dmin / step) * step : lo;
-						const span = Math.max(Math.ceil((dmax - baseLo) / step), minSteps, 1);
-						lo = baseLo;
-						hi = baseLo + span * step;
-					} else {
-						const span = Math.max(Math.ceil((hi - dmin) / step), minSteps, 1);
-						lo = hi - span * step;
-					}
-				} else {
-					if (loAuto)
-						lo = dmin;
-					if (hiAuto)
-						hi = dmax;
-					if (hi <= lo)
-						hi = lo + 1;
-				}
-			}
-
-			const scaleBottom = lo - root.yPaddingBottom;
-			const scaleTop = hi + root.yPaddingTop;
-			const range = scaleTop - scaleBottom;
-			if (range <= 0 || root.xSteps < 1)
-				return;
-
-			let series = root.values;
-			if (root.smoothing > 0 && series.length > 0) {
-				const radius = Math.round(root.smoothing);
-				const raw = series;
-				series = raw.map((v, i) => {
-					if (v == null)
-						return null;
-
-					let sum = 0;
-					let n = 0;
-					for (let j = -radius; j <= radius; j++) {
-						const u = raw[i + j];
-						if (u != null) {
-							sum += u;
-							n++;
-						}
-					}
-					return n > 0 ? sum / n : null;
-				});
-			}
-
-			const xAt = i => plot.x + (i / root.xSteps) * plot.w;
-			const yAt = v => plot.y + (1 - (v - scaleBottom) / range) * plot.h;
-			const crisp = v => Math.floor(v) + 0.5;
-
-			// 1. Grid lines
-			ctx.strokeStyle = Qt.alpha(root.gridColor, root.gridAlpha);
-			ctx.lineWidth = 1;
-
-			if (root.verticalLineStep > 0) {
-				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
-					if (i === 0 && !root.firstXLine)
-						continue;
-					if (i === root.xSteps && !root.lastXLine)
-						continue;
-
-					const x = crisp(xAt(i));
-					ctx.beginPath();
-					ctx.moveTo(x, plot.y);
-					ctx.lineTo(x, H);
-					ctx.stroke();
-				}
-			}
-
-			// Lines extend down into yPaddingBottom, snapped to the grid
-			const vStart = lo - (root.yPaddingBottom > 0 ? Math.floor(root.yPaddingBottom / root.horizontalLineStep) * root.horizontalLineStep : 0);
-
-			if (root.horizontalLineStep > 0) {
-				for (let v = vStart; v <= hi + 0.001; v += root.horizontalLineStep) {
-					const y = crisp(yAt(v));
-					ctx.beginPath();
-					ctx.moveTo(0, y);
-					ctx.lineTo(plot.x + plot.w, y);
-					ctx.stroke();
-				}
-			}
-
-			// 2. Labels
-			ctx.fillStyle = Qt.alpha(root.labelColor, root.labelAlpha);
-			ctx.font = root.labelFontSize + "px sans-serif";
-
-			ctx.textAlign = "left";
-			ctx.textBaseline = "top";
-			if (root.verticalLineStep > 0 && root.xLabel) {
-				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
-					if (i === 0 && !root.firstXLine)
-						continue;
-					if (i === root.xSteps && !root.lastXLine)
-						continue;
-
-					const text = root.xLabel(i);
-					if (text)
-						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 4);
-				}
-			}
-
-			ctx.textBaseline = "bottom";
-			if (root.horizontalLineStep > 0 && root.yLabel) {
-				for (let v = vStart; v <= hi + 0.001; v += root.horizontalLineStep) {
-					const text = root.yLabel(v);
-					if (text)
-						ctx.fillText(text, 2, yAt(v) - 2);
-				}
-			}
-
-			// 3. Curve, split into segments at null gaps
-			const segments = [];
-			let current = null;
-			for (let i = 0; i < series.length; i++) {
-				if (series[i] == null) {
-					if (current)
-						segments.push(current);
-					current = null;
-					continue;
-				}
-				const pt = {
-					x: xAt(i),
-					y: yAt(series[i])
-				};
-				if (!current)
-					current = [];
-				current.push(pt);
-			}
-			if (current)
-				segments.push(current);
-
-			ctx.lineCap = "round";
-			ctx.lineJoin = "round";
-
-			const hasMarker = root.markerX >= 0 && root.markerX <= root.xSteps;
-			const markerPx = hasMarker ? xAt(root.markerX) : 0;
-			let gapPx = 0;
-			if (hasMarker) {
-				// markerGap is measured from the dot edge, perpendicular to the
-				// curve; project onto x via the local curve slope
-				let slope = 0;
-				const seg = segments.find(s => s[0].x <= markerPx && markerPx <= s[s.length - 1].x);
-				if (seg && seg.length > 2 && markerPx - 1 >= seg[0].x && markerPx + 1 <= seg[seg.length - 1].x)
-					slope = (pointAtX(seg, markerPx + 1).y - pointAtX(seg, markerPx - 1).y) / 2;
-				gapPx = (root.markerDotRadius + root.markerGap) / Math.sqrt(1 + slope * slope);
-			}
-
-			for (const seg of segments) {
-				if (seg.length < 2)
-					continue;
-
-				// Fill stays continuous under the marker
-				ctx.fillStyle = Qt.alpha(root.lineColor, root.fillAlpha);
-				strokeCurve(ctx, seg);
-				ctx.lineTo(seg[seg.length - 1].x, plot.y + plot.h);
-				ctx.lineTo(seg[0].x, plot.y + plot.h);
-				ctx.closePath();
-				ctx.fill();
-
-				// Stroke has a gap around the marker
-				const pieces = hasMarker ? [cutLeft(seg, markerPx - gapPx), cutRight(seg, markerPx + gapPx)] : [seg];
-
-				for (const pts of pieces) {
-					if (pts.length < 2)
-						continue;
-
-					ctx.strokeStyle = root.lineColor;
-					ctx.lineWidth = root.lineWidth;
-					strokeCurve(ctx, pts);
-					ctx.stroke();
-				}
-			}
-
-			// 4. Marker: dashed vertical + dot
-			if (root.markerX >= 0 && root.markerX <= root.xSteps) {
-				const x = markerPx;
-
-				ctx.setLineDash([4, 4]);
-				ctx.strokeStyle = Qt.alpha(root.markerColor, 0.6);
-				ctx.lineWidth = 1;
-				ctx.beginPath();
-				ctx.moveTo(crisp(x), plot.y);
-				ctx.lineTo(crisp(x), H);
-				ctx.stroke();
-				ctx.setLineDash([]);
-
-				const i0 = Math.floor(root.markerX);
-				const v0 = series[i0];
-				const v1 = series[i0 + 1];
-				let y = null;
-
-				if (v0 != null && v1 != null)
-					y = yAt(v0 + (v1 - v0) * (root.markerX - i0));
-				else if (v0 != null)
-					y = yAt(v0);
-
-				if (y != null) {
-					ctx.fillStyle = root.markerColor;
-					ctx.beginPath();
-					ctx.arc(x, y, root.markerDotRadius, 0, Math.PI * 2);
-					ctx.fill();
-				}
-			}
-		}
-	}
-
-	onValuesChanged: canvas.requestPaint()
-	onXStepsChanged: canvas.requestPaint()
-	onYMinChanged: canvas.requestPaint()
-	onYMaxChanged: canvas.requestPaint()
-	onYPaddingTopChanged: canvas.requestPaint()
-	onYPaddingBottomChanged: canvas.requestPaint()
-	onVerticalLineStepChanged: canvas.requestPaint()
-	onHorizontalLineStepChanged: canvas.requestPaint()
-	onFirstXLineChanged: canvas.requestPaint()
-	onLastXLineChanged: canvas.requestPaint()
-	onMinHorizontalLinesChanged: canvas.requestPaint()
-	onXLabelChanged: canvas.requestPaint()
-	onYLabelChanged: canvas.requestPaint()
-	onSmoothingChanged: canvas.requestPaint()
-	onCurveSmoothingChanged: canvas.requestPaint()
-	onMarkerXChanged: canvas.requestPaint()
-	onMarkerGapChanged: canvas.requestPaint()
-	onLineColorChanged: canvas.requestPaint()
-	onGridColorChanged: canvas.requestPaint()
-	onMarkerColorChanged: canvas.requestPaint()
-	onLabelColorChanged: canvas.requestPaint()
-	onGridAlphaChanged: canvas.requestPaint()
-	onLabelAlphaChanged: canvas.requestPaint()
-	onFillAlphaChanged: canvas.requestPaint()
-	onLineWidthChanged: canvas.requestPaint()
-	onMarkerDotRadiusChanged: canvas.requestPaint()
-	onLabelFontSizeChanged: canvas.requestPaint()
-}

Components/MaterialIcon.qml

@@ -1,14 +1,27 @@
-import QtQuick
 import ZShell.Config
 import qs.Services
 
 CustomText {
 	id: root
 
+	readonly property list<int> allowed: [20, 24, 40, 48]
 	property real fill: 0
 	property int grade: Colors.light ? 0 : -25
-	property font fontStyle: Tokens.font.icon.small
+	readonly property int opsz: clampOpsz(optical)
+	property int optical: fontInfo.pixelSize
 
-	renderType: Text.NativeRendering
+	function clampOpsz(value): int {
-	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
+		return allowed.reduce((closest, current) => {
+			return Math.abs(current - value) < Math.abs(closest - value) ? current : closest;
+		});
+	}
+
+	font.family: "Material Symbols Rounded"
+	font.pointSize: Tokens.font.size.larger
+	font.variableAxes: ({
+			FILL: fill,
+			GRAD: grade,
+			opsz: opsz,
+			wght: fontInfo.weight
+		})
 }

Components/Menu.qml

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

Components/ScreenState.qml

@@ -1,40 +0,0 @@
-import QtQuick
-import Quickshell
-
-PersistentProperties {
-	required property ShellScreen modelData
-
-	reloadableId: "screenState"
-
-	// Drawer visibilities
-	property bool bar
-	property bool clipboard
-	property bool dashboard
-	property bool dock
-	property bool isDrawing
-	property bool launcher
-	property bool osd
-	property bool resources
-	property bool settings
-	property bool sidebar
-
-	// Dashboard state
-	property int dashboardTab: 0
-	property date dashboardDate: new Date()
-
-	// Sidebar state
-	property int sidebarTab: 0
-	property list<string> expandedNotifs: []
-
-	// Utilities state
-	property string recordingConfirmDelete
-	property bool recordingListExpanded
-	property string recordingMode
-
-	// Drawing state
-	property color penColor: "white"
-	property int penWidth: 4
-
-	// Screenshot state
-	property bool screenshot
-}

Components/SearchBar.qml

@@ -62,7 +62,7 @@ TextFieldBase {
 		anchors.leftMargin: Tokens.padding.large
 		anchors.verticalCenter: parent.verticalCenter
 		color: Colors.palette.m3onSurfaceVariant
-		fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
+		font.pointSize: Tokens.font.size.large
 		text: "search"
 	}
 

Components/StateLayer.qml

@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Shapes
 import ZShell
 import ZShell.Config
+import qs.Helpers
 import qs.Services
 
 MouseArea {
@@ -51,7 +52,7 @@ MouseArea {
 
 	anchors.fill: parent
 	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled && !ShellState.forActive()?.isDrawing
+	enabled: parent.enabled && !Visibilities.getForActive()?.isDrawing
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -98,13 +99,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

Components/TextAreaBase.qml

@@ -8,7 +8,7 @@ TextArea {
 
 	color: Colors.palette.m3onSurface
 	cursorVisible: !readOnly
-	font: Tokens.font.body.small
+	font.pointSize: Tokens.font.size.small
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom

Components/TextEditBase.qml

@@ -11,18 +11,22 @@ TextEdit {
 
 	color: Colors.palette.m3onSurface
 	cursorVisible: !readOnly
-	font: Tokens.font.body.small
+	font.pointSize: Tokens.font.size.small
+	font.family: Config.appearance.font.family.sans
 	renderType: TextField.NativeRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter
 
 	Behavior on color {
-		CAnim {}
+		CAnim {
+		}
+	}
+	cursorDelegate: Item {
 	}
-	cursorDelegate: Item {}
 	Behavior on selectionColor {
-		CAnim {}
+		CAnim {
+		}
 	}
 
 	CustomRect {

Components/TextFieldBase.qml

@@ -8,21 +8,24 @@ TextField {
 
 	color: Colors.palette.m3onSurface
 	cursorVisible: !readOnly
-	font: Tokens.font.body.small
+	font.pointSize: Tokens.font.size.small
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: TextField.QtRendering
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter
 
 	Behavior on color {
-		CAnim {}
+		CAnim {
+		}
+	}
+	cursorDelegate: Item {
 	}
-	cursorDelegate: Item {}
 	Behavior on selectionColor {
-		CAnim {}
+		CAnim {
+		}
 	}
 
 	CustomRect {

Components/Toast/ToastItem.qml

@@ -36,7 +36,8 @@ CustomRect {
 	radius: Tokens.rounding.medium
 
 	Behavior on border.color {
-		CAnim {}
+		CAnim {
+		}
 	}
 
 	Elevation {
@@ -83,7 +84,7 @@ CustomRect {
 						return Colors.palette.m3onError;
 					return Colors.palette.m3onSurfaceVariant;
 				}
-				fontStyle: Tokens.font.icon.builders.large.scale(1.2).build()
+				font.pointSize: Math.round(Tokens.font.size.large * 1.2)
 				text: root.modelData.icon
 			}
 		}
@@ -106,7 +107,7 @@ CustomRect {
 					return Colors.palette.m3onSurface;
 				}
 				elide: Text.ElideRight
-				font: Tokens.font.title.small
+				font.pointSize: Tokens.font.size.normal
 				text: root.modelData.title
 			}
 

Components/VerticalFadeFlickable.qml

@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import Quickshell
 import qs.Effects
 
 CustomFlickable {
@@ -10,7 +9,6 @@ CustomFlickable {
 	property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
 	property real fadeAmount: 0.1
 	property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-	readonly property real dpr: Math.ceil((QsWindow.window as QsWindow)?.devicePixelRatio ?? 1)
 
 	function fadeShouldBeActive(isStart: bool): bool {
 		// When content is smaller than flickable size, hide fade when rebound starts
@@ -30,7 +28,6 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
-	layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask
 

Components/VerticalFadeListView.qml

@@ -7,7 +7,6 @@ CustomListView {
 	id: root
 
 	property real endFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
-	property bool fadeEnabled: true
 	property real fadeAmount: 0.1
 	property real fadeThreshold: 0.0
 	readonly property bool horizontal: orientation === ListView.Horizontal
@@ -18,9 +17,7 @@ CustomListView {
 	}
 
 	function fadeShouldBeActive(isStart: bool): bool {
-		if (!fadeEnabled)
+		// When content is smaller than flickable size, hide fade when rebound starts.
-			return false;
-
 		if (contentSize() + marginStart() + marginEnd() < viewportSize() && rebound.running && ((isStart ? overshootStart() > 0 : overshootStart() < 0))) {
 			return false;
 		}

Components/VerticalScrollBarTrack.qml

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

Daemons/NotifServer.qml

@@ -10,7 +10,6 @@ import ZShell
 import qs.Components
 import qs.Modules
 import qs.Helpers
-import qs.Services
 import qs.Paths
 import ZShell.Config
 
@@ -26,7 +25,7 @@ Singleton {
 	property alias server: server
 
 	function shouldThrottle(appName: string): bool {
-		if (props.dnd || ShellState.anySidebarOpen())
+		if (props.dnd || [...Visibilities.screens.values()].some(v => v.sidebar))
 			return false;
 
 		const key = (appName || "unknown").trim().toLowerCase();

Drawers/Drawing.qml

@@ -3,23 +3,28 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import ZShell.Internal
-import qs.Components
 
 Item {
 	id: root
 
 	readonly property alias content: contentLoader.item
-	required property ScreenState screenState
+	readonly property PersistentProperties drawingState: PersistentProperties {
+		property color penColor: "white"
+		property int penWidth: 4
+
+		reloadableId: "drawingState"
+	}
+	required property PersistentProperties visibilities
 
 	Loader {
 		id: contentLoader
 
-		active: root.screenState.isDrawing
+		active: root.visibilities.isDrawing
 		anchors.fill: parent
 
 		sourceComponent: StrokeCanvas {
-			penColor: root.screenState.penColor
+			penColor: root.drawingState.penColor
-			penWidth: root.screenState.penWidth
+			penWidth: root.drawingState.penWidth
 		}
 	}
 }

Drawers/Exclusions.qml

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

Drawers/Interactions.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import QtQuick
-import ZShell.Config
 import qs.Components
+import ZShell.Config
 import qs.Helpers
 import qs.Modules.Bar.Popouts
 
@@ -19,7 +19,7 @@ Item {
 	required property ShellScreen screen
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	function inBottomPanel(panel: Item, x: real, y: real): bool {
 		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
@@ -63,7 +63,7 @@ Item {
 
 		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 		dragThreshold: 0
-		enabled: !root.screenState.isDrawing
+		enabled: !root.visibilities.isDrawing
 		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
 		maximumPointCount: 1
 		minimumPointCount: 1
@@ -76,59 +76,45 @@ Item {
 		onCentroidChanged: {
 			const x = centroid.position.x;
 			const y = centroid.position.y;
-			const pressX = centroid.pressPosition.x;
+			const dragX = x - centroid.pressPosition.x;
-			const pressY = centroid.pressPosition.y;
+			const dragY = y - centroid.pressPosition.y;
-			const dragX = x - pressX;
-			const dragY = y - pressY;
 
-			if (pressY >= root.screen.height - Config.bar.border && pressX > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+			if (centroid.pressPosition.y >= root.screen.height - Config.bar.border && centroid.pressPosition.x > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-				root.screenState.launcher = true;
+				root.visibilities.launcher = true;
 
 			if (root.singleGestureTriggered)
 				return;
 
-			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, pressX, pressY);
+			if (root.geometry.insetTop(root.borderThickness) > centroid.pressPosition.y) {
-
-			if (inDashboard && root.withinPanelWidth(root.panels.dashboardWrapper, x, y)) {
-				if (dragY > Config.dashboard.dragThreshold) {
-					root.screenState.dashboard = true;
-					root.singleGestureTriggered = true;
-				} else if (dragY < -Config.dashboard.dragThreshold) {
-					root.screenState.dashboard = false;
-					root.singleGestureTriggered = true;
-				}
-			}
-
-			if (root.geometry.insetTop(root.borderThickness) > pressY && (Config.dashboard.showOnHover || !inDashboard)) {
 				if (dragY > 20) {
-					root.screenState.settings = true;
+					root.visibilities.settings = true;
 					root.singleGestureTriggered = true;
 				} else if (dragY < -20) {
-					root.screenState.settings = false;
+					root.visibilities.settings = false;
 					root.singleGestureTriggered = true;
 				}
 			}
 
-			if (pressY > root.screen.height - root.geometry.insetBottom(root.borderThickness) && pressX < root.screen.width / 5 && dragY < -50)
+			if (centroid.pressPosition.y > root.screen.height - root.geometry.insetBottom(root.borderThickness) && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
-				root.screenState.clipboard = true;
+				root.visibilities.clipboard = true;
 
-			if (!Config.dock.hoverToReveal && pressY > root.screen.height - root.geometry.insetTop(root.borderThickness) && pressX > root.screen.width / 5 && !root.screenState.launcher)
+			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.geometry.insetTop(root.borderThickness) && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
 				if (dragY < -10) {
-					root.screenState.dock = true;
+					root.visibilities.dock = true;
 					root.singleGestureTriggered = true;
 				}
 
-			if (pressX > root.screen.width - Config.bar.border && pressY < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
+			if (centroid.pressPosition.x > root.screen.width - Config.bar.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
-				root.screenState.sidebar = true;
+				root.visibilities.sidebar = true;
 				root.singleGestureTriggered = true;
 			}
 
-			if (pressX >= root.screen.width - Config.bar.border && pressY > (root.screen.height / 2) && dragX < -20) {
+			if (centroid.pressPosition.x >= root.screen.width - Config.bar.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
 
-			if (pressX <= Config.bar.border && dragX > 20) {
+			if (centroid.pressPosition.x <= Config.bar.border && dragX > 20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
@@ -141,7 +127,7 @@ Item {
 		property bool setInitialPoint: false
 
 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		enabled: root.screenState.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
+		enabled: root.visibilities.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
 
 		onActiveChanged: {
 			if (!active) {
@@ -192,12 +178,12 @@ Item {
 	HoverHandler {
 		id: hoverHandler
 
-		cursorShape: root.screenState.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
+		cursorShape: root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
 
 		onHoveredChanged: {
 			if (!hovered) {
 				if (!root.osdShortcutActive) {
-					root.screenState.osd = false;
+					root.visibilities.osd = false;
 					root.panels.osd.hovered = false;
 				}
 
@@ -207,16 +193,13 @@ Item {
 
 				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
-
-				if (root.screenState.dashboard && Config.dashboard.showOnHover)
-					root.screenState.dashboard = false;
 			}
 		}
 		onPointChanged: {
 			const x = point.position.x;
 			const y = point.position.y;
 
-			if (root.screenState.isDrawing) {
+			if (root.visibilities.isDrawing) {
 				if (root.inLeftPanel(root.panels.drawing, x, y) && !(drawingHandler.point.pressedButtons & Qt.LeftButton)) {
 					root.panels.drawing.expand();
 					root.drawing.content.hideHover();
@@ -227,7 +210,7 @@ Item {
 				return;
 			}
 
-			if (!root.screenState.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
+			if (!root.visibilities.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
 				root.bar.isHovered = true;
 
 			if (root.bar.fullscreen && !root.bar.isHovered)
@@ -245,7 +228,7 @@ Item {
 				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (!root.osdShortcutActive) {
-					root.screenState.osd = showOsd;
+					root.visibilities.osd = showOsd;
 					root.panels.osd.hovered = showOsd;
 				} else if (showOsd) {
 					root.osdShortcutActive = false;
@@ -253,13 +236,8 @@ Item {
 				}
 			}
 
-			if (Config.dock.enable && Config.dock.hoverToReveal && !root.screenState.dock && !root.screenState.launcher && root.inBottomPanel(root.panels.dock, x, y))
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
-				root.screenState.dock = true;
+				root.visibilities.dock = true;
-
-			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, x, y);
-
-			if (Config.dashboard.showOnHover)
-				root.screenState.dashboard = inDashboard;
 
 			if (root.geometry.barContains(x, y))
 				root.bar.checkPopout(root.geometry.axisPos(x, y));
@@ -268,17 +246,16 @@ Item {
 
 	Connections {
 		function onDashboardChanged() {
-			if (root.screenState.dashboard) {
+			if (root.visibilities.dashboard) {
 				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
 				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
-					root.screenState.launcher = false;
+					root.visibilities.launcher = false;
 
-				root.screenState.settings = false;
+				root.visibilities.settings = false;
-				root.screenState.sidebar = false;
+				root.visibilities.sidebar = false;
-				root.screenState.resources = false;
 				root.popouts.hasCurrent = false;
 			} else {
 				root.dashboardShortcutActive = false;
@@ -286,12 +263,12 @@ Item {
 		}
 
 		function onIsDrawingChanged() {
-			if (!root.screenState.isDrawing)
+			if (!root.visibilities.isDrawing)
 				root.drawing.clear();
 		}
 
 		function onLauncherChanged() {
-			if (!root.screenState.launcher) {
+			if (!root.visibilities.launcher) {
 				root.dashboardShortcutActive = false;
 				root.osdShortcutActive = false;
 				root.utilitiesShortcutActive = false;
@@ -299,23 +276,23 @@ Item {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 
 				if (!inOsdArea) {
-					root.screenState.osd = false;
+					root.visibilities.osd = false;
 					root.panels.osd.hovered = false;
 				}
 			}
 
-			if (root.screenState.launcher) {
+			if (root.visibilities.launcher) {
 				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
-					root.screenState.dashboard = false;
+					root.visibilities.dashboard = false;
 				}
 
-				root.screenState.dock = false;
+				root.visibilities.dock = false;
-				root.screenState.settings = false;
+				root.visibilities.settings = false;
 			}
 		}
 
 		function onOsdChanged() {
-			if (root.screenState.osd) {
+			if (root.visibilities.osd) {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 				if (!inOsdArea) {
 					root.osdShortcutActive = true;
@@ -326,33 +303,32 @@ Item {
 		}
 
 		function onResourcesChanged() {
-			if (root.screenState.resources) {
+			if (root.visibilities.resources && (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))) {
-				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
+				root.popouts.hasCurrent = false;
-					root.popouts.hasCurrent = false;
-
-				root.screenState.settings = false;
-				root.screenState.dashboard = false;
 			}
+
+			if (root.visibilities.resources)
+				root.visibilities.settings = false;
 		}
 
 		function onSettingsChanged() {
-			if (root.screenState.settings) {
+			if (root.visibilities.settings) {
-				root.screenState.resources = false;
+				root.visibilities.resources = false;
-				root.screenState.dashboard = false;
+				root.visibilities.dashboard = false;
-				root.screenState.sidebar = false;
+				root.visibilities.sidebar = false;
 				root.panels.popouts.hasCurrent = false;
-				root.screenState.launcher = false;
+				root.visibilities.launcher = false;
 			}
 		}
 
 		function onSidebarChanged() {
-			if (root.screenState.sidebar) {
+			if (root.visibilities.sidebar) {
-				root.screenState.dashboard = false;
+				root.visibilities.dashboard = false;
-				root.screenState.settings = false;
+				root.visibilities.settings = false;
 				root.popouts.hasCurrent = false;
 			}
 		}
 
-		target: root.screenState
+		target: root.visibilities
 	}
 }

Drawers/Interactions2.qml

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

Drawers/Panels.qml

@@ -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.Sidebar as Sidebar
+import qs.Modules.Notifications.Sidebar as Sidebar
-import qs.Modules.Sidebar.Utils as Utils
+import qs.Modules.Notifications.Sidebar.Utils as Utils
 import qs.Modules.Dashboard as Dashboard
 import qs.Modules.Osd as Osd
 import qs.Components.Toast as Toasts
@@ -19,11 +19,15 @@ 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
@@ -32,18 +36,13 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
+	required property ShellScreen screen
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
-
+	required property PersistentProperties visibilities
-	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
@@ -65,7 +64,7 @@ Item {
 			id: resources
 
 			position: root.geometry.position
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 
@@ -85,8 +84,8 @@ Item {
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
-			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
+			visibilities: root.visibilities
 		}
 	}
 
@@ -97,7 +96,7 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		drawing: root.drawingItem
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Popouts.ClipWrapper {
@@ -122,8 +121,8 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
-		screenState: root.screenState
 		sidebarPanel: sidebar
+		visibilities: root.visibilities
 	}
 
 	Launcher.Wrapper {
@@ -133,7 +132,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Utils.Wrapper {
@@ -141,8 +140,8 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		screenState: root.screenState
 		sidebar: sidebar
+		visibilities: root.visibilities
 	}
 
 	Item {
@@ -150,11 +149,13 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.bottom: root.geometry.barOnLeft || root.geometry.barOnBottom ? parent.bottom : undefined
-		anchors.top: parent.top
+		anchors.left: root.geometry.barOnLeft ? parent.left : undefined
-		clip: offsetScale > 0
+		anchors.right: root.geometry.barOnLeft ? undefined : parent.right
-		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
+		anchors.top: root.geometry.barOnBottom || root.geometry.barOnLeft ? undefined : parent.top
-		implicitWidth: dashboard.implicitWidth
+		clip: true
+		implicitHeight: root.geometry.horizontal ? dashboard.implicitHeight * (1 - offsetScale) : dashboard.implicitHeight
+		implicitWidth: root.geometry.horizontal ? dashboard.implicitWidth : dashboard.implicitWidth * (1 - offsetScale)
 
 		Behavior on offsetScale {
 			Anim {
@@ -167,7 +168,8 @@ Item {
 			id: dashboard
 
 			offsetScale: dashboardWrapper.offsetScale
-			screenState: root.screenState
+			position: root.geometry.position
+			visibilities: root.visibilities
 		}
 	}
 
@@ -178,7 +180,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: notifications.bottom
 		panels: root
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Item {
@@ -194,7 +196,7 @@ Item {
 			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 
@@ -205,7 +207,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Clipboard.Wrapper {
@@ -214,6 +216,6 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 }

Drawers/Windows.qml

@@ -50,16 +50,16 @@ CustomWindow {
 	readonly property alias menuRegion: regions.menuPopoutRegion
 	readonly property HyprlandMonitor monitor: Hypr.monitorFor(screen)
 	property var root: Quickshell.shellDir
-	readonly property ScreenState screenState: ShellState.forScreen(screen)
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.5 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
+	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings || visibilities.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
-	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
+	contentItem.focus: true
+	mask: visibilities.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
@@ -71,26 +71,26 @@ CustomWindow {
 
 	contentItem.Keys.onEscapePressed: {
 		if (Config.bar.autoHide)
-			screenState.bar = false;
+			visibilities.bar = false;
-		screenState.launcher = false;
+		visibilities.launcher = false;
-		screenState.sidebar = false;
+		visibilities.sidebar = false;
-		screenState.dashboard = false;
+		visibilities.dashboard = false;
-		screenState.osd = false;
+		visibilities.osd = false;
-		screenState.settings = false;
+		visibilities.settings = false;
-		screenState.resources = false;
+		visibilities.resources = false;
-		screenState.dock = false;
+		visibilities.dock = false;
-		screenState.clipboard = false;
+		visibilities.clipboard = false;
 		panels.popouts.hasCurrent = false;
 	}
 	onHasFullscreenChanged: {
-		screenState.launcher = false;
+		visibilities.launcher = false;
-		screenState.sidebar = false;
+		visibilities.sidebar = false;
-		screenState.dashboard = false;
+		visibilities.dashboard = false;
-		screenState.osd = false;
+		visibilities.osd = false;
-		screenState.settings = false;
+		visibilities.settings = false;
-		screenState.resources = false;
+		visibilities.resources = false;
-		screenState.clipboard = false;
+		visibilities.clipboard = false;
-		screenState.dock = false;
+		visibilities.dock = false;
 		panels.popouts.hasCurrent = false;
 	}
 
@@ -142,41 +142,44 @@ CustomWindow {
 	HyprlandFocusGrab {
 		id: focusGrab
 
-		active: {
+		active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.clipboard || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!Config.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
-			const s = root.screenState;
-			const c = Config;
-
-			if ((s.launcher && c.launcher.enabled) || (s.sidebar && c.sidebar.enabled) || (s.resources && c.dashboard.performance.enabled) || (s.clipboard && c.clipboard.enabled))
-				return true;
-			if (s.dashboard && !c.dashboard.showOnHover && c.dashboard.enabled)
-				return true;
-			if (!c.dock.hoverToReveal && s.dock && c.dock.enable)
-				return true;
-			if (panels.popouts.currentName.startsWith("traymenu") && (panels.popouts.current as StackView)?.depth > 1)
-				return true;
-			if (s.settings)
-				return true;
-			return false;
-		}
 		windows: [root]
 
 		onCleared: {
-			root.screenState.launcher = false;
+			visibilities.launcher = false;
-			root.screenState.sidebar = false;
+			visibilities.sidebar = false;
-			root.screenState.dashboard = false;
+			visibilities.dashboard = false;
-			root.screenState.osd = false;
+			visibilities.osd = false;
-			root.screenState.settings = false;
+			visibilities.settings = false;
-			root.screenState.resources = false;
+			visibilities.resources = false;
-			root.screenState.clipboard = false;
+			visibilities.clipboard = false;
-			root.screenState.dock = false;
+			visibilities.dock = false;
 			panels.popouts.hasCurrent = false;
 		}
 	}
 
+	PersistentProperties {
+		id: visibilities
+
+		property bool bar
+		property bool clipboard
+		property bool dashboard
+		property bool dock
+		property bool isDrawing
+		property bool launcher
+		property bool notif: NotifServer.popups.length > 0
+		property bool osd
+		property bool resources
+		property bool settings
+		property bool sidebar
+
+		Component.onCompleted: Visibilities.load(root.screen, this)
+	}
+
 	Binding {
 		property: "bar"
-		target: root.screenState
+		target: visibilities
-		value: root.screenState.sidebar || root.screenState.dashboard || root.screenState.osd || (!Config.bar.hideWhenNotif && NotifServer.popups.length > 0) || root.screenState.resources || root.screenState.settings || bar.isHovered
+		value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || (!Config.bar.hideWhenNotif && visibilities.notif) || visibilities.resources || visibilities.settings || bar.isHovered
 		when: Config.bar.autoHide
 	}
 
@@ -184,19 +187,23 @@ CustomWindow {
 		id: surface
 
 		anchors.fill: parent
+		layer.enabled: true
 		opacity: root.surfaceColor.a
 
-		BlobGroup2 {
+		layer.effect: MultiEffect {
+			blurMax: 32
+			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
+			shadowEnabled: true
+		}
+
+		BlobGroup {
 			id: blobGroup
 
-			anchors.fill: parent
 			color: root.surfaceColor
-			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
-			shadowRadius: 18
 			smoothing: Config.bar.smoothing
 		}
 
-		BlobInvertedRect2 {
+		BlobInvertedRect {
 			anchors.fill: parent
 			anchors.margins: -50
 			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
@@ -246,7 +253,6 @@ CustomWindow {
 		PanelBg {
 			id: osdBg
 
-			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -258,7 +264,6 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg
 
-			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
 			radius: Tokens.rounding.large
 		}
@@ -293,16 +298,13 @@ CustomWindow {
 		PanelBg {
 			id: resourcesBg
 
-			property real extraExtent: 0.2
-
-			atRestOverride: panels.resources.offsetScale < 0.99
 			deformAmount: 0.05
-			implicitHeight: panels.resources.height * (1 + extraExtent)
+			implicitHeight: panels.resources.height
-			implicitWidth: panels.resources.width * (1 + extraExtent)
+			implicitWidth: panels.resources.width
 			panel: panels.resourcesWrapper
 			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
-			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness) - panels.resources.width * extraExtent
+			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
-			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness) - panels.resources.height * extraExtent
+			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
 		}
 
 		PanelBg {
@@ -332,15 +334,9 @@ CustomWindow {
 		PanelBg {
 			id: clipboardBg
 
-			property real extraExtent: 0.2
-
 			deformAmount: 0.03
-			implicitHeight: panels.clipboard.height * (1 + extraExtent)
-			implicitWidth: panels.clipboard.width * (1 + extraExtent)
 			panel: panels.clipboard
 			radius: 29
-			x: panels.clipboard.x + geometry.insetLeft(root.borderThickness) - panels.clipboard.width * extraExtent
-			y: panels.clipboard.y + geometry.insetTop(root.borderThickness)
 		}
 	}
 
@@ -348,11 +344,37 @@ CustomWindow {
 		id: drawing
 
 		anchors.fill: parent
-		screenState: root.screenState
+		layer.enabled: true
+		visibilities: visibilities
 		z: 2
+
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskInverted: true
+			maskSource: maskSource
+		}
 	}
 
-	Interactions2 {
+	Item {
+		id: maskSource
+
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false
+
+		CustomRect {
+			readonly property int extraWidth: radius
+
+			color: "white"
+			implicitHeight: panels.drawing.height
+			implicitWidth: panels.drawing.width + extraWidth
+			radius: drawingBg.radius
+			x: -extraWidth + root.borderThickness + panels.drawing.x
+			y: panels.drawing.y + bar.implicitHeight
+		}
+	}
+
+	Interactions {
 		id: interactions
 
 		anchors.fill: parent
@@ -364,7 +386,7 @@ CustomWindow {
 		panels: panels
 		popouts: panels.popouts
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: visibilities
 
 		Panels {
 			id: panels
@@ -374,7 +396,7 @@ CustomWindow {
 			drawingItem: drawing
 			geometry: geometry
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: visibilities
 
 			clipboard.transform: Matrix4x4 {
 				matrix: clipboardBg.deformMatrix
@@ -417,40 +439,22 @@ CustomWindow {
 			anchors.bottom: geometry.barOnBottom ? parent.bottom : undefined
 			anchors.left: parent.left
 			anchors.top: geometry.barOnBottom ? undefined : parent.top
-			enabled: !screenState.isDrawing
+			enabled: !visibilities.isDrawing
 			fullscreen: root.hasFullscreen
 			height: geometry.horizontal ? implicitHeight : parent.height
 			popouts: panels.popouts
 			popoutsWrapper: panels.popoutsWrapper
 			position: geometry.position
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: visibilities
 			width: geometry.horizontal ? parent.width : implicitWidth
 		}
 	}
 
-	LazyLoader {
+	component PanelBg: BlobRect {
-		id: loader
-
-		property bool closing: !root.screenState.screenshot
-
-		onClosingChanged: if (!closing)
-			activeAsync = true
-
-		Picker {
-			loader: loader
-			parent: root.contentItem
-			screen: root.screen
-			screenState: root.screenState
-		}
-	}
-
-	component PanelBg: BlobRect2 {
 		property real deformAmount: 0.15
 		required property Item panel
 
-		atRestOverride: panel?.offsetScale < 0.99 ?? false
-		damping: 28.3
 		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
 		group: blobGroup
 		implicitHeight: panel.height

Greeter/Center.qml

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

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

Greeter/Components/ClipRect.qml

@@ -1,41 +0,0 @@
-import QtQuick
-import ZShell.Components
-
-Item {
-	id: root
-
-	property real radius
-	property real topLeftRadius: radius
-	property real topRightRadius: radius
-	property real bottomRightRadius: radius
-	property real bottomLeftRadius: radius
-	property color color: "transparent"
-	default property alias contentData: contentItem.data
-
-	Item {
-		id: contentItem
-
-		anchors.fill: parent
-	}
-
-	ShaderEffectSource {
-		id: source
-
-		hideSource: true
-		sourceItem: contentItem
-	}
-
-	RoundedMask {
-		anchors.fill: parent
-		source: source
-		topLeftRadius: root.topLeftRadius
-		topRightRadius: root.topRightRadius
-		bottomRightRadius: root.bottomRightRadius
-		bottomLeftRadius: root.bottomLeftRadius
-		color: root.color
-	}
-
-	Behavior on color {
-		CAnim {}
-	}
-}

Greeter/Components/CustomFlickable.qml

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

Greeter/Components/CustomListView.qml

@@ -1,36 +1,13 @@
 import QtQuick
-import qs.Services
 
 ListView {
 	id: root
 
-	property bool doneFakeFlick
-
-	interactive: !ShellState.forActive()?.isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
-		// onRunningChanged: {
-		// 	if (!running && !root.doneFakeFlick) {
-		// 		root.doneFakeFlick = true;
-		// 		root.flick(1, 1);
-		// 		root.flick(-1, -1);
-		// 		Qt.callLater(() => root.cancelFlick());
-		// 	}
-		// }
-
 		Anim {
 			properties: "x,y"
-			type: Anim.DefaultEffects
 		}
 	}
-
-	// Timer {
-	// 	interval: 10
-	// 	running: root.doneFakeFlick
-	//
-	// 	onTriggered: {
-	// 		root.doneFakeFlick = false;
-	// 	}
-	// }
 }

Greeter/Components/CustomMouseArea.qml

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

Greeter/Components/CustomRect.qml

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

Greeter/Components/CustomText.qml

@@ -14,9 +14,10 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font: Tokens.font.body.small
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.normal
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.QtRendering
+	renderType: Text.NativeRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {
@@ -27,25 +28,22 @@ Text {
 		enabled: root.animate
 
 		SequentialAnimation {
-			TAnim {
+			Anim {
-				target: root
 				to: root.animateFrom
-				type: Anim.FastEffects
 			}
 
 			PropertyAction {
 			}
 
-			TAnim {
+			Anim {
-				target: root
 				to: root.animateTo
-				type: Anim.DefaultEffects
 			}
 		}
 	}
 
-	component TAnim: Anim {
+	component Anim: NumberAnimation {
 		duration: root.animateDuration / 2
+		easing.type: Easing.BezierSpline
 		properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
 		property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
 		target: root

Greeter/Components/CustomTextField.qml

@@ -1,305 +1,76 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Shapes
+import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
-TextFieldBase {
+TextField {
 	id: root
 
-	enum TextFieldType {
+	background: null
-		Outlined,
+	color: Colors.palette.m3onSurface
-		Filled
+	cursorVisible: !readOnly
-	}
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.smaller
+	placeholderTextColor: Colors.palette.m3outline
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
 
-	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
+	Behavior on color {
-	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+		CAnim {
-	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
 
-	onEditingFinished: {
+		property bool disableBlink
-		if (!valid)
-			isError = true;
-	}
-	onPressed: {
-		if (stateLayer.enabled)
-			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
-	}
-	onTextEdited: {
-		if (isError)
-			isError = false;
-	}
 
-	Item {
+		color: Colors.palette.m3primary
-		id: contentWrapper
+		implicitWidth: 2
+		radius: Tokens.rounding.medium
 
-		anchors.bottomMargin: root.supportingTextOffset
+		Behavior on opacity {
-		anchors.fill: parent
+			Anim {
-
+				duration: Tokens.anim.durations.small
-		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
-				}
 			}
 		}
 
-		Loader {
+		Connections {
-			id: leadingIconLoader
+			function onCursorPositionChanged(): void {
-
+				if (root.activeFocus && root.cursorVisible) {
-			active: root.leadingIcon
+					cursor.opacity = 1;
-			anchors.left: parent.left
+					cursor.disableBlink = true;
-			anchors.leftMargin: Tokens.padding.small
+					enableBlink.restart();
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.leadingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-
-		Loader {
-			id: trailingIconLoader
-
-			active: root.trailingIcon
-			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.small
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.trailingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-	}
-
-	Loader {
-		id: supportingTextLoader
-
-		active: root.effectiveSupportingText
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.leftMargin: root.horizontalPadding
-
-		sourceComponent: CustomText {
-			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font: Tokens.font.label.small
-			text: root.effectiveSupportingText
-		}
-	}
-
-	TapHandler {
-		id: tapHandler
-	}
-
-	Component {
-		id: outlineComp
-
-		Shape {
-			id: bg
-
-			asynchronous: true
-			preferredRendererType: Shape.CurveRenderer
-
-			ShapePath {
-				id: path
-
-				readonly property real inset: strokeWidth / 2
-				readonly property real outlineGap: placeholder.width * root.smallFontScale + Tokens.spacing.small * 2
-				property real outlineGapScale: root.activeFocus || root.text ? 1 : 0
-
-				capStyle: ShapePath.RoundCap
-				fillColor: "transparent"
-				startX: path.inset + root.horizontalPadding - root.clampedRadius + path.outlineGap * (1 - path.outlineGapScale) / 2 + path.outlineGap * path.outlineGapScale
-				startY: path.inset
-				strokeColor: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				strokeWidth: root.activeFocus ? 2 : 1
-
-				Behavior on outlineGapScale {
-					Anim {
-						type: Anim.DefaultEffects
-					}
-				}
-				Behavior on strokeColor {
-					CAnim {}
-				}
-				Behavior on strokeWidth {
-					Anim {}
-				}
-
-				PathLine {
-					x: bg.width - path.inset - root.clampedRadius
-					y: path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathLine {
-					x: bg.width - path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset - root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathLine {
-					x: path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset + root.clampedRadius
-					y: path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.horizontalPadding - root.clampedRadius / 2 + path.outlineGap * (1 - path.outlineGapScale) / 2
-					y: path.inset
 				}
 			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 100
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
 		}
 	}
-
+	Behavior on placeholderTextColor {
-	Component {
+		CAnim {
-		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,16 +1,15 @@
 import QtQuick
-import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.colSecondaryContainer
+	selectionColor: Colors.tPalette.m3onSecondaryContainer
 
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Config.appearance?.font.size.normal ?? 15
+		pixelSize: Tokens?.font.size.normal ?? 15
 	}
 }

Greeter/Components/FadeImage.qml

@@ -1,79 +0,0 @@
-import QtQuick
-import Quickshell
-import ZShell.Config
-
-Image {
-	id: root
-
-	property int fadeInAnim: Anim.DefaultEffects
-	property int fadeInLargeAnim: Anim.StandardLarge
-	property int fadeOutAnim: Anim.FastEffects
-	property bool fadingOut
-	property bool hadPrevious
-	property bool preventInit
-
-	function maybeStartInAnim(): void {
-		if (!preventInit && !opacityInAnim.running && status === Image.Ready) {
-			opacityInAnim.type = hadPrevious ? fadeInAnim : fadeInLargeAnim;
-			opacityInAnim.start();
-		}
-	}
-
-	asynchronous: true
-	fillMode: Image.PreserveAspectCrop
-	opacity: 0
-	retainWhileLoading: true
-	sourceSize: {
-		const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
-		return Qt.size(width * dpr, height * dpr);
-	}
-
-	Anim on opacity {
-		id: opacityInAnim
-
-		running: false
-		to: 1
-	}
-	Behavior on source {
-		SequentialAnimation {
-			ScriptAction {
-				script: opacityInAnim.stop()
-			}
-
-			PropertyAction {
-				property: "fadingOut"
-				target: root
-				value: true
-			}
-
-			Anim {
-				property: "opacity"
-				target: root
-				to: 0
-				type: root.fadeOutAnim
-			}
-
-			PropertyAction {
-				property: "fadingOut"
-				target: root
-				value: false
-			}
-
-			PropertyAction {
-				property: "hadPrevious"
-				target: root
-				value: root.source
-			}
-
-			PropertyAction {
-			}
-
-			ScriptAction {
-				script: root.maybeStartInAnim()
-			}
-		}
-	}
-
-	onPreventInitChanged: maybeStartInAnim()
-	onStatusChanged: maybeStartInAnim()
-}

Greeter/Components/LoadingIndicator.qml

@@ -1,115 +0,0 @@
-import QtQuick
-import Quickshell
-import M3Shapes
-import ZShell.Config
-import qs.Services
-
-MaterialShape {
-	id: root
-
-	property bool animated: true
-	property real cRotation
-	property bool containsIcon
-	property real dampingRatio: 0.6
-	property real lRotation
-	property int morphAnimRotation: 60
-	property real morphScale: 0.14
-	property alias rotateAnimDuration: rotateAnim.duration
-	property int shapeIndex
-	property list<int> shapes: {
-		if (containsIcon)
-			return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-		return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pentagon, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-	}
-	readonly property real springDuration: {
-		const wn = Math.sqrt(stiffness);
-		const r = -dampingRatio * wn;
-		const c = 1 / Math.sqrt(1 - dampingRatio * dampingRatio);
-		return Math.log(visibilityThreshold / c) / r;
-	}
-	readonly property real springMaxVelocity: {
-		const wn = Math.sqrt(stiffness);
-		const factor = Math.exp(-z * Math.acos(z) / Math.sqrt(1 - z * z));
-		return wn * factor;
-	}
-	property bool springSettled: true
-	property real stiffness: 180
-	property real thisLRotation
-	property real visibilityThreshold: 0.075
-
-	function spring(t: real): var {
-		const wn = Math.sqrt(stiffness);
-		const za = dampingRatio * wn;
-
-		const wd = wn * Math.sqrt(1 - dampingRatio * dampingRatio);
-		const r = za / wd;
-		const pos = 1 - Math.exp(-za * t) * (Math.cos(wd * t) + r * Math.sin(wd * t));
-		const vel = Math.exp(-za * t) * (wn * wn / wd) * Math.sin(wd * t);
-
-		return [pos, vel];
-	}
-
-	color: Colors.palette.m3primary
-	implicitSize: 38
-	toShape: shapes[0]
-
-	RotationAnimation on cRotation {
-		id: rotateAnim
-
-		duration: 4666
-		easing.type: Easing.Linear
-		from: 0
-		loops: Animation.Infinite
-		running: root.animated
-		to: 360
-	}
-	Behavior on color {
-		CAnim {
-		}
-	}
-
-	ElapsedTimer {
-		id: timer
-	}
-
-	FrameAnimation {
-		running: root.animated && !root.springSettled
-
-		onTriggered: {
-			const t = timer.elapsed();
-
-			if (t >= root.springDuration) {
-				root.springSettled = true;
-			} else {
-				const [pos, vel] = root.spring(t);
-				root.morphProgress = Math.min(1, pos); // Overshooting the morph looks weird
-				root.thisLRotation = pos * root.morphAnimRotation;
-				root.scale = 1 + vel * root.morphScale / root.springMaxVelocity;
-			}
-		}
-	}
-
-	Timer {
-		interval: 650
-		repeat: true
-		running: root.animated
-		triggeredOnStart: true
-
-		onTriggered: {
-			root.beginBatchUpdate();
-			root.fromShape = root.toShape;
-			root.shapeIndex = (root.shapeIndex + 1) % root.shapes.length;
-			root.toShape = root.shapes[root.shapeIndex];
-			root.morphProgress = 0;
-
-			root.rotation = root.rotation;
-			root.lRotation = (root.lRotation + root.thisLRotation) % 360;
-			root.thisLRotation = 0;
-			root.rotation = Qt.binding(() => root.cRotation + root.lRotation + root.thisLRotation);
-
-			root.springSettled = false;
-			timer.restart();
-			root.endBatchUpdate();
-		}
-	}
-}

Greeter/Components/MaterialIcon.qml

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

Greeter/Components/StateLayer.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
+import ZShell.Components
+import qs.Helpers
 import ZShell.Config
 import qs.Services
 
@@ -11,6 +13,7 @@ MouseArea {
 	property alias bottomRightRadius: base.bottomRightRadius
 	property real circleRadius
 	property alias color: base.color
+	property bool disabled
 	readonly property real endRadius: {
 		const d1 = distSq(0, 0);
 		const d2 = distSq(width, 0);
@@ -19,7 +22,6 @@ MouseArea {
 		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
 	}
 	property real endRadiusAtPress
-	property bool manualHoverOverride
 	property bool manualPressOverride
 	property real pressX: width / 2
 	property real pressY: height / 2
@@ -27,7 +29,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
+	property real stateOpacity: containsMouse ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius
 
@@ -50,8 +52,8 @@ MouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
+	cursorShape: disabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled
+	enabled: !disabled
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -98,13 +100,13 @@ MouseArea {
 		id: base
 
 		anchors.fill: parent
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		color: Colors.palette.m3onSurface
 		opacity: root.stateOpacity
 		// Pick up radius from parent if it has one (parent can be anything with radius props)
 		// qmllint disable missing-property
 		radius: root.parent?.radius ?? 0
-		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
-		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
 		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
 		// qmllint enable missing-property

Greeter/Content.qml

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

Greeter/GreeterSurface.qml

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

Greeter/InputField.qml

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

Greeter/SessionDock.qml

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

Greeter/UserDock.qml

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

Greeter/WeatherInfo.qml

@@ -0,0 +1,170 @@
+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);
+
+					return forecast.slice(0, count);
+				}
+
+				ColumnLayout {
+					id: forecastHour
+
+					required property var modelData
+
+					Layout.fillWidth: true
+					spacing: Tokens.spacing.small
+
+					CustomText {
+						Layout.fillWidth: true
+						color: Colors.palette.m3outline
+						font.pointSize: Tokens.font.size.larger
+						horizontalAlignment: Text.AlignHCenter
+						text: {
+							const hour = forecastHour.modelData?.hour ?? 0;
+							return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
+						}
+					}
+
+					MaterialIcon {
+						Layout.alignment: Qt.AlignHCenter
+						font.pointSize: Tokens.font.size.extraLarge * 1.5
+						font.weight: 500
+						text: forecastHour.modelData?.icon ?? "cloud_alert"
+					}
+
+					CustomText {
+						Layout.alignment: Qt.AlignHCenter
+						color: Colors.palette.m3secondary
+						font.pointSize: Tokens.font.size.larger
+						text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
+					}
+				}
+			}
+		}
+	}
+
+	Timer {
+		interval: 900000 // 15 minutes
+		repeat: true
+		running: true
+		triggeredOnStart: true
+
+		onTriggered: Weather.reload()
+	}
+}

Helpers/AreaPicker.qml

@@ -0,0 +1,88 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Hyprland
+import ZShell
+import qs.Components
+
+Scope {
+	LazyLoader {
+		id: root
+
+		property bool closing
+		property bool freeze
+
+		Variants {
+			model: Quickshell.screens
+
+			PanelWindow {
+				id: win
+
+				required property ShellScreen modelData
+
+				WlrLayershell.exclusionMode: ExclusionMode.Ignore
+				WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive
+				WlrLayershell.layer: WlrLayer.Overlay
+				WlrLayershell.namespace: "areapicker"
+				color: "transparent"
+				mask: root.closing ? empty : null
+				screen: modelData
+
+				anchors {
+					bottom: true
+					left: true
+					right: true
+					top: true
+				}
+
+				Region {
+					id: empty
+
+				}
+
+				Picker {
+					loader: root
+					screen: win.modelData
+				}
+			}
+		}
+	}
+
+	IpcHandler {
+		function open(): void {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+
+		function openFreeze(): void {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+
+		target: "picker"
+	}
+
+	CustomShortcut {
+		name: "screenshot"
+
+		onPressed: {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+
+	CustomShortcut {
+		name: "screenshotFreeze"
+
+		onPressed: {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+}

Helpers/Hyprsunset.qml

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

Helpers/NetworkUsage.qml

@@ -0,0 +1,242 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import ZShell.Internal
+import ZShell.Config
+
+Singleton {
+	id: root
+
+	property real _downloadSpeed: 0
+	property real _downloadTotal: 0
+
+	property real _initialRxBytes: 0
+	property real _initialTxBytes: 0
+	property bool _initialized: false
+
+	property real _prevRxBytes: 0
+	property real _prevTimestamp: 0
+	property real _prevTxBytes: 0
+	property real _uploadSpeed: 0
+	property real _uploadTotal: 0
+
+	readonly property CircularBuffer downloadBuffer: _downloadBuffer
+
+	readonly property real downloadSpeed: _downloadSpeed
+
+	readonly property real downloadTotal: _downloadTotal
+	readonly property int historyLength: Config.dashboard.performance.showVram ? 70 : 30
+	property int refCount: 0
+	readonly property CircularBuffer uploadBuffer: _uploadBuffer
+	readonly property real uploadSpeed: _uploadSpeed
+	readonly property real uploadTotal: _uploadTotal
+
+function resetSampling(): void {
+	netDevFile.reload();
+
+	const content = netDevFile.text();
+	if (!content)
+		return;
+
+	const data = root.parseNetDev(content);
+	const now = Date.now();
+
+	root._prevRxBytes = data.rx;
+	root._prevTxBytes = data.tx;
+	root._prevTimestamp = now;
+}
+
+	function formatBytes(bytes: real): var {
+		// Handle negative or invalid values
+		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
+			return {
+				value: 0,
+				unit: "B/s"
+			};
+		}
+
+		if (bytes < 1024) {
+			return {
+				value: bytes,
+				unit: "B/s"
+			};
+		} else if (bytes < 1024 * 1024) {
+			return {
+				value: bytes / 1024,
+				unit: "KB/s"
+			};
+		} else if (bytes < 1024 * 1024 * 1024) {
+			return {
+				value: bytes / (1024 * 1024),
+				unit: "MB/s"
+			};
+		} else {
+			return {
+				value: bytes / (1024 * 1024 * 1024),
+				unit: "GB/s"
+			};
+		}
+	}
+
+	function formatBytesTotal(bytes: real): var {
+		// Handle negative or invalid values
+		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
+			return {
+				value: 0,
+				unit: "B"
+			};
+		}
+
+		if (bytes < 1024) {
+			return {
+				value: bytes,
+				unit: "B"
+			};
+		} else if (bytes < 1024 * 1024) {
+			return {
+				value: bytes / 1024,
+				unit: "KB"
+			};
+		} else if (bytes < 1024 * 1024 * 1024) {
+			return {
+				value: bytes / (1024 * 1024),
+				unit: "MB"
+			};
+		} else {
+			return {
+				value: bytes / (1024 * 1024 * 1024),
+				unit: "GB"
+			};
+		}
+	}
+
+	function parseNetDev(content: string): var {
+		const lines = content.split("\n");
+		let totalRx = 0;
+		let totalTx = 0;
+
+		for (let i = 2; i < lines.length; i++) {
+			const line = lines[i].trim();
+			if (!line)
+				continue;
+
+			const parts = line.split(/\s+/);
+			if (parts.length < 10)
+				continue;
+
+			const iface = parts[0].replace(":", "");
+			// Skip loopback interface
+			if (iface === "lo")
+				continue;
+
+			const rxBytes = parseFloat(parts[1]) || 0;
+			const txBytes = parseFloat(parts[9]) || 0;
+
+			totalRx += rxBytes;
+			totalTx += txBytes;
+		}
+
+		return {
+			rx: totalRx,
+			tx: totalTx
+		};
+	}
+
+	CircularBuffer {
+		id: _downloadBuffer
+
+		capacity: root.historyLength + 1
+	}
+
+	CircularBuffer {
+		id: _uploadBuffer
+
+		capacity: root.historyLength + 1
+	}
+
+	FileView {
+		id: netDevFile
+
+		path: "/proc/net/dev"
+	}
+
+	Timer {
+		interval: Config.dashboard.resourceUpdateInterval
+		repeat: true
+		running: true
+		triggeredOnStart: true
+
+		onTriggered: {
+			if (root.refCount <= 0) {
+				root.resetSampling();
+				return;
+			}
+
+			netDevFile.reload();
+			const content = netDevFile.text();
+			if (!content)
+				return;
+
+			const data = root.parseNetDev(content);
+			const now = Date.now();
+
+			if (!root._initialized) {
+				root._initialRxBytes = data.rx;
+				root._initialTxBytes = data.tx;
+				root._prevRxBytes = data.rx;
+				root._prevTxBytes = data.tx;
+				root._prevTimestamp = now;
+				root._initialized = true;
+				return;
+			}
+
+			const timeDelta = (now - root._prevTimestamp) / 1000; // seconds
+			if (timeDelta > 0) {
+				// Calculate byte deltas
+				let rxDelta = data.rx - root._prevRxBytes;
+				let txDelta = data.tx - root._prevTxBytes;
+
+				// Handle counter overflow (when counters wrap around from max to 0)
+				// This happens when counters exceed 32-bit or 64-bit limits
+				if (rxDelta < 0) {
+					// Counter wrapped around - assume 64-bit counter
+					rxDelta += Math.pow(2, 64);
+				}
+				if (txDelta < 0) {
+					txDelta += Math.pow(2, 64);
+				}
+
+				// Calculate speeds
+				root._downloadSpeed = rxDelta / timeDelta;
+				root._uploadSpeed = txDelta / timeDelta;
+
+				if (root._downloadSpeed >= 0 && isFinite(root._downloadSpeed))
+					_downloadBuffer.push(root._downloadSpeed);
+
+				if (root._uploadSpeed >= 0 && isFinite(root._uploadSpeed))
+					_uploadBuffer.push(root._uploadSpeed);
+			}
+
+			// Calculate totals with overflow handling
+			let downTotal = data.rx - root._initialRxBytes;
+			let upTotal = data.tx - root._initialTxBytes;
+
+			// Handle counter overflow for totals
+			if (downTotal < 0) {
+				downTotal += Math.pow(2, 64);
+			}
+			if (upTotal < 0) {
+				upTotal += Math.pow(2, 64);
+			}
+
+			root._downloadTotal = downTotal;
+			root._uploadTotal = upTotal;
+
+			root._prevRxBytes = data.rx;
+			root._prevTxBytes = data.tx;
+			root._prevTimestamp = now;
+		}
+	}
+}

Helpers/Picker.qml

@@ -41,9 +41,8 @@ Item {
 	property real rsy: Math.min(sy, ey)
 	readonly property real scaleRatio: Hypr.monitorFor(screen).scale
 	required property ShellScreen screen
-	required property ScreenState screenState
 	property real sh: Math.abs(sy - ey)
-	readonly property color shadowColor: Hypr.options.decoration.shadow?.color ?? "black"
+	readonly property color shadowColor: Hypr.options.decoration.shadow.color
 	readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
 	readonly property var shadowOffset: Hypr.options.decoration.shadow.offset
 	readonly property int shadowRange: Hypr.options.decoration.shadow.range
@@ -98,6 +97,10 @@ Item {
 		const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
 		const postCmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : null;
 
+		overlay.visible = border.visible = false;
+		handles.visible = false;
+		toolbar.visible = false;
+
 		ZShellIo.saveItem(captureLayer, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => {
 			const finalize = finalPath => {
 				if (copyToClipboard) {
@@ -126,22 +129,22 @@ Item {
 	Behavior on rsx {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		Anim {}
+		ExAnim {}
 	}
 	Behavior on rsy {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		Anim {}
+		ExAnim {}
 	}
 	Behavior on sh {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		Anim {}
+		ExAnim {}
 	}
 	Behavior on sw {
 		enabled: !selectArea.pressed && root.mode === "select"
 
-		Anim {}
+		ExAnim {}
 	}
 	Behavior on opacity {
 		Anim {
@@ -151,7 +154,7 @@ Item {
 
 	Component.onCompleted: {
 		Hypr.extras.refreshOptions();
-		root.forceActiveFocus();
+		screencopy.active = true;
 
 		opacity = 1;
 
@@ -216,63 +219,13 @@ Item {
 		onReleased: root.enterEditMode()
 	}
 
-	Connections {
-		function onClosingChanged(): void {
-			if (root.loader.closing)
-				closeAnim.start();
-			else {
-				closeAnim.stop();
-				returnAnim.start();
-			}
-		}
-
-		target: root.loader
-	}
-
-	ParallelAnimation {
-		id: returnAnim
-
-		Anim {
-			duration: 300
-			property: "opacity"
-			target: root
-			to: 1
-		}
-
-		Anim {
-			property: "rsx"
-			target: root
-			to: Math.min(root.sx, root.ex)
-		}
-
-		Anim {
-			property: "rsy"
-			target: root
-			to: Math.min(root.sy, root.ey)
-		}
-
-		Anim {
-			property: "sw"
-			target: root
-			to: Math.abs(root.sx - root.ex)
-		}
-
-		Anim {
-			property: "sh"
-			target: root
-			to: Math.abs(root.sy - root.ey)
-		}
-	}
-
 	SequentialAnimation {
 		id: closeAnim
 
-		ScriptAction {
+		PropertyAction {
-			script: {
+			property: "closing"
-				const states = ShellState.allStates();
+			target: root.loader
-				for (const s of states)
+			value: true
-					s.screenshot = false;
-			}
 		}
 
 		ParallelAnimation {
@@ -283,19 +236,19 @@ Item {
 				to: 0
 			}
 
-			Anim {
+			ExAnim {
 				properties: "rsx,rsy"
 				target: root
 				to: 0
 			}
 
-			Anim {
+			ExAnim {
 				property: "sw"
 				target: root
 				to: root.screen.width
 			}
 
-			Anim {
+			ExAnim {
 				property: "sh"
 				target: root
 				to: root.screen.height
@@ -314,12 +267,17 @@ Item {
 
 		anchors.fill: parent
 
-		ScreencopyView {
+		Loader {
 			id: screencopy
 
+			active: false
 			anchors.fill: parent
-			captureSource: root.screen
+			asynchronous: true
-			paintCursor: false
+
+			sourceComponent: ScreencopyView {
+				captureSource: root.screen
+				paintCursor: false
+			}
 		}
 
 		AnnotationCanvas {
@@ -328,7 +286,6 @@ Item {
 			anchors.fill: parent
 			inkColor: root.inkColor
 			layer.enabled: true
-			selection: selectionRect
 			tool: root.mode === "edit" && root.tool !== "move" ? root.tool : "none"
 
 			layer.effect: MultiEffect {
@@ -340,14 +297,15 @@ Item {
 		}
 	}
 
-	CustomRect {
+	Rectangle {
 		id: overlay
 
 		anchors.fill: parent
 		color: "white"
 		layer.enabled: true
 		opacity: 0.3
-		visible: screencopy.hasContent
+		radius: root.realRounding
+		visible: screencopy.item?.hasContent ?? false
 
 		layer.effect: MultiEffect {
 			maskEnabled: true
@@ -376,15 +334,16 @@ Item {
 		}
 	}
 
-	CustomRect {
+	Rectangle {
 		id: border
 
 		border.color: Colors.palette.m3primary
 		border.width: root.realBorderWidth
+		color: "transparent"
 		implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
 		implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
 		radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
-		visible: screencopy.hasContent
+		visible: screencopy.item?.hasContent ?? false
 		x: selectionRect.x - root.realBorderWidth
 		y: selectionRect.y - root.realBorderWidth
 
@@ -396,24 +355,17 @@ Item {
 	SelectionHandles {
 		id: handles
 
-		border: root.realBorderWidth
 		selH: root.sh
 		selW: root.sw
 		selX: root.rsx
 		selY: root.rsy
-		selection: selectionRect
-		tool: root.tool
 		visible: root.mode === "edit" && root.tool === "move"
 
 		onBoundsChanged: (x, y, w, h) => {
-			let nx = Math.max(0, x);
+			root.sx = x;
-			let ny = Math.max(0, y);
+			root.sy = y;
-			let nw = Math.min(w, root.screen.width - nx);
+			root.ex = x + w;
-			let nh = Math.min(h, root.screen.height - ny);
+			root.ey = y + h;
-			root.sx = nx;
-			root.sy = ny;
-			root.ex = nx + nw;
-			root.ey = ny + nh;
 		}
 		onMoveBy: (dx, dy) => {
 			const w = root.sw, h = root.sh;
@@ -444,4 +396,6 @@ Item {
 		onToolSelected: t => root.tool = t
 		onUndoRequested: annotations.undo()
 	}
+
+	component ExAnim: Anim {}
 }

Helpers/Picker/AnnotationCanvas.qml

@@ -8,13 +8,13 @@ Item {
 
 	property color inkColor: "#ff3b30"
 	property real inkWidth: 4
-	required property Rectangle selection
 	property string tool: "none"
 
 	signal changed
 
 	function clearAll() {
-		canvas.clear();
+		committedCanvas.clear();
+		previewCanvas.clear();
 		changed();
 	}
 
@@ -54,85 +54,90 @@ Item {
 	}
 
 	function undo() {
-		canvas.undoLastGroup();
+		committedCanvas.undoLastGroup();
 		changed();
 	}
 
 	anchors.fill: parent
-	enabled: tool !== "none"
 
 	StrokeCanvas {
-		id: canvas
+		id: committedCanvas
 
 		anchors.fill: parent
 		penColor: root.inkColor
 		penWidth: root.inkWidth
 	}
 
-	MouseArea {
+	StrokeCanvas {
+		id: previewCanvas
+
+		anchors.fill: parent
+		penColor: root.inkColor
+		penWidth: root.inkWidth
+	}
+
+	PointHandler {
 		id: drawHandler
 
 		property real startX
 		property real startY
+		property bool started: false
 
 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		anchors.fill: parent
+		enabled: root.tool !== "none"
-		cursorShape: undefined
-		enabled: root.enabled
 
-		onPositionChanged: e => {
+		onActiveChanged: {
-			const x = e.x;
+			if (active)
-			const y = e.y;
-
-			if (!pressed)
 				return;
 
 			if (root.tool === "pen") {
-				canvas.appendPoint(x, y);
+				committedCanvas.endStroke();
+			} else if (started) {
+				const pts = root.sampleShape(root.tool, startX, startY, point.position.x, point.position.y);
+				if (pts.length > 0) {
+					committedCanvas.beginStroke(pts[0][0], pts[0][1], true);
+					for (let i = 1; i < pts.length; i++)
+						committedCanvas.appendPoint(pts[i][0], pts[i][1]);
+					committedCanvas.endStroke();
+				}
+				previewCanvas.clear();
+			}
+			started = false;
+			root.changed();
+		}
+		onPointChanged: {
+			if (!active)
+				return;
+
+			if (point.pressedButtons & Qt.RightButton) {
+				root.clearAll();
 				return;
 			}
 
-			const pts = root.sampleShape(root.tool, startX, startY, x, y);
-			if (pts.length > 0) {
-				canvas.beginStroke(pts[0][0], pts[0][1], true);
-				for (let i = 1; i < pts.length; i++)
-					canvas.appendPoint(pts[i][0], pts[i][1]);
-			}
-		}
-		onPressed: e => {
-			if (e.button & Qt.LeftButton) {
-				startX = e.x;
-				startY = e.y;
-				canvas.beginStroke(e.x, e.y);
-			} else if (e.button & Qt.RightButton) {
-				root.clearAll();
-			}
-		}
-		onPressedChanged: if (!pressed)
-			canvas.endStroke()
-	}
-
-	HoverHandler {
-		cursorShape: {
-			if (root.tool === "none")
-				return undefined;
-
 			const x = point.position.x;
 			const y = point.position.y;
-			const withinXWidth = x > root.selection.x && x < root.selection.x + root.selection.implicitWidth;
-			const withinYHeight = y > root.selection.y && y < root.selection.y + root.selection.implicitHeight;
 
-			if (withinXWidth && withinYHeight) {
+			if (root.tool === "pen") {
-				if (!drawHandler.pressed)
+				if (!started) {
-					canvas.showHover(x, y);
+					started = true;
-				else
+					committedCanvas.beginStroke(x, y);
-					canvas.showHover(drawHandler.mouseX, drawHandler.mouseY);
+					return;
-				return Qt.BlankCursor;
+				}
-			} else {
+				committedCanvas.appendPoint(x, y);
-				canvas.hideHover();
+				return;
-				return undefined;
+			}
+
+			if (!started) {
+				started = true;
+				startX = point.pressPosition.x;
+				startY = point.pressPosition.y;
+			}
+			const pts = root.sampleShape(root.tool, startX, startY, x, y);
+			if (pts.length > 0) {
+				previewCanvas.beginStroke(pts[0][0], pts[0][1], true);
+				for (let i = 1; i < pts.length; i++)
+					previewCanvas.appendPoint(pts[i][0], pts[i][1]);
 			}
 		}
-		enabled: root.enabled
 	}
 }

Helpers/Picker/AnnotationToolbar.qml

@@ -73,7 +73,7 @@ CustomRect {
 					required property var modelData
 
 					color: root.tool === modelData.id ? "#3584e4" : "transparent"
-					font: Tokens.font.icon.medium
+					font.pointSize: Tokens.font.size.large
 					icon: tool.modelData.glyph
 					inactiveColor: root.tool === modelData.id ? Colors.palette.m3primary : "transparent"
 					inactiveOnColor: root.tool === modelData.id ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
@@ -103,7 +103,7 @@ CustomRect {
 					required property color modelData
 
 					fillWidth: false
-					font: Tokens.font.icon.medium
+					font.pointSize: Tokens.font.size.large
 					icon: ""
 					implicitHeight: buttonSize
 					implicitWidth: buttonSize
@@ -128,7 +128,7 @@ CustomRect {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
-				font: Tokens.font.icon.medium
+				font.pointSize: Tokens.font.size.large
 				icon: "undo"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -140,7 +140,7 @@ CustomRect {
 			}
 
 			IconButton {
-				font: Tokens.font.icon.medium
+				font.pointSize: Tokens.font.size.large
 				icon: "delete_history"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -152,7 +152,7 @@ CustomRect {
 			}
 
 			IconButton {
-				font: Tokens.font.icon.medium
+				font.pointSize: Tokens.font.size.large
 				icon: "content_copy"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -164,7 +164,7 @@ CustomRect {
 			}
 
 			IconButton {
-				font: Tokens.font.icon.medium
+				font.pointSize: Tokens.font.size.large
 				icon: "delete_forever"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -176,7 +176,7 @@ CustomRect {
 			}
 
 			IconButton {
-				font: Tokens.font.icon.medium
+				font.pointSize: Tokens.font.size.large
 				icon: "check"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface

Helpers/Picker/SelectionHandles.qml

@@ -1,23 +1,18 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import ZShell.Internal
-import qs.Services
 
 Item {
 	id: root
 
-	required property int border
+	property color handleBorder: "#3584e4"
-	property color handleBorder: Colors.palette.m3primary
+	property color handleFill: "white"
-	property color handleFill: Colors.palette.m3onPrimary
 	property real hs: 12
 	property real minSize: 24
 	required property real selH
 	required property real selW
 	required property real selX
 	required property real selY
-	required property Rectangle selection
-	required property string tool
 
 	signal boundsChanged(x: real, y: real, w: real, h: real)
 	signal dragFinished
@@ -28,16 +23,12 @@ Item {
 	x: selX
 	y: selY
 
-	Component.onDestruction: Cursor.clearOverride()
-
 	DragHandler {
 		id: moveHandler
 
 		property real accumX: 0
 		property real accumY: 0
 
-		cursorShape: undefined
-		dragThreshold: 0
 		target: null
 
 		onActiveChanged: {
@@ -54,63 +45,51 @@ Item {
 		}
 	}
 
-	HoverHandler {
-		cursorShape: {
-			if (root.tool !== "move")
-				return undefined;
-
-			if ((moveHandler.centroid.pressedButtons & Qt.LeftButton) && moveHandler.active)
-				return Qt.ClosedHandCursor;
-			else
-				return Qt.OpenHandCursor;
-		}
-	}
-
 	Handle {
 		edge: "tl"
-		x: -(root.hs + root.border) / 2
+		x: -root.hs / 2
-		y: -(root.hs + root.border) / 2
+		y: -root.hs / 2
 	}
 
 	Handle {
 		edge: "t"
 		x: root.width / 2 - root.hs / 2
-		y: -(root.hs + root.border) / 2
+		y: -root.hs / 2
 	}
 
 	Handle {
 		edge: "tr"
-		x: root.width - root.hs / 2 + root.border / 2
+		x: root.width - root.hs / 2
-		y: -(root.hs + root.border) / 2
+		y: -root.hs / 2
 	}
 
 	Handle {
 		edge: "r"
-		x: root.width - root.hs / 2 + root.border / 2
+		x: root.width - root.hs / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
 	Handle {
 		edge: "br"
-		x: root.width - root.hs / 2 + root.border / 2
+		x: root.width - root.hs / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		y: root.height - root.hs / 2
 	}
 
 	Handle {
 		edge: "b"
 		x: root.width / 2 - root.hs / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		y: root.height - root.hs / 2
 	}
 
 	Handle {
 		edge: "bl"
-		x: -(root.hs + root.border) / 2
+		x: -root.hs / 2
-		y: root.height - root.hs / 2 + root.border / 2
+		y: root.height - root.hs / 2
 	}
 
 	Handle {
 		edge: "l"
-		x: -(root.hs + root.border) / 2
+		x: -root.hs / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
@@ -128,8 +107,6 @@ Item {
 		z: 10
 
 		HoverHandler {
-			id: hover
-
 			cursorShape: {
 				switch (handle.edge) {
 				case "tl":
@@ -155,7 +132,6 @@ Item {
 			property real startX
 			property real startY
 
-			dragThreshold: 0
 			grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.TakeOverForbidden
 			target: null
 
@@ -165,10 +141,8 @@ Item {
 					startY = root.y;
 					startW = root.width;
 					startH = root.height;
-					Cursor.setOverride(hover.cursorShape);
 				} else {
 					root.dragFinished();
-					Cursor.clearOverride();
 				}
 			}
 			onTranslationChanged: {

Helpers/Strings.qml

@@ -5,15 +5,6 @@ import Quickshell
 Singleton {
 	property var _regexCache: ({})
 
-	function percent(value: int): string {
-		// TRANSLATORS: %1 = a number
-		return qsTr("%1%").arg(value);
-	}
-
-	function percentOne(value: real): string {
-		return percent(Math.round(value * 100));
-	}
-
 	function testRegexList(filterList: list<string>, target: string): bool {
 		const regexChecker = /^\^.*\$$/;
 		for (const filter of filterList) {

Helpers/Visibilities.qml

@@ -0,0 +1,16 @@
+pragma Singleton
+
+import Quickshell
+
+Singleton {
+	property var bars: new Map()
+	property var screens: new Map()
+
+	function getForActive(): PersistentProperties {
+		return screens.get(Hypr.focusedMonitor);
+	}
+
+	function load(screen: ShellScreen, visibilities: var): void {
+		screens.set(Hypr.monitorFor(screen), visibilities);
+	}
+}

Helpers/Wallpapers.qml

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

Helpers/Weather.qml

@@ -3,36 +3,25 @@ pragma Singleton
 import QtQuick
 import Quickshell
 import ZShell
-import ZShell.Internal
 import ZShell.Config
 
 Singleton {
 	id: root
 
 	readonly property var cachedCities: new Map()
+	property var cc
+	property string city
 	readonly property string description: cc?.weatherDesc ?? qsTr("No weather")
 	readonly property string feelsLike: formatTemp(cc?.feelsLikeC)
+	property list<var> forecast
+	property list<var> hourlyForecast
 	readonly property int humidity: cc?.humidity ?? 0
 	readonly property string icon: cc ? Icons.getWeatherIcon(cc.weatherCode) : "cloud_alert"
+	property string loc
 	readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
 	readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
 	readonly property string temp: formatTemp(cc?.tempC)
 	readonly property real windSpeed: cc?.windSpeed ?? 0
-	readonly property CircularBuffer precipitationForecast: precipitationBuffer
-
-	property var cc
-	property string city
-	property list<var> forecast
-	property list<var> hourlyForecast
-	readonly property int currentHourIndex: {
-		const now = new Date();
-		for (let i = 0; i < hourlyForecast.length; i++) {
-			if (new Date(hourlyForecast[i].timestamp.replace("T", " ")) >= now)
-				return i;
-		}
-		return -1;
-	}
-	property string loc
 
 	function fetchCityFromCoords(coords: string): void {
 		if (cachedCities.has(coords)) {
@@ -123,12 +112,11 @@ Singleton {
 			forecast = forecastList;
 
 			const hourlyList = [];
-			const startOfToday = new Date();
+			const now = new Date();
-			startOfToday.setHours(0, 0, 0, 0);
 			for (let i = 0; i < json.hourly.time.length; i++) {
 				const time = new Date(json.hourly.time[i].replace("T", " "));
 
-				if (time < startOfToday)
+				if (time < now)
 					continue;
 
 				hourlyList.push({
@@ -141,10 +129,6 @@ Singleton {
 				});
 			}
 			hourlyForecast = hourlyList;
-			precipitationBuffer.clear();
-
-			for (const hour of hourlyList)
-				precipitationBuffer.push(hour.precipChance);
 		});
 	}
 
@@ -274,11 +258,6 @@ Singleton {
 
 	onLocChanged: fetchWeatherData()
 
-	CircularBuffer {
-		id: precipitationBuffer
-		capacity: 24
-	}
-
 	Connections {
 		function onWeatherLocationChanged(): void {
 			root.reload();

Modules/Bar/Bar.qml

@@ -4,7 +4,6 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
-import qs.Components
 import qs.Modules.Bar.Components
 import qs.Modules.Bar.Popouts
 
@@ -17,12 +16,12 @@ GridLayout {
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
-	required property ScreenState screenState
 	readonly property int vPadding: 6
+	required property PersistentProperties visibilities
 
 	function axisCenterOf(item: Item): real {
 		const c = item.mapToItem(root, item.implicitWidth / 2, item.implicitHeight / 2);
-		return horizontal ? Math.floor(c.x) : Math.floor(c.y);
+		return horizontal ? c.x : c.y;
 	}
 
 	function checkPopout(pos: real): void {
@@ -35,7 +34,7 @@ GridLayout {
 			return;
 		}
 
-		if (screenState.sidebar || screenState.dashboard || screenState.resources || screenState.settings)
+		if (visibilities.sidebar || visibilities.dashboard || visibilities.resources || visibilities.settings)
 			return;
 
 		if (id === "statusIcons" && Config.bar.popouts.statusIcons) {
@@ -89,10 +88,10 @@ GridLayout {
 			role: "id"
 
 			DelegateChoice {
-				roleValue: "nightlight"
+				roleValue: "hyprsunset"
 
 				delegate: EntryWrapper {
-					NightlightWidget {
+					HyprsunsetWidget {
 						horizontal: root.horizontal
 						visible: !root.fullscreen || root.isHovered
 					}
@@ -150,7 +149,7 @@ GridLayout {
 				delegate: EntryWrapper {
 					Resources {
 						horizontal: root.horizontal
-						screenState: root.screenState
+						visibilities: root.visibilities
 						visible: !root.fullscreen || root.isHovered
 					}
 				}
@@ -174,7 +173,7 @@ GridLayout {
 					NotifBell {
 						horizontal: root.horizontal
 						popouts: root.popouts
-						screenState: root.screenState
+						visibilities: root.visibilities
 						visible: !root.fullscreen || root.isHovered
 					}
 				}
@@ -188,7 +187,7 @@ GridLayout {
 						horizontal: root.horizontal
 						loader: root
 						popouts: root.popouts
-						screenState: root.screenState
+						visibilities: root.visibilities
 						visible: !root.fullscreen || root.isHovered
 					}
 				}
@@ -210,7 +209,8 @@ GridLayout {
 				roleValue: "network"
 
 				delegate: EntryWrapper {
-					NetworkWidget {}
+					NetworkWidget {
+					}
 				}
 			}
 

Modules/Bar/BarLoader.qml

@@ -10,7 +10,7 @@ Item {
 	id: root
 
 	readonly property int clampedExtent: Math.max(Config.bar.border, extent)
-	readonly property int contentThickness: Math.floor(Math.max(Config.bar.height, Tokens.sizes.bar.innerSize * (horizontal ? 1 : 1.5))) + padding * 2
+	readonly property int contentThickness: Math.floor(Math.max(Config.bar.height, Tokens.bar.innerSize * (horizontal ? 1 : 1.5))) + padding * 2
 	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentThickness
 	property real extent: fullscreen ? 0 : Config.bar.border
 	required property bool fullscreen
@@ -21,9 +21,9 @@ Item {
 	required property ClipWrapper popoutsWrapper
 	required property string position
 	required property ShellScreen screen
-	readonly property bool shouldBeVisible: (!fullscreen && (!Config.bar.autoHide || screenState.bar)) || isHovered
+	readonly property bool shouldBeVisible: (!fullscreen && (!Config.bar.autoHide || visibilities.bar)) || isHovered
 	readonly property int vPadding: 6
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	function checkPopout(pos: real): void {
 		(content.item as Bar)?.checkPopout(pos);
@@ -85,7 +85,7 @@ Item {
 			popouts: root.popouts
 			popoutsWrapper: root.popoutsWrapper
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 }

Modules/Bar/Border.qml

@@ -0,0 +1,49 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Effects
+import ZShell.Config
+import qs.Components
+import qs.Services
+
+Item {
+	id: root
+
+	required property Item bar
+	required property PersistentProperties visibilities
+
+	anchors.fill: parent
+
+	CustomRect {
+		anchors.fill: parent
+		anchors.margins: -1
+		color: Colors.palette.m3surface
+		layer.enabled: true
+
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskInverted: true
+			maskSource: mask
+			maskSpreadAtMin: 1
+			maskThresholdMin: 0.5
+		}
+	}
+
+	Item {
+		id: mask
+
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false
+
+		Rectangle {
+			anchors.fill: parent
+			anchors.margins: Config.bar.border + 1
+			anchors.topMargin: root.bar.implicitHeight + 1
+			radius: Config.bar.border > 0 ? Config.bar.rounding : 0
+			topLeftRadius: Config.bar.rounding
+			topRightRadius: Config.bar.rounding
+		}
+	}
+}

Modules/Bar/Components/Clock.qml

@@ -13,8 +13,7 @@ import qs.Services
 WidgetBase {
 	id: root
 
-	readonly property font font: Tokens.font.clock.family(Config.appearance.font.family.clock).build()
+	readonly property color contentColor: visibilities.dashboard ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-	readonly property color contentColor: Colors.palette.m3onSurface
 	readonly property string effectiveFormat: {
 		let fmt = Config.general.dateFormat;
 		if (!root.horizontal)
@@ -45,11 +44,10 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property int roundedWidth: Math.round(timeText.implicitWidth)
+	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
-	readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
+	required property PersistentProperties visibilities
-	readonly property real size: horizontal ? evenWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
-	required property ScreenState screenState
 
+	color: visibilities.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : size
 	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
@@ -59,7 +57,7 @@ WidgetBase {
 
 		anchors.centerIn: parent
 		color: root.contentColor
-		font: root.font
+		font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 		height: implicitHeight
 		text: Time.dateStr
 		visible: root.horizontal
@@ -85,7 +83,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: root.font
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 				text: Qt.formatDateTime(Time.date, modelData)
 
 				Behavior on color {
@@ -114,7 +112,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: root.font
+				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 				text: {
 					if (modelData.includes("h"))
 						return Time.hourStr;
@@ -134,7 +132,7 @@ WidgetBase {
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
 			color: root.contentColor
-			font: root.font
+			font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
 			text: Qt.formatDateTime(Time.date, "AP")
 			visible: Config.services.useTwelveHourClock && root.formatParts.timeTokens.length > 0
 
@@ -143,4 +141,13 @@ WidgetBase {
 			}
 		}
 	}
+
+	StateLayer {
+		acceptedButtons: Qt.LeftButton
+		color: root.contentColor
+
+		onClicked: {
+			root.visibilities.dashboard = !root.visibilities.dashboard;
+		}
+	}
 }

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -24,11 +24,12 @@ Row {
 		color: Battery.getColors(root.percentage, root.devState).bg
 		height: root.batHeight
 		radius: root.radius
-		width: root.batWidth - 1
+		width: root.batWidth
 
 		CustomText {
 			color: Battery.getColors(root.percentage, root.devState).fg
-			font: Tokens.font.body.builders.small.size(11).weight(Font.Bold).build()
+			font.pointSize: Tokens.font.size.larger / 1.5
+			font.weight: 800
 			height: track.height
 			horizontalAlignment: Text.AlignHCenter
 			text: Math.round(root.percentage * 100)
@@ -59,7 +60,8 @@ Row {
 
 					clip: true
 					color: Battery.getColors(root.percentage, root.devState).bg
-					font: Tokens.font.body.builders.small.size(11).weight(Font.Bold).build()
+					font.pointSize: Tokens.font.size.larger / 1.5
+					font.weight: 800
 					height: track.height
 					horizontalAlignment: Text.AlignHCenter
 					text: Math.round(root.percentage * 100)

Modules/Bar/Components/Common/WidgetBase.qml

@@ -6,7 +6,7 @@ import qs.Services
 CustomRect {
 	id: root
 
-	readonly property int baseSize: horizontal ? Math.max(Config.bar.height, Tokens.sizes.bar.innerSize) : Math.max(Config.bar.height, Math.floor(Tokens.sizes.bar.innerSize * 1.5))
+	readonly property int baseSize: horizontal ? Math.max(Config.bar.height, Tokens.bar.innerSize) : Math.max(Config.bar.height, Math.floor(Tokens.bar.innerSize * 1.5))
 	required property bool horizontal
 
 	color: Colors.tPalette.m3surfaceContainer

Modules/Bar/Components/HyprsunsetWidget.qml

@@ -8,15 +8,15 @@ import qs.Services
 WidgetBase {
 	id: root
 
-	property bool tempEnabled: Nightlight.enabled
+	property bool tempEnabled: Hyprsunset.enabled
 
 	color: root.tempEnabled ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	radius: Tokens.rounding.full
 
 	StateLayer {
 		onClicked: {
-			Nightlight.toggleNightLight();
+			Hyprsunset.toggleNightLight();
-			Nightlight.manualToggle = true;
+			Hyprsunset.manualToggle = true;
 		}
 	}
 
@@ -25,11 +25,12 @@ WidgetBase {
 		animate: true
 		color: root.tempEnabled ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		fill: root.tempEnabled ? 1 : 0
-		fontStyle: Tokens.font.icon.small
+		font.pointSize: Tokens.font.size.larger
 		text: root.tempEnabled ? "lightbulb" : "light_off"
 
 		Behavior on fill {
-			Anim {}
+			Anim {
+			}
 		}
 	}
 }

Modules/Bar/Components/MediaWidget.qml

@@ -13,18 +13,20 @@ WidgetBase {
 	readonly property int textWidth: Math.min(metrics.width, 200)
 
 	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.small * 2
-	implicitWidth: horizontal ? (layout.implicitWidth % 2 === 0 ? layout.implicitWidth : layout.implicitWidth + 1) + Tokens.padding.small * 2 : baseSize
+	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 
 	TextMetrics {
@@ -45,14 +47,15 @@ WidgetBase {
 		columns: root.horizontal ? -1 : 1
 
 		Behavior on implicitWidth {
-			Anim {}
+			Anim {
+			}
 		}
 
 		MaterialIcon {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
 			animate: true
 			color: Players.active?.isPlaying ? Colors.palette.m3primary : Colors.palette.m3onSurface
-			fontStyle: Tokens.font.icon.small
+			font.pointSize: Tokens.font.size.larger
 			text: Players.active?.isPlaying ? "music_note" : "music_off"
 		}
 
@@ -62,6 +65,7 @@ WidgetBase {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
 			animate: true
 			color: Players.active?.isPlaying ? Colors.palette.m3primary : Colors.palette.m3onSurface
+			font.pointSize: Tokens.font.size.normal
 			horizontalAlignment: Text.AlignHCenter
 			implicitHeight: root.horizontal ? root.implicitHeight : root.textWidth
 			implicitWidth: root.horizontal ? root.textWidth : root.implicitWidth

Modules/Bar/Components/NotifBell.qml

@@ -11,33 +11,35 @@ WidgetBase {
 	id: root
 
 	required property Wrapper popouts
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
-	color: screenState.sidebar ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
+	color: visibilities.sidebar ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	radius: Tokens.rounding.full
 
 	MaterialIcon {
 		id: notificationCenterIcon
 
 		anchors.centerIn: parent
-		color: root.screenState.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+		color: root.visibilities.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-		fill: root.screenState.sidebar ? 1 : 0
+		fill: root.visibilities.sidebar ? 1 : 0
-		fontStyle: Tokens.font.icon.size(16).build()
+		font.pointSize: Tokens.font.size.larger
 		text: NotifServer.list.length ? "\uf4fe" : "\ue7f4"
 
 		Behavior on color {
-			CAnim {}
+			CAnim {
+			}
 		}
 		Behavior on fill {
-			Anim {}
+			Anim {
+			}
 		}
 	}
 
 	StateLayer {
-		color: root.screenState.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+		color: root.visibilities.sidebar ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 
 		onClicked: {
-			root.screenState.sidebar = !root.screenState.sidebar;
+			root.visibilities.sidebar = !root.visibilities.sidebar;
 		}
 	}
 }

Modules/Bar/Components/Resource.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
+import QtQuick.Shapes
 import qs.Components
 import ZShell.Config
 import qs.Services
@@ -27,7 +27,8 @@ GridLayout {
 	percentage: 0
 
 	Behavior on animatedPercentage {
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: animatedPercentage = percentage
@@ -43,41 +44,31 @@ GridLayout {
 
 		Layout.preferredWidth: 16
 		color: root.iconColor
-		fontStyle: Tokens.font.icon.small
+		font.pointSize: Tokens.font.size.larger
 		text: root.icon
 	}
 
-	CustomRect {
+	CustomClippingRect {
-		id: track
-
 		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.extraSmall : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		radius: Tokens.rounding.full
 
-		Item {
+		CustomRect {
-			id: clipper
+			id: fill
 
-			anchors.bottom: root.horizontal ? parent.bottom : undefined
+			anchors.bottom: parent.bottom
-			anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
+			anchors.left: parent.left
-			anchors.left: root.horizontal ? undefined : parent.left
+			anchors.right: root.horizontal ? parent.right : undefined
-			anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
+			anchors.top: root.horizontal ? undefined : parent.top
-			clip: true
+			color: root.mainColor
-			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
+			implicitHeight: root.horizontal ? Math.ceil(root.percentage * parent.height) : 0
-			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
+			implicitWidth: root.horizontal ? 0 : Math.ceil(root.percentage * parent.width)
 
-			CustomRect {
+			// Behavior on implicitHeight {
-				anchors.bottom: root.horizontal ? parent.bottom : undefined
+			// 	Anim {
-				anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
+			// 	}
-				anchors.left: root.horizontal ? undefined : parent.left
+			// }
-				anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
-
-				color: root.mainColor
-				radius: track.radius
-
-				implicitHeight: track.height
-				implicitWidth: track.width
-			}
 		}
 	}
 }

Modules/Bar/Components/Resources.qml

@@ -12,18 +12,18 @@ import qs.Components
 WidgetBase {
 	id: root
 
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	clip: true
-	color: screenState.resources ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
+	color: visibilities.resources ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : gridLayout.implicitHeight + Tokens.padding.medium * 2
 	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.medium * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	StateLayer {
-		color: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+		color: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 
-		onClicked: root.screenState.resources = !root.screenState.resources
+		onClicked: root.visibilities.resources = !root.visibilities.resources
 	}
 
 	GridLayout {
@@ -33,7 +33,6 @@ WidgetBase {
 		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
 		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
 		columnSpacing: Tokens.spacing.small
-		rowSpacing: 0
 		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {
@@ -52,11 +51,10 @@ WidgetBase {
 			Layout.alignment: Qt.AlignVCenter
 			Layout.fillHeight: root.horizontal
 			Layout.fillWidth: !root.horizontal
-
 			horizontal: root.horizontal
 			icon: "memory"
-			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-			mainColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary
+			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary
 			percentage: Cpu.percentage
 			warningThreshold: 95
 		}
@@ -66,8 +64,8 @@ WidgetBase {
 			Layout.fillWidth: !root.horizontal
 			horizontal: root.horizontal
 			icon: "memory_alt"
-			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-			mainColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3secondary
+			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3secondary
 			percentage: Memory.percentage
 			warningThreshold: 80
 		}
@@ -77,8 +75,8 @@ WidgetBase {
 			Layout.fillWidth: !root.horizontal
 			horizontal: root.horizontal
 			icon: "gamepad"
-			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-			mainColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3tertiary
+			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3tertiary
 			percentage: Gpu.percentage
 		}
 
@@ -87,8 +85,8 @@ WidgetBase {
 			Layout.fillWidth: !root.horizontal
 			horizontal: root.horizontal
 			icon: "developer_board"
-			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+			iconColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-			mainColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary
+			mainColor: root.visibilities.resources ? Colors.palette.m3onPrimary : Colors.palette.m3primary
 			percentage: Gpu.memoryUsed / Gpu.memoryTotal
 		}
 	}

Modules/Bar/Components/StatusIcons.qml

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

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -6,25 +6,26 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: speaker
 
 	required property bool horizontal
 
 	animate: true
 	color: Audio.muted ? Colors.palette.m3error : Colors.palette.m3onSurface
 	fill: 1
-	fontStyle: Tokens.font.icon.small
+	font.pointSize: Tokens.font.size.larger
 	text: Audio.muted ? "volume_off" : "volume_up"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 }

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -6,25 +6,26 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: mic
 
 	required property bool horizontal
 
 	animate: true
 	color: (Audio.sourceMuted ?? false) ? Colors.palette.m3error : Colors.palette.m3onSurface
 	fill: 1
-	fontStyle: Tokens.font.icon.small
+	font.pointSize: Tokens.font.size.larger
 	text: Audio.sourceMuted ? "mic_off" : "mic"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 }

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -15,16 +15,20 @@ Item {
 	implicitWidth: currentItem?.implicitWidth ?? 0
 
 	Behavior on Layout.preferredHeight {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on Layout.preferredWidth {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: Battery.startDaemon()
@@ -36,7 +40,7 @@ Item {
 		anchors.centerIn: parent
 
 		sourceComponent: BatteryIcon {
-			devState: Battery.deviceStateString.toLowerCase()
+			devState: Battery.deviceStateString
 			percentage: Battery.currentPerc
 		}
 	}
@@ -63,7 +67,7 @@ Item {
 			Layout.alignment: Qt.AlignVCenter
 			animate: true
 			fill: 1
-			fontStyle: Tokens.font.icon.small
+			font.pointSize: Tokens.font.size.larger
 			text: {
 				if (PowerProfiles.profile === PowerProfile.PowerSaver)
 					return "energy_savings_leaf";

Modules/Bar/Components/Tray/TrayItem.qml

@@ -19,7 +19,7 @@ Item {
 	required property Wrapper popouts
 
 	function resolveIcon(app: string, icon: string): string {
-		if (app === "discord_status_icon_1" && Config.bar.tray.replaceIcons) {
+		if (app === "chrome_status_icon_1") {
 			return Quickshell.iconPath("discord-tray");
 		} else if (app === "AyuGramDesktop") {
 			if (icon === Quickshell.iconPath("com.ayugram.desktop-attention-symbolic"))
@@ -50,8 +50,6 @@ Item {
 		radius: Tokens.rounding.full
 
 		StateLayer {
-			id: layer
-
 			acceptedButtons: Qt.LeftButton | Qt.RightButton
 			anchors.fill: parent
 			color: icon.layer.enabled && root.current ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
@@ -64,10 +62,10 @@ Item {
 					root.popouts.currentName = `traymenu${root.ind}`;
 					root.popouts.currentCenter = Qt.binding(() => root.mapToItem(root.loader, root.implicitWidth / 2, 0).x);
 					root.popouts.hasCurrent = true;
-					if (screenState.sidebar || screenState.dashboard || screenState.settings) {
+					if (visibilities.sidebar || visibilities.dashboard || visibilities.settings) {
-						screenState.sidebar = false;
+						visibilities.sidebar = false;
-						screenState.dashboard = false;
+						visibilities.dashboard = false;
-						screenState.settings = false;
+						visibilities.settings = false;
 					}
 				}
 			}
@@ -79,7 +77,6 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
-		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Bar/Components/TrayIcons.qml

@@ -38,12 +38,11 @@ WidgetBase {
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 		rowSpacing: -2
-		columnSpacing: Tokens.spacing.extraSmall
 
 		Repeater {
 			id: repeater
 
-			model: SystemTray.items.values.filter(i => i.status !== Status.Passive && i.hasMenu)
+			model: SystemTray.items
 
 			TrayItem {
 				id: trayItem

Modules/Bar/Components/UpdatesWidget.qml

@@ -27,13 +27,14 @@ WidgetBase {
 
 		MaterialIcon {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
-			fontStyle: Tokens.font.icon.small
+			font.pointSize: root.horizontal ? Tokens.font.size.larger : Tokens.font.size.large
 			text: "package_2"
 		}
 
 		CustomText {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
 			color: root.textColor
+			font.pointSize: Tokens.font.size.normal
 			text: root.countUpdates
 		}
 	}

Modules/Bar/Components/WindowTitle.qml

@@ -52,7 +52,8 @@ Item {
 
 		elide: Qt.ElideRight
 		elideWidth: root.maxSize - (root.horizontal ? root.current.anchors.leftMargin : 0)
-		font: Tokens.font.body.small
+		font.family: "Rubik"
+		font.pointSize: Tokens.font.size.normal
 		text: Hypr.activeToplevel?.title ?? qsTr("Desktop")
 
 		onElideWidthChanged: root.current.text = elidedText
@@ -80,7 +81,8 @@ Item {
 		width: root.horizontal ? implicitWidth : implicitHeight
 
 		Behavior on opacity {
-			Anim {}
+			Anim {
+			}
 		}
 		transform: [
 			Translate {

Modules/Bar/Components/Workspaces.qml

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

Modules/Bar/Popouts/AudioPopout.qml

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

Modules/Bar/Popouts/UPowerPopout.qml

@@ -47,7 +47,6 @@ Column {
 
 			CustomText {
 				Layout.fillWidth: true
-				elide: CustomText.ElideRight
 				text: layout.modelData.model
 			}
 
@@ -181,7 +180,8 @@ Column {
 				}
 			]
 			transitions: Transition {
-				AnchorAnim {}
+				AnchorAnim {
+				}
 			}
 		}
 
@@ -245,7 +245,7 @@ Column {
 			anchors.centerIn: parent
 			color: profiles.current === text ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 			fill: profiles.current === text ? 1 : 0
-			fontStyle: Tokens.font.icon.extraLarge
+			font.pointSize: Tokens.font.size.large * 2
 			grade: Colors.light ? 0 : (text === "balance" ? -25 : 0)
 			text: parent.icon
 

Modules/Bar/Popouts/UpdatesPopout.qml

@@ -9,7 +9,7 @@ import qs.Modules
 import qs.Helpers
 import qs.Services
 
-CustomRect {
+CustomClippingRect {
 	id: root
 
 	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
@@ -36,17 +36,15 @@ CustomRect {
 			MaterialIcon {
 				id: noUpdatesIcon
 
-				anchors.centerIn: parent
+				anchors.horizontalCenter: parent.horizontalCenter
-				anchors.verticalCenterOffset: -noUpdatesText.implicitHeight
+				anchors.top: parent.top
 				color: Colors.tPalette.m3onSurfaceVariant
-				fontStyle: Tokens.font.icon.builders.large.size(48).weight(Font.DemiBold).build()
+				font.pointSize: Tokens.font.size.extraLarge * 3
 				horizontalAlignment: Text.AlignHCenter
 				text: "check"
 			}
 
 			CustomText {
-				id: noUpdatesText
-
 				anchors.horizontalCenter: parent.horizontalCenter
 				anchors.top: noUpdatesIcon.bottom
 				color: Colors.tPalette.m3onSurfaceVariant
@@ -73,7 +71,6 @@ CustomRect {
 			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 			implicitWidth: contentWidth
 			spacing: Tokens.spacing.medium
-			clip: true
 
 			delegate: CustomRect {
 				id: update
@@ -92,7 +89,7 @@ CustomRect {
 					anchors.rightMargin: Tokens.padding.small
 
 					MaterialIcon {
-						fontStyle: Tokens.font.icon.extraLarge
+						font.pointSize: Tokens.font.size.large * 2
 						text: "package_2"
 					}
 
@@ -103,7 +100,7 @@ CustomRect {
 							Layout.fillWidth: true
 							Layout.preferredHeight: 25
 							elide: Text.ElideRight
-							font: Tokens.font.title.medium
+							font.pointSize: Tokens.font.size.large
 							text: update.sections[0]
 						}
 
@@ -125,7 +122,7 @@ CustomRect {
 							Layout.preferredWidth: 125
 							animate: true
 							color: Colors.palette.m3tertiary
-							font: Tokens.font.title.medium
+							font.pointSize: Tokens.font.size.large
 							horizontalAlignment: Text.AlignHCenter
 							marqueeEnabled: true
 							pauseMs: 4000
@@ -136,7 +133,7 @@ CustomRect {
 						MaterialIcon {
 							Layout.fillHeight: true
 							color: Colors.palette.m3secondary
-							fontStyle: Tokens.font.icon.large
+							font.pointSize: Tokens.font.size.extraLarge
 							horizontalAlignment: Text.AlignHCenter
 							text: "arrow_right_alt"
 							verticalAlignment: Text.AlignVCenter
@@ -149,7 +146,7 @@ CustomRect {
 							Layout.preferredWidth: 120
 							animate: true
 							color: Colors.palette.m3primary
-							font: Tokens.font.title.medium
+							font.pointSize: Tokens.font.size.large
 							horizontalAlignment: Text.AlignHCenter
 							marqueeEnabled: true
 							pauseMs: 4000

Modules/Bar/Popouts/Wrapper.qml

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

Modules/Clipboard/Content.qml

@@ -14,7 +14,7 @@ Item {
 
 	readonly property int itemHeight: Config.clipboard.sizes.itemHeight
 	required property ShellScreen screen
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	implicitHeight: search.implicitHeight + entries.anchors.topMargin + ((view.spacing + itemHeight) * Config.clipboard.maxEntriesShown) - view.spacing
 	implicitWidth: Config.clipboard.sizes.width + preview.width + preview.anchors.leftMargin
@@ -25,7 +25,7 @@ Item {
 		searchField.forceActiveFocus();
 	}
 
-	ClipRect {
+	CustomClippingRect {
 		id: search
 
 		anchors.left: parent.left
@@ -49,12 +49,12 @@ Item {
 			Keys.onUpPressed: view.decrementCurrentIndex()
 			onAccepted: {
 				ClipHistory.copy(view.currentItem.modelData);
-				root.screenState.clipboard = false;
+				root.visibilities.clipboard = false;
 			}
 		}
 	}
 
-	CustomRect {
+	CustomClippingRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -64,10 +64,10 @@ Item {
 		color: Colors.tPalette.m3surfaceContainer
 		implicitWidth: ClipHistory.previewIsImage ? Math.max(Math.min(imagePreview.sourceSize.width + Tokens.padding.large * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth) : Math.max(Math.min(textPreviewColumn.width + textPreviewColumn.anchors.margins * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth)
 		radius: 25
-		clip: true
 
 		Behavior on implicitWidth {
-			Anim {}
+			Anim {
+			}
 		}
 
 		Column {
@@ -104,6 +104,7 @@ Item {
 							anchors.right: parent.right
 							anchors.verticalCenter: parent.verticalCenter
 							color: Colors.palette.m3onSurfaceVariant
+							font.pointSize: Tokens.font.size.small
 							text: lineRow.modelData.line
 						}
 					}
@@ -229,12 +230,11 @@ Item {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					Item {
+					CustomClippingRect {
 						id: textRect
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
-						clip: true
 
 						Item {
 							id: textWrapper
@@ -252,7 +252,7 @@ Item {
 								anchors.left: parent.left
 								anchors.margins: Tokens.padding.small
 								anchors.verticalCenter: parent.verticalCenter
-								fontStyle: Tokens.font.icon.large
+								font.pointSize: Tokens.font.size.large
 								text: clipItem.isImage ? "image" : "text_fields"
 							}
 

Modules/Clipboard/Wrapper.qml

@@ -11,8 +11,8 @@ Item {
 	property int contentHeight
 	property real offsetScale: shouldBeActive ? 0 : 1
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: screenState.clipboard && Config.clipboard.enabled
+	readonly property bool shouldBeActive: visibilities.clipboard && Config.clipboard.enabled
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight + Tokens.padding.small * 2
@@ -35,7 +35,7 @@ Item {
 
 		sourceComponent: Content {
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 }