Moved network related files, added network sub pages

.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

.qmlformat.ini

@@ -3,9 +3,8 @@ FunctionsSpacing=true
 IndentWidth=4
 MaxColumnWidth=-1
 NewlineType=native
-GroupAttributesTogether=false
+NormalizeOrder=true
 ObjectsSpacing=true
 SemicolonRule=always
-SingleLineEmptyObjects=true
 SortImports=false
 UseTabs=true

CMakeLists.txt

@@ -26,51 +26,49 @@ if(NOT DEFINED VERSION)
 	endif()
 endif()
 
-if(NOT DEFINED GIT_REVISION)
-	execute_process(COMMAND git rev-parse HEAD
-								WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-								OUTPUT_VARIABLE GIT_REVISION
-								OUTPUT_STRIP_TRAILING_WHITESPACE
-				)
-
-	if("${GIT_REVISION}" STREQUAL "")
-		message(FATAL_ERROR "GIT_REVISION is not set and failed to get from git")
-	endif()
-endif()
-
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 project(ZShell VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 message(STATUS "ZShell version: ${VERSION}")
 
-include(GNUInstallDirs)
-
 set(CMAKE_CXX_STANDARD 20)
 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(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "plugin;shell;m3shapes" CACHE STRING "Modules to build/install")
 
-set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
+set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
-set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
+set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
-set(INSTALL_QSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
+set(INSTALL_QSCONFDIR "etc/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
-set(INSTALL_GREETERCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
+set(INSTALL_GREETERCONFDIR "etc/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
 
 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>
 )
 
 
-if("cli" IN_LIST ENABLE_MODULES)
+if("shell" IN_LIST ENABLE_MODULES)
+	# Build settings index
+	find_package(Python3 COMPONENTS Interpreter REQUIRED)
+	set(SETTINGS_INDEX_JSON "${CMAKE_BINARY_DIR}/settings-index.json")
+	execute_process(
+		COMMAND ${Python3_EXECUTABLE}
+			"${CMAKE_SOURCE_DIR}/scripts/build-settings-index.py"
+			"${CMAKE_SOURCE_DIR}/Modules/Settings"
+			"${SETTINGS_INDEX_JSON}"
+		RESULT_VARIABLE SETTINGS_INDEX_RESULT
+	)
+	if(NOT SETTINGS_INDEX_RESULT EQUAL 0)
+		message(FATAL_ERROR "Failed to build settings search index")
+	endif()
+
 	# Nuitka compilation
 	set(ZSHELL_CLI_BUILD_DIR "${CMAKE_BINARY_DIR}/zshell-cli")
 	set(ZSHELL_CLI_DIST "${ZSHELL_CLI_BUILD_DIR}/zshell.dist")
@@ -190,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

@@ -16,11 +16,15 @@ CustomRect {
 	property color activeOnColor
 	property bool checked
 	property real checkedRadius: Tokens.rounding.medium
-	property real defaultRadius: Tokens.rounding.large
+	property real defaultRadius: Math.min(width, height) / 2
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property bool fillWidth
-	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
@@ -34,6 +34,7 @@ BusyIndicator {
 		anchors.fill: parent
 		bgColor: root.bgColor
 		fgColor: root.fgColor
+		hasEndIndicator: false
 		padding: root.padding
 		rotation: manager.rotation
 		startAngle: manager.startFraction * 360
@@ -53,6 +54,7 @@ BusyIndicator {
 		Anim {
 			duration: manager.completeEndDuration * Tokens.anim.durations.scale
 			properties: "opacity,internalStrokeWidth"
+			type: Anim.DefaultEffects
 		}
 	}
 

Components/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 {
@@ -28,9 +28,6 @@ Flickable {
 		interval: 10
 		running: root.doneFakeFlick
 
-		onTriggered: {
+		onTriggered: root.doneFakeFlick = false
-			root.doneFakeFlick = false;
-			root.returnToBounds();
-		}
 	}
 }

Components/CustomListView.qml

@@ -1,36 +1,33 @@
 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 {
-		// onRunningChanged: {
+		onRunningChanged: {
-		// 	if (!running && !root.doneFakeFlick) {
+			if (!running && !root.doneFakeFlick) {
-		// 		root.doneFakeFlick = true;
+				root.doneFakeFlick = true;
-		// 		root.flick(1, 1);
+				root.flick(1, 1);
-		// 		root.flick(-1, -1);
+				root.flick(-1, -1);
-		// 		Qt.callLater(() => root.cancelFlick());
+				Qt.callLater(() => root.cancelFlick());
-		// 	}
+			}
-		// }
+		}
 
 		Anim {
 			properties: "x,y"
-			type: Anim.DefaultEffects
 		}
 	}
 
-	// Timer {
+	Timer {
-	// 	interval: 10
+		interval: 10
-	// 	running: root.doneFakeFlick
+		running: root.doneFakeFlick
-	//
+
-	// 	onTriggered: {
+		onTriggered: root.doneFakeFlick = false
-	// 		root.doneFakeFlick = false;
+	}
-	// 	}
-	// }
 }

Components/CustomMouseArea.qml

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

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

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

Components/CustomScrollBar.qml

@@ -1,41 +1,32 @@
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Templates
-import qs.Services
+import qs.Helpers
 import ZShell.Config
+import qs.Services
 
 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
-	readonly property real axisContentPos: isHorizontal ? (reversed ? flickable.contentX : (flickable.contentX - flickable.originX)) : (reversed ? flickable.contentY : (flickable.contentY - flickable.originY))
-	readonly property real axisLength: isHorizontal ? root.width : root.height
 	readonly property real effectiveSize: Math.max(nonAnimHeight, root.minimumSize)
 	readonly property real effectiveTravel: Math.max(0, 1 - root.effectiveSize)
-	readonly property real nonAnimHeight: root.axisSize / root.axisContentSize
+	required property Flickable flickable
-	readonly property real nonAnimY: root.axisContentPos / root.axisContentSize
+	readonly property real nonAnimHeight: flickable.height / flickable.contentHeight
+	readonly property real nonAnimY: flickable.contentY / flickable.contentHeight
 	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)
+	readonly property bool reversed: 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
+	implicitWidth: Tokens.padding.extraSmall * 2
 
-	enabled: !ShellState.forActive().isDrawing
+	contentItem: Item {
-
+	}
-	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
-	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0
-
-	contentItem: Item {}
 	Behavior on position {
 		enabled: !fullMouse.pressed
 
-		Anim {}
+		Anim {
+		}
 	}
 
 	onHoveredChanged: {
@@ -56,27 +47,54 @@ ScrollBar {
 		target: root.flickable
 	}
 
-	Loader {
+	CustomClippingRect {
-		anchors.fill: parent
+		anchors.bottom: parent.bottom
-		active: root.size < 1
+		anchors.right: parent.right
-		sourceComponent: root.isHorizontal ? horizontalTrack : verticalTrack
+		anchors.top: parent.top
-	}
+		implicitWidth: handle.implicitWidth
+		radius: Tokens.rounding.full
 
-	Component {
+		CustomRect {
-		id: verticalTrack
+			id: handle
 
-		VerticalScrollBarTrack {
+			anchors.right: parent.right
-			scrollBar: root
+			color: Colors.palette.m3secondary
-			mouseArea: fullMouse
+			implicitHeight: root.height * root.effectiveSize
-		}
+			implicitWidth: fullMouse.pressed || fullMouse.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
-	}
+			opacity: {
+				if (!root.enabled)
+					return 0;
+				if (root.size === 1)
+					return 0;
+				if (fullMouse.pressed)
+					return 1;
+				if (fullMouse.containsMouse)
+					return 0.8;
+				if (root.policy === ScrollBar.AlwaysOn || root.shouldBeActive)
+					return 0.6;
+				return 0;
+			}
+			radius: Tokens.rounding.full
+			y: root.reversed ? root.height * (1 + root.nonAnimY) * root.travelScale : root.height * root.nonAnimY * root.travelScale
 
-	Component {
+			Behavior on implicitWidth {
-		id: horizontalTrack
+				Anim {
+				}
+			}
+			Behavior on opacity {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
 
-		HorizontalScrollBarTrack {
+			MouseArea {
-			scrollBar: root
+				id: mouse
-			mouseArea: fullMouse
+
+				acceptedButtons: Qt.NoButton
+				anchors.fill: parent
+				cursorShape: Qt.PointingHandCursor
+				hoverEnabled: true
+			}
 		}
 	}
 
@@ -93,40 +111,25 @@ ScrollBar {
 
 		property real pressOffset: 0
 
-		function contentPosFromThumbStart(thumbStart) {
+		function contentYFromThumbTop(thumbTop) {
-			var visualPos = root.effectiveTravel > 0 ? thumbStart / root.travelScale : 0;
+			var visualPos = root.effectiveTravel > 0 ? thumbTop / root.travelScale : 0;
-			return root.reversed ? (visualPos - 1) * root.axisContentSize : visualPos * root.axisContentSize;
+
+			return root.reversed ? (visualPos - 1) * root.flickable.contentHeight : visualPos * root.flickable.contentHeight;
 		}
 
 		function updateFromEvent(event) {
-			var eventPos = root.isHorizontal ? event.x : event.y;
+			var posInTrack = event.y / root.height;
-			var posInTrack = eventPos / root.axisLength;
+			var thumbTop = posInTrack - pressOffset;
-			var thumbStart = posInTrack - pressOffset;
+			thumbTop = Math.max(0, Math.min(root.effectiveTravel, thumbTop));
-			thumbStart = Math.max(0, Math.min(root.effectiveTravel, thumbStart));
 
-			var newPos = contentPosFromThumbStart(thumbStart);
+			root.flickable.contentY = contentYFromThumbTop(thumbTop);
-			if (root.isHorizontal)
-				root.flickable.contentX = newPos + (root.flickable.originX + (root.reversed ? root.flickable.contentWidth : 0));
-			else
-				root.flickable.contentY = newPos + (root.flickable.originY + (root.reversed ? root.flickable.contentHeight : 0));
 		}
 
-		function visualThumbStart() {
+		function visualThumbTop() {
 			const visualPos = root.reversed ? (1 + root.nonAnimY) : root.nonAnimY;
 			return visualPos * root.travelScale;
 		}
 
-		function onWheel(event: WheelEvent): void {
-			if (root.horizontal) {
-				event.accepted = false;
-				return;
-			}
-
-			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)));
-			root.position = newPos;
-		}
-
 		anchors.fill: parent
 		cursorShape: undefined
 		hoverEnabled: true
@@ -137,15 +140,24 @@ ScrollBar {
 				updateFromEvent(event);
 		}
 		onPressed: event => {
-			var currentStart = visualThumbStart();
+			var currentTop = visualThumbTop();
-			var currentEnd = currentStart + root.effectiveSize;
+			var currentBottom = currentTop + root.effectiveSize;
-			var eventPos = root.isHorizontal ? event.x : event.y;
+			var clickPos = event.y / root.height;
-			var clickPos = eventPos / root.axisLength;
 
-			var clickedInsideThumb = clickPos >= currentStart && clickPos <= currentEnd;
+			var clickedInsideThumb = clickPos >= currentTop && clickPos <= currentBottom;
-			pressOffset = clickedInsideThumb ? (clickPos - currentStart) : root.effectiveSize / 2;
+
+			if (clickedInsideThumb) {
+				pressOffset = clickPos - currentTop;
+			} else {
+				pressOffset = root.effectiveSize / 2;
+			}
 
 			updateFromEvent(event);
 		}
+		onWheel: event => {
+			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
+			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,29 @@ 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
+	property alias sLayer: stateLayer
+	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
@@ -150,8 +146,8 @@ TextFieldBase {
 
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
+				font.pointSize: Tokens.font.size.larger
 				text: root.leadingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 
@@ -166,7 +162,6 @@ TextFieldBase {
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
 				text: root.trailingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 	}
@@ -181,7 +176,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 +214,12 @@ TextFieldBase {
 					}
 				}
 				Behavior on strokeColor {
-					CAnim {}
+					CAnim {
+					}
 				}
 				Behavior on strokeWidth {
-					Anim {}
+					Anim {
+					}
 				}
 
 				PathLine {
@@ -297,7 +294,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

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

@@ -124,7 +124,7 @@ MouseArea {
 					model: root.items
 
 					CustomRect {
-						id: menuItem
+						id: item
 
 						readonly property bool active: modelData === root?.active
 						required property int index
@@ -142,13 +142,13 @@ MouseArea {
 						}
 
 						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;
 							}
 						}
@@ -162,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

@@ -1,86 +0,0 @@
-import QtQuick
-import QtQuick.Templates
-import ZShell.Config
-import qs.Services
-
-TextArea {
-	id: root
-
-	color: Colors.palette.m3onSurface
-	cursorVisible: !readOnly
-	font: Tokens.font.body.small
-	implicitHeight: contentHeight + topPadding + bottomPadding
-	implicitWidth: contentWidth + leftPadding + rightPadding
-	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: TextArea.NativeRendering
-	selectedTextColor: color
-	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
-	verticalAlignment: TextInput.AlignVCenter
-
-	Behavior on color {
-		CAnim {}
-	}
-	Behavior on selectionColor {
-		CAnim {}
-	}
-	cursorDelegate: Item {}
-
-	CustomRect {
-		id: cursor
-
-		property bool disableBlink
-
-		color: Colors.palette.m3primary
-		implicitHeight: root.cursorRectangle.height
-		implicitWidth: 1.5
-		radius: Tokens.rounding.largeIncreased
-		x: root.cursorRectangle.x
-		y: root.cursorRectangle.y
-
-		Behavior on x {
-			Anim {
-				duration: Tokens.anim.durations.expressiveFastEffects
-				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
-			}
-		}
-		Behavior on opacity {
-			Anim {
-				type: Anim.StandardSmall
-			}
-		}
-
-		Connections {
-			function onCursorPositionChanged(): void {
-				if (root.activeFocus && root.cursorVisible) {
-					cursor.opacity = 1;
-					cursor.disableBlink = true;
-					enableBlink.restart();
-				}
-			}
-
-			target: root
-		}
-
-		Timer {
-			id: enableBlink
-
-			interval: 500
-
-			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
-		}
-	}
-}

Components/TextEditBase.qml

@@ -1,96 +0,0 @@
-import QtQuick
-import QtQuick.Templates
-import ZShell.Config
-import qs.Services
-
-TextEdit {
-	id: root
-
-	property bool animateCursor: true
-	property alias cursor: cursor
-
-	color: Colors.palette.m3onSurface
-	cursorVisible: !readOnly
-	font: Tokens.font.body.small
-	renderType: TextField.NativeRendering
-	selectedTextColor: color
-	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
-	verticalAlignment: TextInput.AlignVCenter
-
-	Behavior on color {
-		CAnim {}
-	}
-	cursorDelegate: Item {}
-	Behavior on selectionColor {
-		CAnim {}
-	}
-
-	CustomRect {
-		id: cursor
-
-		property bool disableBlink
-
-		color: Colors.palette.m3primary
-		implicitHeight: root.cursorRectangle.height
-		implicitWidth: 1.5
-		radius: Tokens.rounding.largeIncreased
-		x: root.cursorRectangle.x
-		y: root.cursorRectangle.y
-
-		Behavior on opacity {
-			Anim {
-				type: Anim.StandardSmall
-			}
-		}
-		Behavior on x {
-			enabled: root.animateCursor
-
-			Anim {
-				duration: Tokens.anim.durations.expressiveFastEffects
-				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
-			}
-		}
-		Behavior on y {
-			enabled: root.animateCursor
-
-			Anim {
-				duration: Tokens.anim.durations.expressiveFastEffects
-				easing.bezierCurve: [0.2, 1, 0.21, 1, 1, 1]
-			}
-		}
-
-		Connections {
-			function onCursorPositionChanged(): void {
-				if (root.activeFocus && root.cursorVisible) {
-					cursor.opacity = 1;
-					cursor.disableBlink = true;
-					enableBlink.restart();
-				}
-			}
-
-			target: root
-		}
-
-		Timer {
-			id: enableBlink
-
-			interval: 500
-
-			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
-		}
-	}
-}

Components/TextFieldBase.qml

@@ -8,7 +8,7 @@ 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
@@ -18,11 +18,14 @@ TextField {
 	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/VerticalFadeListView.qml

@@ -7,9 +7,7 @@ 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
 	property real startFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
 
@@ -18,9 +16,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;
 		}
@@ -32,11 +28,11 @@ CustomListView {
 	}
 
 	function marginEnd(): real {
-		return horizontal ? rightMargin - fadeThreshold : bottomMargin - fadeThreshold;
+		return horizontal ? rightMargin : bottomMargin;
 	}
 
 	function marginStart(): real {
-		return horizontal ? leftMargin - fadeThreshold : topMargin - fadeThreshold;
+		return horizontal ? leftMargin : topMargin;
 	}
 
 	function overshootStart(): real {

Components/VerticalScrollBarTrack.qml

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

@@ -37,12 +37,12 @@ Item {
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
-	required property ScreenState screenState
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
+	required property PersistentProperties visibilities
 
 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
@@ -64,7 +64,7 @@ Item {
 			id: resources
 
 			position: root.geometry.position
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 
@@ -84,8 +84,8 @@ Item {
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
-			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
+			visibilities: root.visibilities
 		}
 	}
 
@@ -96,7 +96,7 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		drawing: root.drawingItem
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Popouts.ClipWrapper {
@@ -121,8 +121,8 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
-		screenState: root.screenState
 		sidebarPanel: sidebar
+		visibilities: root.visibilities
 	}
 
 	Launcher.Wrapper {
@@ -132,7 +132,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Utils.Wrapper {
@@ -140,8 +140,9 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		screenState: root.screenState
+		popouts: popouts
 		sidebar: sidebar
+		visibilities: root.visibilities
 	}
 
 	Item {
@@ -149,11 +150,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 {
@@ -166,7 +169,8 @@ Item {
 			id: dashboard
 
 			offsetScale: dashboardWrapper.offsetScale
-			screenState: root.screenState
+			position: root.geometry.position
+			visibilities: root.visibilities
 		}
 	}
 
@@ -177,7 +181,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: notifications.bottom
 		panels: root
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Item {
@@ -193,7 +197,7 @@ Item {
 			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: root.visibilities
 		}
 	}
 
@@ -204,7 +208,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 
 	Clipboard.Wrapper {
@@ -213,6 +217,6 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: root.visibilities
 	}
 }

Drawers/Windows.qml

@@ -11,6 +11,7 @@ import ZShell.Blobs
 import qs.Daemons
 import qs.Components
 import qs.Modules.Bar
+import qs.Modules.Bar.Popouts.Network as N
 import ZShell.Config
 import qs.Helpers
 import qs.Drawers
@@ -50,47 +51,49 @@ 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 ? 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 {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on surfaceColor {
-		CAnim {}
+		CAnim {
+		}
 	}
 
 	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;
 	}
 
@@ -143,40 +146,53 @@ CustomWindow {
 		id: focusGrab
 
 		active: {
-			const s = root.screenState;
+			const v = visibilities;
-			const c = Config;
+			const conf = Config;
-
+			if (!N.PopupManager.closed && panels.popouts.hasCurrent)
-			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)
+			if ((v.launcher && conf.launcher.enabled) || (v.sidebar && conf.sidebar.enabled) || (v.resources && conf.dashboard.performance.enabled) || (v.dashboard && conf.dashboard.enabled) || v.settings || (v.clipboard && conf.clipboard.enabled) || (v.dock && conf.dock.enabled))
 				return true;
-			if (!c.dock.hoverToReveal && s.dock && c.dock.enable)
+			if (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!conf.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
-				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 +200,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 +266,6 @@ CustomWindow {
 		PanelBg {
 			id: osdBg
 
-			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -258,7 +277,6 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg
 
-			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
 			radius: Tokens.rounding.large
 		}
@@ -286,23 +304,21 @@ CustomWindow {
 			y: panels.popoutsWrapper.y + panels.popouts.y + geometry.insetTop(root.borderThickness) - (geometry.barOnTop ? panels.popouts.height * extraExtent : 0)
 
 			Behavior on extraExtent {
-				Anim {}
+				Anim {
+				}
 			}
 		}
 
 		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 +348,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 +358,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 +400,7 @@ CustomWindow {
 		panels: panels
 		popouts: panels.popouts
 		screen: root.screen
-		screenState: root.screenState
+		visibilities: visibilities
 
 		Panels {
 			id: panels
@@ -374,7 +410,7 @@ CustomWindow {
 			drawingItem: drawing
 			geometry: geometry
 			screen: root.screen
-			screenState: root.screenState
+			visibilities: visibilities
 
 			clipboard.transform: Matrix4x4 {
 				matrix: clipboardBg.deformMatrix
@@ -417,40 +453,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/Services/Colors.qml

@@ -13,17 +13,21 @@ import qs.Paths
 Singleton {
 	id: root
 
-	readonly property M3Palette current: M3Palette {}
+	readonly property M3Palette current: M3Palette {
+	}
 	property bool currentLight
 	property string flavour
 	readonly property bool light: showPreview ? previewLight : currentLight
 	readonly property M3Palette palette: showPreview ? preview : current
-	readonly property M3Palette preview: M3Palette {}
+	readonly property M3Palette preview: M3Palette {
+	}
 	property bool previewLight
 	property string scheme
 	property bool showPreview
-	readonly property M3TPalette tPalette: M3TPalette {}
+	readonly property M3TPalette tPalette: M3TPalette {
-	readonly property Transparency transparency: Transparency {}
+	}
+	readonly property Transparency transparency: Transparency {
+	}
 	readonly property alias wallLuminance: analyser.luminance
 
 	function alterColor(c: color, a: real, layer: int): color {
@@ -108,7 +112,8 @@ Singleton {
 
 	function setMode(mode: string): void {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", mode]);
-		Config.colors.mode = mode;
+		Config.general.color.mode = mode;
+		Config.save();
 	}
 
 	function swapRG(c: color): color {

Greeter/WeatherInfo.qml

@@ -119,8 +119,7 @@ ColumnLayout {
 							length: count
 						}, () => null);
 
-					const start = Math.max(0, Weather.currentHourIndex);
+					return forecast.slice(0, count);
-					return forecast.slice(start, start + count);
 				}
 
 				ColumnLayout {

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

@@ -9,13 +9,13 @@ Singleton {
 	id: root
 
 	readonly property bool enabled: service.enabled
-	readonly property int end: Config.display.nightlight.scheduleEnd
+	readonly property int end: Config.general.color.scheduleHyprsunsetEnd
 	property bool manualToggle: false
-	readonly property int start: Config.display.nightlight.scheduleStart
+	readonly property int start: Config.general.color.scheduleHyprsunsetStart
-	readonly property int temp: Config.display.nightlight.temp
+	readonly property int temp: Config.general.color.hyprsunsetTemp
 
 	function checkStartup(): void {
-		if (!Config.display.nightlight.schedule)
+		if (!Config.general.color.scheduleHyprsunset)
 			return;
 
 		service.apply();
@@ -26,14 +26,12 @@ Singleton {
 		service.toggle();
 	}
 
-	NightlightManager {
+	HyprsunsetManager {
 		id: service
 
-		activeAuto: Config.display.nightlight.schedule
+		activeAuto: Config.general.color.scheduleHyprsunset
 		endTime: root.end
 		startTime: root.start
 		temp: root.temp
-		fadeDuration: Config.display.nightlight.fadeDuration / 1000
-		useNativeNightlight: Config.display.nightlight.useNative
 	}
 }

Helpers/Icons.qml

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

Helpers/ModeScheduler.qml

@@ -11,14 +11,14 @@ import qs.Services
 Singleton {
 	id: root
 
-	readonly property int darkEnd: Config.colors.scheduleDarkEnd
+	readonly property int darkEnd: Config.general.color.scheduleDarkEnd
-	readonly property int darkStart: Config.colors.scheduleDarkStart
+	readonly property int darkStart: Config.general.color.scheduleDarkStart
-	readonly property bool enabled: Config.colors.scheduleDark && Config.colors.schemeGen
+	readonly property bool enabled: Config.general.color.scheduleDark && Config.general.color.schemeGeneration
 
 	function applyDarkMode() {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "dark"]);
 
-		Config.colors.mode = "dark";
+		Config.general.color.mode = "dark";
 
 		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-dark'"]);
 
@@ -30,13 +30,13 @@ Singleton {
 	function applyLightMode() {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "light"]);
 
-		Config.colors.mode = "light";
+		Config.general.color.mode = "light";
 
 		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-light'"]);
 
 		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Dark.colors/color_scheme_path=\\1Light.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`]);
 
-		if (Config.colors.neovimColors)
+		if (Config.general.color.neovimColors)
 			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"]);
 	}
 

Helpers/Network/Network.qml

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

Helpers/Network/NetworkDivider.qml

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

Helpers/Network/NetworkItem.qml

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

Helpers/Network/Toggle.qml

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

Helpers/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) {
@@ -123,35 +126,39 @@ Item {
 	focus: true
 	opacity: 0
 
-	Behavior on rsx {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		Anim {}
-	}
-	Behavior on rsy {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		Anim {}
-	}
-	Behavior on sh {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		Anim {}
-	}
-	Behavior on sw {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		Anim {}
-	}
 	Behavior on opacity {
 		Anim {
 			duration: 300
 		}
 	}
+	Behavior on rsx {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		ExAnim {
+		}
+	}
+	Behavior on rsy {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		ExAnim {
+		}
+	}
+	Behavior on sh {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		ExAnim {
+		}
+	}
+	Behavior on sw {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		ExAnim {
+		}
+	}
 
 	Component.onCompleted: {
 		Hypr.extras.refreshOptions();
-		root.forceActiveFocus();
+		screencopy.active = true;
 
 		opacity = 1;
 
@@ -216,63 +223,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 +240,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 +271,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 +290,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 +301,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,44 +338,39 @@ 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
 
 		Behavior on border.color {
-			Anim {}
+			Anim {
+			}
 		}
 	}
 
 	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 +401,7 @@ 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.Internal
 import ZShell.Config
-import qs.Components
 import qs.Services
 import qs.Helpers
 import qs.Paths
@@ -40,7 +38,7 @@ Searcher {
 		previewPath = path;
 		showPreview = true;
 
-		if (Config.colors.schemeGen)
+		if (Config.general.color.schemeGeneration)
 			previewColorsProc.running = true;
 	}
 
@@ -64,8 +62,8 @@ Searcher {
 		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)
+		if (Config.general.color.schemeGeneration)
-			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.colors.mode}`]);
+			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
 	}
 
 	function stopPreview(): void {
@@ -142,40 +140,4 @@ Searcher {
 			}
 		}
 	}
-
-	WallpaperService {
-		id: wallpaper
-
-		path: root.current
-	}
-
-	Variants {
-		model: Quickshell.screens
-
-		WallpaperObject {
-			readonly property var crops: root.getCrop(modelData.name)
-			required property var modelData
-
-			cropHeight: crops?.height ?? 1.0
-			cropWidth: crops?.width ?? 1.0
-			cropX: crops?.x ?? 0.0
-			cropY: crops?.y ?? 0.0
-			screen: modelData.name
-			service: wallpaper
-			zoom: crops?.zoom ?? 1.0
-
-			Behavior on cropHeight {
-				Anim {}
-			}
-			Behavior on cropWidth {
-				Anim {}
-			}
-			Behavior on cropX {
-				Anim {}
-			}
-			Behavior on cropY {
-				Anim {}
-			}
-		}
-	}
 }

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
 					}
 				}
@@ -206,15 +205,6 @@ GridLayout {
 				}
 			}
 
-			DelegateChoice {
-				roleValue: "network"
-
-				delegate: EntryWrapper {
-					NetworkWidget {
-					}
-				}
-			}
-
 			DelegateChoice {
 				roleValue: "media"
 

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

@@ -11,7 +11,7 @@ Item {
 	id: root
 
 	required property Item bar
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	anchors.fill: parent
 

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,9 +44,10 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
+	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.small * 2 : verticalColumn.implicitHeight + Tokens.padding.small * 2
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
+	color: visibilities.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : size
 	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
@@ -57,13 +57,14 @@ WidgetBase {
 
 		anchors.centerIn: parent
 		color: root.contentColor
-		font: root.font
+		font.family: Config.appearance.font.family.mono // qmllint disable incompatible-type
 		height: implicitHeight
 		text: Time.dateStr
 		visible: root.horizontal
 
 		Behavior on color {
-			CAnim {}
+			CAnim {
+			}
 		}
 	}
 
@@ -83,11 +84,12 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: root.font
+				font.family: Config.appearance.font.family.mono // qmllint disable incompatible-type
 				text: Qt.formatDateTime(Time.date, modelData)
 
 				Behavior on color {
-					CAnim {}
+					CAnim {
+					}
 				}
 			}
 		}
@@ -112,7 +114,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font: root.font
+				font.family: Config.appearance.font.family.mono // qmllint disable incompatible-type
 				text: {
 					if (modelData.includes("h"))
 						return Time.hourStr;
@@ -124,7 +126,8 @@ WidgetBase {
 				}
 
 				Behavior on color {
-					CAnim {}
+					CAnim {
+					}
 				}
 			}
 		}
@@ -132,13 +135,23 @@ WidgetBase {
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
 			color: root.contentColor
-			font: root.font
+			font.family: Config.appearance.font.family.mono // qmllint disable incompatible-type
 			text: Qt.formatDateTime(Time.date, "AP")
 			visible: Config.services.useTwelveHourClock && root.formatParts.timeTokens.length > 0
 
 			Behavior on color {
-				CAnim {}
+				CAnim {
+				}
 			}
 		}
 	}
+
+	StateLayer {
+		acceptedButtons: Qt.LeftButton
+		color: root.contentColor
+
+		onClicked: {
+			root.visibilities.dashboard = !root.visibilities.dashboard;
+		}
+	}
 }

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -28,7 +28,8 @@ Row {
 
 		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

@@ -19,12 +19,14 @@ WidgetBase {
 	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
@@ -12,7 +12,6 @@ GridLayout {
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
-	readonly property real dpr: (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1
 	required property bool horizontal
 	property string icon
 	required property color iconColor
@@ -23,10 +22,6 @@ GridLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
-	function snap(v) {
-		return Math.round(v * dpr) / dpr;
-	}
-
 	columnSpacing: Tokens.spacing.medium
 	columns: horizontal ? -1 : 1
 	percentage: 0
@@ -49,39 +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: Math.min(width, height) / 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
-			height: root.horizontal ? root.snap(root.percentage * track.height) : track.height * 2
+			implicitHeight: root.horizontal ? Math.ceil(root.percentage * parent.height) : 0
-			width: root.horizontal ? track.width * 2 : root.snap(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
-				height: track.height
-				radius: track.radius
-				width: 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 {
@@ -53,8 +53,8 @@ WidgetBase {
 			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
 		}
@@ -64,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
 		}
@@ -75,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
 		}
 
@@ -85,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

@@ -105,6 +105,28 @@ WidgetBase {
 					}
 				}
 
+				DelegateChoice {
+					roleValue: "bluetooth"
+
+					delegate: EntryWrapper {
+						name: "bluetooth"
+
+						BluetoothWidget {
+						}
+					}
+				}
+
+				DelegateChoice {
+					roleValue: "network"
+
+					delegate: EntryWrapper {
+						name: "network"
+
+						NetworkWidget {
+						}
+					}
+				}
+
 				DelegateChoice {
 					roleValue: "power"
 

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -13,16 +13,19 @@ MaterialIcon {
 	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"
 
 	Behavior on Layout.maximumWidth {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 }

Modules/Bar/Components/StatusIcons/BluetoothWidget.qml

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

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -13,16 +13,19 @@ MaterialIcon {
 	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"
 
 	Behavior on Layout.maximumWidth {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 }

Modules/Bar/Components/StatusIcons/NetworkWidget.qml

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

Modules/Bar/Components/StatusIcons/UPowerWidget.qml

@@ -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()
@@ -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

@@ -62,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;
 					}
 				}
 			}

Modules/Bar/Components/TrayIcons.qml

@@ -42,7 +42,7 @@ WidgetBase {
 		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

@@ -17,7 +17,7 @@ Item {
 	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) + activeWorkspaceMargin * 2
 	property int workspaceButtonWidth: (horizontal ? bgRect.implicitHeight : bgRect.implicitWidth) - root.activeWorkspaceMargin * 2
 	property int workspaceIndexInGroup: (effectiveActiveWorkspaceId - 1) % root.workspacesShown
@@ -30,12 +30,14 @@ Item {
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
-		Anim {}
+		Anim {
+		}
 	}
 
 	CustomRect {

Modules/Bar/Popouts/BluetoothPopout.qml

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

Modules/Bar/Popouts/Content.qml

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

Modules/Bar/Popouts/Network/NetworkOverlay.qml

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

Modules/Bar/Popouts/Network/PSKOverlay.qml

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

Modules/Bar/Popouts/Network/PopupManager.qml

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

Modules/Bar/Popouts/NetworkPopout.qml

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

Modules/Bar/Popouts/UPowerPopout.qml

@@ -181,7 +181,8 @@ Column {
 				}
 			]
 			transitions: Transition {
-				AnchorAnim {}
+				AnchorAnim {
+				}
 			}
 		}
 
@@ -245,7 +246,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

@@ -36,17 +36,15 @@ CustomClippingRect {
 			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
@@ -91,7 +89,7 @@ CustomClippingRect {
 					anchors.rightMargin: Tokens.padding.small
 
 					MaterialIcon {
-						fontStyle: Tokens.font.icon.extraLarge
+						font.pointSize: Tokens.font.size.large * 2
 						text: "package_2"
 					}
 
@@ -102,7 +100,7 @@ CustomClippingRect {
 							Layout.fillWidth: true
 							Layout.preferredHeight: 25
 							elide: Text.ElideRight
-							font: Tokens.font.title.medium
+							font.pointSize: Tokens.font.size.large
 							text: update.sections[0]
 						}
 
@@ -124,7 +122,7 @@ CustomClippingRect {
 							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
@@ -135,7 +133,7 @@ CustomClippingRect {
 						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
@@ -148,7 +146,7 @@ CustomClippingRect {
 							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/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
@@ -49,7 +49,7 @@ Item {
 			Keys.onUpPressed: view.decrementCurrentIndex()
 			onAccepted: {
 				ClipHistory.copy(view.currentItem.modelData);
-				root.screenState.clipboard = false;
+				root.visibilities.clipboard = false;
 			}
 		}
 	}
@@ -66,7 +66,8 @@ Item {
 		radius: 25
 
 		Behavior on implicitWidth {
-			Anim {}
+			Anim {
+			}
 		}
 
 		Column {
@@ -103,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
 						}
 					}
@@ -250,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
 		}
 	}
 }

Modules/Dashboard/Content.qml

@@ -1,169 +1,82 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Widgets
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Config
-import ZShell
 import qs.Components
 
 Item {
 	id: root
 
-	readonly property var dashboardTabs: {
+	required property PersistentProperties dashState
-		const allTabs = [
+	readonly property real nonAnimHeight: view.implicitHeight + viewWrapper.anchors.margins * 2
-			{
-				component: dashComponent,
-				iconName: "dashboard",
-				text: qsTr("Dashboard"),
-				enabled: Config.dashboard.showDashboard
-			},
-			{
-				component: weatherComponent,
-				iconName: "cloud",
-				text: qsTr("Weather"),
-				enabled: Config.dashboard.showWeather
-			},
-			{
-				component: mediaComponent,
-				iconName: "queue_music",
-				text: qsTr("Media"),
-				enabled: Config.dashboard.showMedia
-			},
-			{
-				component: procsComponent,
-				iconName: "speed",
-				text: qsTr("Processes"),
-				enabled: Config.dashboard.showProcesses
-			},
-		];
-		return allTabs.filter(tab => tab.enabled);
-	}
-	readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
 	readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
-	required property ScreenState screenState
+	required property PersistentProperties visibilities
 
 	implicitHeight: nonAnimHeight
 	implicitWidth: nonAnimWidth
 
 	Behavior on implicitHeight {
 		Anim {
-			type: Anim.SlowEffects
 		}
 	}
 	Behavior on implicitWidth {
 		Anim {
-			type: Anim.SlowEffects
 		}
 	}
 
-	Tabs {
+	ClippingRectangle {
-		id: tabs
-
-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
-		anchors.top: parent.top
-		anchors.topMargin: ZUtils.clamp(anchors.margins - Config.bar.border, 0, anchors.margins)
-		nonAnimWidth: view.implicitWidth
-		screenState: root.screenState
-		tabs: root.dashboardTabs
-	}
-
-	Item {
 		id: viewWrapper
 
-		property int radius: Tokens.rounding.extraLarge - anchors.margins
-
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		anchors.margins: Tokens.padding.small
 		anchors.right: parent.right
-		anchors.top: tabs.bottom
+		anchors.top: parent.top
-		anchors.topMargin: Tokens.spacing.small
+		color: "transparent"
-		clip: view.currentIndex !== 3 || (!view.currentItem?.settled ?? true)
+		radius: Tokens.rounding.extraLarge - anchors.margins
 
 		Item {
 			id: view
 
-			readonly property int currentIndex: root.screenState.dashboardTab
+			readonly property int currentIndex: root.dashState?.currentTab
-			readonly property Item currentItem: {
+			readonly property Item currentItem: row.children[currentIndex]
-				repeater.count;
-				return repeater.itemAt(currentIndex);
-			}
 
 			anchors.fill: parent
-			implicitHeight: currentItem?.implicitHeight ?? 0
+			implicitHeight: currentItem.implicitHeight
-			implicitWidth: currentItem?.implicitWidth ?? 0
+			implicitWidth: currentItem.implicitWidth
 
-			Repeater {
+			RowLayout {
-				id: repeater
+				id: row
 
-				delegate: Loader {
+				Pane {
-					id: paneLoader
+					index: 0
 
-					required property int index
+					sourceComponent: Dash {
-					required property var modelData
+						dashState: root.dashState
-
+						visibilities: root.visibilities
-					readonly property real targetX: index < view.currentIndex ? -view.implicitWidth : index > view.currentIndex ? view.implicitWidth : 0
-					readonly property bool settled: x === targetX
-
-					active: index === view.currentIndex || opacity > 0
-					opacity: index === view.currentIndex ? 1 : 0
-					sourceComponent: modelData.component
-					visible: opacity > 0
-					x: targetX
-					y: 0
-
-					Behavior on opacity {
-						Anim {
-							type: Anim.DefaultEffects
-						}
 					}
-					Behavior on x {
-						Anim {
-							type: Anim.DefaultEffects
-						}
-					}
-				}
-				model: ScriptModel {
-					values: root.dashboardTabs
-				}
-			}
-
-			Component {
-				id: dashComponent
-
-				Dash {
-					radius: viewWrapper.radius
-					screenState: root.screenState
-				}
-			}
-
-			Component {
-				id: weatherComponent
-
-				WeatherTab {
-					radius: viewWrapper.radius
-				}
-			}
-
-			Component {
-				id: mediaComponent
-
-				Media {
-					radius: viewWrapper.radius
-					screenState: root.screenState
-				}
-			}
-
-			Component {
-				id: procsComponent
-
-				ProcessesTab {
-					radius: viewWrapper.radius
 				}
 			}
 		}
 	}
+
+	component Pane: Loader {
+		id: pane
+
+		required property int index
+
+		Layout.alignment: Qt.AlignTop
+
+		Component.onCompleted: active = Qt.binding(() => {
+			// Always keep current tab loaded
+			if (pane.index === view.currentIndex)
+				return true;
+			const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
+			const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
+			return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
+		})
+	}
 }

Modules/Dashboard/Dash.qml

@@ -11,9 +11,10 @@ import qs.Services
 GridLayout {
 	id: root
 
-	readonly property bool dashboardVisible: screenState.dashboard
+	required property PersistentProperties dashState
-	required property int radius
+	readonly property bool dashboardVisible: visibilities.dashboard
-	required property ScreenState screenState
+	property int radius: Tokens.rounding.medium
+	required property PersistentProperties visibilities
 
 	columnSpacing: Tokens.spacing.small
 	rowSpacing: Tokens.spacing.small
@@ -60,18 +61,19 @@ GridLayout {
 		User {
 			id: user
 
-			screenState: root.screenState
+			dashState: root.dashState
 		}
 	}
 
 	Rect {
 		Layout.columnSpan: 2
 		Layout.fillHeight: true
-		Layout.preferredWidth: Tokens.sizes.dashboard.weatherWidth
+		Layout.preferredWidth: Config.dashboard.sizes.weatherWidth
 		Layout.row: 0
 		radius: root.radius
 
-		Weather {}
+		Weather {
+		}
 	}
 
 	Rect {
@@ -85,7 +87,7 @@ GridLayout {
 		Calendar {
 			id: calendar
 
-			screenState: root.screenState
+			dashState: root.dashState
 		}
 	}
 
@@ -102,6 +104,20 @@ GridLayout {
 		}
 	}
 
+	CustomClippingRect {
+		Layout.column: 0
+		Layout.columnSpan: 5
+		Layout.fillWidth: true
+		Layout.preferredHeight: media.implicitHeight
+		Layout.row: 2
+		color: Colors.tPalette.m3surfaceContainer
+		radius: root.radius
+
+		Media {
+			id: media
+		}
+	}
+
 	component Rect: CustomRect {
 		color: Colors.tPalette.m3surfaceContainer
 	}

Modules/Dashboard/Dash/Calendar.qml

@@ -12,12 +12,12 @@ CustomMouseArea {
 	id: root
 
 	property int activeGrid: 1
-	required property ScreenState screenState
+	required property PersistentProperties dashState
 	property bool initialized: false
 	property int month1
 	property int month2
-	readonly property int realCurrMonth: screenState.dashboardDate.getMonth()
+	readonly property int realCurrMonth: dashState.currentDate.getMonth()
-	readonly property int realCurrYear: screenState.dashboardDate.getFullYear()
+	readonly property int realCurrYear: dashState.currentDate.getFullYear()
 	property int year1
 	property int year2
 
@@ -43,9 +43,9 @@ CustomMouseArea {
 
 	function onWheel(event: WheelEvent): void {
 		if (event.angleDelta.y > 0)
-			root.screenState.dashboardDate = new Date(root.realCurrYear, root.realCurrMonth - 1, 1);
+			root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth - 1, 1);
 		else if (event.angleDelta.y < 0)
-			root.screenState.dashboardDate = new Date(root.realCurrYear, root.realCurrMonth + 1, 1);
+			root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth + 1, 1);
 	}
 
 	acceptedButtons: Qt.MiddleButton
@@ -61,7 +61,7 @@ CustomMouseArea {
 
 		initialized = true;
 	}
-	onClicked: root.screenState.dashboardDate = new Date()
+	onClicked: root.dashState.currentDate = new Date()
 	onRealCurrMonthChanged: handleDateChange()
 	onRealCurrYearChanged: handleDateChange()
 
@@ -135,7 +135,7 @@ CustomMouseArea {
 				padding: Tokens.padding.extraSmall
 				type: IconButton.Text
 
-				onClicked: root.screenState.dashboardDate = new Date(root.realCurrYear, root.realCurrMonth - 1, 1)
+				onClicked: root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth - 1, 1)
 			}
 
 			Item {
@@ -158,7 +158,7 @@ CustomMouseArea {
 						}
 					}
 
-					onClicked: root.screenState.dashboardDate = new Date()
+					onClicked: root.dashState.currentDate = new Date()
 				}
 
 				Item {
@@ -206,7 +206,7 @@ CustomMouseArea {
 				padding: Tokens.padding.extraSmall
 				type: IconButton.Text
 
-				onClicked: root.screenState.dashboardDate = new Date(root.realCurrYear, root.realCurrMonth + 1, 1)
+				onClicked: root.dashState.currentDate = new Date(root.realCurrYear, root.realCurrMonth + 1, 1)
 			}
 		}
 

Modules/Dashboard/Dash/DateTime.qml

@@ -0,0 +1,51 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import ZShell.Config
+import qs.Helpers
+import qs.Services
+
+Item {
+	id: root
+
+	anchors.bottom: parent.bottom
+	anchors.top: parent.top
+	implicitWidth: 110
+
+	ColumnLayout {
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		spacing: 0
+
+		CustomText {
+			Layout.alignment: Qt.AlignHCenter
+			Layout.bottomMargin: -(font.pointSize * 0.4)
+			color: Colors.palette.m3secondary
+			font.family: "Rubik"
+			font.pointSize: 18
+			font.weight: 600
+			text: Time.hourStr
+		}
+
+		CustomText {
+			Layout.alignment: Qt.AlignHCenter
+			color: Colors.palette.m3primary
+			font.family: "Rubik"
+			font.pointSize: 18 * 0.9
+			text: "•••"
+		}
+
+		CustomText {
+			Layout.alignment: Qt.AlignHCenter
+			Layout.topMargin: -(font.pointSize * 0.4)
+			color: Colors.palette.m3secondary
+			font.family: "Rubik"
+			font.pointSize: 18
+			font.weight: 600
+			text: Time.minuteStr
+		}
+	}
+}

Modules/Dashboard/Dash/Media.qml

@@ -0,0 +1,329 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Services.Mpris
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Shapes
+import QtQuick.Effects
+import ZShell.Components
+import ZShell.Services
+import ZShell.Config
+import qs.Modules.Dashboard.Dash.Media
+import qs.Daemons
+import qs.Components
+import qs.Helpers
+import qs.Services
+
+Item {
+	id: root
+	readonly property bool hasUnknownLength: (Players.active?.length ?? 0) > 2147483647
+	property real playerProgress: {
+		const active = Players.active;
+		return active?.length ? (active.position % active.length) / active.length : 0;
+	}
+	property int rowHeight: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small
+
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	function lengthStr(length: int): string {
+		if (length < 0)
+		return "-1:-1";
+
+		const hours = Math.floor(length / 3600);
+		const mins = Math.floor((length % 3600) / 60);
+		const secs = Math.floor(length % 60).toString().padStart(2, "0");
+
+		if (hours > 0)
+		return `${hours}:${mins.toString().padStart(2, "0")}:${secs}`;
+		return `${mins}:${secs}`;
+	}
+
+	Behavior on playerProgress {
+		Anim {
+			duration: Tokens.anim.durations.large
+		}
+	}
+
+	Timer {
+		running: Players.active?.isPlaying ?? false
+		interval: Config.dashboard.mediaUpdateInterval
+		triggeredOnStart: true
+		repeat: true
+		onTriggered: Players.active?.positionChanged()
+	}
+
+	ServiceRef {
+		service: Audio.cava
+	}
+
+	BackgroundShapes {
+		anchors.fill: parent
+	}
+
+	Shape {
+		id: visualizer
+
+		readonly property int bars: Config.services.visualizerBars
+		property color color: Qt.alpha(Colors.palette.m3primary, 0.5)
+		property color fillColor: Qt.alpha(color, 0.1)
+
+		anchors.fill: parent
+		anchors.leftMargin: -(shape.strokeWidth / 2)
+		layer.enabled: true
+		asynchronous: true
+		preferredRendererType: Shape.CurveRenderer
+
+		ShapePath {
+			id: shape
+			strokeColor: visualizer.color
+			fillColor: visualizer.fillColor
+			strokeWidth: 2
+
+			PathSvg {
+				path: shape.curvePath
+			}
+
+			property string curvePath: {
+				const values = Audio.cava.values;
+				const n = values.length;
+
+				if (n < 2)
+				return "";
+
+				const h = root.height + shape.strokeWidth / 2;
+				const w = root.width + shape.strokeWidth;
+
+				function x(i) {
+					return i * w / (n - 1);
+				}
+
+				function y(i) {
+					return h - (values[i] * Config.dashboard.sizes.mediaVisualizerSize) / 2;
+				}
+
+				let d = `M 0 ${h} `;
+				d += `L ${x(0)} ${y(0)} `;
+
+				for (let i = 0; i < n - 1; ++i) {
+					const x0 = x(i);
+					const y0 = y(i);
+
+					const x1 = x(i + 1);
+					const y1 = y(i + 1);
+
+					const prev = Math.max(0, i - 1);
+					const next = Math.min(n - 1, i + 2);
+
+					const c1x = x0 + (x1 - x(prev)) / 6;
+					const c1y = y0 + (y1 - y(prev)) / 6;
+
+					const c2x = x1 - (x(next) - x0) / 6;
+					const c2y = y1 - (y(next) - y0) / 6;
+
+					d += `C ${c1x} ${c1y}, ${c2x} ${c2y}, ${x1} ${y1} `;
+				}
+
+				d += `L ${w} ${h} `;
+				d += `L 0 ${h} Z`;
+
+				return d;
+			}
+		}
+	}
+
+	CustomRect {
+		anchors.fill: visualizer
+
+		color: Qt.alpha(Colors.palette.m3shadow, 0.2)
+		layer.enabled: true
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskSource: visualizer
+		}
+	}
+
+	RowLayout {
+		id: layout
+
+		anchors.fill: parent
+		anchors.margins: Tokens.padding.large
+		anchors.leftMargin: Tokens.padding.extraLarge
+
+		CoverVisualizer {
+			Layout.fillHeight: true
+			implicitWidth: Config.dashboard.sizes.mediaCoverArtSize
+		}
+
+		ColumnLayout {
+			Layout.fillWidth: true
+			Layout.leftMargin: Tokens.spacing.largeIncreased
+			Layout.rightMargin: Tokens.spacing.largeIncreased
+
+			spacing: Tokens.spacing.small
+
+			MarqueeText {
+				id: title
+
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+				color: Colors.palette.m3primary
+				font.pointSize: Tokens.font.size.normal
+				horizontalAlignment: Text.AlignHCenter
+				pauseMs: 4000
+				text: (Players.active?.trackTitle ?? qsTr("No media")) || qsTr("Unknown title")
+				implicitWidth: parent.width - Tokens.padding.large * 4
+			}
+
+			MarqueeText {
+				id: album
+
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+				color: Colors.palette.m3outline
+				font.pointSize: Tokens.font.size.small
+				horizontalAlignment: Text.AlignHCenter
+				pauseMs: 4000
+				text: (Players.active?.trackAlbum ?? qsTr("No media")) || qsTr("Unknown album")
+				implicitWidth: parent.width - Tokens.padding.large * 4
+			}
+
+			MarqueeText {
+				id: artist
+
+				Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+				color: Colors.palette.m3secondary
+				horizontalAlignment: Text.AlignHCenter
+				pauseMs: 4000
+				text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist")
+				implicitWidth: parent.width - Tokens.padding.large * 4
+			}
+
+			RowLayout {
+				id: positionSliderLayout
+				Layout.topMargin: Tokens.spacing.large
+				Layout.fillWidth: true
+				spacing: Tokens.spacing.small
+
+				TextMetrics {
+					id: timeMetrics
+
+					text: Players.active ? root.lengthStr(Math.max(Players.active.position, root.hasUnknownLength ? 0 : Players.active.length)).replace(/[1-9]/g, "0") : "00:00"
+				}
+
+				CustomText {
+					id: positionLabel
+
+					Layout.preferredWidth: timeMetrics.width
+					text: root.lengthStr(Players.active?.position ?? -1)
+					color: Colors.palette.m3onSurfaceVariant
+					font: timeMetrics.font
+					horizontalAlignment: Text.AlignHCenter
+				}
+
+				CustomSlider {
+					id: positionSlider
+
+					Layout.fillWidth: true
+					value: Players.active ? Players.active.position / (Players.active.length || 1) : 0
+					enabled: (Players.active?.canSeek ?? false) && !root.hasUnknownLength
+					wavy: true
+					animateWave: Players.active?.isPlaying ?? false
+					waveFrequency: 5
+					waveDuration: 2000
+					interactionOnMove: false
+					onInteraction: value => {
+						const active = Players.active;
+						if (active?.canSeek && active?.positionSupported)
+						active.position = value * active.length;
+					}
+					Binding {
+						target: positionLabel
+						property: "text"
+						value: root.lengthStr(positionSlider.pos * (Players.active?.length ?? 0))
+						when: positionSlider.dragging
+					}
+				}
+
+				CustomText {
+					Layout.preferredWidth: timeMetrics.width
+					text: root.hasUnknownLength ? "--:--" : root.lengthStr(Players.active?.length ?? -1)
+					color: Colors.palette.m3onSurfaceVariant
+					font: timeMetrics.font
+					horizontalAlignment: Text.AlignHCenter
+				}
+			}
+			ButtonRow {
+				Layout.topMargin: Tokens.spacing.largeIncreased
+				Layout.fillWidth: true
+				spacing: Tokens.spacing.extraSmall
+				Layout.leftMargin: positionSliderLayout.implicitWidth / 4
+				Layout.rightMargin: positionSliderLayout.implicitWidth / 4
+
+				IconButton {
+					type: IconButton.Tonal
+					icon: "shuffle"
+					isRound: true
+					shapeMorph: true
+					checked: Players.active?.shuffle ?? false
+					enabled: Players.active?.shuffleSupported
+					onClicked: Players.active.shuffle = !Players.active?.shuffle
+				}
+
+				IconButton {
+					id: previousBtn
+
+					type: IconButton.Tonal
+					icon: "skip_previous"
+					isRound: true
+					shapeMorph: true
+					enabled: Players.active?.canGoPrevious
+					onClicked: Players.active?.previous()
+					font.pointSize: Tokens.font.size.large
+				}
+
+				IconButton {
+					id: playPauseBtn
+
+					icon: Players.active?.isPlaying ? "pause" : "play_arrow"
+					isRound: true
+					shapeMorph: true
+					fillWidth: true
+					checked: Players.active?.isPlaying ?? false
+					enabled: Players.active?.canTogglePlaying
+					onClicked: Players.active?.togglePlaying()
+					font.pointSize: Tokens.font.size.large
+				}
+
+				IconButton {
+					id: nextBtn
+
+					type: IconButton.Tonal
+					icon: "skip_next"
+					isRound: true
+					shapeMorph: true
+					enabled: Players.active?.canGoNext
+					onClicked: Players.active?.next()
+					font.pointSize: Tokens.font.size.large
+				}
+
+				IconButton {
+					type: IconButton.Tonal
+					icon: Players.active?.loopState === MprisLoopState.Track ? "repeat_one" : "repeat"
+					isRound: true
+					shapeMorph: true
+					checked: Players.active?.loopState === MprisLoopState.Track || Players.active?.loopState === MprisLoopState.Playlist
+					enabled: Players.active?.loopSupported
+					onClicked: {
+						const state = Players.active.loopState;
+						if (state === MprisLoopState.None)
+						Players.active.loopState = MprisLoopState.Track;
+						else if (state === MprisLoopState.Track)
+						Players.active.loopState = MprisLoopState.Playlist;
+						else
+						Players.active.loopState = MprisLoopState.None;
+					}
+				}
+			}
+		}
+	}
+}